修改 万青下单发现的bug 限购bug

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

@@ -307,31 +307,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             } else {
                 isDownGeneral = true;
 
-                //限购判断 如果实名 则身份证维度限购 如果不实名则数量限购
-                if (entersVoList.size() > 0) {
-                    for (int i = 0; i < entersVoList.size(); i++) {
-                        dataUtils.changeBuyInfo(uid, entersVoList.get(i).getIdCard(), performanceData.getPerformancesId(), ticketData.getTicketsId(), 1);
-                        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("")) {
-                            for (int x = 0; x < i; x++) {
-                                dataUtils.changeBuyInfo(uid, entersVoList.get(x).getIdCard(), performanceData.getPerformancesId(), ticketData.getTicketsId(), -1);
-                            }
-                            orderUtils.changeSurplus(isPay, payOrderParam.getTicketId(), payOrderParam.getNumber());
-                            orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
-                            return ResponseDto.failure(res1);//乱七八糟异常
-                        }
-                    }
-                } else {
-                    dataUtils.changeBuyInfo(uid, "", performanceData.getPerformancesId(), ticketData.getTicketsId(), payOrderParam.getNumber());
-                    String res1 = orderUtils.judgeOrderLimit(performanceData.getType(), uid, "", payOrderParam.getPerformanceId(), payOrderParam.getTicketId(), performanceLimit, performanceMemberLimit, ticketLimit, ticketMemberLimit, payOrderParam.getNumber(), payOrderParam.getNumber(), memberType, isTrueName);
-                    if (!res1.equals("")) {
-                        dataUtils.changeBuyInfo(uid, "", performanceData.getPerformancesId(), ticketData.getTicketsId(), -payOrderParam.getNumber());
-                        orderUtils.changeSurplus(isPay, payOrderParam.getTicketId(), payOrderParam.getNumber());
-                        orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
-                        return ResponseDto.failure(res1);//乱七八糟异常
-                    }
-                }
-
                 //学生票 判断
                 if (isTrueName == 1) {
                     for (AdamEntersVo adamEnters : entersVoList) {
@@ -356,6 +331,31 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                     }
                 }
 
+                //限购判断 如果实名 则身份证维度限购 如果不实名则数量限购
+                if (entersVoList.size() > 0) {
+                    for (int i = 0; i < entersVoList.size(); i++) {
+                        dataUtils.changeBuyInfo(uid, entersVoList.get(i).getIdCard(), performanceData.getPerformancesId(), ticketData.getTicketsId(), 1);
+                        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("")) {
+                            for(int x = 0 ; x<i;x++) {
+                                dataUtils.changeBuyInfo(uid, entersVoList.get(x).getIdCard(), performanceData.getPerformancesId(), ticketData.getTicketsId(), -1);
+                            }
+                            orderUtils.changeSurplus(isPay, payOrderParam.getTicketId(), payOrderParam.getNumber());
+                            orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
+                            return ResponseDto.failure(res1);//乱七八糟异常
+                        }
+                    }
+                } else {
+                    dataUtils.changeBuyInfo(uid, "", performanceData.getPerformancesId(), ticketData.getTicketsId(), payOrderParam.getNumber());
+                    String res1 = orderUtils.judgeOrderLimit(performanceData.getType(), uid, "", payOrderParam.getPerformanceId(), payOrderParam.getTicketId(), performanceLimit, performanceMemberLimit, ticketLimit, ticketMemberLimit, payOrderParam.getNumber(), payOrderParam.getNumber(), memberType, isTrueName);
+                    if (!res1.equals("")) {
+                        dataUtils.changeBuyInfo(uid, "", performanceData.getPerformancesId(), ticketData.getTicketsId(), -payOrderParam.getNumber());
+                        orderUtils.changeSurplus(isPay, payOrderParam.getTicketId(), payOrderParam.getNumber());
+                        orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
+                        return ResponseDto.failure(res1);//乱七八糟异常
+                    }
+                }
+
                 ResponseDto<PayInnerResultVo> resultData = order(payOrderParam, uid, isMember, isTrueName, performanceData, ticketData, entersVoList, isStudent, content, useTime, advanceMap, addressesVo, orderTicketId, orderCode);
                 isDownGeneral = false;
                 return resultData;
@@ -694,7 +694,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         sqlsDataA.add(orderTickets.getAddObject(CurrentUtil.getCliIpAddr(), vo.getArea(), vo.getProvince(), vo.getCity(), vo.getCounty()));
 
         // 待支付发送队列
-        queueUtils.sendMsgByRedisGoblinStock(orderTickets.getOrderTicketsId(), orderTickets.getCreatedAt(), "TICKET", performanceData.getPayCountdownMinute());
+        queueUtils.sendMsgByRedisGoblinStock(orderTickets.getOrderTicketsId(), orderTickets.getCreatedAt(), "TICKET",performanceData.getPayCountdownMinute());
         // 生成vo
         KylinOrderTicketVo orderTicketVo = KylinOrderTicketVo.getNew();
         orderTicketVo.setOrderTicket(orderTickets);