Merge branch 'master' into pre

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

@@ -129,7 +129,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 }
             }
 
-            if (performanceData == null || ticketTimesData == null || ticketData == null) {
+            if (ticketTimesData == null || ticketData == null) {
                 return ResponseDto.failure(ErrorMapping.get("20004"));//参数错误
             }
             if (performanceData.getStatusSell() == 0) {
@@ -204,6 +204,11 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             }
 
             int memberType; //会员状态 不需要判断会员 1判断会员逻辑 2会员专属
+            if (DateUtil.compareStrDay(DateUtil.getNowTime(), memberTimeStart) == 1 && DateUtil.compareStrDay(DateUtil.getNowTime(), timeStart) == -1){//优先时间
+                if(payOrderParam.getNumber()>2){
+                    return ResponseDto.failure("非法下单");
+                }
+            }
             if (ticketData.getIsExclusive() == 1) {
                 memberType = 2;
                 if (!isMember) {