Merge branch 'pre' into 'master'

不是快递 不是电子

See merge request !41

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

@@ -122,6 +122,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 return ResponseDto.failure("票种类型错误");//参数错误
             } else if (payOrderParam.getIsElectronic().equals(1) && ticketData.getIsElectronic().equals(0)) {
                 return ResponseDto.failure("票种类型错误");//参数错误
+            }else if(payOrderParam.getIsExpress().equals(0) && payOrderParam.getIsElectronic().equals(0)){
+                return ResponseDto.failure("票种类型错误");//参数错误
             }