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

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

@@ -513,9 +513,10 @@ 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)) {
+        if (!CollectionUtils.isEmpty(policyOrdersEm)) {
             MailboxSendRecord mailboxSendRecord = new MailboxSendRecord();
             mailboxSendRecord.setId(IdWorker.getIdStr());
             mailboxSendRecord.setPolicyType(PolicyTypeEnum.EM.getKey());
@@ -541,6 +542,7 @@ public class AgreementLogic {
                 mailboxSendRecordPolicy.setPolicyMobile(policyOrder.getWorkerMobile());
                 mailboxSendRecordPolicy.setPolicyNumber(policyOrder.getWorkerNumber());
                 mailboxSendRecordPolicy.setPolicyIdcard(policyOrder.getWorkerIdcard());
+                mailboxSendRecordPolicy.setPolicyIdcard(policyOrder.getWorkerIdcard());
                 mailboxSendRecordPolicy.setType("IN");
                 mailboxSendRecordPolicy.setSendBatch(mailboxSendRecord.getSendBatch());
                 mailboxSendRecordPolicy.setPolicyType(PolicyTypeEnum.EM.getKey());
@@ -579,6 +581,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();
 
@@ -728,6 +731,7 @@ public class AgreementLogic {
                         workerPolicy.setWebsitId(policyOrder.getWebsitId());
                         workerPolicy.setWebsitName(policyOrder.getWebsitName());
                         workerPolicy.setWorkerName(policyOrder.getWorkerName());
+                        workerPolicy.setWorkerName(policyOrder.getWorkerName());
                         workerPolicies.add(workerPolicy);
                     }
                     workerPolicyService.saveBatch(workerPolicies);

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()))

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

@@ -556,6 +556,7 @@ public class WorkerManagerLogic {
             policyOrder.setWorkerMobile(user.getMobile());
             policyOrder.setWorkerName(workerManagerBean.getUser().getNickName());
             policyOrder.setWorkerNumber(workerManagerBean.getUser().getWorkerNumber());
+            policyOrder.setWebsitUserId(workerManagerBean.getId());
 
             policyOrder.setPolicyOrderStatus(PolicyOrderEmStutasEnum.DTH.getKey());