Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/controller/member/MemberController.java

@@ -153,6 +153,15 @@ public class MemberController {
         return ResponseHelper.success();
     }
 
+    @PostMapping("/userWatit/update")
+    @ApiOperation("修改师傅初始资料")
+    public ResponseHelper workerUpdate(
+            @RequestBody UserWait userWait
+    ) {
+        userLogic.userWaitUpdate(userWait);
+        return ResponseHelper.success();
+    }
+
 
     @PostMapping("/worker/update")
     @ApiOperation("修改师傅资料")

mall-server-api/src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

@@ -273,7 +273,7 @@ public class UserLogic {
                     this.saveWebsitUser(adminWebsit.getWebsitId(), worker, bankAccount, workerNumber, "系统导入初始化");
                 }
             }
-            userWait.setId(workerNumber);
+
             userWait.setName(name);
             userWait.setIdcard(idcard);
             userWait.setCompanyWechatId(adminUser.getCompanyWechatId());
@@ -282,7 +282,7 @@ public class UserLogic {
             userWait.setWorkerNumber(workerNumber);
             userWaits.add(userWait);
         }
-        userWaitService.saveOrUpdateBatch(userWaits);
+        userWaitService.saveBatch(userWaits);
     }
 
 
@@ -917,4 +917,19 @@ public class UserLogic {
     }
 
 
+    @Transactional(rollbackFor = Exception.class)
+    public void userWaitUpdate(UserWait userWait) {
+        userService.lambdaUpdate()
+                .ne(User::getMobile,userWait.getMobile())
+                .eq(User::getWorkerNumber,userWait.getWorkerNumber())
+                .set(User::getType,"GENERAL")
+                .set(User::getWorkerNumber,null)
+                .update();
+
+        userWait.updateById();
+
+        userWaitService.lambdaUpdate()
+                .eq(UserWait::getWorkerNumber,userWait.getWorkerNumber())
+                .set(UserWait::getMobile,userWait.getMobile()).update();
+    }
 }