|
@@ -175,13 +175,12 @@ public class OrderScheduler {
|
|
|
lock.lock();
|
|
lock.lock();
|
|
|
try {
|
|
try {
|
|
|
log.info("超时订单自动取消任务开始运行");
|
|
log.info("超时订单自动取消任务开始运行");
|
|
|
-// 查询所有超时时间不为空的待结账订单
|
|
|
|
|
LambdaQueryWrapper<TbOrder> wrapper=new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<TbOrder> wrapper=new LambdaQueryWrapper<>();
|
|
|
- wrapper.eq(TbOrder::getStatus,0)
|
|
|
|
|
- .isNotNull(TbOrder::getTimeOut);
|
|
|
|
|
- List<TbOrder> orderList = orderService.list(wrapper);
|
|
|
|
|
|
|
+ wrapper.eq(TbOrder::getStatus,0);
|
|
|
|
|
+ wrapper.isNotNull(TbOrder::getTimeOut);
|
|
|
|
|
|
|
|
- if (orderList.size()==0) {
|
|
|
|
|
|
|
+ List<TbOrder> orderList = orderService.list(wrapper);
|
|
|
|
|
+ if (CollUtil.isEmpty(orderList)) {
|
|
|
log.info("没有符合条件的超时订单,超时订单自动取消任务运行....");
|
|
log.info("没有符合条件的超时订单,超时订单自动取消任务运行....");
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
@@ -190,12 +189,17 @@ public class OrderScheduler {
|
|
|
ArrayList<TbOrder> orders = new ArrayList<>();
|
|
ArrayList<TbOrder> orders = new ArrayList<>();
|
|
|
for (TbOrder tbOrder : orderList) {
|
|
for (TbOrder tbOrder : orderList) {
|
|
|
Long timeOut = tbOrder.getTimeOut();
|
|
Long timeOut = tbOrder.getTimeOut();
|
|
|
- if (time>timeOut) {
|
|
|
|
|
|
|
+ if (time > timeOut) {
|
|
|
tbOrder.setStatus(5);
|
|
tbOrder.setStatus(5);
|
|
|
orders.add(tbOrder);
|
|
orders.add(tbOrder);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ if (CollUtil.isEmpty(orders)) {
|
|
|
|
|
+ log.info("没有符合条件的超时订单,超时订单自动取消任务运行....");
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
orderService.updateBatchById(orders);
|
|
orderService.updateBatchById(orders);
|
|
|
|
|
|
|
|
log.info("超时订单自动取消运行成功");
|
|
log.info("超时订单自动取消运行成功");
|