|
@@ -396,12 +396,20 @@ public class SettlementOrderLogic {
|
|
|
|
|
|
|
|
|
public void sync() throws WxPayException, InterruptedException {
|
|
|
-
|
|
|
- List<WorkerOrder> workerOrders = workerOrderService.lambdaQuery()
|
|
|
+ List<WorkerOrder> workerOrders =new ArrayList<>();
|
|
|
+ workerOrders.addAll(workerOrderService.lambdaQuery()
|
|
|
.eq(WorkerOrder::getPayState, IsYesNoEnum.YES.getKey())
|
|
|
.ne(WorkerOrder::getPayStatus, PayStatusEnum.PAID.getKey())
|
|
|
.le(WorkerOrder::getPayNum, 10)
|
|
|
- .list();
|
|
|
+ .list());
|
|
|
+
|
|
|
+
|
|
|
+ workerOrders.addAll(workerOrderService.lambdaQuery()
|
|
|
+ .eq(WorkerOrder::getPayState, IsYesNoEnum.YES.getKey())
|
|
|
+ .ge(WorkerOrder::getPayStateTime, DateUtil.offsetMinute(new Date(),20))
|
|
|
+ .ne(WorkerOrder::getPayStatus, PayStatusEnum.PAID.getKey())
|
|
|
+ .le(WorkerOrder::getPayNum, 11)
|
|
|
+ .list());
|
|
|
|
|
|
for (WorkerOrder workerOrder : workerOrders) {
|
|
|
|