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

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

@@ -444,6 +444,7 @@ public class WorkerLogic {
         List<AdminWebsit> adminWebsits = new ArrayList<>();
         for (WebsitUser websitUser : websitUsers) {
             if (workerPolicyService.lambdaQuery().eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
+                    .eq(WorkerPolicy::getPolicyType,"AC")
                     .in(WorkerPolicy::getStatus,"BZZ","DSX").count() < 1) {
                 AdminWebsit adminWebsit = adminWebsitService.getById(websitUser.getWebsitId());
                 adminWebsits.add(adminWebsit);

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

@@ -291,10 +291,14 @@ public class SyncOrderInfoLogic {
         forms.put("grant_type", Collections.singletonList("client_credentials"));
         String s = HttpUtils.requestXwww(v3TokenUrl, forms);
         //String s = HttpUtils.requestPostForm(tokenUrl, map, null);
-        log.info("【获取总部token】response:{}", s);
+        //log.info("【获取总部token】response:{}", s);
         Map<String, Object> bodyMap = JSON.parseObject(s);
+        if (!bodyMap.get("statusCode").toString().equals("200")) {
+            log.info("【获取总部token】response:{}", s);
+        }
         Map<String, Object> map = JSON.parseObject(bodyMap.get("data").toString());
 
+
         return (String) map.get("access_token");
     }
 

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

@@ -1,6 +1,7 @@
 package com.gree.mall.manager.logic.policy;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -563,15 +564,14 @@ public class AgreementLogic {
 
 
                 if (mailboxSendRecord.getPolicyType().equals(PolicyTypeEnum.AC.getKey())) {
+
+
                     policyOrderService.lambdaUpdate()
                             .in(PolicyOrder::getId, policyOrderId)
-                            .le(PolicyOrder::getStartTime, new Date())
-                            .ge(PolicyOrder::getEndTime, new Date())
                             .set(PolicyOrder::getIsReceipt, IsYesNoEnum.YES.getKey())
                             .set(PolicyOrder::getReceiptTime, new Date())
                             .set(PolicyOrder::getPolicyOrderStatus, PolicyOrderEmStutasEnum.BZZ.getKey()).update();
 
-
                     List<PolicyOrder> policyOrders = policyOrderService.lambdaQuery().in(PolicyOrder::getId, policyOrderId).list();
 
                     for (PolicyOrder policyOrder : policyOrders) {
@@ -581,6 +581,8 @@ public class AgreementLogic {
                         workerPolicyService.lambdaUpdate()
                                 .eq(WorkerPolicy::getOrderId,policyOrder.getId()).remove();
 
+                        policyOrder.setIsReceipt(IsYesNoEnum.YES.getKey());
+                        policyOrder.setReceiptTime(new Date());
 
 
                         List<WorkerPolicy> workerPolicies = workerPolicyService.lambdaQuery()
@@ -602,9 +604,14 @@ public class AgreementLogic {
                             startTime = policy.getStartTime();
 
 
-                        policyOrder.setStartTime(startTime);
+                        policyOrder.setStartTime(DateUtil.beginOfDay(startTime));
                         policyOrder.setEndTime(policy.getEndTime());
 
+                        if (new Date().after(policyOrder.getStartTime()))
+                            policyOrder.setPolicyOrderStatus("BZZ");
+                        else
+                            policyOrder.setPolicyOrderStatus("DSX");
+
                         policyOrder.updateById();
 
                         //生成师傅待生效保险
@@ -693,37 +700,6 @@ public class AgreementLogic {
                             .set(PolicyOrder::getPolicyOrderStatus, PolicyOrderEmStutasEnum.DSX.getKey()).update();
 
 
-                    List<PolicyOrder> policyOrders = policyOrderService.lambdaQuery().in(PolicyOrder::getId, policyOrderId).list();
-
-
-                    List<WorkerPolicy> workerPolicies = new ArrayList<>();
-
-                    for (PolicyOrder policyOrder : policyOrders) {
-                        workerPolicyService.lambdaUpdate().eq(WorkerPolicy::getOrderId,policyOrder.getId()).remove();
-                        WorkerPolicy workerPolicy = new WorkerPolicy();
-                        workerPolicy.setWorkerId(policyOrder.getWorkerNumber());
-                        workerPolicy.setType("IN");
-                        workerPolicy.setPolicyName(policyOrder.getPolicyName());
-                        workerPolicy.setOrderId(policyOrder.getId());
-                        workerPolicy.setPolicyOrder(policyOrder.getPolicyId());
-                        workerPolicy.setPolicyType(policyOrder.getType());
-                        workerPolicy.setStatus(PolicyOrderEmStutasEnum.DSX.getKey());
-                        workerPolicy.setWebsitUserId(policyOrder.getWebsitUserId());
-                        workerPolicy.setWebsitId(policyOrder.getWebsitId());
-                        workerPolicy.setWebsitName(policyOrder.getWebsitName());
-                        workerPolicy.setWorkerName(policyOrder.getWorkerName());
-                        workerPolicy.setWorkerName(policyOrder.getWorkerName());
-                        workerPolicy.setCompany(policyOrder.getCompany());
-
-                        if (new Date().after(workerPolicy.getStartTime()))
-                            workerPolicy.setStatus("BZZ");
-                        else
-                            workerPolicy.setStatus("DSX");
-
-                        workerPolicies.add(workerPolicy);
-                    }
-                    workerPolicyService.saveBatch(workerPolicies);
-
                 }
 
 
@@ -1070,9 +1046,11 @@ public class AgreementLogic {
 
         List<WorkerPolicy> workerPolicies = workerPolicyService.lambdaQuery().in(WorkerPolicy::getWebsitUserId, websitUserIds)
                 .eq(WorkerPolicy::getPolicyType,PolicyTypeEnum.IN.getKey())
+                .eq(WorkerPolicy::getStatus,PolicyOrderStatusEnum.BZZ.getKey())
+                .ge(WorkerPolicy::getEndTime,DateUtil.offsetDay(DateUtil.endOfDay(new Date()),-3))
                 .list();
 
-        for (WebsitUser websitUser : websitUsers) {
+        for (WorkerPolicy workerPolicy : workerPolicies) {
 
         }
     }

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

@@ -352,13 +352,13 @@ public class WorkerManagerLogic {
                 throw new RemoteServiceException("师傅编号已经录入不允许更改");
             }
         }
-        if (StringUtil.isEmpty(workerManagerBean.getUser().getWorkerNumber()))
-            throw new RemoteServiceException("师傅编号不能为空");
+        if (!StringUtil.isEmpty(workerManagerBean.getUser().getWorkerNumber())) {
 
 
-        if(userService.lambdaQuery().eq(User::getWorkerNumber,workerManagerBean.getUser().getWorkerNumber())
-                .ne(User::getUserId,workerManagerBean.getUserId()).count() > 0)
-            throw new RemoteServiceException("已有该师傅编号");
+            if (userService.lambdaQuery().eq(User::getWorkerNumber, workerManagerBean.getUser().getWorkerNumber())
+                    .ne(User::getUserId, workerManagerBean.getUserId()).count() > 0)
+                throw new RemoteServiceException("已有该师傅编号");
+        }
 
 
         workerManagerBean.setBankAccount(workerManagerBean.getUser().getBankAccount());

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

@@ -25,14 +25,14 @@ public class InsureEmailSchedule {
 
 
     //每小时执行1次
-    @Scheduled(fixedDelay =60* 1000)
+   // @Scheduled(fixedDelay =60* 1000)
     public void task() throws IOException {
         agreementLogic.sendEmailSche();
     }
 
 
     //监测今天是否有回执邮件，如果有则表示今天买保险的回执成功
-    @Scheduled(fixedDelay = 60* 1000)
+   // @Scheduled(fixedDelay = 60* 1000)
     public void task2() throws IOException, MessagingException {
         agreementLogic.receEmail();
     }