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

# Conflicts:
#	mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/common/CommonLogic.java

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/common/CommonLogic.java

@@ -89,6 +89,10 @@ public class CommonLogic {
             token = request.getParameter("x-token");
         }
 
+        if (StringUtils.isBlank(device) && StringUtils.isBlank(appid)) {
+            throw new RemoteServiceException("非法请求，缺少必须的参数");
+        }
+        log.info("打印token："+token);
 //        if (StringUtils.isBlank(device) && StringUtils.isBlank(appid)) {
 //            throw new RemoteServiceException("非法请求，缺少必须的参数");
 //        }
@@ -98,8 +102,8 @@ public class CommonLogic {
         if (StringUtils.isBlank(device)) {
             adminCompanyWechat = adminCompanyWechatService.lambdaQuery()
                     .eq(AdminCompanyWechat::getSubAppId, appid)
-                .or()
-                .eq(AdminCompanyWechat::getPubAppId,appid)
+//                .or()
+//                .eq(AdminCompanyWechat::getPubAppId,appid)
                     .one();
             if (adminCompanyWechat == null) {
                 throw new RemoteServiceException("非法请求，请联系管理员配置必要的参数:" + appid);

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

@@ -734,6 +734,7 @@ public class AgreementLogic {
                 .le(PolicyOrder::getStartTime, new Date())
                 .eq(PolicyOrder::getIsReceipt, IsYesNoEnum.YES.getKey())
                 .ne(PolicyOrder::getPolicyOrderStatus, PolicyOrderStatusEnum.BZZ.getKey())
+                .ne(PolicyOrder::getPolicyOrderStatus, PolicyOrderStatusEnum.YSX.getKey())
                 .select(PolicyOrder::getId)
                 .list();
 
@@ -753,6 +754,7 @@ public class AgreementLogic {
                 .le(PolicyOrder::getStartTime, new Date())
                 .eq(PolicyOrder::getIsReceipt, IsYesNoEnum.YES.getKey())
                 .ne(PolicyOrder::getPolicyOrderStatus, PolicyOrderStatusEnum.BZZ.getKey())
+                .ne(PolicyOrder::getPolicyOrderStatus, PolicyOrderStatusEnum.YSX.getKey())
                 .set(PolicyOrder::getPolicyOrderStatus, PolicyOrderStatusEnum.BZZ.getKey())
                 .update();
 
@@ -913,14 +915,14 @@ public class AgreementLogic {
                 MailboxSendRecordPolicy mailboxSendRecordPolicy = new MailboxSendRecordPolicy();
 
                 mailboxSendRecordPolicy.setCompanyWechatId(mailboxSendRecord.getCompanyWechatId());
-                mailboxSendRecordPolicy.setCompanyWechatId(mailboxSendRecord.getCompanyWechatName());
+                mailboxSendRecordPolicy.setCompanyWechatName(mailboxSendRecord.getCompanyWechatName());
                 mailboxSendRecordPolicy.setPolicyNumber(policyOrder.getPolicyId());
                 mailboxSendRecordPolicy.setPolicyName(policyOrder.getWorkerName());
                 mailboxSendRecordPolicy.setPolicyOrderId(policyOrder.getId());
                 mailboxSendRecordPolicy.setWebsitName(policyOrder.getWebsitName());
                 mailboxSendRecordPolicy.setWebsitId(policyOrder.getWebsitId());
                 mailboxSendRecordPolicy.setPolicyMobile(policyOrder.getWorkerMobile());
-                mailboxSendRecordPolicy.setPolicyNumber(policyOrder.getWorkerNumber());
+
                 mailboxSendRecordPolicy.setPolicyIdcard(policyOrder.getWorkerIdcard());
                 mailboxSendRecordPolicy.setPolicyIdcard(policyOrder.getWorkerIdcard());
                 mailboxSendRecordPolicy.setType("IN");
@@ -1012,14 +1014,13 @@ public class AgreementLogic {
                     MailboxSendRecordPolicy mailboxSendRecordPolicy = new MailboxSendRecordPolicy();
 
                     mailboxSendRecordPolicy.setCompanyWechatId(mailboxSendRecord.getCompanyWechatId());
-                    mailboxSendRecordPolicy.setCompanyWechatId(mailboxSendRecord.getCompanyWechatName());
+                    mailboxSendRecordPolicy.setCompanyWechatName(mailboxSendRecord.getCompanyWechatName());
                     mailboxSendRecordPolicy.setPolicyNumber(policyOrder.getPolicyId());
                     mailboxSendRecordPolicy.setPolicyOrderId(policyOrder.getId());
                     mailboxSendRecordPolicy.setPolicyName(policyOrder.getWorkerName());
                     mailboxSendRecordPolicy.setWebsitName(policyOrder.getWebsitName());
                     mailboxSendRecordPolicy.setWebsitId(policyOrder.getWebsitId());
                     mailboxSendRecordPolicy.setPolicyMobile(policyOrder.getWorkerMobile());
-                    mailboxSendRecordPolicy.setPolicyNumber(policyOrder.getWorkerNumber());
                     mailboxSendRecordPolicy.setPolicyIdcard(policyOrder.getWorkerIdcard());
                     mailboxSendRecordPolicy.setType("IN");
                     mailboxSendRecordPolicy.setSendBatch(mailboxSendRecord.getSendBatch());

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

@@ -134,6 +134,25 @@ public class WorkerManagerLogic {
         websitUser.setExamineStatus(ExamineWorkerStatusEnum.QUIT.getKey());
         websitUser.updateById();
 
+        AdminWebsit adminWebsit = adminWebsitService.getById(websitUserBean.getWebsitId());
+        if (adminWebsit.getInsureType().equals("意外险,雇主险")){
+            policyOrderService.lambdaUpdate()
+                    .ge(PolicyOrder::getEndTime,new Date())
+                    .eq(PolicyOrder::getWebsitUserId,websitUser.getId())
+                    .eq(PolicyOrder::getType,PolicyTypeEnum.EM.getKey())
+                    .set(PolicyOrder::getPolicyOrderStatus,PolicyOrderEmStutasEnum.KTH.getKey())
+                    .update();
+
+            workerPolicyService.lambdaUpdate()
+                    .ge(WorkerPolicy::getEndTime,new Date())
+                    .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
+                    .eq(WorkerPolicy::getPolicyType,PolicyTypeEnum.EM.getKey())
+                    .set(WorkerPolicy::getStatus,PolicyOrderEmStutasEnum.YSX.getKey())
+                    .set(WorkerPolicy::getEndTime,new Date())
+                    .update();
+
+        }
+
         WebsitUserLog websitUserLog = new WebsitUserLog();
 
         websitUserLog.setTypeText("操作离职");
@@ -156,6 +175,26 @@ public class WorkerManagerLogic {
         websitUser.setExamineStatus(ExamineWorkerStatusEnum.POLICY_WAIT.getKey());
         websitUser.updateById();
 
+        AdminWebsit adminWebsit = adminWebsitService.getById(websitUserBean.getWebsitId());
+        if (adminWebsit.getInsureType().equals("意外险,雇主险")){
+            List<PolicyOrder> policyOrders = policyOrderService.lambdaQuery()
+                    .ge(PolicyOrder::getEndTime, new Date())
+                    .eq(PolicyOrder::getWebsitUserId, websitUser.getId())
+                    .eq(PolicyOrder::getType, PolicyTypeEnum.EM.getKey())
+                    .eq(PolicyOrder::getPolicyOrderStatus, PolicyOrderEmStutasEnum.KTH.getKey())
+                    .list();
+
+            for (PolicyOrder policyOrder : policyOrders) {
+                workerPolicyService.lambdaUpdate().eq(WorkerPolicy::getOrderId,policyOrder.getId())
+                        .set(WorkerPolicy::getEndTime,policyOrder.getEndTime())
+                        .set(WorkerPolicy::getStatus,PolicyOrderStatusEnum.BZZ.getKey()).update();
+
+                policyOrder.setPolicyOrderStatus(PolicyOrderStatusEnum.BZZ.getKey());
+                policyOrder.updateById();
+            }
+
+        }
+
         WebsitUserLog websitUserLog = new WebsitUserLog();
 
         websitUserLog.setTypeText("重新入职");