‘linchangsheng’ 3 周之前
父节点
当前提交
2f2c64975e
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/AgreementLogic.java

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

@@ -880,7 +880,7 @@ public class AgreementLogic {
 
         if (!CollectionUtils.isEmpty(list)) {
             workerPolicyService.lambdaUpdate()
-                    .ge(WorkerPolicy::getEndTime,  DateUtil.beginOfDay(new Date()))
+                    .ge(WorkerPolicy::getEndTime,  DateUtil.offsetMinute(DateUtil.endOfDay(new Date()),-2))
                     .le(WorkerPolicy::getStartTime, new Date())
                     .in(WorkerPolicy::getOrderId, list.stream().map(PolicyOrder::getId).collect(Collectors.toList()))
                     .ne(WorkerPolicy::getStatus, PolicyOrderStatusEnum.BZZ.getKey())
@@ -890,7 +890,7 @@ public class AgreementLogic {
 
 
         policyOrderService.lambdaUpdate()
-                .ge(PolicyOrder::getEndTime,  DateUtil.beginOfDay(new Date()))
+                .ge(PolicyOrder::getEndTime,  DateUtil.offsetMinute(DateUtil.endOfDay(new Date()),-2))
                 .le(PolicyOrder::getStartTime, new Date())
                 .ne(PolicyOrder::getPolicyOrderStatus, PolicyOrderStatusEnum.BZZ.getKey())
                 .ne(PolicyOrder::getPolicyOrderStatus, PolicyOrderStatusEnum.YSX.getKey())