Merge branch 'dev' into test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-common/src/main/java/com/liquidnet/client/admin/common/enums/BannersTargetType.java

@@ -14,23 +14,23 @@ import java.util.*;
  */
 public enum BannersTargetType {
 
-    TARGET_TYPE1("PGC点播", 1),
-    TARGET_TYPE2("PGC直播", 2),
+//    TARGET_TYPE1("PGC点播", 1),
+//    TARGET_TYPE2("PGC直播", 2),
     TARGET_TYPE5("场地", 5),
     TARGET_TYPE6("票务", 6),
     TARGET_TYPE7("商品", 7),
 //    TARGET_TYPE8("巡演", 8),
     TARGET_TYPE12("活动跳转-可分享", 12),
     TARGET_TYPE100("活动跳转", 100),
-    TARGET_TYPE13("积分商品", 13),
+//    TARGET_TYPE13("积分商品", 13),
     TARGET_TYPE14("商品集合", 14),
     TARGET_TYPE20("音乐人", 20),
     TARGET_TYPE21("歌曲", 21),
     TARGET_TYPE22("专辑", 22),
-    TARGET_TYPE23("视频播单", 23),
+//    TARGET_TYPE23("视频播单", 23),
     TARGET_TYPE24("音乐人集合", 24),
     TARGET_TYPE26("摩登会员", 26),
-    TARGET_TYPE201("youngBlood报名跳转", 201),
+//    TARGET_TYPE201("youngBlood报名跳转", 201),
     TARGET_TYPE0("不跳转", 0);
 
     private String name;

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

@@ -176,7 +176,7 @@
         ) AS 'total_sale_price' ,
         otr.performance_id AS 'performance_id' FROM kylin_order_tickets AS ot LEFT JOIN kylin_order_ticket_status AS ots
         ON ots.order_id = ot.order_tickets_id LEFT JOIN kylin_order_ticket_relations AS otr ON otr.order_id =
-        ot.order_tickets_id WHERE (ots.`status` = 1 or ots.`status` = 0 or ots.`status` = 3) AND coupon_type = 'no' GROUP BY otr.performance_id
+        ot.order_tickets_id WHERE (ots.`status` = 1 or ots.`status` = 0 or ots.`status` = 3 or ots.`status` = 6) AND coupon_type = 'no' GROUP BY otr.performance_id
         ) AS ot ON ot.performance_id = p.performances_id
         <where>
             <if test="title!=''">
@@ -265,7 +265,7 @@
         LEFT JOIN kylin_order_ticket_status AS ots ON ots.order_id = ot.order_tickets_id
         LEFT JOIN kylin_order_ticket_relations AS otr ON otr.order_id = ot.order_tickets_id
         WHERE
-        (ots.`status` = 1 or ots.`status` = 0 or ots.`status` = 3) and coupon_type ='no'
+        (ots.`status` = 1 or ots.`status` = 0 or ots.`status` = 3 or ots.`status` = 6) and coupon_type ='no'
         GROUP BY otr.performance_id
         ) AS ot ON ot.performance_id = p.performances_id
         <where>
@@ -462,7 +462,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
-                                                                                      WHERE kotr.performance_id = ${performancesId} and kots.`status` in (0,1,3)
+                                                                                      WHERE kotr.performance_id = ${performancesId} and kots.`status` in (0,1,3,6)
                                                                                       group by kotr.performance_id,kot.user_id
                                                                                   ) t
             ) AS ut ON ut.performance_id = kp.performances_id
@@ -520,4 +520,4 @@
         AND ots.status NOT IN (0, 2, 5)
         AND ot.get_ticket_type = 'express'
     </select>
-</mapper>
+</mapper>
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/kylin/DataImpl.java

@@ -190,7 +190,7 @@ public class DataImpl {
                         performancePartnerVo.setTimeStart(DateUtil.Formatter.yyyyMMddHHmmss.format(performances.getTimeStart()));
                         performancePartnerVo.setTimeEnd(DateUtil.Formatter.yyyyMMddHHmmss.format(performances.getTimeEnd()));
                         performancePartnerVo.setFieldId(performanceRelations.getFieldId());
-                        performancePartnerVo.setFieldName((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + performances.getPerformancesId(), "name"));
+                        performancePartnerVo.setFieldName((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "name"));
                         performancePartnerVo.setNotice(performances.getNotice());
                         performancePartnerVo.setSponsorId(performances.getSponsorId());
                         performancePartnerVo.setSponsorType(performances.getSponsorType());