Merge remote-tracking branch 'origin/20240123_COUPON_SPU' into 阶梯退票_羊毛券_合并分支

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

@@ -95,6 +95,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
         preParam.setSkuName("");
         preParam.setOrderIdList("");
         HashMap<String, Integer> couponSkuIdNoBuyLimitMap = CollectionUtil.mapStringInteger();// 记录券类商品关联人限购KEY:NUM
+        boolean rollbackStock = false;
         try {
             List<GoblinOrderStoreParam> goblinOrderStoreParamList = param.getGoblinOrderStoreParamList();//分订单
             boolean isMember;
@@ -166,6 +167,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                     //判断限购
                     if (orderUtils.noZhengzaiOrder(uid)) {
                         String res1 = orderUtils.judgeOrderLimit(uid, skuParam.getSkuId(), skuParam.getNumber(), limitCount);
+                        rollbackStock = true;
                         if (!res1.equals("")) {
                             throw new Exception("已超出限购数量");
                         }
@@ -221,7 +223,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             log.info(UserPathDto.setData("下单(唤起支付)", param, data));
             return data;
         } catch (Exception e) {
-            log.error("Kylin Order Pay Error = {}", e);
+            log.error("Goblin Order Pay Error = {}", e);
             Long time3 = System.currentTimeMillis();
             //回顾限购 回滚库存
             for (String item : skuAndPreListAndNumber) {
@@ -231,7 +233,9 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                 int number = Integer.parseInt(array[2]);
                 redisUtils.incrSkuStock(pre, skuId, number);
                 if (orderUtils.noZhengzaiOrder(uid)) {
-                    redisUtils.decrSkuCountByUid(uid, skuId, number);
+                    if (rollbackStock) {
+                        redisUtils.decrSkuCountByUid(uid, skuId, number);
+                    }
                 }
             }
             //回退平台券