需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/policy/WorkerLogic.java

@@ -155,15 +155,10 @@ public class WorkerLogic {
                     workerRemind.setRemindIn(2);
                     workerRemind.setEndTime(workerPolicy.getEndTime());
                     workerReminds.add(workerRemind);
+
+                    workerPolicy.setExTime(DateUtil.endOfDay(new Date())).updateById();
                 }
 
-                workerPolicyService.lambdaUpdate()
-                        .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
-                        .in(WorkerPolicy::getStatus,"YSX")
-                        .notIn(WorkerPolicy::getStatus,"DSX","BZZ")
-                        .eq(WorkerPolicy::getPolicyType,"AC")
-                        .and(item -> item.isNull(WorkerPolicy::getExTime).or().le(WorkerPolicy::getExTime,new Date()))
-                        .set(WorkerPolicy::getExTime,DateUtil.endOfDay(new Date())).update();
             }
 
             // 意外险失效，没有购买的意外险

mall-server-api/src/main/java/com/gree/mall/manager/controller/policy/MailboxController.java

@@ -152,4 +152,18 @@ public class MailboxController {
         return ResponseHelper.success();
     }
 
+    @ApiOperation(value = "测试过期提醒")
+    @PostMapping("task6")
+    public ResponseHelper task6() throws IOException, MessagingException {
+        agreementLogic.task6();
+        return ResponseHelper.success();
+    }
+
+    @ApiOperation(value = "测试过期提醒")
+    @PostMapping("task7")
+    public ResponseHelper task7() throws IOException, MessagingException {
+        agreementLogic.task7();
+        return ResponseHelper.success();
+    }
+
 }

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

@@ -1066,12 +1066,13 @@ public class AgreementLogic {
         for (WorkerPolicy workerPolicy : workerPolicies) {
 
             if (policyOrderService.lambdaQuery().eq(PolicyOrder::getPolicyOrderStatus, PolicyOrderInStutasEnum.DGM.getKey())
+                    .eq(PolicyOrder::getWebsitUserId,workerPolicy.getWebsitUserId())
                     .eq(PolicyOrder::getType,"IN").count() > 0) {
                 continue;
             }
 
             AdminWebsit adminWebsit = adminWebsitService.getById(workerPolicy.getWebsitId());
-            WebsitUser websitUser = websitUserService.getById(workerPolicy.getId());
+            WebsitUser websitUser = websitUserService.getById(workerPolicy.getWebsitUserId());
             User user = userService.getById(websitUser.getUserId());
 
             SysDictCompany sysDictCompany = sysDictCompanyService.lambdaQuery().eq(SysDictCompany::getDictCode, adminWebsit.getInsureSteadUnit())
@@ -1120,18 +1121,16 @@ public class AgreementLogic {
 
         for (WorkerPolicy workerPolicy : workerPolicies) {
 
-            if (policyOrderService.lambdaQuery().eq(PolicyOrder::getPolicyOrderStatus, PolicyOrderInStutasEnum.DGM.getKey())
+            if (policyOrderService.lambdaQuery().eq(PolicyOrder::getPolicyOrderStatus, PolicyOrderEmStutasEnum.XG.getKey())
+                    .eq(PolicyOrder::getWebsitUserId,workerPolicy.getWebsitUserId())
                     .eq(PolicyOrder::getType,"EM").count() > 0) {
                 continue;
             }
 
             AdminWebsit adminWebsit = adminWebsitService.getById(workerPolicy.getWebsitId());
-            WebsitUser websitUser = websitUserService.getById(workerPolicy.getId());
+            WebsitUser websitUser = websitUserService.getById(workerPolicy.getWebsitUserId());
             User user = userService.getById(websitUser.getUserId());
 
-            SysDictCompany sysDictCompany = sysDictCompanyService.lambdaQuery().eq(SysDictCompany::getDictCode, adminWebsit.getInsureSteadUnit())
-                    .eq(SysDictCompany::getDictType,"INSURE_STEAD_UNIT").one();
-
 
             PolicyOrder policyOrder = new PolicyOrder();
             policyOrder.setBelongCompany(adminWebsit.getBelongCompany());
@@ -1148,10 +1147,6 @@ public class AgreementLogic {
             policyOrder.setWorkerName(user.getNickName());
             policyOrder.setWorkerIdcard(user.getIdCard());
             policyOrder.setWorkerMobile(user.getMobile());
-            policyOrder.setBuyUnitId(adminWebsit.getInsureSteadUnit());
-            policyOrder.setBuyUnit(sysDictCompany.getDictValue());
-            policyOrder.setCompany(sysDictCompany.getDictValue());
-
             policyOrder.setWebsitUserId(websitUser.getId());
             policyOrder.setType("EM");
             policyOrder.insert();