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

@@ -165,6 +165,16 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                     int limitCount = skuVo.getBuyLimit() == 0 ? Integer.MAX_VALUE : skuVo.getBuyLimit();
                     //判断限购
                     if (orderUtils.noZhengzaiOrder(uid)) {
+                        String res1 = orderUtils.judgeOrderLimit(uid, skuParam.getSkuId(), skuParam.getNumber(), limitCount);
+                        if (!res1.equals("")) {
+                            throw new Exception("已超出限购数量");
+                        }
+                        //权限限购
+                        Boolean res2 = orderUtils.judgeOrderRose(isMember, skuParam.getSkuId(), StringUtils.defaultString(((String) CurrentUtil.getTokenClaims().get("mobile")), ""), Integer.parseInt(skuVo.getBuyFactor()));
+                        if (!res2) {
+                            throw new Exception("无权购买");
+                        }
+
                         if (Objects.equals(skuVo.getSkuType(), 2)) {// 券类商品
                             if (skuParam.getNumber() > 1) {// 券类商品单次下单限购1
                                 throw new LiquidnetServiceException("-1", String.format("代金券商品单次下单限购%d张", 1));
@@ -178,16 +188,6 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                                 }
                             }
                         }
-
-                        String res1 = orderUtils.judgeOrderLimit(uid, skuParam.getSkuId(), skuParam.getNumber(), limitCount);
-                        if (!res1.equals("")) {
-                            throw new Exception("已超出限购数量");
-                        }
-                        //权限限购
-                        Boolean res2 = orderUtils.judgeOrderRose(isMember, skuParam.getSkuId(), StringUtils.defaultString(((String) CurrentUtil.getTokenClaims().get("mobile")), ""), Integer.parseInt(skuVo.getBuyFactor()));
-                        if (!res2) {
-                            throw new Exception("无权购买");
-                        }
                     }
                     //库存回滚
                     if (surplusGeneral < 0) {