修改 搜索接口

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

@@ -1583,7 +1583,11 @@ public class GoblinMongoUtils {
                         continue;
                     }
                     GoblinGoodsSkuInfoVo itemVo = redisUtils.getGoodsSkuInfoVo(skuIdItem);
-                    stock += redisUtils.getSkuAllStatusStock(itemVo);
+                    if("4".equals(filterParam.getShelvesStatus())) {
+                        stock += redisUtils.getSkuAllStatusStockStatus4(itemVo);
+                    }else {
+                        stock += redisUtils.getSkuAllStatusStock(itemVo);
+                    }
                 }
                 mgtGoodsSkuListVo.setSurplusStock(stock);
             }

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

@@ -1803,6 +1803,21 @@ public class GoblinRedisUtils {
         }
     }
 
+    // 获取盲盒下藏品的库存 各种状态下不能算库存的排除掉
+    public int getSkuAllStatusStockStatus4(GoblinGoodsSkuInfoVo info) {
+        if (
+                info != null
+                        && LocalDateTime.now().isBefore(info.getSaleStartTime())
+                        && (null == info.getSoldoutStatus() || info.getSoldoutStatus().equals("0"))
+                        && (null == info.getHitRatio() || info.getHitRatio().compareTo(BigDecimal.ZERO) > 0)
+                        && (null == info.getSkuCanbuy() || info.getSkuCanbuy().equals("1"))
+        ) {// 可以返回库存
+            return getSkuStock(null, info.getSkuId());
+        } else {// 不计入库存
+            return 0;
+        }
+    }
+
     // 各种状态下判断藏品是否可以展示
     public boolean getSkuAllStatusShow(GoblinGoodsSkuInfoVo info) {
         if (