需求

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

@@ -303,9 +303,9 @@ public class PolicyOrderLogic {
                 }
 
                 log.info("打印保险导入1");
-                if (policyOrderService.lambdaQuery().lt(PolicyOrder::getStartTime,policyOrderup.getEndTime())
+                if (policyOrderService.lambdaQuery().le(PolicyOrder::getStartTime,policyOrderup.getEndTime())
                 .gt(PolicyOrder::getEndTime,policyOrderup.getStartTime())
-                        .eq(PolicyOrder::getType,"IN")
+                        .ge(PolicyOrder::getType,"IN")
                         .ne(PolicyOrder::getPolicyOrderStatus,"YSX")
                         .eq(PolicyOrder::getWebsitUserId,policyOrderup.getWebsitUserId()).count() > 0){
                     throw new RemoteServiceException(errPrefix + "师傅已导入该时间段得保险");
@@ -339,8 +339,8 @@ public class PolicyOrderLogic {
                 }
                 workerPolicy.insert();
                 log.info("打印保险导入2");
-                if (workerPolicyService.lambdaQuery().lt(WorkerPolicy::getStartTime,policyOrderup.getEndTime())
-                        .gt(WorkerPolicy::getEndTime,policyOrderup.getStartTime())
+                if (workerPolicyService.lambdaQuery().le(WorkerPolicy::getStartTime,policyOrderup.getEndTime())
+                        .ge(WorkerPolicy::getEndTime,policyOrderup.getStartTime())
                         .eq(WorkerPolicy::getPolicyType,"IN")
                         .ne(WorkerPolicy::getStatus,"YSX")
                         .eq(WorkerPolicy::getWebsitUserId,policyOrderup.getWebsitUserId()).count() > 0){