‘linchangsheng’ 6 달 전
부모
커밋
4d8028297c

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

@@ -513,6 +513,7 @@ public class AgreementLogic {
         //雇主保险发送邮件
         List<PolicyOrder> policyOrdersEm = policyOrderService.lambdaQuery()
                 .eq(PolicyOrder::getType, PolicyTypeEnum.EM.getKey())
+                .eq(PolicyOrder::getIsImport, IsYesNoEnum.NO.getKey())
                 .eq(PolicyOrder::getIsSend, IsYesNoEnum.NO.getKey()).list();
 
         if (!CollectionUtils.isEmpty(policyOrders)) {
@@ -579,6 +580,7 @@ public class AgreementLogic {
         for (MailboxReceive mailboxReceive : mailboxReceives) {
             List<PolicyOrder> policyOrdersIn = policyOrderService.lambdaQuery()
                     .eq(PolicyOrder::getType, PolicyTypeEnum.IN.getKey())
+                    .eq(PolicyOrder::getIsImport, IsYesNoEnum.NO.getKey())
                     .eq(PolicyOrder::getBuyUnitId, mailboxReceive.getDictId())
                     .eq(PolicyOrder::getIsSend, IsYesNoEnum.NO.getKey()).list();
 

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

@@ -180,6 +180,7 @@ public class PolicyOrderLogic {
             policyOrder.setClassWebsitId((String) row.get(11));
             policyOrder.setClassWebsitName((String) row.get(12));
             policyOrder.setPayAmount(Convert.toBigDecimal(row.get(8)));
+            policyOrder.setIsImport(IsYesNoEnum.YES.getKey());
 
 
             if (new Date().after(policyOrder.getStartTime()) && new Date().before(policyOrder.getEndTime()))
@@ -237,11 +238,10 @@ public class PolicyOrderLogic {
             policyOrder.setWorkerMobile((String) row.get(5));
             policyOrder.setWorkerName((String) row.get(2));
             policyOrder.setWorkerNumber((String) row.get(3));
+            policyOrder.setIsImport(IsYesNoEnum.YES.getKey());
 
             policyOrder.setType("EM");
 
-
-
             if (new Date().after(policyOrder.getStartTime()) && new Date().before(policyOrder.getEndTime()))
                 policyOrder.setPolicyOrderStatus("BZZ");
             else if (new Date().after(policyOrder.getEndTime()))