goblin相关 获取判断库存增加listId

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinNftGoodsAppServiceImpl.java

@@ -69,10 +69,9 @@ public class GoblinNftGoodsAppServiceImpl implements IGoblinNftGoodsAppService {
         for (int i = finalCount; i < initCount; i++) {
             String skuId = allIdList.get(i);
             // sku信息
-            HashMap<String,Object> map = goblinRedisUtils.getGoodsSkuInfoVo(now,skuId);
+            HashMap<String, Object> map = goblinRedisUtils.getGoodsSkuInfoVo(now, skuId);
             GoblinGoodsSkuInfoVo skuInfoVo = (GoblinGoodsSkuInfoVo) map.get("vo");
             Integer tagType = (Integer) map.get("tagType");
-            String listId = (String) map.get("listId");
             GoblinNftGoodsSkuListVo goblinNftGoodsSkuListVo = GoblinNftGoodsSkuListVo.getNew().copy(skuInfoVo);
             // spu信息
             Object spuInfoMap = spuInfoList.get(skuInfoVo.getSpuId());
@@ -106,7 +105,7 @@ public class GoblinNftGoodsAppServiceImpl implements IGoblinNftGoodsAppService {
     @Override
     public GoblinNftGoodsSkuInfoVo goodsDetail(String skuId) {
         LocalDateTime now = LocalDateTime.now();
-        HashMap<String,Object> map = goblinRedisUtils.getGoodsSkuInfoVo(now,skuId);
+        HashMap<String, Object> map = goblinRedisUtils.getGoodsSkuInfoVo(now, skuId);
         GoblinGoodsSkuInfoVo skuInfoVo = (GoblinGoodsSkuInfoVo) map.get("vo");
         Integer tagType = (Integer) map.get("tagType");
         String listId = (String) map.get("listId");
@@ -129,7 +128,7 @@ public class GoblinNftGoodsAppServiceImpl implements IGoblinNftGoodsAppService {
             GoblinNftGoodsDetailSpuInfoVo nftGoodsDetailSpuInfoVo = GoblinNftGoodsDetailSpuInfoVo.getNew().copy(goodsInfoVo);
             nftGoodsSkuInfoVo.setGoblinNftGoodsDetailSpuInfoVo(nftGoodsDetailSpuInfoVo);
             // 库存
-            HashMap<String, Integer> stockHashMap = goblinOrderUtils.getIsStock(skuId, skuInfoVo.getUnbox(), skuInfoVo.getSoldoutStatus(), goodsInfoVo.getSkuIdList());
+            HashMap<String, Integer> stockHashMap = goblinOrderUtils.getIsStock(listId, skuId, skuInfoVo.getUnbox(), skuInfoVo.getSoldoutStatus(), goodsInfoVo.getSkuIdList());
             nftGoodsSkuInfoVo.setIsStock(stockHashMap.get("isStock"));
             // 总库存
             if (skuInfoVo.getUnbox().equals("1")) {

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/inner/GoblinNftJobServiceImpl.java

@@ -92,7 +92,9 @@ public class GoblinNftJobServiceImpl {
                 if (info.getUnbox().equals("1")) {// 是盲盒，非盲盒少查一次spu
                     skuIdList = goblinRedisUtils.getGoodsInfoVo(info.getSpuId()).getSkuIdList();
                 }
-                HashMap<String, Integer> stockHashMap = goblinOrderUtils.getIsStock(info.getSkuId(), info.getUnbox(), info.getSoldoutStatus(), skuIdList);
+                HashMap<String, Object> map = goblinRedisUtils.getGoodsSkuInfoVo(nowTime, info.getSkuId());
+                String listId = (String) map.get("listId");
+                HashMap<String, Integer> stockHashMap = goblinOrderUtils.getIsStock(listId, info.getSkuId(), info.getUnbox(), info.getSoldoutStatus(), skuIdList);
                 if (stockHashMap.get("isStock") == 1) {// 已开卖-未售罄
                     startSkuIdList.add(info.getSkuId());
                 } else {// 已开卖-已售罄 时间正序

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java

@@ -1577,8 +1577,10 @@ public class GoblinMongoUtils {
                     if (skuIdItem.equals(vo.getSkuId())) {// 过滤自己
                         continue;
                     }
-                    GoblinGoodsSkuInfoVo itemVo = redisUtils.getGoodsSkuInfoVo(skuIdItem);
-                    stock += redisUtils.getSkuAllStatusStock(itemVo);
+                    HashMap<String, Object> map = redisUtils.getGoodsSkuInfoVo(LocalDateTime.now(), skuIdItem);
+                    GoblinGoodsSkuInfoVo itemVo = (GoblinGoodsSkuInfoVo) map.get("vo");
+                    String listId = (String) map.get("listId");
+                    stock += redisUtils.getSkuAllStatusStock(itemVo, listId);
                 }
                 mgtGoodsSkuListVo.setSurplusStock(stock);
             }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinOrderUtils.java

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.MultiValueMap;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -90,21 +91,23 @@ public class GoblinOrderUtils {
     }
 
     // NFT判断是否售罄
-    public HashMap<String, Integer> getIsStock(String skuId, String unbox, String soldoutStatus, List<String> skuIdList) {
+    public HashMap<String, Integer> getIsStock(String listId, String skuId, String unbox, String soldoutStatus, List<String> skuIdList) {
         HashMap<String, Integer> returnMap = CollectionUtil.mapStringInteger();
         Integer isStock = 0;
         Integer totalStock = 0;
         if (null == soldoutStatus || soldoutStatus.equals("0")) {// 未设置售罄 查询库存
             int surplusStock = 0;
             if (unbox.equals("0")) {// 不是盲盒
-                surplusStock = redisUtils.getSkuStock(null, skuId);
+                surplusStock = redisUtils.getSkuStock(listId, skuId);
             } else {
                 for (String skuIdItem : skuIdList) {// 盲盒计算所有sku库存总数
                     if (skuIdItem.equals(skuId)) {// 过滤自己
                         continue;
                     }
-                    GoblinGoodsSkuInfoVo itemVo = redisUtils.getGoodsSkuInfoVo(skuIdItem);
-                    surplusStock += redisUtils.getSkuAllStatusStock(itemVo);
+                    HashMap<String, Object> map = redisUtils.getGoodsSkuInfoVo(LocalDateTime.now(), skuIdItem);
+                    GoblinGoodsSkuInfoVo itemVo = (GoblinGoodsSkuInfoVo) map.get("vo");
+                    String listId2 = (String) map.get("listId");
+                    surplusStock += redisUtils.getSkuAllStatusStock(itemVo, listId2);
                     totalStock += redisUtils.getSkuTotalStock(itemVo);
                 }
             }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinRedisUtils.java

@@ -1710,7 +1710,7 @@ public class GoblinRedisUtils {
      * String unbox; 是否盲盒[0-否|1-是]
      */
     // 获取盲盒下藏品的库存 各种状态下不能算库存的排除掉
-    public int getSkuAllStatusStock(GoblinGoodsSkuInfoVo info) {
+    public int getSkuAllStatusStock(GoblinGoodsSkuInfoVo info, String listId) {
         if (
                 info != null
                         && LocalDateTime.now().isAfter(info.getSaleStartTime())
@@ -1718,7 +1718,7 @@ public class GoblinRedisUtils {
                         && (null == info.getHitRatio() || info.getHitRatio().compareTo(BigDecimal.ZERO) > 0)
                         && (null == info.getSkuCanbuy() || info.getSkuCanbuy().equals("1"))
         ) {// 可以返回库存
-            return getSkuStock(null, info.getSkuId());
+            return getSkuStock(listId, info.getSkuId());
         } else {// 不计入库存
             return 0;
         }