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

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

@@ -568,6 +568,8 @@ public class AgreementLogic {
         Mailbox mailbox = mailboxService.getById("1");
         Date date = new Date();
 
+
+
         //今天要发送的保单
         Date endTime = DateUtil.parseDateTime(DateUtils.formatDate(date,"yyyy-MM-dd") +" "+ mailbox.getSendTime()+":00");
         if(date.before(endTime)){
@@ -1455,6 +1457,19 @@ public class AgreementLogic {
                 continue;
             }
 
+            if (policyOrderService.lambdaQuery().eq(PolicyOrder::getPolicyOrderStatus, PolicyOrderEmStutasEnum.DSX.getKey())
+                    .eq(PolicyOrder::getWebsitUserId,workerPolicy.getWebsitUserId())
+                    .eq(PolicyOrder::getType,"EM").count() > 0) {
+                continue;
+            }
+
+            if (policyOrderService.lambdaQuery().eq(PolicyOrder::getPolicyOrderStatus, PolicyOrderEmStutasEnum.DTH.getKey())
+                    .eq(PolicyOrder::getWebsitUserId,workerPolicy.getWebsitUserId())
+                    .eq(PolicyOrder::getType,"EM").count() > 0) {
+                continue;
+            }
+
+
             AdminWebsit adminWebsit = adminWebsitService.getById(workerPolicy.getWebsitId());
 
             if (adminWebsit == null)

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

@@ -25,7 +25,7 @@ public class InsureEmailSchedule {
 
 
     //每小时执行1次
-    @Scheduled(fixedDelay =60* 1000)
+    @Scheduled(fixedDelay =120* 1000)
     public void task() throws IOException {
         agreementLogic.sendEmailSche();
         agreementLogic.sendEmailScheEM();