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

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/user/PayLogic.java

@@ -985,31 +985,7 @@ public class PayLogic {
         policyOrder.updateById();
 
 
-        Policy policy = policyService.getById(policyOrder.getPolicyId());
-
-
-        //生成师傅待生效保险
-        WorkerPolicy workerPolicy = new WorkerPolicy();
-        workerPolicy.setWebsitId(policyOrder.getWorkerNumber());
-        workerPolicy.setStatus("DSX");
-        workerPolicy.setCompany(policy.getCompany());
-        workerPolicy.setType("IN");
-        workerPolicy.setPolicyName(policy.getPolicyName());
-        workerPolicy.setPolicyOrder(policy.getPolicyNumber());
-        workerPolicy.setOrderId(policyOrder.getId());
-        workerPolicy.setPolicyOrder(policy.getPolicyNumber());
-        workerPolicy.setPolicyType("AC");
-        workerPolicy.setStartTime(policyOrder.getStartTime());
-        workerPolicy.setEndTime(policyOrder.getEndTime());
-        workerPolicy.setWebsitUserId(policyOrder.getWebsitUserId());
-        workerPolicy.setWebsitId(policyOrder.getWebsitId());
-        workerPolicy.setWebsitName(policyOrder.getWebsitName());
-        workerPolicy.setPolicyPrice(policyOrder.getPayAmount());
-        workerPolicy.setWorkerName(policyOrder.getWorkerName());
-        workerPolicy.setWorkerId(policyOrder.getWorkerNumber());
-
-
-        workerPolicy.insert();
+
 
     }
 }

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

@@ -692,11 +692,42 @@ public class AgreementLogic {
                             .set(PolicyOrder::getIsReceipt, IsYesNoEnum.YES.getKey())
                             .set(PolicyOrder::getReceiptTime, new Date())
                             .set(PolicyOrder::getPolicyOrderStatus, PolicyOrderEmStutasEnum.BZZ.getKey()).update();
-                    workerPolicyService.lambdaUpdate()
-                            .in(WorkerPolicy::getOrderId, policyOrderId)
-                            .le(WorkerPolicy::getStartTime, new Date())
-                            .ge(WorkerPolicy::getEndTime, new Date())
-                            .set(WorkerPolicy::getStatus, "BZZ").update();
+
+
+                    List<PolicyOrder> policyOrders = policyOrderService.lambdaQuery().in(PolicyOrder::getId, policyOrderId).list();
+
+                    for (PolicyOrder policyOrder : policyOrders) {
+
+                        Policy policy = policyService.getById(policyOrder.getPolicyId());
+
+
+                        //生成师傅待生效保险
+                        WorkerPolicy workerPolicy = new WorkerPolicy();
+                        workerPolicy.setWebsitId(policyOrder.getWorkerNumber());
+                        workerPolicy.setCompany(policy.getCompany());
+                        workerPolicy.setType("IN");
+                        workerPolicy.setPolicyName(policy.getPolicyName());
+                        workerPolicy.setPolicyOrder(policy.getPolicyNumber());
+                        workerPolicy.setOrderId(policyOrder.getId());
+                        workerPolicy.setPolicyOrder(policy.getPolicyNumber());
+                        workerPolicy.setPolicyType("AC");
+                        workerPolicy.setStartTime(policyOrder.getStartTime());
+                        workerPolicy.setEndTime(policyOrder.getEndTime());
+                        workerPolicy.setWebsitUserId(policyOrder.getWebsitUserId());
+                        workerPolicy.setWebsitId(policyOrder.getWebsitId());
+                        workerPolicy.setWebsitName(policyOrder.getWebsitName());
+                        workerPolicy.setPolicyPrice(policyOrder.getPayAmount());
+                        workerPolicy.setWorkerName(policyOrder.getWorkerName());
+                        workerPolicy.setWorkerId(policyOrder.getWorkerNumber());
+
+
+                        if (new Date().after(workerPolicy.getStartTime()))
+                            workerPolicy.setStatus("BZZ");
+                        else
+                            workerPolicy.setStatus("DSX");
+
+                        workerPolicy.insert();
+                    }
                 }
 
 
@@ -732,6 +763,12 @@ public class AgreementLogic {
                         workerPolicy.setWebsitName(policyOrder.getWebsitName());
                         workerPolicy.setWorkerName(policyOrder.getWorkerName());
                         workerPolicy.setWorkerName(policyOrder.getWorkerName());
+
+                        if (new Date().after(workerPolicy.getStartTime()))
+                            workerPolicy.setStatus("BZZ");
+                        else
+                            workerPolicy.setStatus("DSX");
+
                         workerPolicies.add(workerPolicy);
                     }
                     workerPolicyService.saveBatch(workerPolicies);

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

@@ -712,7 +712,7 @@ public class WorkerManagerLogic {
                 workerPolicy.setStatus("YSX");
             }
         }
-        if (workerPolicies.stream().filter(item -> item.getStatus().equals("BZZ")).count() < 1) {
+        if (workerPolicies.stream().filter(item -> item.getStatus().equals("BZZ") ).count() < 1) {
             throw new RemoteServiceException("意外险必须有生效的保险");
         }