优惠券和盲票关联bug修改

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

@@ -130,7 +130,8 @@ public class UserTicketController extends BaseApiController {
 
         if (CollectionUtils.isNotEmpty(param.getBoxIds())) {
             queryWrapper.in("t1.box_id", param.getBoxIds());
-            queryWrapper.eq("t1.sale_channel_type", TicketBoxSaleChannelTypeEnum.PART.getValue());
+            // TODO 先注释掉 销售渠道问题待确认
+//            queryWrapper.eq("t1.sale_channel_type", TicketBoxSaleChannelTypeEnum.PART.getValue());
         } else {
             queryWrapper.eq("t1.sale_channel_type", TicketBoxSaleChannelTypeEnum.ALL.getValue());
         }

mp-service/src/main/resources/mapper/admin/TicketBoxMapper.xml

@@ -64,11 +64,13 @@
 
                 t2.type refType,
                 t2.ref_id,
-               t1.*
+                t1.*,
+                t0.coupon_id
         from mp_ticket_box t1
+             left join mp_coupon_ticket t0 on t1.box_id = t0.box_id
              left join mp_ticket_box_goods t2 on t1.box_id = t2.box_id
              left join mp_goods t3 on t2.ref_id = t3.goods_id
-             left join mp_coupon t4 on t2.ref_id = t4.coupon_id
+             left join mp_coupon t4 on t0.coupon_id = t4.coupon_id
              left join mp_coupon_pkg t5 on t2.ref_id = t5.id
 
       ${ew.customSqlSegment}