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

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

@@ -991,7 +991,7 @@ public class PayLogic {
         //生成师傅待生效保险
         WorkerPolicy workerPolicy = new WorkerPolicy();
         workerPolicy.setWebsitId(policyOrder.getWorkerNumber());
-        workerPolicy.setStatus("WAIT_ON");
+        workerPolicy.setStatus("DSX");
         workerPolicy.setCompany(policy.getCompany());
         workerPolicy.setType("IN");
         workerPolicy.setPolicyName(policy.getPolicyName());

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

@@ -1283,7 +1283,7 @@ public class UserLogic {
                 userApplyBean.getWorkerPolicy().setWebsitName(websitUser.getWebsitName());
                 userApplyBean.getWorkerPolicy().setWorkerName(user.getNickName());
                 userApplyBean.getWorkerPolicy().setType("AC");
-                userApplyBean.getWorkerPolicy().setStatus("YSX");
+                userApplyBean.getWorkerPolicy().setStatus("BZZ");
                 userApplyBean.getWorkerPolicy().setWorkerId(websitUser.getWorkerNumber());
             }
 

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

@@ -72,6 +72,9 @@ public class AgreementLogic {
     @Autowired
     WorkerPolicyService workerPolicyService;
 
+    @Autowired
+    WebsitUserService websitUserService;
+
 
 
     public IPage<AgreementVo> list(Page page, ZfireParamBean zfireParam) {
@@ -749,8 +752,8 @@ public class AgreementLogic {
         workerPolicyService.lambdaUpdate()
                 .ge(WorkerPolicy::getEndTime,new Date())
                 .le(WorkerPolicy::getStartTime,new Date())
-                .ne(WorkerPolicy::getStatus,PolicyOrderStatusEnum.YSX.getKey())
-                .set(WorkerPolicy::getStatus,PolicyOrderStatusEnum.YSX.getKey())
+                .ne(WorkerPolicy::getStatus,PolicyOrderStatusEnum.BZZ.getKey())
+                .set(WorkerPolicy::getStatus,PolicyOrderStatusEnum.BZZ.getKey())
                 .update();
 
         policyOrderService.lambdaUpdate()
@@ -763,4 +766,15 @@ public class AgreementLogic {
     }
 
 
+    public void task4() {
+        List<WebsitUser> websitUsers = websitUserService.lambdaQuery().eq(WebsitUser::getExamineStatus, "WAIT_WORKER").list();
+
+        for (WebsitUser websitUser : websitUsers) {
+            if (workerPolicyService.lambdaQuery().in(WorkerPolicy::getStatus,"BZZ","DSX").count() > 2) {
+                websitUser.setExamineStatus("POLICY_WAIT");
+                websitUser.updateById();
+            }
+        }
+
+    }
 }

mall-server-api/src/main/java/com/gree/mall/manager/schedule/InsureEmailSchedule.java

@@ -5,6 +5,7 @@ package com.gree.mall.manager.schedule;
 import com.gree.mall.manager.logic.policy.AgreementLogic;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import javax.mail.MessagingException;
@@ -38,12 +39,17 @@ public class InsureEmailSchedule {
 
 
     //保险过期
-//    @Scheduled(fixedDelay = 60*60* 1000)
+   @Scheduled(fixedDelay = 60* 1000)
     public void task3(){
         agreementLogic.offInsure();
     }
 
 
+    //检查保险是否全部买齐转为保险待审批
+    @Scheduled(fixedDelay = 60* 1000)
+    public void task4(){
+        agreementLogic.task4();
+    }
 
 
 }