修改 客服数据导出增加 票种相关信息

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

@@ -15,6 +15,15 @@ public class OrderExportVo implements Serializable, Cloneable{
     @Excel(name = "姓名", cellType = Excel.ColumnType.STRING)
     private String userName;
 
+    @Excel(name = "票种名称", cellType = Excel.ColumnType.STRING)
+    private String title;
+    @Excel(name = "票种适用时间", cellType = Excel.ColumnType.STRING)
+    private String useTime;
+    @Excel(name = "票种适用开始时间", cellType = Excel.ColumnType.STRING)
+    private String useStart;
+    @Excel(name = "票种适用结束时间", cellType = Excel.ColumnType.STRING)
+    private String useEnd;
+
     private static final OrderExportVo obj = new OrderExportVo();
 
     public static OrderExportVo getNew() {
@@ -30,6 +39,10 @@ public class OrderExportVo implements Serializable, Cloneable{
         this.setPerformanceTitle(source.getPerformanceTitle());
         this.setUserMobile(source.getUserMobile());
         this.setUserName(source.getUserName());
+        this.setTitle(source.getTitle());
+        this.setUseTime(source.getUseTime());
+        this.setUseStart(source.getUseStart());
+        this.setUseEnd(source.getUseEnd());
         return this;
     }
 }

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

@@ -338,7 +338,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
     }
 
     public static void main(String[] args) {
-        Long a=IDGenerator.getDamaiCode("625614651458519045936293");
+        Long a=IDGenerator.getDamaiCode("1360935572095672321307852");
 
         System.out.println(a);
     }

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

@@ -10,6 +10,16 @@ public class OrderExportDao {
     private String userMobile;
     //名称
     private String userName;
+    //票种名称
+    private String title;
+    //适用时间
+    private String useTime;
+    //适用开始时间
+    private String useStart;
+    //适用结束时间
+    private String useEnd;
+
+
     //订单号
     private String orderCode;
     //商户订单号

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

@@ -54,6 +54,11 @@
         <result column="user_mobile" property="userMobile"/>
         <result column="user_name" property="userName"/>
 
+        <result column="title" property="title"/>
+        <result column="use_time" property="useTime"/>
+        <result column="use_start" property="useStart"/>
+        <result column="use_end" property="useEnd"/>
+
         <result column="order_code" property="orderCode"/>
         <result column="code" property="code"/>
         <result column="pay_code" property="payCode"/>
@@ -626,22 +631,24 @@
     </select>
 
     <select id="exportOrderByPerformanceIdAll" resultMap="OrderExportDaoResult">
-SELECT performance_title,user_mobile,user_name
+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
          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
-WHERE performance_id =  #{performancesId}
-GROUP BY user_mobile;
+         INNER JOIN kylin_tickets as kt on kt.tickets_id = kotr.ticket_id
+WHERE performance_id = #{performancesId}
+GROUP BY user_mobile,tickets_id;
     </select>
 
     <select id="exportOrderByPerformanceIdPay" resultMap="OrderExportDaoResult">
-SELECT performance_title,user_mobile,user_name
+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
          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;
+GROUP BY user_mobile,tickets_id;
     </select>
     <select id="getPerformanceSimpleByTicketId" resultType="com.liquidnet.service.kylin.dao.PerformanceSimpleAllDao">
         <!--        select kp.performances_id  as performancesId,-->