Merge branch 'hjc_road_coupon' into dev_rc_xuper_op

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

@@ -253,13 +253,13 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                             return ResponseDto.failure("优先券不可用");
                         }
                         Integer typeVoucher = (Integer) advanceMap.get("type");
-//                        String couponId = (String) advanceMap.get("couponId");
-//                        if (typeVoucher.equals(-1) || orderUtils.judgeRoadShowCanUse(couponId, performanceData.getRoadShowId())) {
-//                            return ResponseDto.failure("优先券不可用");
-//                        }
-                        if (typeVoucher.equals(-1)) {
+                        String couponId = (String) advanceMap.get("couponId");
+                        if (typeVoucher.equals(-1) || orderUtils.judgeRoadShowCanUse(couponId, performanceData.getRoadShowId())) {
                             return ResponseDto.failure("优先券不可用");
                         }
+//                        if (typeVoucher.equals(-1)) {
+//                            return ResponseDto.failure("优先券不可用");
+//                        }
                     }
                 }
             }