需求

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

@@ -740,13 +740,14 @@ public class AgreementLogic {
     }
 
     public void offInsure() {
+
         workerPolicyService.lambdaUpdate()
                 .le(WorkerPolicy::getEndTime,new Date())
-                .eq(WorkerPolicy::getStatus,PolicyOrderStatusEnum.YSX.getKey()).update();
+                .set(WorkerPolicy::getStatus,PolicyOrderStatusEnum.YSX.getKey()).update();
 
         policyOrderService.lambdaUpdate()
                 .le(PolicyOrder::getEndTime,new Date())
-                .eq(PolicyOrder::getPolicyOrderStatus,PolicyOrderStatusEnum.YSX.getKey()).update();
+                .set(PolicyOrder::getPolicyOrderStatus,PolicyOrderStatusEnum.YSX.getKey()).update();
 
 
         workerPolicyService.lambdaUpdate()
@@ -770,7 +771,8 @@ public class AgreementLogic {
         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) {
+            if (workerPolicyService.lambdaQuery().in(WorkerPolicy::getStatus,"BZZ","DSX")
+                    .eq(WorkerPolicy::getWebsitUserId,websitUser.getId()).count() > 1) {
                 websitUser.setExamineStatus("POLICY_WAIT");
                 websitUser.updateById();
             }

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

@@ -94,7 +94,7 @@ public class PolicyOrderLogic {
                     .eq(PolicyOrder::getWebsitId, (String) row.get(1))
                     .eq(PolicyOrder::getWorkerNumber, (String) row.get(3))
                     .eq(PolicyOrder::getType, "IN")
-                    .eq(PolicyOrder::getPolicyOrderStatus, "DSX").one();
+                    .eq(PolicyOrder::getPolicyOrderStatus, "DGM").one();
 
 
             if (policyOrder != null){
@@ -106,14 +106,14 @@ public class PolicyOrderLogic {
                 workerPolicy.setCompany(policyOrder.getBelongCompany());
                 workerPolicy.setPolicyOrder(policyOrder.getPolicyNumber());
                 workerPolicy.setPolicyType("IN");
-                workerPolicy.setStartTime(policyOrder.getStartTime());
-                workerPolicy.setEndTime(policyOrder.getEndTime());
+                workerPolicy.setStartTime(DateUtil.parse((String) row.get(9),"yyyy-MM-dd"));
+                workerPolicy.setEndTime(DateUtil.endOfDay(DateUtil.parse((String) row.get(10),"yyyy-MM-dd")));
                 workerPolicy.setWebsitUserId(policyOrder.getId());
                 workerPolicy.setWebsitId(policyOrder.getWebsitId());
                 workerPolicy.setWebsitName(policyOrder.getWebsitName());
                 workerPolicy.setWorkerName(policyOrder.getWorkerName());
 
-                if (new Date().after(policyOrder.getStartTime()) && new Date().before(policyOrder.getEndTime()))
+                if (new Date().after(workerPolicy.getStartTime()) && new Date().before(workerPolicy.getEndTime()))
                     workerPolicy.setStatus("BZZ");
                 else if (new Date().after(policyOrder.getEndTime()))
                     workerPolicy.setStatus("YSX");
@@ -123,17 +123,23 @@ public class PolicyOrderLogic {
                 workerPolicy.insert();
             }
 
-            policyOrderService.lambdaUpdate()
-                    .eq(PolicyOrder::getWebsitId,(String) row.get(1))
-                    .eq(PolicyOrder::getWorkerNumber,(String) row.get(3))
-                    .eq(PolicyOrder::getType,"IN")
-                    .eq(PolicyOrder::getPolicyOrderStatus,"DSX")
-                    .set(PolicyOrder::getStartTime, DateUtil.parse((String) row.get(9),"yyyy-MM-dd"))
-                    .set(PolicyOrder::getEndTime,DateUtil.endOfDay(DateUtil.parse((String) row.get(10),"yyyy-MM-dd")))
-                    .set(PolicyOrder::getClassWebsitId,(String) row.get(11))
-                    .set(PolicyOrder::getClassWebsitName,(String) row.get(12))
-                    .set(DateUtil.parse((String) row.get(9),"yyyy-MM-dd").after(new Date()),PolicyOrder::getPolicyOrderStatus,"BZZ")
-                    .update();
+            policyOrder.setStartTime(DateUtil.parse((String) row.get(9),"yyyy-MM-dd"));
+            policyOrder.setEndTime(DateUtil.endOfDay(DateUtil.parse((String) row.get(10),"yyyy-MM-dd")));
+            policyOrder.setClassWebsitId((String) row.get(11));
+            policyOrder.setClassWebsitId((String) row.get(12));
+
+
+            if (new Date().after(policyOrder.getStartTime()) && new Date().before(policyOrder.getEndTime()))
+                policyOrder.setPolicyOrderStatus("BZZ");
+            else if (new Date().after(policyOrder.getEndTime()))
+                policyOrder.setPolicyOrderStatus("YSX");
+            else {
+                policyOrder.setPolicyOrderStatus("DSX");
+            }
+
+            policyOrder.updateById();
+
+
 
         }
     }

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

@@ -15,7 +15,7 @@ import java.io.IOException;
  * 定时购买保险
  */
 @ConditionalOnProperty(name = "schedule.enable", havingValue = "true", matchIfMissing = true)
-//@Component
+@Component
 public class InsureEmailSchedule {
 
 
@@ -46,7 +46,7 @@ public class InsureEmailSchedule {
 
 
     //检查保险是否全部买齐转为保险待审批
-    @Scheduled(fixedDelay = 60* 1000)
+    @Scheduled(fixedDelay = 30* 1000)
     public void task4(){
         agreementLogic.task4();
     }