Merge branch 'pre' into 'master'

Pre

See merge request !360

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/constant/GoblinRedisConst.java

@@ -119,7 +119,7 @@ public class GoblinRedisConst {
 
     public static final String REDIS_GOBLIN_BUY_COUNT = PREFIX.concat("uid:");//用户sku购买数量 key:uid:skuId:$skuId
 
-    public static final String REDIS_GOBLIN_BUY_COUNT_IDNO = PREFIX.concat("idno:%s:%s:%s");// 实名sku购买数量 key:$idType:$idNo:$skuId
+    public static final String REDIS_GOBLIN_BUY_COUNT_IDNO = PREFIX.concat("idcard:%s:%s:%s");// 实名sku购买数量 key:$idType:$idNo:$skuId
     public static final String REDIS_GOBLIN_SALE_COUNT = PREFIX.concat("sale:skuId:");//用户sku购买数量 key:sale:skuId:$skuId
     public static final String REDIS_GOBLIN_SALE_SPU_COUNT = PREFIX.concat("sale:spuId:");//用户sku购买数量 key:sale:skuId:$spuId
     public static final String REDIS_GOBLIN_ORDER = PREFIX.concat("order:");//用户sku购买数量 key:$orderId

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

@@ -184,9 +184,10 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                             }
                             if (Objects.equals(skuVo.getIsTrueName(), 1)) {// 需关联实名人
                                 int idNoLimitCount = 1;// 这里默认券类商品需要关联实名人且都要求关联实名人限购，限购数量为1
-                                String couponSkuIdNoBuyLimitKey = String.format(GoblinRedisConst.REDIS_GOBLIN_BUY_COUNT_IDNO, skuParam.getIdType(), skuParam.getIdNo(), skuId, skuParam.getNumber());
+                                String couponSkuIdNoBuyLimitKey = String.format(GoblinRedisConst.REDIS_GOBLIN_BUY_COUNT_IDNO, skuParam.getIdType(), skuParam.getIdNo(), skuId);
+                                long incrRstNum = redisUtils.redisUtil.incr(couponSkuIdNoBuyLimitKey, skuParam.getNumber());
                                 couponSkuIdNoBuyLimitMap.put(couponSkuIdNoBuyLimitKey, skuParam.getNumber());
-                                if (redisUtils.redisUtil.incr(couponSkuIdNoBuyLimitKey, skuParam.getNumber()) > idNoLimitCount) {
+                                if (incrRstNum > idNoLimitCount) {
                                     throw new LiquidnetServiceException("-1", String.format("超过限购数量，一个证件信息限购%d张", idNoLimitCount));
                                 }
                             }
@@ -194,7 +195,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                     }
                     //库存回滚
                     if (surplusGeneral < 0) {
-                        return orderUtils.orderException(skuAndPreListAndNumber, platformCodeList, storeCodeList, uid, "库存不足");
+                        return orderUtils.orderException(skuAndPreListAndNumber, platformCodeList, storeCodeList, uid, "库存不足", couponSkuIdNoBuyLimitMap);
 //                        throw new Exception("库存不足");
                     }
                 }//GoblinOrderSkuParam
@@ -216,7 +217,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                 orderSqlParams.add(sqlParam);
             }//GoblinOrderStoreParam
             if (preParam.getOrderIdList().equals("")) {
-                return orderUtils.orderException(skuAndPreListAndNumber, platformCodeList, storeCodeList, uid, "参数异常");
+                return orderUtils.orderException(skuAndPreListAndNumber, platformCodeList, storeCodeList, uid, "参数异常", couponSkuIdNoBuyLimitMap);
 //                throw new Exception("参数异常");
             }
             ResponseDto<GoblinPayInnerResultVo> data = payOrder(preParam, orderSqlParams, uid);
@@ -254,9 +255,9 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             if (params.size() > 0) {
                 orderUtils.backStoreCoupon(params);
             }
-            if (!CollectionUtils.isEmpty(couponSkuIdNoBuyLimitMap)) {
-                couponSkuIdNoBuyLimitMap.forEach((couponSkuIdNoBuyLimitKey, number) -> {
-                    redisUtils.redisUtil.decr(couponSkuIdNoBuyLimitKey, number);
+            if (!CollectionUtils.isEmpty(couponSkuIdNoBuyLimitMap)) {// 券类商品实名限购回滚
+                couponSkuIdNoBuyLimitMap.forEach((couponSkuIdNoBuyLimitKey, numb) -> {
+                    redisUtils.redisUtil.decr(couponSkuIdNoBuyLimitKey, numb);
                 });
             }
             if (e instanceof LiquidnetServiceException) {

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

@@ -23,6 +23,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.MultiValueMap;
 
 import java.math.BigDecimal;
@@ -526,7 +527,9 @@ public class GoblinOrderUtils {
     }
 
     //订单异常处理
-    public ResponseDto<GoblinPayInnerResultVo> orderException(List<String> skuAndPreListAndNumber, List<String> platformCodeList, List<String> storeCodeList, String uid, String message) {
+    public ResponseDto<GoblinPayInnerResultVo> orderException(List<String> skuAndPreListAndNumber, List<String> platformCodeList,
+                                                              List<String> storeCodeList, String uid, String message,
+                                                              HashMap<String, Integer> couponSkuIdNoBuyLimitMap) {
         long time3 = System.currentTimeMillis();
         //回顾限购 回滚库存
         for (String item : skuAndPreListAndNumber) {
@@ -554,6 +557,12 @@ public class GoblinOrderUtils {
         if (params.size() > 0) {
             backStoreCoupon(params);
         }
+        // 这里加的'券类商品实名限购回滚'是因为这里'库存不足'没按异常处理
+        if (!CollectionUtils.isEmpty(couponSkuIdNoBuyLimitMap)) {// 券类商品实名限购回滚
+            couponSkuIdNoBuyLimitMap.forEach((couponSkuIdNoBuyLimitKey, numb) -> {
+                redisUtils.redisUtil.decr(couponSkuIdNoBuyLimitKey, numb);
+            });
+        }
         log.info("回滚逻辑 " + (System.currentTimeMillis() - time3) + "ms");
         if (message == null && !message.equals("")) {
             return ResponseDto.failure(ErrorMapping.get("20018"));//乱七八糟异常