Merge branch 'pre' into 'master'

Pre

See merge request !107

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/service/impl/CandyCouponServiceImpl.java

@@ -155,7 +155,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
                     continue;
                 }
             }
-            if (baseVo.getCouType().equals(101)) {
+            if (baseVo.getCouType().equals(101) || baseVo.getCouType().equals(3)) {
                 continue;
             }
             if (dtoItem.getExclusive().equals(1)) { //会员券
@@ -186,7 +186,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         int canUse = 0;
         for (CandyUserCouponBasicDto dtoItem : dtoList) {
             CandyCouponVo baseVo = CouponBaseUtil.getPerformanceCouponUserVo(dtoItem, priceTotal, performanceId, timeId, ticketId);
-            if (baseVo.getCouType().equals(101) || baseVo.getBusiType() == 2) {
+            if (baseVo.getCouType().equals(101) || baseVo.getCouType().equals(3) || baseVo.getBusiType() == 2) {
                 continue;
             }
             if (baseVo.getState().equals(1)) { //可用

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

@@ -101,6 +101,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         try {
             if (payOrderParam.getVoucherType() != null && payOrderParam.getVoucherType().equals(3)) {
                 isPay = false;
+                if(payOrderParam.getNumber()>1){
+                    return ResponseDto.failure("张数大于1不支持兑换");//参数错误
+                }
             }
             KylinPerformanceVo performanceData = dataUtils.getPerformanceVo(payOrderParam.getPerformanceId());
             KylinTicketTimesVo ticketTimesData = null;