Browse Source

门店绑定二维码

zhangkaikai 2 years ago
parent
commit
2ac0694d18

+ 1 - 0
mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserTicketController.java

@@ -133,6 +133,7 @@ public class UserTicketController extends BaseApiController {
 
         queryWrapper.eq("t1.status", TicketBoxStatusEnum.PUT_ON);
         queryWrapper.eq("t2.is_deleted", 0);
+        queryWrapper.eq("t1.sale_channel_type", TicketBoxSaleChannelTypeEnum.ALL.getValue());
         queryWrapper.orderByDesc("t1.sort_weight");
         if (param.getSalePriceSort() != null && param.getSalePriceSort() != 0) {
             if (param.getSalePriceSort() == 1) {

+ 3 - 3
mp-service/src/main/java/com/qs/mp/admin/service/impl/TicketBoxServiceImpl.java

@@ -440,9 +440,9 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
             }
         }
 
-        // 指定渠道
+        // 线下票指定渠道
         if (TicketBoxSaleChannelTypeEnum.PART.getValue().equals(param.getSaleChannelType())
-            && TicketTypeEnum.OFFLINE.getValue().equals(param.getType())) {
+            && TicketTypeEnum.OFFLINE.getValue().equals(param.getType().getValue())) {
             List<Long> channelIdList = param.getChannelIdList();
             if (CollectionUtils.isEmpty(channelIdList)) {
                 throw new ServiceException("渠道列表为空");
@@ -478,7 +478,7 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
 
         // 线上票指定门店
         if (TicketBoxSaleChannelTypeEnum.PART.getValue().equals(param.getSaleChannelType())
-                && TicketTypeEnum.ONLINE.getValue().equals(param.getType())) {
+                && TicketTypeEnum.ONLINE.getValue().equals(param.getType().getValue())) {
             List<Long> channelIdList = param.getChannelIdList();
             if (CollectionUtils.isEmpty(channelIdList)) {
                 throw new ServiceException("门店列表为空");