Przeglądaj źródła

门店绑定二维码

zhangkaikai 1 rok temu
rodzic
commit
a7d8a6ea8d

+ 15 - 14
mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/mall/ChannelTicketController.java

@@ -70,13 +70,13 @@ public class ChannelTicketController extends BaseApiController {
 
     Long channelId = SecurityUtils.getLoginUser().getChannelId();
     Channel channel = channelService.getById(channelId);
-    List<Long> channelIds = new ArrayList<>();
-    if (StringUtils.isNotBlank(channel.getChannelNo())) {
-      String[] split = StringUtils.split(channel.getChannelNo(), ".");
-      for (String s : split) {
-        channelIds.add(Long.valueOf(s));
-      }
-    }
+//    List<Long> channelIds = new ArrayList<>();
+//    if (StringUtils.isNotBlank(channel.getChannelNo())) {
+//      String[] split = StringUtils.split(channel.getChannelNo(), ".");
+//      for (String s : split) {
+//        channelIds.add(Long.valueOf(s));
+//      }
+//    }
     QueryWrapper<TicketBox> queryWrapper = new QueryWrapper<>();
 
     if (Objects.nonNull(param.getIsPre()) && param.getIsPre() == 1) {
@@ -108,13 +108,14 @@ public class ChannelTicketController extends BaseApiController {
     }
 
     queryWrapper.orderByDesc("t1.sort_weight");
-
-    queryWrapper.nested(wrapper -> {
-      wrapper.eq("t1.sale_channel_type", TicketBoxSaleChannelTypeEnum.ALL.getValue());
-      if (channelIds.size() != 0) {
-        wrapper.or().in("t2.channel_id",channelIds);
-      }
-    });
+    queryWrapper.eq("t1.sale_channel_type", TicketBoxSaleChannelTypeEnum.ALL.getValue());
+
+//    queryWrapper.nested(wrapper -> {
+//      wrapper.eq("t1.sale_channel_type", TicketBoxSaleChannelTypeEnum.ALL.getValue());
+//      if (channelIds.size() != 0) {
+//        wrapper.or().in("t2.channel_id",channelIds);
+//      }
+//    });
     startPage();
     List<TicketBox> ticketBoxes  = ticketBoxService.listBySaleChannel(queryWrapper);