‘linchangsheng’ 3 semanas atrás
pai
commit
9907516ee3

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

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