Merge remote-tracking branch 'origin/master' into dev_member_voucher_refund_09151

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java

@@ -349,6 +349,7 @@ public class PerformanceVoUtils {
                     BeanUtils.copyProperties(kylinTicketPartnerVo, tickets);
                     KylinTicketStatus ticketStatus = new KylinTicketStatus();
                     BeanUtils.copyProperties(kylinTicketPartnerVo, ticketStatus);
+                    ticketStatus.setStatus(null);
                     KylinTicketRelations ticketRelations = new KylinTicketRelations();
                     BeanUtils.copyProperties(kylinTicketPartnerVo, ticketRelations);
 

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

@@ -117,6 +117,15 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 }
             }
 
+            if (payOrderParam.getIsExpress().equals(1) && ticketData.getIsExpress().equals(0)) {
+                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("票种类型错误");//参数错误
+            }
+
+
             if (performanceData == null || ticketTimesData == null || ticketData == null) {
                 return ResponseDto.failure(ErrorMapping.get("20004"));//参数错误
             }