需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/policy/WorkerLogic.java

@@ -326,10 +326,6 @@ public class WorkerLogic {
 
         policyOrder.setWebsitUserId(websiUser.getId());
 
-
-        policyOrder.setStartTime(startTime);
-        policyOrder.setEndTime(policy.getEndTime());
-
         int month = DateUtil.month(startTime);
         int month2 = DateUtil.month(policy.getEndTime());
         int year = DateUtil.year(startTime);

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

@@ -340,6 +340,8 @@ public class SyncOrderInfoLogic {
 
             String json = JSONUtil.toJsonStr(workOrderSearchReq);
 
+            log.info("工单同步详情返回："+json);
+
             String body = HttpUtils.requestPostBody(greeUrl + Constant.gree.POST_WORKER_ORDER_DETAIL, json, heard);
 
             Map<String, Object> bodyMap = JSON.parseObject(body);
@@ -544,7 +546,10 @@ public class SyncOrderInfoLogic {
                 workerOrderSyncBean.setInSynReqId(Convert.toStr(itfTblWorkOrder.getSynReqId()));
                 workerOrderSyncBean.setInDownloadBatchNo(itfTblWorkOrder.getDownloadBatchNo());
                 WorkerOrderSyncBean workerOrderSyncBean1 = syncMapper.orderExecute(workerOrderSyncBean);
+
                 if (!workerOrderSyncBean1.getOutSynStatus()){
+
+                    log.info("工单同步返回内容："+workerOrderSyncBean1.toString());
                     itfTblWorkOrder.setSynTimes(itfTblWorkOrder.getSynTimes()+1);
                     itfTblWorkOrder.setSynErrMsg(workerOrderSyncBean1.getOutSynErrMsg());
                     itfTblWorkOrder.updateById();
@@ -553,6 +558,8 @@ public class SyncOrderInfoLogic {
                 itfTblWorkOrder.setSynTimes(itfTblWorkOrder.getSynTimes()+1);
                 itfTblWorkOrder.setSynErrMsg(e.getMessage());
                 itfTblWorkOrder.updateById();
+
+                log.info("工单同步返回日志错误内容："+itfTblWorkOrder.getDownloadBatchNo()+e);
             }
 
 

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

@@ -30,6 +30,7 @@ import org.springframework.util.CollectionUtils;
 import javax.mail.MessagingException;
 import java.io.File;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -577,7 +578,32 @@ public class AgreementLogic {
 
                         Policy policy = policyService.getById(policyOrder.getPolicyId());
 
-                        workerPolicyService.lambdaUpdate().eq(WorkerPolicy::getOrderId,policyOrder.getId()).remove();
+                        workerPolicyService.lambdaUpdate()
+                                .eq(WorkerPolicy::getOrderId,policyOrder.getId()).remove();
+
+
+
+                        List<WorkerPolicy> workerPolicies = workerPolicyService.lambdaQuery()
+                                .eq(WorkerPolicy::getWebsitId, policyOrder.getWebsitId())
+                                .eq(WorkerPolicy::getWorkerId, policyOrder.getWorkerNumber())
+                                .eq(WorkerPolicy::getPolicyType, "AC")
+                                .orderByDesc(WorkerPolicy::getEndTime)
+                                .list();
+
+                        //取师傅最后时间的后一天，小于保险时间就取保险时间
+
+                        Date startTime = new Date();
+
+                        if (!CollectionUtils.isEmpty(workerPolicies)){
+                            startTime = DateUtil.beginOfDay(DateUtil.offsetDay(workerPolicies.get(0).getEndTime(),1));
+                        }
+
+                        if (startTime.before(policy.getStartTime()))
+                            startTime = policy.getStartTime();
+
+
+                        policyOrder.setStartTime(startTime);
+                        policyOrder.setEndTime(policy.getEndTime());
 
                         //生成师傅待生效保险
                         WorkerPolicy workerPolicy = new WorkerPolicy();
@@ -615,7 +641,7 @@ public class AgreementLogic {
                     policyOrderService.lambdaUpdate()
                             .in(PolicyOrder::getId, policyOrderId)
                             .set(PolicyOrder::getStartTime, DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), 1)))
-                            .set(PolicyOrder::getEndTime, DateUtil.endOfDay(DateUtil.offsetMonth(new Date(), 12)))
+                            .set(PolicyOrder::getEndTime, DateUtil.offsetMillisecond(DateUtil.endOfDay(DateUtil.offsetMonth(new Date(), 12)),-999))
                             .set(PolicyOrder::getIsReceipt, IsYesNoEnum.YES.getKey())
                             .set(PolicyOrder::getReceiptTime, new Date())
                             .set(PolicyOrder::getPolicyOrderStatus, PolicyOrderEmStutasEnum.DSX.getKey()).update();
@@ -637,7 +663,7 @@ public class AgreementLogic {
                         workerPolicy.setPolicyType(policyOrder.getType());
                         workerPolicy.setStatus(PolicyOrderEmStutasEnum.DSX.getKey());
                         workerPolicy.setStartTime(DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), 1)));
-                        workerPolicy.setEndTime(DateUtil.endOfDay(DateUtil.offsetMonth(new Date(), 12)));
+                        workerPolicy.setEndTime(DateUtil.offsetMillisecond(DateUtil.endOfDay(DateUtil.offsetMonth(new Date(), 12)),-999));
                         workerPolicy.setWebsitUserId(policyOrder.getWebsitUserId());
                         workerPolicy.setWebsitId(policyOrder.getWebsitId());
                         workerPolicy.setWebsitName(policyOrder.getWebsitName());
@@ -680,8 +706,6 @@ public class AgreementLogic {
                         workerPolicy.setPolicyOrder(policyOrder.getPolicyId());
                         workerPolicy.setPolicyType(policyOrder.getType());
                         workerPolicy.setStatus(PolicyOrderEmStutasEnum.DSX.getKey());
-                        workerPolicy.setStartTime(DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), 1)));
-                        workerPolicy.setEndTime(DateUtil.endOfDay(DateUtil.offsetMonth(new Date(), 12)));
                         workerPolicy.setWebsitUserId(policyOrder.getWebsitUserId());
                         workerPolicy.setWebsitId(policyOrder.getWebsitId());
                         workerPolicy.setWebsitName(policyOrder.getWebsitName());

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

@@ -88,7 +88,7 @@ public class PolicyLogic {
 
         policyDetail.setCompanyWechatId(adminUser.getCompanyWechatId());
         policyDetail.setCompanyWechatName(adminUser.getCompanyName());
-        policyDetail.setEndTime(DateUtil.endOfDay(policyDetail.getEndTime()));
+        policyDetail.setEndTime(DateUtil.offsetMillisecond(DateUtil.endOfDay(policyDetail.getEndTime()),-999));
         policyDetail.setStartTime(DateUtil.beginOfDay(policyDetail.getEndTime()));
 
         policyDetail.insert();

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

@@ -73,7 +73,9 @@ public class WorkerManagerLogic {
 
         websitUserLog.setTypeText("暂停接单");
         websitUserLog.setOpRemark("操作该账号暂停接单");
-
+        websitUserLog.setWebsitUserId(websitUserBean.getId());
+        websitUserLog.setWebsitName(websitUserBean.getWebsitName());
+        websitUserLog.setWebsitId(websitUserBean.getWebsitId());
         websitUserLog.insert();
 
     }
@@ -93,6 +95,9 @@ public class WorkerManagerLogic {
 
         websitUserLog.setTypeText("激活账号");
         websitUserLog.setOpRemark("操作激活账号");
+        websitUserLog.setWebsitUserId(websitUserBean.getId());
+        websitUserLog.setWebsitName(websitUserBean.getWebsitName());
+        websitUserLog.setWebsitId(websitUserBean.getWebsitId());
 
         websitUserLog.insert();
     }
@@ -128,6 +133,9 @@ public class WorkerManagerLogic {
 
         websitUserLog.setTypeText("操作离职");
         websitUserLog.setOpRemark("操作离职");
+        websitUserLog.setWebsitUserId(websitUserBean.getId());
+        websitUserLog.setWebsitName(websitUserBean.getWebsitName());
+        websitUserLog.setWebsitId(websitUserBean.getWebsitId());
 
         websitUserLog.insert();
     }
@@ -147,6 +155,9 @@ public class WorkerManagerLogic {
 
         websitUserLog.setTypeText("重新入职");
         websitUserLog.setOpRemark("操作重新入职");
+        websitUserLog.setWebsitUserId(websitUserBean.getId());
+        websitUserLog.setWebsitName(websitUserBean.getWebsitName());
+        websitUserLog.setWebsitId(websitUserBean.getWebsitId());
 
         websitUserLog.insert();
     }
@@ -159,6 +170,29 @@ public class WorkerManagerLogic {
 
         WebsitUser websitUser = websitUserService.getById(workerManagerBean.getId());
 
+        if (!user.getIdCardEndTime().equals(user.getIdCardEndTime())){
+            WebsitUserLog websitUserLog = new WebsitUserLog();
+
+            websitUserLog.setTypeText("身份证修改");
+            websitUserLog.setOpRemark("身份证结束日期变更"+ DateUtil.format(user.getIdCardEndTime(),"yyyy-MM-dd")+","+
+                    DateUtil.format(workerManagerBean.getUser().getIdCardEndTime(),"yyyy-MM-dd"));
+
+            websitUserLog.setWebsitUserId(workerManagerBean.getId());
+
+            websitUserLog.insert();
+        }
+        if (!user.getIdCardStartTime().equals(user.getIdCardStartTime())){
+            WebsitUserLog websitUserLog = new WebsitUserLog();
+
+            websitUserLog.setTypeText("身份证修改");
+            websitUserLog.setOpRemark("身份证开始日期变更"+ DateUtil.format(user.getIdCardStartTime(),"yyyy-MM-dd")+","+
+                    DateUtil.format(workerManagerBean.getUser().getIdCardStartTime(),"yyyy-MM-dd"));
+
+            websitUserLog.setWebsitUserId(workerManagerBean.getId());
+
+            websitUserLog.insert();
+        }
+
 
         workerManagerBean.setExamineStatus(ExamineWorkerStatusEnum.POLICY_WAIT.getKey());
 
@@ -236,6 +270,10 @@ public class WorkerManagerLogic {
                 websitUserLog.setOpRemark("保险时间为"+ DateUtil.format(workerPolicy.getStartTime(),"yyyy-MM-dd")+","+
                         DateUtil.format(workerPolicy.getEndTime(),"yyyy-MM-dd"));
 
+                websitUserLog.setWebsitUserId(workerPolicy.getWebsitUserId());
+                websitUserLog.setWebsitName(workerPolicy.getWebsitName());
+                websitUserLog.setWebsitId(workerPolicy.getWebsitId());
+
                 websitUserLog.insert();
             }else {
                 List<WorkerPolicy> workerPolicyLists = workerPolicyList.stream()
@@ -252,6 +290,10 @@ public class WorkerManagerLogic {
                     websitUserLog.setOpRemark("保险时间为"+ DateUtil.format(workerPolicy.getStartTime(),"yyyy-MM-dd")+","+
                             DateUtil.format(workerPolicy.getEndTime(),"yyyy-MM-dd"));
 
+                    websitUserLog.setWebsitUserId(workerPolicy.getWebsitUserId());
+                    websitUserLog.setWebsitName(workerPolicy.getWebsitName());
+                    websitUserLog.setWebsitId(workerPolicy.getWebsitId());
+
                     websitUserLog.insert();
 
                 }
@@ -369,6 +411,9 @@ public class WorkerManagerLogic {
         if (!CollectionUtils.isEmpty(workerManagerBean.getWorkerPolicies())) {
 
             for (WorkerPolicy workerPolicy : workerManagerBean.getWorkerPolicies()) {
+
+                workerPolicy.setEndTime(DateUtil.offsetDay(DateUtil.endOfDay(workerPolicy.getEndTime()),-999));
+
                 if (workerPolicy.getEndTime().after(new Date()) && workerPolicy.getStartTime().before(new Date())) {
                     workerPolicy.setStatus("BZZ");
                 } else {
@@ -692,6 +737,7 @@ public class WorkerManagerLogic {
 
 
         for (WorkerPolicy workerPolicy : workerManagerBean.getWorkerPolicies()) {
+            workerPolicy.setEndTime(DateUtil.offsetDay(DateUtil.endOfDay(workerPolicy.getEndTime()),-999));
             workerPolicy.setWorkerId(workerManagerBean.getUserId());
             workerPolicy.setWebsitUserId(workerManagerBean.getId());
         }