需求

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

@@ -564,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) {
@@ -582,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()
@@ -606,6 +607,11 @@ public class AgreementLogic {
                         policyOrder.setStartTime(startTime);
                         policyOrder.setEndTime(policy.getEndTime());
 
+                        if (new Date().after(policyOrder.getStartTime()))
+                            policyOrder.setPolicyOrderStatus("BZZ");
+                        else
+                            policyOrder.setPolicyOrderStatus("DSX");
+
                         policyOrder.updateById();
 
                         //生成师傅待生效保险

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