Merge branch 'wyf-admin-add-colume' into 'master'

admin后台工具新增功能

See merge request !398

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/dto/OrderExportVo.java

@@ -24,6 +24,9 @@ public class OrderExportVo implements Serializable, Cloneable{
     @Excel(name = "票种适用结束时间", cellType = Excel.ColumnType.STRING)
     private String useEnd;
 
+    @Excel(name = "购买数量", cellType = Excel.ColumnType.STRING)
+    private String buyTotal;
+
     private static final OrderExportVo obj = new OrderExportVo();
 
     public static OrderExportVo getNew() {
@@ -43,6 +46,7 @@ public class OrderExportVo implements Serializable, Cloneable{
         this.setUseTime(source.getUseTime());
         this.setUseStart(source.getUseStart());
         this.setUseEnd(source.getUseEnd());
+        this.setBuyTotal(source.getBuyTotal());
         return this;
     }
 }

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

@@ -57,4 +57,5 @@ public class OrderExportDao {
     //支付时间
     private String timePay;
 
+    private String buyTotal;
 }

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

@@ -714,14 +714,23 @@ GROUP BY user_mobile,tickets_id;
     </select>
 
     <select id="exportOrderByPerformanceIdPay" resultMap="OrderExportDaoResult">
-SELECT performance_title,user_mobile,user_name,title,CONCAT(use_start,use_end) as 'use_time',use_start,use_end
-FROM kylin_order_tickets kot
+        SELECT
+            performance_title,
+            user_mobile,
+            user_name,
+            title,
+            count(user_mobile) as 'buy_total',
+            CONCAT(use_start,use_end) as 'use_time',
+            use_start,
+            use_end
+        FROM kylin_order_tickets kot
+            INNER JOIN kylin_order_ticket_entities kote on kot.order_tickets_id = kote.order_id
             INNER JOIN kylin_order_ticket_relations as kotr on kotr.order_id = kot.order_tickets_id
             INNER JOIN kylin_order_ticket_status as kots on kots.order_id = kot.order_tickets_id
             INNER JOIN kylin_tickets as kt on kt.tickets_id = kotr.ticket_id
-WHERE performance_id =  #{performancesId}
-  AND status IN (1, 3)
-GROUP BY user_mobile,tickets_id;
+        WHERE kotr.performance_id = #{performancesId}
+          AND kots.status IN (1, 3)
+        GROUP BY user_mobile, tickets_id;
     </select>
     <select id="getPerformanceSimpleByTicketId" resultType="com.liquidnet.service.kylin.dao.PerformanceSimpleAllDao">
         <!--        select kp.performances_id  as performancesId,-->