‘linchangsheng’ 3 months ago
parent
commit
d9d037e2ad

+ 11 - 1
mall-server-api/src/main/java/com/gree/mall/manager/logic/websit/SettlementOrderLogic.java

@@ -406,9 +406,19 @@ public class SettlementOrderLogic {
 
         workerOrders.addAll(workerOrderService.lambdaQuery()
                 .eq(WorkerOrder::getPayState, IsYesNoEnum.YES.getKey())
-                .le(WorkerOrder::getPayStateTime, DateUtil.offsetMinute(new Date(),-20))
+                .le(WorkerOrder::getPayStateTime, DateUtil.offsetMinute(new Date(),-10))
                 .ne(WorkerOrder::getPayStatus, PayStatusEnum.PAID.getKey())
                 .le(WorkerOrder::getPayNum, 11)
+                .gt(WorkerOrder::getPayNum, 10)
+                .list());
+
+
+        workerOrders.addAll(workerOrderService.lambdaQuery()
+                .eq(WorkerOrder::getPayState, IsYesNoEnum.YES.getKey())
+                .le(WorkerOrder::getPayStateTime, DateUtil.offsetMinute(new Date(),-20))
+                .ne(WorkerOrder::getPayStatus, PayStatusEnum.PAID.getKey())
+                .gt(WorkerOrder::getPayNum, 11)
+                .le(WorkerOrder::getPayNum, 12)
                 .list());
 
         for (WorkerOrder workerOrder : workerOrders) {