Merge branch 'dev_duihuanlimit' into 'master'

兑换票种不做限制

See merge request !382

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

@@ -255,14 +255,16 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             }
 
             // 获取限购 实名
-            int ticketLimit = ticketData.getLimitCount();//普通票种限购
+            int ticketLimit = 1;
             int ticketMemberLimit = ticketData.getLimitCountMember();//会员票种限购
             int ticketIdCount = ticketData.getIdCount();//实名票种限购
-            int performanceLimit=1;
-            if(isPay){
-                performanceLimit= performanceData.getLimitCount();//普通演出限购
-            }else {
+            int performanceLimit = 1;
+            if (isPay) {
+                performanceLimit = performanceData.getLimitCount();//普通演出限购
+                ticketLimit = ticketData.getLimitCount();//普通票种限购
+            } else {
                 performanceLimit = 10000;//兑换不限制演出限购
+                ticketLimit = 10000;//兑换不限制票种限购
             }
 
             int performanceMemberLimit = 1;//会员演出限购