盲票订单取消

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

@@ -2,6 +2,7 @@ package com.qs.mp.quartz.task;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.qs.mp.common.enums.TicketTypeEnum;
 import com.qs.mp.common.enums.UserTicketOrderStatusEnum;
 import com.qs.mp.common.utils.DateUtils;
 import com.qs.mp.common.utils.LogUtil;
@@ -35,11 +36,12 @@ public class TicketOrderTask {
     LogUtil.info(logger, "...盲票购买未支付订单定时取消任务开始...");
     int total = PAGE_SIZE;
     while (total == PAGE_SIZE) {
-      // 捞取30分钟前未支付订单
+      // 捞取30分钟前未支付在线盲票购买订单
       List<UserTicketOrder> ticketOrderList = userTicketOrderService.list(
           new QueryWrapper<UserTicketOrder>()
               .select("distinct box_id")
-              .lambda().eq(UserTicketOrder::getStatus, UserTicketOrderStatusEnum.NOT_PAY)
+              .lambda().eq(UserTicketOrder::getResource, TicketTypeEnum.ONLINE)
+              .eq(UserTicketOrder::getStatus, UserTicketOrderStatusEnum.NOT_PAY)
               .lt(UserTicketOrder::getCreatedTime,
                   DateUtils.addMinutes(DateUtils.getNowDate(), -30))
               .last("limit " + PAGE_SIZE));

mp-service/src/main/java/com/qs/mp/user/service/impl/UserTicketOrderServiceImpl.java

@@ -245,7 +245,7 @@ public class UserTicketOrderServiceImpl extends
     int sumTicket = 0;
     for (String orderId : orderIds) {
       UserTicketOrder userTicketOrder = getById(orderId);
-      Assert.isTrue(userTicketOrder.getResource() == TicketTypeEnum.ONLINE);
+      Assert.isTrue(userTicketOrder.getResource() == TicketTypeEnum.ONLINE, "非在线盲票不用取消。boxId:" + boxId);
       if (!rollbackOrder(userTicketOrder)) {
         return false;
       }