Merge branch 'zjp_dev_volume' into 'master'

Zjp dev volume

See merge request !365

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

@@ -274,11 +274,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
 //                return ResponseDto.failure(ErrorMapping.get("20010"));//当前不可购买
 //            }
 
-            //通用判断时间
+            //优先卷使用
             if (payOrderParam.getAdvanceCode() != null) {
-                if (isOldMember) {
-
-                } else {
+                if (!isOldMember) {
                     if (DateUtil.compareStrDay(DateUtil.getNowTime(), memberTimeStart) == 1 && DateUtil.compareStrDay(DateUtil.getNowTime(), timeStart) == -1) {
                         advanceMap = orderUtils.useCoupon(payOrderParam.getAdvanceCode(), "购买 " + performanceData.getTitle(), BigDecimal.ZERO, payOrderParam.getPerformanceId(), payOrderParam.getTimeId(), payOrderParam.getTicketId(),performanceData.getType());
                         if (advanceMap == null) {
@@ -298,6 +296,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                         if (couponCount > 1) {//todo
                             useAdvance = false;
                             dataUtils.decrUseCouponCount(uid, performanceData.getPerformancesId());
+                            //退卷
+                            orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
                             return ResponseDto.failure("本场演出限用1张优先券，已超出");
                         }
                     }