cup 2 years ago
parent
commit
0a2766256f

+ 2 - 0
mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/PromoterController.java

@@ -48,6 +48,7 @@ public class PromoterController extends BaseApiController {
             getErrorDataTable("门店信息不正确");
         }
 
+        startPage();
         List<Channel> list = channelService.list(new LambdaQueryWrapper<Channel>()
             .eq(Channel::getParentId, channelId)
             .nested(StringUtils.isNotBlank(param.getSearchValue()), queryWrapper -> {
@@ -82,4 +83,5 @@ public class PromoterController extends BaseApiController {
     }
 
 
+
 }

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

@@ -524,7 +524,7 @@ public class UserTicketOrderServiceImpl extends
             new LambdaQueryWrapper<UserTicketOrderItem>().eq(UserTicketOrderItem::getOrderId, ticketOrder.getOrderId()));
         for (UserTicketOrderItem orderItem : userTicketOrderItemList) {
             Ticket ticket = ticketService.getById(orderItem.getTicketId());
-            // TODO: 线上和线下票如果有关联商品,都要发送关联商品到用户的仓库中
+            // 线上和线下票如果有关联商品,都要发送关联商品到用户的仓库中
             List<TicketBoxGoods> ticketBoxGoodsList = ticketBoxGoodsService.list(new LambdaQueryWrapper<TicketBoxGoods>()
                 .eq(TicketBoxGoods::getBoxId, ticketOrder.getBoxId()));
             if (CollectionUtils.isNotEmpty(ticketBoxGoodsList)) {