no message

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/worker/WebsitWorkerBean.java

@@ -8,9 +8,12 @@ import lombok.Data;
 @ApiModel
 public class WebsitWorkerBean {
 
-    @ApiModelProperty(value = "师傅编号")
+    @ApiModelProperty(value = "师傅id")
     private String workerId;
 
+    @ApiModelProperty(value = "师傅编号")
+    private String workerNumber;
+
     @ApiModelProperty(value = "师傅名称")
     private String workerName;
 

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/worker/WorkerTeamLogic.java

@@ -10,6 +10,7 @@ import com.gree.mall.miniapp.bean.worker.WebsitWorkerBean;
 import com.gree.mall.miniapp.bean.worker.WorkerTeamApplyBean;
 import com.gree.mall.miniapp.bean.worker.WorkerTeamBean;
 import com.gree.mall.miniapp.enums.ExamineStatusEnum;
+import com.gree.mall.miniapp.enums.ExamineWorkerStatusEnum;
 import com.gree.mall.miniapp.enums.StateEnum;
 import com.gree.mall.miniapp.exception.RemoteServiceException;
 import com.gree.mall.miniapp.logic.common.CommonLogic;
@@ -120,11 +121,14 @@ public class WorkerTeamLogic {
         }
         if (StringUtils.isBlank(workerTeam.getMasterWorkerId()) || StringUtils.isBlank(workerTeam.getMasterWorkerName())) {
             workerTeam.setMasterWorkerId(current.getUser().getUserId())
+                    .setMasterWorkerNumber(current.getUser().getWorkerNumber())
                     .setMasterWorkerName(current.getUser().getNickName());
         }
         if (StringUtils.isBlank(workerTeam.getAssistantWorkerId()) || StringUtils.isBlank(workerTeam.getAssistantWorkerName())) {
             throw new RemoteServiceException("组队师傅不能为空");
         }
+        final User assistantWorker = userService.getById(workerTeam.getAssistantWorkerId());
+        workerTeam.setAssistantWorkerNumber(assistantWorker.getWorkerNumber());
         final Integer count = workerTeamService.lambdaQuery()
                 .eq(WorkerTeam::getWebsitId, workerTeam.getWebsitId())
                 .eq(WorkerTeam::getMasterWorkerId, workerTeam.getMasterWorkerId())
@@ -176,8 +180,10 @@ public class WorkerTeamLogic {
                     .setCompanyWechatName(apply.getCompanyWechatName())
                     .setWebsitId(apply.getWebsitId())
                     .setMasterWorkerId(apply.getMasterWorkerId())
+                    .setMasterWorkerNumber(apply.getMasterWorkerNumber())
                     .setMasterWorkerName(apply.getMasterWorkerName())
                     .setAssistantWorkerId(apply.getAssistantWorkerId())
+                    .setAssistantWorkerNumber(apply.getAssistantWorkerNumber())
                     .setAssistantWorkerName(apply.getAssistantWorkerName())
                     .setStatus(StateEnum.ON.getKey())
                     .insert();
@@ -193,7 +199,7 @@ public class WorkerTeamLogic {
                 .eq(WebsitUser::getCompanyWechatId, current.getUser().getCompanyWechatId())
                 .eq(WebsitUser::getWebsitId, websitId)
                 .ne(WebsitUser::getUserId, current.getUserId())
-                .eq(WebsitUser::getExamineStatus, ExamineStatusEnum.OK.getKey())
+                .in(WebsitUser::getExamineStatus, ExamineWorkerStatusEnum.OK.getKey(), ExamineWorkerStatusEnum.EXPIRED.getKey())
                 .list();
         final List<User> userList = userService.lambdaQuery()
                 .eq(User::getCompanyWechatId, current.getUser().getCompanyWechatId())
@@ -206,6 +212,7 @@ public class WorkerTeamLogic {
             if (userMap.containsKey(websitUser.getUserId())) {
                 WebsitWorkerBean bean = new WebsitWorkerBean();
                 bean.setWorkerId(websitUser.getUserId());
+                bean.setWorkerNumber(websitUser.getWorkerNumber());
                 bean.setWorkerName(userMap.get(websitUser.getUserId()));
                 workerMap.put(bean.getWorkerId(), bean);
             }

mall-server-api/src/main/java/com/gree/mall/manager/bean/worker/WorkerTeamVO.java

@@ -43,15 +43,23 @@ public class WorkerTeamVO {
     @ApiModelProperty(value = "大工师傅名称")
     private String masterWorkerName;
 
-    @ApiModelProperty(value = "大工师傅编号")
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "大工师傅id")
     private String masterWorkerId;
 
+    @ApiModelProperty(value = "大工师傅编号")
+    private String masterWorkerNumber;
+
     @ApiModelProperty(value = "小工师傅名称")
     private String assistantWorkerName;
 
-    @ApiModelProperty(value = "小工师傅编号")
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "小工师傅id")
     private String assistantWorkerId;
 
+    @ApiModelProperty(value = "小工师傅编号")
+    private String assistantWorkerNumber;
+
     @ApiModelProperty(value = "状态")
     private StateEnum status;
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/worker/WorkerTeamLogic.java

@@ -8,10 +8,14 @@ import com.gree.mall.manager.bean.worker.WebsitWorkerBean;
 import com.gree.mall.manager.bean.worker.WorkerTeamVO;
 import com.gree.mall.manager.commonmapper.CommonMapper;
 import com.gree.mall.manager.enums.ExamineStatusEnum;
+import com.gree.mall.manager.enums.ExamineWorkerStatusEnum;
 import com.gree.mall.manager.enums.material.StateEnum;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
-import com.gree.mall.manager.plus.entity.*;
+import com.gree.mall.manager.plus.entity.User;
+import com.gree.mall.manager.plus.entity.WebsitUser;
+import com.gree.mall.manager.plus.entity.WorkerTeam;
+import com.gree.mall.manager.plus.entity.WorkerTeamApply;
 import com.gree.mall.manager.plus.service.*;
 import com.gree.mall.manager.utils.CommonUtils;
 import com.gree.mall.manager.utils.excel.ExcelUtils;
@@ -85,6 +89,16 @@ public class WorkerTeamLogic {
         if (StringUtils.isBlank(workerTeam.getAssistantWorkerName())) {
             workerTeam.setAssistantWorkerName("");
         }
+        final User user = userService.getById(workerTeam.getMasterWorkerId());
+        if (Objects.isNull(user)) {
+            throw new RemoteServiceException("大工师傅信息不存在");
+        }
+        final User user2 = userService.getById(workerTeam.getAssistantWorkerId());
+        if (Objects.isNull(user2)) {
+            throw new RemoteServiceException("小工师傅信息不存在");
+        }
+        workerTeam.setMasterWorkerNumber(user.getWorkerNumber())
+                .setAssistantWorkerNumber(user2.getWorkerNumber());
     }
 
     private void checkUniqueTeam(WorkerTeam workerTeam) {
@@ -144,7 +158,7 @@ public class WorkerTeamLogic {
                 .eq(WebsitUser::getCompanyWechatId, adminUser.getCompanyWechatId())
                 .eq(WebsitUser::getWebsitId, websitId)
                 .ne(StringUtils.isNotBlank(workerId), WebsitUser::getUserId, workerId)
-                .eq(WebsitUser::getExamineStatus, ExamineStatusEnum.OK.getKey())
+                .in(WebsitUser::getExamineStatus, ExamineWorkerStatusEnum.OK.getKey(), ExamineWorkerStatusEnum.EXPIRED.getKey())
                 .list();
         if (CollectionUtil.isEmpty(websitUsers)) {
             return new ArrayList<>();
@@ -232,8 +246,10 @@ public class WorkerTeamLogic {
             User masterWorker = userMap.get(workerTeam.getMasterWorkerId());
             User assistantWorker = userMap.get(workerTeam.getAssistantWorkerId());
             workerTeam.setMasterWorkerId(masterWorker.getUserId())
+                    .setMasterWorkerNumber(masterWorker.getWorkerNumber())
                     .setMasterWorkerName(masterWorker.getNickName())
                     .setAssistantWorkerId(assistantWorker.getUserId())
+                    .setAssistantWorkerId(assistantWorker.getWorkerNumber())
                     .setAssistantWorkerName(assistantWorker.getNickName());
             this.checkUniqueTeam(workerTeam);
             workerTeam.insert();
@@ -252,7 +268,7 @@ public class WorkerTeamLogic {
                 .eq(WebsitUser::getCompanyWechatId, workerTeam.getCompanyWechatId())
                 .eq(WebsitUser::getUserId, user.getUserId())
                 .eq(WebsitUser::getWebsitId, workerTeam.getWebsitId())
-                .eq(WebsitUser::getExamineStatus, ExamineStatusEnum.OK.getKey())
+                .in(WebsitUser::getExamineStatus, ExamineWorkerStatusEnum.OK.getKey(), ExamineWorkerStatusEnum.EXPIRED.getKey())
                 .count();
         if (count == 0) {
             throw new RemoteException("师傅" + workerTeam.getMasterWorkerId() + "未入驻成功");
@@ -268,9 +284,9 @@ public class WorkerTeamLogic {
                 .eq(WebsitUser::getCompanyWechatId, workerTeam.getCompanyWechatId())
                 .eq(WebsitUser::getUserId, user2.getUserId())
                 .eq(WebsitUser::getWebsitId, workerTeam.getWebsitId())
-                .eq(WebsitUser::getExamineStatus, ExamineStatusEnum.OK.getKey())
+                .in(WebsitUser::getExamineStatus, ExamineWorkerStatusEnum.OK.getKey(), ExamineWorkerStatusEnum.EXPIRED.getKey())
                 .count();
-        if (count == 0) {
+        if (count2 == 0) {
             throw new RemoteException("师傅" + workerTeam.getAssistantWorkerId() + "未入驻成功");
         }
     }