人员客户端接口补充消息

alien-entity/src/main/java/shop/alien/entity/store/vo/StoreStaffFitnessDetailVo.java

@@ -7,19 +7,20 @@ import lombok.Data;
 import shop.alien.entity.store.StoreStaffConfig;
 import shop.alien.entity.store.StoreStaffFitnessBase;
 import shop.alien.entity.store.StoreStaffFitnessCertification;
+import shop.alien.entity.store.StoreStaffFitnessExperience;
 
 import java.io.Serializable;
 import java.util.List;
 
 /**
- * 健身教练详情视图对象（包含员工信息、基本信息和认证/荣誉列表）
+ * 健身教练详情视图对象（包含员工信息、基本信息、认证/荣誉列表和从业经历）
  *
  * @author system
  * @since 2025-01-XX
  */
 @Data
 @JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "StoreStaffFitnessDetailVo对象", description = "健身教练详情视图对象（包含员工信息、基本信息和认证/荣誉列表）")
+@ApiModel(value = "StoreStaffFitnessDetailVo对象", description = "健身教练详情视图对象（包含员工信息、基本信息、认证/荣誉列表和从业经历）")
 public class StoreStaffFitnessDetailVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -35,5 +36,8 @@ public class StoreStaffFitnessDetailVo implements Serializable {
 
     @ApiModelProperty(value = "荣誉列表（type=2）")
     private List<StoreStaffFitnessCertification> honorList;
+
+    @ApiModelProperty(value = "从业经历列表")
+    private List<StoreStaffFitnessExperience> experienceList;
 }
 

alien-store/src/main/java/shop/alien/store/controller/StoreStaffConfigController.java

@@ -337,12 +337,12 @@ public class StoreStaffConfigController {
     }
 
     /**
-     * 查询健身教练详情（包含员工信息、基本信息和认证/荣誉列表）
+     * 查询健身教练详情（包含员工信息、基本信息、认证/荣誉列表和从业经历）
      *
      * @param id 员工主键ID
-     * @return 健身教练详情（包含员工信息、基本信息和认证/荣誉列表）
+     * @return 健身教练详情（包含员工信息、基本信息、认证/荣誉列表和从业经历）
      */
-    @ApiOperation("查询健身教练详情（包含员工信息、基本信息和认证/荣誉列表）用户端")
+    @ApiOperation("查询健身教练详情（包含员工信息、基本信息、认证/荣誉列表和从业经历）用户端")
     @ApiOperationSupport(order = 9)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "员工主键ID", dataType = "Integer", paramType = "query", required = true)
@@ -366,10 +366,6 @@ public class StoreStaffConfigController {
                 return R.fail("员工不存在");
             }
 
-            log.info("查询健身教练详情成功，id={}，认证数量：{}，荣誉数量：{}",
-                    id,
-                    result.getCertificationList() != null ? result.getCertificationList().size() : 0,
-                    result.getHonorList() != null ? result.getHonorList().size() : 0);
             return R.data(result);
         } catch (Exception e) {
             log.error("查询健身教练详情异常，id={}，异常信息：{}", id, e.getMessage(), e);

alien-store/src/main/java/shop/alien/store/service/impl/StoreStaffConfigServiceImpl.java

@@ -25,6 +25,7 @@ import shop.alien.store.service.StoreStaffConfigService;
 import shop.alien.store.service.StoreStaffFitnessBaseService;
 import shop.alien.store.service.StoreStaffFitnessCertificationService;
 import shop.alien.store.service.StoreStaffFitnessCourseService;
+import shop.alien.store.service.StoreStaffFitnessExperienceService;
 import shop.alien.store.util.CommonConstant;
 import shop.alien.store.util.ai.AiContentModerationUtil;
 import shop.alien.util.ali.AliOSSUtil;
@@ -72,6 +73,8 @@ public class StoreStaffConfigServiceImpl implements StoreStaffConfigService {
 
     private final AiContentModerationUtil aiContentModerationUtil;
 
+    private final StoreStaffFitnessExperienceService storeStaffFitnessExperienceService;
+
     /**
      * 认证类型：认证
      */
@@ -894,17 +897,29 @@ public class StoreStaffConfigServiceImpl implements StoreStaffConfigService {
             List<shop.alien.entity.store.StoreStaffFitnessCertification> honorList =
                     storeStaffFitnessCertificationService.getListByStaffIdAndType(id, HONOR_TYPE);
 
+
+            // 查询从业经历列表
+            List<shop.alien.entity.store.StoreStaffFitnessExperience> experienceList = null;
+            try {
+                experienceList = storeStaffFitnessExperienceService.getListByStaffId(id);
+            } catch (Exception e) {
+                log.warn("查询从业经历列表失败，id={}，异常信息：{}", id, e.getMessage());
+                // 从业经历查询失败不影响整体返回，设置为null即可
+            }
+
             // 构建返回对象
             StoreStaffFitnessDetailVo detailVo = new StoreStaffFitnessDetailVo();
             detailVo.setStaffInfo(staffConfig);
             detailVo.setBaseInfo(baseInfo);
             detailVo.setCertificationList(certificationList != null ? certificationList : new ArrayList<>());
             detailVo.setHonorList(honorList != null ? honorList : new ArrayList<>());
+            detailVo.setExperienceList(experienceList != null ? experienceList : new ArrayList<>());
 
-            log.info("查询健身教练详情成功，id={}，认证数量：{}，荣誉数量：{}",
-                    id,
+            log.info("查询健身教练详情成功，id={}，认证数量：{}，荣誉数量：{}，从业经历数量：{}",
+                    id, 
                     certificationList != null ? certificationList.size() : 0,
-                    honorList != null ? honorList.size() : 0);
+                    honorList != null ? honorList.size() : 0,
+                    experienceList != null ? experienceList.size() : 0);
             return detailVo;
         } catch (Exception e) {
             log.error("查询健身教练详情异常，id={}，异常信息：{}", id, e.getMessage(), e);