订单失效

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

@@ -165,7 +165,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             int ticketLimit = ticketData.getLimitCount();//普通票种限购
             int ticketMemberLimit = ticketData.getLimitCountMember();//会员票种限购
             int performanceLimit = performanceData.getLimitCount();//普通演出限购
-            int performanceMemberLimit = performanceData.getLimitCountMember();//会员演出限购
+//            int performanceMemberLimit = performanceData.getLimitCountMember();//会员演出限购
+            int performanceMemberLimit = 0;//会员演出限购
             int isTrueName = ticketData.getIsTrueName();//是否演出实名
 
             if (!canBuyStatus.contains(performanceData.getAppStatus())) {
@@ -187,16 +188,17 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
 
             if (isMember || advanceMap != null) {
                 if (DateUtil.compareStrDay(DateUtil.getNowTime(), memberTimeStart) == -1) {
+                    orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
                     return ResponseDto.failure(ErrorMapping.get("20011"));//未开始
                 }
             } else {
                 if (DateUtil.compareStrDay(DateUtil.getNowTime(), timeStart) == -1) {
-                    orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(),uid);
+                    orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
                     return ResponseDto.failure(ErrorMapping.get("20011"));//未开始
                 }
             }
             if (DateUtil.compareStrDay(DateUtil.getNowTime(), timeEnd) == 1) {
-                orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(),uid);
+                orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
                 return ResponseDto.failure(ErrorMapping.get("20012"));//已结束
             }
 
@@ -213,11 +215,11 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             }
             //实名判断
             if (isTrueName == 1 && payOrderParam.getEnterIdList().size() <= 0) {
-                orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(),uid);
+                orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
                 return ResponseDto.failure(ErrorMapping.get("20015"));//需要实名 未实名
             }
             if (isTrueName == 1 && payOrderParam.getEnterIdList().size() != payOrderParam.getNumber()) {
-                orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(),uid);
+                orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
                 return ResponseDto.failure(ErrorMapping.get("20015"));//入场人数量错误
             }
 
@@ -240,7 +242,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                             int age = IDCard.getAgeByIdCard(adamEnters.getIdCard());
                             if (age > 25) {
                                 orderUtils.changeSurplus(isPay, payOrderParam.getTicketId(), payOrderParam.getNumber());
-                                orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(),uid);
+                                orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
                                 return ResponseDto.failure(ErrorMapping.get("20017"));//年龄超了
                             }
                         }
@@ -253,7 +255,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                         String res1 = orderUtils.judgeOrderLimit(performanceData.getType(), uid, entersVoList.get(i).getIdCard(), payOrderParam.getPerformanceId(), payOrderParam.getTicketId(), performanceLimit, performanceMemberLimit, ticketLimit, ticketMemberLimit, 1, 1, memberType, isTrueName);
                         if (!res1.equals("")) {
                             orderUtils.changeSurplus(isPay, payOrderParam.getTicketId(), payOrderParam.getNumber());
-                            orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(),uid);
+                            orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
                             return ResponseDto.failure(res1);//乱七八糟异常
                         }
                     }
@@ -261,7 +263,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                     String res1 = orderUtils.judgeOrderLimit(performanceData.getType(), uid, "", payOrderParam.getPerformanceId(), payOrderParam.getTicketId(), performanceLimit, performanceMemberLimit, ticketLimit, ticketMemberLimit, payOrderParam.getNumber(), payOrderParam.getNumber(), memberType, isTrueName);
                     if (!res1.equals("")) {
                         orderUtils.changeSurplus(isPay, payOrderParam.getTicketId(), payOrderParam.getNumber());
-                        orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(),uid);
+                        orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
                         return ResponseDto.failure(res1);//乱七八糟异常
                     }
                 }
@@ -348,7 +350,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         }
 
         if (payOrderParam.getVoucherCode() != null) {
-            HashMap<String, Object> hashMap = orderUtils.useCoupon(payOrderParam.getVoucherCode(), content, orderTickets.getPriceTotal(),payOrderParam.getPerformanceId(),payOrderParam.getTimeId(),payOrderParam.getTicketId());
+            HashMap<String, Object> hashMap = orderUtils.useCoupon(payOrderParam.getVoucherCode(), content, orderTickets.getPriceTotal(), payOrderParam.getPerformanceId(), payOrderParam.getTimeId(), payOrderParam.getTicketId());
             BigDecimal priceVoucher = (BigDecimal) hashMap.get("voucher");
             Integer typeVoucher = (Integer) hashMap.get("type");
             if (typeVoucher.equals(-1)) {
@@ -374,7 +376,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         }
 
         BigDecimal finalPrice = orderTickets.getPriceTotal().subtract(orderTickets.getPriceVoucher());
-        orderTickets.setPriceActual(finalPrice.compareTo(BigDecimal.ZERO)<=0?BigDecimal.ZERO:finalPrice);
+        orderTickets.setPriceActual(finalPrice.compareTo(BigDecimal.ZERO) <= 0 ? BigDecimal.ZERO : finalPrice);
         orderTickets.setPriceExpress(payOrderParam.getIsExpress() == 1 ? ticketData.getPriceExpress() : BigDecimal.valueOf(0));
         orderTickets.setPriceRefund(BigDecimal.valueOf(0.0));
         orderTickets.setRefundNumber(0);
@@ -919,9 +921,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
     }
 
     public boolean checkAgent(String agentId, KylinTicketVo ticketData) {
-        if(agentId.equals(0)){
+        if (agentId.equals(0)) {
             return true;
-        }else{
+        } else {
             boolean isAgent = ticketData.getIsAgent() == 1;
             if (isAgent) {
                 return true;