Merge branch 'pre' into 'master'

修改 下单接口 支持 新小程序支付

See merge request !238

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

@@ -87,12 +87,12 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         add(10);
     }};
 
-    ArrayList<Integer> canBuyTStatus = new ArrayList() {{
-        add(6);
-//        add(8);
-//        add(9);
-//        add(10);
-    }};
+//    ArrayList<Integer> canBuyTStatus = new ArrayList() {{
+//        add(6);
+////        add(8);
+////        add(9);
+////        add(10);
+//    }};
 
     @Override
     public ResponseDto<PayInnerResultVo> checkCanOrder(PayOrderParam payOrderParam) {
@@ -238,9 +238,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 return ResponseDto.failure(ErrorMapping.get("20010"));//当前不可购买
             }
 
-            if (!canBuyTStatus.contains(ticketData.getStatus())) {
-                return ResponseDto.failure(ErrorMapping.get("20010"));//当前不可购买
-            }
+//            if (!canBuyTStatus.contains(ticketData.getStatus())) {
+//                return ResponseDto.failure(ErrorMapping.get("20010"));//当前不可购买
+//            }
 
             //通用判断时间
             if (payOrderParam.getAdvanceCode() != null) {