Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam.yml

@@ -28,7 +28,7 @@ logging:
     console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
-    root: ${liquidnet.logfile.level}
+    root: info
     #以下是为指定包设置日志级别
     com.liquidnet: ${liquidnet.logfile.level}
 # -----------------------------------------------------------

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin.yml

@@ -28,7 +28,7 @@ logging:
     console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
-    root: ${liquidnet.logfile.level}
+    root: info
     #以下是为指定包设置日志级别
     com:
       liquidnet: ${liquidnet.logfile.level}

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

@@ -394,7 +394,7 @@
             kt.use_start,
             IFNULL(kts.total_general , 0) AS 'total_general' ,
             IFNULL(ot.total_sale_general , 0) AS 'sale_general' ,
-            IFNULL((kts.total_general - ot.total_sale_general),0) AS 'surplus_general',
+            IFNULL((kts.total_general - IFNULL(ot.total_sale_general,0)),0) AS 'surplus_general',
             IFNULL(ot.total_sale_price , 0) AS 'total_sale_price' ,
             IFNULL(kts.total_exchange , 0) AS 'total_exchange',
             IFNULL(ot.total_refund_general , 0) AS 'total_refund_general',
@@ -403,8 +403,11 @@
             IFNULL(otp.total_paying_number , 1) AS 'total_paying_number',
             IFNULL(ut.total_buy_users , 0) AS 'total_buy_users'
         FROM
-            (select t.performances_id from kylin_performances t where t.performances_id = ${performancesId}) AS kp
-                inner JOIN(
+            (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
+                                                                              inner join kylin_ticket_relations ktr on kttr.times_id = ktr.times_id
+             where t.performances_id = ${performancesId}) AS kp
+                left JOIN(
                 SELECT
                     kotr.performance_id AS 'performance_id',
                     kotr.ticket_id,
@@ -420,7 +423,7 @@
                 WHERE 1>0 and kotr.performance_id = ${performancesId}
                   and kots.`status` in(1,3,4) and kot.coupon_type ='no'
                 group by kotr.performance_id,kotr.ticket_id
-            ) AS ot ON ot.performance_id = kp.performances_id
+            ) AS ot ON (ot.performance_id = kp.performances_id and ot.ticket_id = kp.ticket_id)
                 left JOIN(
                 SELECT
                     kotr.performance_id,kotr.ticket_id,
@@ -432,21 +435,21 @@
                 WHERE 1>0 and kotr.performance_id = ${performancesId}
                   and kots.`status` = 0 and kot.coupon_type ='no'
                 group by kotr.performance_id,kotr.ticket_id
-            ) AS otp ON otp.performance_id = kp.performances_id
-                inner join kylin_tickets kt on kt.tickets_id = ot.ticket_id
-                inner join kylin_ticket_status kts on kts.ticket_id = kt.tickets_id
+            ) AS otp ON (otp.performance_id = kp.performances_id and otp.ticket_id = kp.ticket_id)
+                left join kylin_tickets kt on kt.tickets_id = kp.ticket_id
+                left join kylin_ticket_status kts on kts.ticket_id = kp.ticket_id
                 inner JOIN(
                 select t.performance_id,count(t.user_id) as 'total_buy_users' from(
-                  SELECT
-                      kotr.performance_id,
-                      kot.user_id
-                  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
-                  WHERE kotr.performance_id = ${performancesId} and (kots.`status` = 0 OR kots.`status` = 1)
-                  group by kotr.performance_id,kot.user_id
-              ) t
+                      SELECT
+                          kotr.performance_id,
+                          kot.user_id
+                      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
+                      WHERE kotr.performance_id = ${performancesId} and (kots.`status` = 0 OR kots.`status` = 1)
+                      group by kotr.performance_id,kot.user_id
+                  ) t
             ) AS ut ON ut.performance_id = kp.performances_id
     </select>
     <select id="getPerformanceSponsorList" resultMap="performanceSponsorDaoResult">

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinStationController.java

@@ -190,7 +190,7 @@ public class KylinStationController {
                     Query performanceTicketVoQuery = Query.query(Criteria.where("ticketsId").in(
                             oteVoList.stream().filter(distinctByKey(KylinOrderTicketEntitiesVo::getTicketId)).map(KylinOrderTicketEntitiesVo::getTicketId).toArray()
                     ));
-                    List<KylinTicketVo> performanceTicketVoList = mongoTemplate.find(performanceTicketVoQuery, KylinTicketVo.class, KylinTicketVo.class.getSimpleName());
+                    List<KylinTicketVo> performanceTicketVoList = mongoTemplate.find(performanceTicketVoQuery, KylinTicketVo.class, KylinPerformanceVo.class.getSimpleName());
                     log.debug("performanceTicketVoList:{}", JsonUtils.toJson(performanceTicketVoList));
                     // 转换票种信息结构为Map<ticketsId, ticketVo>
                     Map<String, KylinTicketVo> performanceTicketMap = performanceTicketVoList.stream().collect(Collectors.toMap(KylinTicketVo::getTicketsId, Function.identity(), (k1, k2) -> k2));