下单锁取消

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

@@ -73,8 +73,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
     @Value("${liquidnet.url-pay.localUrl}")
     private String synUrl;
 
-    @Autowired
-    private Environment environment;
     @Autowired
     private DataUtils dataUtils;
     @Autowired
@@ -142,20 +140,20 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             }
 
             if (performanceData == null || ticketTimesData == null || ticketData == null) {
-                redisLockUtil.unlock(lock);
+//                redisLockUtil.unlock(lock);
                 return ResponseDto.failure(ErrorMapping.get("20004"));//参数错误
             }
             if (!ticketData.getTimeId().equals(payOrderParam.getTimeId()) || !ticketTimesData.getPerformanceId().equals(payOrderParam.getPerformanceId())) {
-                redisLockUtil.unlock(lock);
+//                redisLockUtil.unlock(lock);
                 return ResponseDto.failure(ErrorMapping.get("20004"));//参数错误
             }
             if (payOrderParam.getNumber() % ticketData.getCounts() != 0) {
-                redisLockUtil.unlock(lock);
+//                redisLockUtil.unlock(lock);
                 return ResponseDto.failure(ErrorMapping.get("20007"));//数量错误
             }
             //判断代理
             if (!checkAgent(payOrderParam.getAgentId(), ticketData)) {
-                redisLockUtil.unlock(lock);
+//                redisLockUtil.unlock(lock);
                 return ResponseDto.failure(ErrorMapping.get("20008"));//无权购买
             }
 
@@ -173,7 +171,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             if (ticketData.getIsExclusive() == 1) {
                 memberType = 2;
                 if (!isMember) {
-                    redisLockUtil.unlock(lock);
+//                    redisLockUtil.unlock(lock);
                     return ResponseDto.failure(ErrorMapping.get("20009"));//没有会员权限
                 }
             } else {
@@ -181,7 +179,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                     // 会员购买逻辑
                     memberType = 1;
                     if (!isMember) {
-                        redisLockUtil.unlock(lock);
+//                        redisLockUtil.unlock(lock);
                         return ResponseDto.failure(ErrorMapping.get("20009"));//没有会员权限
                     }
                 } else {
@@ -198,48 +196,50 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             int isTrueName = ticketData.getIsTrueName();//是否演出实名
 
             if (!canBuyStatus.contains(performanceData.getAppStatus())) {
+                redisLockUtil.unlock(lock);
                 return ResponseDto.failure(ErrorMapping.get("20010"));//当前不可购买
             }
 
             if (!canBuyStatus.contains(performanceData.getAppStatus())) {
+//                redisLockUtil.unlock(lock);
                 return ResponseDto.failure(ErrorMapping.get("20010"));//当前不可购买
             }
 
             //通用判断时间
             if (isMember) {
                 if (DateUtil.compareStrDay(DateUtil.getNowTime(), memberTimeStart) == -1) {
-                    redisLockUtil.unlock(lock);
+//                    redisLockUtil.unlock(lock);
                     return ResponseDto.failure(ErrorMapping.get("20011"));//未开始
                 }
             } else {
                 if (DateUtil.compareStrDay(DateUtil.getNowTime(), timeStart) == -1) {
-                    redisLockUtil.unlock(lock);
+//                    redisLockUtil.unlock(lock);
                     return ResponseDto.failure(ErrorMapping.get("20011"));//未开始
                 }
             }
             if (DateUtil.compareStrDay(DateUtil.getNowTime(), timeEnd) == 1) {
-                redisLockUtil.unlock(lock);
+//                redisLockUtil.unlock(lock);
                 return ResponseDto.failure(ErrorMapping.get("20012"));//已结束
             }
 
             //快递票判断
             if (payOrderParam.getIsExpress() != null) {
                 if (payOrderParam.getIsExpress() == 1 && DateUtil.compareStrDay(DateUtil.getNowTime(), timeExpressEnd) == 1) {
-                    redisLockUtil.unlock(lock);
+//                    redisLockUtil.unlock(lock);
                     return ResponseDto.failure(ErrorMapping.get("20013"));//快递票不卖
                 }
                 if (payOrderParam.getIsExpress() == 1 && payOrderParam.getAddressId().isEmpty()) {
-                    redisLockUtil.unlock(lock);
+//                    redisLockUtil.unlock(lock);
                     return ResponseDto.failure(ErrorMapping.get("20014"));//快递票未填写收货地址
                 }
             }
             //实名判断
             if (isTrueName == 1 && payOrderParam.getEnterIdList().size() <= 0) {
-                redisLockUtil.unlock(lock);
+//                redisLockUtil.unlock(lock);
                 return ResponseDto.failure(ErrorMapping.get("20015"));//需要实名 未实名
             }
             if (isTrueName == 1 && payOrderParam.getEnterIdList().size() != payOrderParam.getNumber()) {
-                redisLockUtil.unlock(lock);
+//                redisLockUtil.unlock(lock);
                 return ResponseDto.failure(ErrorMapping.get("20015"));//入场人数量错误
             }
 
@@ -255,7 +255,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 dataUtils.changeSurplusGeneral(payOrderParam.getTicketId(), payOrderParam.getNumber());
                 currentTime = System.currentTimeMillis() - currentTime;
                 log.debug("redis 修改库存 售罄 -> time:" + (currentTime) + "毫秒");
-                redisLockUtil.unlock(lock);
+//                redisLockUtil.unlock(lock);
                 return ResponseDto.failure(ErrorMapping.get("20016"));//没抢到
             } else {
                 isDownGeneral = true;
@@ -270,7 +270,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                         if (isStudent == 1) {
                             int age = IDCard.getAgeByIdCard(adamEnters.getIdCard());
                             if (age > 25) {
-                                redisLockUtil.unlock(lock);
+//                                redisLockUtil.unlock(lock);
                                 dataUtils.changeSurplusGeneral(payOrderParam.getTicketId(), payOrderParam.getNumber());
                                 return ResponseDto.failure(ErrorMapping.get("20017"));//年龄超了
                             }
@@ -287,7 +287,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                         String res1 = orderUtils.judgeOrderLimit(performanceData.getType(), uid, entersVoList.get(i).getIdCard(), payOrderParam.getPerformanceId(), payOrderParam.getTicketId(), performanceLimit, performanceMemberLimit, ticketLimit, ticketMemberLimit, 1, 1, memberType, isTrueName);
                         log.debug("redis 判断库存 -> time:" + (currentTime) + "毫秒");
                         if (!res1.equals("")) {
-                            redisLockUtil.unlock(lock);
+//                            redisLockUtil.unlock(lock);
                             dataUtils.changeSurplusGeneral(payOrderParam.getTicketId(), payOrderParam.getNumber());
                             return ResponseDto.failure(res1);//乱七八糟异常
                         }
@@ -300,7 +300,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                     String res1 = orderUtils.judgeOrderLimit(performanceData.getType(), uid, "", payOrderParam.getPerformanceId(), payOrderParam.getTicketId(), performanceLimit, performanceMemberLimit, ticketLimit, ticketMemberLimit, payOrderParam.getNumber(), payOrderParam.getNumber(), memberType, isTrueName);
                     currentTime = System.currentTimeMillis() - currentTime;
                     if (!res1.equals("")) {
-                        redisLockUtil.unlock(lock);
+//                        redisLockUtil.unlock(lock);
                         dataUtils.changeSurplusGeneral(payOrderParam.getTicketId(), payOrderParam.getNumber());
                         return ResponseDto.failure(res1);//乱七八糟异常
                     }
@@ -322,7 +322,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             }
             e.printStackTrace();
             log.error("Kylin Order Pay Error = " + e.getMessage());
-            redisLockUtil.unlock(lock);
+//            redisLockUtil.unlock(lock);
             return ResponseDto.failure(ErrorMapping.get("20018"));//乱七八糟异常
         }
     }