‘linchangsheng’ 4 months ago
parent
commit
4c2b02eeea

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

@@ -302,12 +302,13 @@ public class PolicyOrderLogic {
                     policyOrderup.setPolicyOrderStatus("DSX");
                 }
 
-                log.info("打印保险导入1");
-                if (policyOrderService.lambdaQuery().le(PolicyOrder::getStartTime,policyOrderup.getEndTime())
-                .ge(PolicyOrder::getEndTime,policyOrderup.getStartTime())
-                        .eq(PolicyOrder::getType,"IN")
-                        .ne(PolicyOrder::getPolicyOrderStatus,"YSX")
-                        .eq(PolicyOrder::getWebsitUserId,policyOrderup.getWebsitUserId()).count() > 0){
+                Integer count = policyOrderService.lambdaQuery().le(PolicyOrder::getStartTime, policyOrderup.getEndTime())
+                        .ge(PolicyOrder::getEndTime, policyOrderup.getStartTime())
+                        .eq(PolicyOrder::getType, "IN")
+                        .ne(PolicyOrder::getPolicyOrderStatus, "YSX")
+                        .eq(PolicyOrder::getWebsitUserId, policyOrderup.getWebsitUserId()).count();
+                log.error("打印保险导入1+"+count);
+                if (count > 0){
                     throw new RemoteServiceException(errPrefix + "师傅已导入该时间段得保险");
                 }
 
@@ -337,8 +338,7 @@ public class PolicyOrderLogic {
                 else {
                     workerPolicy.setStatus("DSX");
                 }
-                workerPolicy.insert();
-                log.info("打印保险导入2");
+
                 if (workerPolicyService.lambdaQuery().le(WorkerPolicy::getStartTime,policyOrderup.getEndTime())
                         .ge(WorkerPolicy::getEndTime,policyOrderup.getStartTime())
                         .eq(WorkerPolicy::getPolicyType,"IN")
@@ -347,6 +347,10 @@ public class PolicyOrderLogic {
                     throw new RemoteServiceException(errPrefix + "师傅已导入该时间段得保险");
                 }
 
+                workerPolicy.insert();
+
+
+
             }