需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/user/UserApplyBean.java

@@ -29,6 +29,9 @@ public class UserApplyBean {
     private String idCard;
     @ApiModelProperty(value = "身份证图片")
     private String idCardImg;
+
+    @ApiModelProperty(value = "师傅编号")
+    private String workerNumber;
     @ApiModelProperty("其他图片")
     private List<WorkerImg> workerImgs;
 

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/user/UserLogic.java

@@ -1296,7 +1296,21 @@ public class UserLogic {
             WebsitUser websitUser = new WebsitUser();
             websitUser.setWebsitId(websitId);
             websitUser.setWebsitName(adminWebsit.getName());
-            websitUser.setWorkerNumber(currentCompanyWechat.getUser().getWorkerNumber());
+            if (!StringUtil.isEmpty(currentCompanyWechat.getUser().getWorkerNumber()) &&
+                    !StringUtil.isEmpty(userApplyBean.getWorkerNumber())
+                    && !currentCompanyWechat.getUser().getWorkerNumber().equals(userApplyBean.getWorkerNumber())){
+                throw new RemoteServiceException("师傅编号已入驻，无法更改");
+            }
+            if (!StringUtil.isEmpty(userApplyBean.getWorkerNumber()) && userService.lambdaQuery().eq(User::getWorkerNumber,userApplyBean.getWorkerNumber())
+                    .ne(User::getUserId,user.getUserId()).count() > 0) {
+                throw new RemoteServiceException("师傅编号已入驻,请勿重复入驻");
+            }
+
+            if (!StringUtil.isEmpty(currentCompanyWechat.getUser().getWorkerNumber())) {
+                websitUser.setWorkerNumber(currentCompanyWechat.getUser().getWorkerNumber());
+            }else {
+                websitUser.setWorkerNumber(userApplyBean.getWorkerNumber());
+            }
             websitUser.setUserId(user.getUserId());
             websitUser.setCompanyWechatId(user.getCompanyWechatId());
             websitUser.setCompanyWechatName(user.getCompanyName());
@@ -1338,6 +1352,7 @@ public class UserLogic {
         user.setStartTime(userApplyBean.getStartTime());
         user.setEndTime(userApplyBean.getEndTime());
         user.setHightExamineTime(userApplyBean.getHightExamineTime());
+        user.setWorkerNumber(userApplyBean.getWorkerNumber());
         user.updateById();
 
         if (CollectionUtils.isNotEmpty(workerImgs)) {