Merge remote-tracking branch 'origin/dev' into dev

mp-quartz/src/main/java/com/qs/mp/quartz/task/UserDeliverOrderTask.java

@@ -4,7 +4,10 @@ import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.date.TemporalUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.qs.mp.channel.domain.ChannelOrder;
+import com.qs.mp.common.enums.ChannelOrderStatusEnum;
 import com.qs.mp.common.enums.DeliverOrderStatusEnum;
+import com.qs.mp.common.utils.DateUtils;
 import com.qs.mp.common.utils.LogUtil;
 import com.qs.mp.user.domain.UserDeliverOrder;
 import com.qs.mp.user.service.IUserDeliverOrderService;
@@ -34,6 +37,8 @@ public class UserDeliverOrderTask {
     @Autowired
     private IUserDeliverOrderService userDeliverOrderService;
 
+    private final int PAGE_SIZE = 500;
+
 
     /**
      * x天前的待收货订单自动确认收货任务
@@ -62,5 +67,29 @@ public class UserDeliverOrderTask {
         LogUtil.info(logger, "...用户提货订单自动确认收货任务结束...");
     }
 
+    /**
+     * 订单取消到期任务
+     */
+    public void cancel() {
+        LogUtil.info(logger, "...用户提货未支付订单定时取消任务开始...");
+        int total = PAGE_SIZE;
+        while (total == PAGE_SIZE) {
+            // 捞取30分钟前未支付订单
+            List<UserDeliverOrder> userDeliverOrderList = userDeliverOrderService.list(
+                new LambdaQueryWrapper<UserDeliverOrder>()
+                    .eq(UserDeliverOrder::getStatus, DeliverOrderStatusEnum.NOT_PAY)
+                    .lt(UserDeliverOrder::getCreatedTime, DateUtils.addMinutes(DateUtils.getNowDate(), -30))
+                    .last("limit " + PAGE_SIZE));
+            total = userDeliverOrderList.size();
+            for (UserDeliverOrder userDeliverOrder : userDeliverOrderList) {
+                try {
+                    userDeliverOrderService.cancelOrder(userDeliverOrder.getOrderId());
+                } catch (Exception e) {
+                    LogUtil.error(logger, e, "定时取消未支付用户提货订单异常。orderId:{0}", userDeliverOrder.getOrderId());
+                }
+            }
+        }
+        LogUtil.info(logger, "...用户提货未支付订单定时取消任务结束...");
+    }
 
 }