Merge remote-tracking branch 'origin/20240123_COUPON_SPU' into 20240123_COUPON_SPU

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

@@ -97,6 +97,9 @@
                 <th>
                     <div class="cell">退票数量</div>
                 </th>
+                <th>
+                    <div class="cell">优惠券数量</div>
+                </th>
                 <th>
                     <div class="cell">销售额（元）</div>
                 </th>
@@ -134,6 +137,9 @@
                 <td>
                     <div class="cell" th:text="${respBean.totalRefundGeneral}">0</div>
                 </td>
+                <td>
+                    <div class="cell" th:text="${respBean.totalVoucherCount}">0</div>
+                </td>
                 <td>
                     <div class="cell" th:text="${respBean.totalSalePrice}">0</div>
                 </td>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java

@@ -895,6 +895,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
             countBean.setTotalRefundPrice(countBean.getTotalRefundPrice().add(dto.getTotalRefundPrice()));
             countBean.setTotalMemberNumber(countBean.getTotalMemberNumber().add(dto.getTotalMemberNumber()));
             countBean.setTotalPayingNumber(countBean.getTotalPayingNumber().add(dto.getTotalPayingNumber()));
+            countBean.setTotalVoucherCount(countBean.getTotalVoucherCount().add(dto.getTotalVoucherCount()));
             countBean.setTotalBuyUsers(dto.getTotalBuyUsers());
         });
         dtoList.add(countBean);

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceOrderStatisticalDao.java

@@ -33,6 +33,7 @@ public class PerformanceOrderStatisticalDao implements Cloneable{
     private BigDecimal totalMemberNumber = BigDecimal.ZERO;
     private BigDecimal totalPayingNumber = BigDecimal.ZERO;
     private BigDecimal totalBuyUsers = BigDecimal.ZERO;
+    private BigDecimal totalVoucherCount = BigDecimal.ZERO;
 
     private static final PerformanceOrderStatisticalDao obj = new PerformanceOrderStatisticalDao();
     public static PerformanceOrderStatisticalDao getNew() {

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

@@ -171,6 +171,7 @@
         <result column="total_member_number" property="totalMemberNumber"/>
         <result column="total_paying_number" property="totalPayingNumber"/>
         <result column="total_buy_users" property="totalBuyUsers"/>
+        <result column="total_voucher_count" property="totalVoucherCount"/>
     </resultMap>
     <resultMap id="performanceOrderListDaoResult" type="com.liquidnet.service.kylin.dao.PerformanceOrderListDao">
         <result column="performances_id" property="performancesId"/>
@@ -514,6 +515,7 @@
             IFNULL(ot.total_member_number , 0) AS 'total_member_number',
             IFNULL(otp.total_paying_number , 0) AS 'total_paying_number',
             IFNULL(ut.total_buy_users , 0) AS 'total_buy_users'
+            ,IFNULL(ot.voucher_count, 0)                                                                          AS 'total_voucher_count'
         FROM
             (select t.performances_id,ktr.ticket_id from kylin_performances t inner join kylin_ticket_time_relation kttr
                                                                                          on t.performances_id = kttr.performance_id
@@ -526,10 +528,12 @@
                     sum(kot.number)-sum(ifnull(kot.refund_number,0)) AS 'total_sale_general' ,
                     sum(kot.price_actual)-sum(ifnull(kot.price_refund,0)) AS 'total_sale_price',
                     sum(case when kotr.is_member = 1 then kot.number else 0 end) total_member_number
+                    ,count(koc.order_id) as voucher_count
                 FROM
                     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
                 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