KylinDamaiServiceImpl 大麦同步修改

KylinPerformancesMapper.xml admin 演出详情 增加根据票种名称排序
KylinTicketsPartnerServiceImpl 票种增加价格排序
KylinTicketTimesPartnerServiceImpl 场次根据 创建时间排序
orderList.html 增加短订单查询
KylinPerformancesServiceImpl 增加 根据券规则获取演出id
KylinTicketsPartnerServiceImpl 演出已结束 可下线
CouponBaseUtil 修改 全场券 getUseRules为null的问题

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/util/CouponBaseUtil.java

@@ -40,12 +40,14 @@ public class CouponBaseUtil {
         vo.setUsedAt(DateUtil.format(dtoItem.getUsedAt(), DateUtil.Formatter.yyyy_MM_dd));
         vo.setUsedFor(dtoItem.getUsedFor());
         //适用范围 规则
-        for (CandyCouponRuleDto ruleItem : dtoItem.getUseRules()) {
-            CandyCouponRulesVo voRules = CandyCouponRulesVo.getNew();
-            voRules.setUseScope(ruleItem.getUseScope());
-            voRules.setBusiId(ruleItem.getBusiId());
-            voRules.setBusiName(ruleItem.getBusiName());
-            rulesVoList.add(voRules);
+        if (dtoItem.getUseRules() != null) {
+            for (CandyCouponRuleDto ruleItem : dtoItem.getUseRules()) {
+                CandyCouponRulesVo voRules = CandyCouponRulesVo.getNew();
+                voRules.setUseScope(ruleItem.getUseScope());
+                voRules.setBusiId(ruleItem.getBusiId());
+                voRules.setBusiName(ruleItem.getBusiName());
+                rulesVoList.add(voRules);
+            }
         }
         //券类别
         if (dtoItem.getBusiType().equals(3)) {