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

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>
@@ -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());