需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/policy/WorkerRemind.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 @ApiModel
 @Data
 public class WorkerRemind {
@@ -16,4 +18,7 @@ public class WorkerRemind {
 
     @ApiModelProperty("1保险购买提示，2意外到期提醒，3意外已到期")
     private Integer remindIn;
+
+    @ApiModelProperty("过期时间")
+    private Date endTime;
 }

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

@@ -107,21 +107,31 @@ public class WorkerLogic {
                     .le(WorkerPolicy::getExTime,new Date())
                     .count() > 0){
 
+
+                List<WorkerPolicy> list = workerPolicyService.lambdaQuery()
+                        .in(WorkerPolicy::getStatus, "ON", "WAIT_ON")
+                        .le(WorkerPolicy::getEndTime, DateUtil.offsetDay(new Date(), 7))
+                        .eq(WorkerPolicy::getPolicyType, "AC")
+                        .eq(WorkerPolicy::getWebsitUserId, websitUser.getId())
+                        .le(WorkerPolicy::getExTime, new Date()).list();
+
+                AdminWebsit adminWebsit = adminWebsitService.getById(websitUser.getWebsitId());
+
+                for (WorkerPolicy workerPolicy : list) {
+                    WorkerRemind workerRemind = new WorkerRemind();
+                    workerRemind.setWebsitId(websitUser.getWebsitId());
+                    workerRemind.setWebsitName(adminWebsit.getName());
+                    workerRemind.setRemindIn(2);
+                    workerRemind.setEndTime(workerPolicy.getEndTime());
+                    workerReminds.add(workerRemind);
+                }
+
                 workerPolicyService.lambdaUpdate()
                         .in(WorkerPolicy::getStatus,"OFF")
                         .notIn(WorkerPolicy::getStatus,"ON","WAIT_ON")
                         .eq(WorkerPolicy::getPolicyType,"AC")
                         .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
                         .set(WorkerPolicy::getExTime,DateUtil.endOfDay(new Date())).update();
-
-                AdminWebsit adminWebsit = adminWebsitService.getById(websitUser.getWebsitId());
-
-                WorkerRemind workerRemind = new WorkerRemind();
-                workerRemind.setWebsitId(websitUser.getWebsitId());
-                workerRemind.setWebsitName(adminWebsit.getName());
-                workerRemind.setRemindIn(2);
-
-                workerReminds.add(workerRemind);
             }
 
             // 意外险失效，没有购买的意外险