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

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

@@ -1276,13 +1276,16 @@ public class UserLogic {
             websitUser.setBankAccount(bankAccount);
             websitUser.insert();
 
-            userApplyBean.getWorkerPolicy().setWebsitUserId(websitUser.getId());
-            userApplyBean.getWorkerPolicy().setWebsitId(websitUser.getWebsitId());
-            userApplyBean.getWorkerPolicy().setWebsitName(websitUser.getWebsitName());
-            userApplyBean.getWorkerPolicy().setWorkerName(user.getNickName());
-            userApplyBean.getWorkerPolicy().setType("AC");
-            userApplyBean.getWorkerPolicy().setStatus("YSX");
-            userApplyBean.getWorkerPolicy().setWorkerId(websitUser.getWorkerNumber());
+            if (userApplyBean.getWorkerPolicy()!= null) {
+
+                userApplyBean.getWorkerPolicy().setWebsitUserId(websitUser.getId());
+                userApplyBean.getWorkerPolicy().setWebsitId(websitUser.getWebsitId());
+                userApplyBean.getWorkerPolicy().setWebsitName(websitUser.getWebsitName());
+                userApplyBean.getWorkerPolicy().setWorkerName(user.getNickName());
+                userApplyBean.getWorkerPolicy().setType("AC");
+                userApplyBean.getWorkerPolicy().setStatus("YSX");
+                userApplyBean.getWorkerPolicy().setWorkerId(websitUser.getWorkerNumber());
+            }
 
         }
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/AgreementLogic.java

@@ -739,7 +739,7 @@ public class AgreementLogic {
     public void offInsure() {
         workerPolicyService.lambdaUpdate()
                 .le(WorkerPolicy::getEndTime,new Date())
-                .eq(WorkerPolicy::getStatus,WorkerPolicyStatusEnum.OFF.getKey()).update();
+                .eq(WorkerPolicy::getStatus,PolicyOrderStatusEnum.YSX.getKey()).update();
 
         policyOrderService.lambdaUpdate()
                 .le(PolicyOrder::getEndTime,new Date())
@@ -749,8 +749,8 @@ public class AgreementLogic {
         workerPolicyService.lambdaUpdate()
                 .ge(WorkerPolicy::getEndTime,new Date())
                 .le(WorkerPolicy::getStartTime,new Date())
-                .ne(WorkerPolicy::getStatus,WorkerPolicyStatusEnum.ON.getKey())
-                .set(WorkerPolicy::getStatus,WorkerPolicyStatusEnum.ON.getKey())
+                .ne(WorkerPolicy::getStatus,PolicyOrderStatusEnum.YSX.getKey())
+                .set(WorkerPolicy::getStatus,PolicyOrderStatusEnum.YSX.getKey())
                 .update();
 
         policyOrderService.lambdaUpdate()

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/WorkerManagerLogic.java

@@ -177,6 +177,17 @@ public class WorkerManagerLogic {
     @Transactional(rollbackFor = Exception.class)
     public void examineWait(WorkerManagerBean workerManagerBean) {
 
+
+        User user = userService.getById(workerManagerBean.getUserId());
+
+        if (!StringUtil.isEmpty(user.getWorkerNumber())){
+            if (!workerManagerBean.getWorkerNumber().equals(user.getWorkerNumber())) {
+                throw new RemoteServiceException("师傅编号已经录入不允许更改");
+            }
+        }
+        if (StringUtil.isEmpty(workerManagerBean.getWorkerNumber()))
+            throw new RemoteServiceException("师傅编号不能为空");
+
         workerManagerBean.updateById();
 
         workerManagerBean.getUser().updateById();