‘linchangsheng’ 1 year ago
parent
commit
8b05cb490b

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

@@ -180,6 +180,11 @@ public class WorkerManagerLogic {
 
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
+        WebsitUser websitUser = websitUserService.getById(workerManagerBean.getId());
+
+        if (!websitUser.getExamineStatus().equals(ExamineWorkerStatusEnum.WAIT.getKey()))
+            throw new RemoteServiceException("状态不为待审核状态");
+
         workerManagerBean.setCreateTime(null);
 
         workerManagerBean.setExamineBy(adminUser.getNickName());
@@ -319,7 +324,7 @@ public class WorkerManagerLogic {
                     this.scGongShang(workerManagerBean);
                 }
 
-                if (workerPolicies.stream().filter(item -> item.getStatus().equals("BZZ")).count() > 1) {
+                if (workerManagerBean.getWorkerPolicies().stream().filter(item -> item.getStatus().equals("BZZ")).count() > 1) {
                     workerManagerBean.setExamineStatus(ExamineWorkerStatusEnum.OK.getKey());
                 }
 
@@ -339,7 +344,7 @@ public class WorkerManagerLogic {
                     this.scGuZhu(workerManagerBean);
                 }
 
-                if (workerPolicies.stream().filter(item -> item.getStatus().equals("BZZ")).count() > 1) {
+                if (workerManagerBean.getWorkerPolicies().stream().filter(item -> item.getStatus().equals("BZZ")).count() > 1) {
                     workerManagerBean.setExamineStatus(ExamineWorkerStatusEnum.OK.getKey());
                 }
 
@@ -469,6 +474,11 @@ public class WorkerManagerLogic {
         workerManagerBean.setPolicyExamineBy(adminUser.getNickName());
         workerManagerBean.setPolicyExamineTime(new Date());
 
+        WebsitUser websitUser = websitUserService.getById(workerManagerBean.getId());
+
+        if (!websitUser.getExamineStatus().equals(ExamineWorkerStatusEnum.POLICY_WAIT.getKey()))
+            throw new RemoteServiceException("状态不为保险待审核状态");
+
         workerManagerBean.setCreateTime(null);
         workerManagerBean.updateById();