Browse Source

线下票停售(修复)

zhangkaikai 1 year ago
parent
commit
4c1fcd9f3a

+ 8 - 5
mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/TicketBoxMgrController.java

@@ -502,14 +502,17 @@ public class TicketBoxMgrController extends BaseApiController {
             return AjaxResult.error("参数异常,盲票组不存在");
             return AjaxResult.error("参数异常,盲票组不存在");
         }
         }
 
 
+        // 待付款、待发货票组不可停售
         QueryWrapper<ChannelOrderItem> queryWrapper = new QueryWrapper<ChannelOrderItem>();
         QueryWrapper<ChannelOrderItem> queryWrapper = new QueryWrapper<ChannelOrderItem>();
         queryWrapper.eq("box_id", ticketBox.getBoxId());
         queryWrapper.eq("box_id", ticketBox.getBoxId());
         List<String> orderIdList = channelOrderItemService.list(queryWrapper).stream().map(ChannelOrderItem::getOrderId).collect(Collectors.toList());
         List<String> orderIdList = channelOrderItemService.list(queryWrapper).stream().map(ChannelOrderItem::getOrderId).collect(Collectors.toList());
-        List<ChannelOrder> channelOrders = channelOrderService.listByIds(orderIdList);
-        for (ChannelOrder channelOrder : channelOrders) {
-            if (ChannelOrderStatusEnum.NOT_PAY.getValue().equals(channelOrder.getStatus().getValue())
-                    || ChannelOrderStatusEnum.NOT_DELIVER.getValue().equals(channelOrder.getStatus().getValue())) {
-                return AjaxResult.error("该票组有" + channelOrder.getStatus().getDesc() + "的订单,orderId:" + channelOrder.getOrderId());
+        if (CollectionUtils.isNotEmpty(orderIdList)) {
+            List<ChannelOrder> channelOrders = channelOrderService.listByIds(orderIdList);
+            for (ChannelOrder channelOrder : channelOrders) {
+                if (ChannelOrderStatusEnum.NOT_PAY.getValue().equals(channelOrder.getStatus().getValue())
+                        || ChannelOrderStatusEnum.NOT_DELIVER.getValue().equals(channelOrder.getStatus().getValue())) {
+                    return AjaxResult.error("该票组有" + channelOrder.getStatus().getDesc() + "的订单,orderId:" + channelOrder.getOrderId());
+                }
             }
             }
         }
         }
         // 预付票组不可停售
         // 预付票组不可停售