需求

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

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

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

@@ -687,6 +687,7 @@ public class AgreementLogic {
                         workerPolicy.setWebsitName(policyOrder.getWebsitName());
                         workerPolicy.setWorkerName(policyOrder.getWorkerName());
                         workerPolicy.setWorkerName(policyOrder.getWorkerName());
+                        workerPolicy.setCompany(policyOrder.getCompany());
 
                         if (new Date().after(workerPolicy.getStartTime()))
                             workerPolicy.setStatus("BZZ");
@@ -778,12 +779,17 @@ public class AgreementLogic {
 
             User user = userService.getById(websitUser.getUserId());
 
-            String remark = "";
-            if (!(websitUser.getOverdueRemark().split("高空证").length > 0) && user.getEndTime().before(DateUtil.offsetMonth(new Date(),1))) {
+            String remark = StringUtil.isEmpty(websitUser.getOverdueRemark())?"":websitUser.getOverdueRemark();
+            if ((StringUtil.isEmpty(remark) && user.getEndTime() != null && user.getEndTime().before(DateUtil.offsetMonth(new Date(),1)))
+                    || (!StringUtil.isEmpty(remark) && remark.split("高空证").length < 1
+                    && user.getEndTime() != null && user.getEndTime().before(DateUtil.offsetMonth(new Date(),1))) ){
                 remark = remark+"高空证"+DateUtil.format(user.getEndTime(),"yyyy-MM-dd");
             }
 
-            if (!(websitUser.getOverdueRemark().split("身份证").length > 0) && user.getIdCardEndTime().before(DateUtil.offsetMonth(new Date(),1))) {
+
+            if ((StringUtil.isEmpty(remark) && user.getIdCardEndTime() != null && user.getIdCardEndTime().before(DateUtil.offsetMonth(new Date(),1)))
+                    || (!StringUtil.isEmpty(remark) && remark.split("身份证").length < 1
+                    && user.getIdCardEndTime() != null && user.getIdCardEndTime().before(DateUtil.offsetMonth(new Date(),1))) ){
                 remark = remark+"身份证"+DateUtil.format(user.getIdCardEndTime(),"yyyy-MM-dd");
             }
 
@@ -792,15 +798,37 @@ public class AgreementLogic {
                     .list();
 
             for (WorkerPolicy workerPolicy : workerPolicies) {
-                if (workerPolicy.getPolicyType().equals(PolicyTypeEnum.AC.getKey()) && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1))) {
+                if (workerPolicy.getPolicyType().equals(PolicyTypeEnum.AC.getKey()) &&
+                        (
+                (StringUtil.isEmpty(remark) && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1)))
+                        || (!StringUtil.isEmpty(remark) && remark.split("意外险").length < 1
+                        && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1))
+                        && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1)))
+                        )
+                ) {
+
                     remark = remark+"意外险"+DateUtil.format(workerPolicy.getEndTime(),"yyyy-MM-dd");
                 }
-                if (workerPolicy.getPolicyType().equals(PolicyTypeEnum.EM.getKey()) && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1))) {
+                if (workerPolicy.getPolicyType().equals(PolicyTypeEnum.EM.getKey()) &&
+                        (
+                                (StringUtil.isEmpty(remark) && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1)))
+                                        || (!StringUtil.isEmpty(remark) && remark.split("雇主险").length < 1
+                                        && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1))
+                                        && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1)))
+                        )
+                ) {
                     remark = remark+"雇主险"+DateUtil.format(workerPolicy.getEndTime(),"yyyy-MM-dd");
                 }
 
-                if (workerPolicy.getPolicyType().equals(PolicyTypeEnum.IN.getKey()) && workerPolicy.getEndTime().before(DateUtil.offsetDay(new Date(),3))) {
-                    remark = remark+"工伤"+DateUtil.format(workerPolicy.getEndTime(),"yyyy-MM-dd");
+                if (workerPolicy.getPolicyType().equals(PolicyTypeEnum.IN.getKey()) &&
+                        (
+                                (StringUtil.isEmpty(remark) && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1)))
+                                        || (!StringUtil.isEmpty(remark) && remark.split("工伤险").length < 1
+                                        && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1))
+                                        && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1)))
+                        )
+                ) {
+                    remark = remark+"工伤险"+DateUtil.format(workerPolicy.getEndTime(),"yyyy-MM-dd");
                 }
             }
 

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

@@ -621,6 +621,7 @@ public class WorkerManagerLogic {
         policyOrder.setWorkerMobile(workerManagerBean.getUser().getMobile());
         policyOrder.setBuyUnitId(belongCompany.getDictCode());
         policyOrder.setBuyUnit(belongCompany.getDictValue());
+        policyOrder.setCompany(belongCompany.getDictValue());
 
         policyOrder.setWebsitUserId(workerManagerBean.getId());
         policyOrder.setType("IN");

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

@@ -14,7 +14,7 @@ import java.io.IOException;
 /**
  * 定时购买保险
  */
-//@ConditionalOnProperty(name = "schedule.enable", havingValue = "true", matchIfMissing = true)
+@ConditionalOnProperty(name = "schedule.enable", havingValue = "true", matchIfMissing = true)
 @Component
 public class InsureEmailSchedule {
 
@@ -25,21 +25,21 @@ public class InsureEmailSchedule {
 
 
     //每小时执行1次
-   // @Scheduled(fixedDelay =60* 1000)
+    @Scheduled(fixedDelay =60* 1000)
     public void task() throws IOException {
         agreementLogic.sendEmailSche();
     }
 
 
     //监测今天是否有回执邮件，如果有则表示今天买保险的回执成功
-   // @Scheduled(fixedDelay = 60* 1000)
+    @Scheduled(fixedDelay = 60* 1000)
     public void task2() throws IOException, MessagingException {
         agreementLogic.receEmail();
     }
 
 
     //保险过期
-   @Scheduled(fixedDelay = 60* 1000)
+    @Scheduled(fixedDelay = 60* 1000)
     public void task3(){
         agreementLogic.offInsure();
     }

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

@@ -41,7 +41,7 @@ public class SyncSchedule {
 
 
     //同步工单数据
-    @Scheduled(fixedDelay = 5* 1000)
+   // @Scheduled(fixedDelay = 5* 1000)
     public void task3() throws IOException, MessagingException {
         syncOrderInfoLogic.task3();
     }