需求

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

@@ -383,6 +383,8 @@ public class WorkerLogic {
         policyOrder.setPolicyNumber(policy.getPolicyNumber());
 
         policyOrder.setWebsitUserId(websiUser.getId());
+        if (startTime.after(policy.getEndTime()))
+            throw new RemoteServiceException("已拥有对应时间得保险");
 
         int month = DateUtil.month(startTime);
         int month2 = DateUtil.month(policy.getEndTime());

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

@@ -377,6 +377,31 @@ public class PolicyOrderLogic {
                     .one();
 
 
+            List<PolicyOrder> policyOrders = policyOrderService.lambdaQuery()
+                    .eq(PolicyOrder::getWebsitId, (String) row.get(1))
+                    .eq(PolicyOrder::getWorkerNumber, (String) row.get(3))
+                    .eq(PolicyOrder::getType, "EM")
+                    .in(PolicyOrder::getPolicyOrderStatus, PolicyOrderEmStutasEnum.XG.getKey(),
+                            PolicyOrderEmStutasEnum.DSX.getKey(),
+                            PolicyOrderEmStutasEnum.KTH.getKey()
+
+                    ).list();
+            for (PolicyOrder order : policyOrders) {
+                workerPolicyService.lambdaUpdate().eq(WorkerPolicy::getOrderId,order.getId()).remove();
+            }
+
+
+            policyOrderService.lambdaUpdate()
+                    .eq(PolicyOrder::getWebsitId, (String) row.get(1))
+                    .eq(PolicyOrder::getWebsitUserId, websitUser.getId())
+                    .eq(PolicyOrder::getType, "EM")
+                    .in(PolicyOrder::getPolicyOrderStatus, PolicyOrderEmStutasEnum.XG.getKey(),
+                            PolicyOrderEmStutasEnum.KTH.getKey(),
+                            PolicyOrderEmStutasEnum.DTH.getKey()
+
+                    ).remove();
+
+
 
             PolicyOrder policyOrder = new PolicyOrder();
             policyOrder.setId("PW"+ IdWorker.getIdStr());
@@ -446,30 +471,7 @@ public class PolicyOrderLogic {
             }
             workerPolicy.insert();
 
-            List<PolicyOrder> policyOrders = policyOrderService.lambdaQuery()
-                    .eq(PolicyOrder::getWebsitId, (String) row.get(1))
-                    .eq(PolicyOrder::getWorkerNumber, (String) row.get(3))
-                    .eq(PolicyOrder::getType, "EM")
-                    .in(PolicyOrder::getPolicyOrderStatus, PolicyOrderEmStutasEnum.XG.getKey(),
-                            PolicyOrderEmStutasEnum.DSX.getKey(),
-                            PolicyOrderEmStutasEnum.KTH.getKey()
-
-                    ).list();
-            for (PolicyOrder order : policyOrders) {
-                workerPolicyService.lambdaUpdate().eq(WorkerPolicy::getOrderId,order.getId()).remove();
-            }
-
-
-            policyOrderService.lambdaUpdate()
-                    .eq(PolicyOrder::getWebsitId, (String) row.get(1))
-                    .eq(PolicyOrder::getWebsitUserId, websitUser.getId())
-                    .eq(PolicyOrder::getType, "EM")
-                    .in(PolicyOrder::getPolicyOrderStatus, PolicyOrderEmStutasEnum.XG.getKey(),
-                            PolicyOrderEmStutasEnum.DSX.getKey(),
-                            PolicyOrderEmStutasEnum.KTH.getKey(),
-                            PolicyOrderEmStutasEnum.DTH.getKey()
 
-                    ).remove();