Merge branch '20240123_COUPON_SPU' into 阶梯退票_羊毛券_合并分支

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/performancesStatic.html

@@ -98,7 +98,7 @@
                     <div class="cell">退票数量</div>
                 </th>
                 <th>
-                    <div class="cell">优惠券数量</div>
+                    <div class="cell">羊毛券数量</div>
                 </th>
                 <th>
                     <div class="cell">销售额（元）</div>

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml

@@ -534,7 +534,7 @@
                     kylin_order_ticket_relations kotr
                         inner join kylin_order_tickets AS kot on kotr.order_id = kot.order_tickets_id
                         inner JOIN kylin_order_ticket_status AS kots ON kots.order_id = kot.order_tickets_id
-                         LEFT JOIN kylin_order_coupons AS koc on kots.order_id = koc.order_id
+                         LEFT JOIN kylin_order_coupons AS koc on kots.order_id = koc.order_id and coupon_type = 1
                 WHERE 1>0 and kotr.performance_id = ${performancesId}
                   and kots.`status` in(1,3,6) and kot.coupon_type ='no' and kots.transfer_status in (0,1,2,5)
                 group by kotr.performance_id,kotr.ticket_id