|
@@ -397,9 +397,10 @@ public class SettlementOrderLogic {
|
|
|
|
|
|
public void sync() throws WxPayException, InterruptedException {
|
|
public void sync() throws WxPayException, InterruptedException {
|
|
|
|
|
|
- List<WorkerOrder> workerOrders = workerOrderService.lambdaQuery().eq(WorkerOrder::getPayState, IsYesNoEnum.YES.getKey())
|
|
|
|
|
|
+ List<WorkerOrder> workerOrders = workerOrderService.lambdaQuery()
|
|
|
|
+ .eq(WorkerOrder::getPayState, IsYesNoEnum.YES.getKey())
|
|
.ne(WorkerOrder::getPayStatus, PayStatusEnum.PAID.getKey())
|
|
.ne(WorkerOrder::getPayStatus, PayStatusEnum.PAID.getKey())
|
|
- .ge(WorkerOrder::getPayStateTime, DateUtil.offsetMinute(new Date(), -3))
|
|
|
|
|
|
+ .le(WorkerOrder::getPayNum, 10)
|
|
.list();
|
|
.list();
|
|
|
|
|
|
for (WorkerOrder workerOrder : workerOrders) {
|
|
for (WorkerOrder workerOrder : workerOrders) {
|
|
@@ -450,6 +451,7 @@ public class SettlementOrderLogic {
|
|
|
|
|
|
workerOrder.setPayTime(new Date());
|
|
workerOrder.setPayTime(new Date());
|
|
workerOrder.setPayType("WECHAT");
|
|
workerOrder.setPayType("WECHAT");
|
|
|
|
+ workerOrder.setPayNum((workerOrder.getPayNum()==null?0: workerOrder.getPayNum())+1);
|
|
workerOrder.setPayStatus(PayStatusEnum.PAID.getKey());
|
|
workerOrder.setPayStatus(PayStatusEnum.PAID.getKey());
|
|
workerOrder.updateById();
|
|
workerOrder.updateById();
|
|
|
|
|