修改搜索接口

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinStoreMgtGoodsSkuFilterParam.java

@@ -25,5 +25,7 @@ public class GoblinStoreMgtGoodsSkuFilterParam implements Serializable {
     private String keyword;
     @ApiModelProperty(position = 14, required = false, value = "商品上架状态[0-待上架|1-下架|2-违规|3-上架|4-已上架未开售]", allowableValues = "0,1,2,3")
     private String shelvesStatus;
+    @ApiModelProperty(position = 15, required = false, value = "类型[0-普通|1-分批购]")
+    private Integer type;
 
 }

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

@@ -105,6 +105,9 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
 
     @Override
     public PagedResult<GoblinStoreMgtGoodsSkuListVo> skusList(GoblinStoreMgtGoodsSkuFilterParam mgtGoodsSkuFilterParam) {
+        if(mgtGoodsSkuFilterParam.getType()==null){
+            mgtGoodsSkuFilterParam.setType(0);
+        }
         PagedResult<GoblinStoreMgtGoodsSkuListVo> voList = goblinMongoUtils.getSkuSearch(mgtGoodsSkuFilterParam);
         return voList;
     }

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

@@ -1651,10 +1651,14 @@ public class GoblinMongoUtils {
                         continue;
                     }
                     GoblinGoodsSkuInfoVo itemVo = redisUtils.getGoodsSkuInfoVo(skuIdItem);
-                    if ("4".equals(filterParam.getShelvesStatus())) {
-                        stock += redisUtils.getSkuAllStatusStockStatus4(itemVo);
-                    } else {
-                        stock += redisUtils.getSkuAllStatusStock(itemVo, null);
+                    if (filterParam.getType().equals(0)) {
+                        if ("4".equals(filterParam.getShelvesStatus())) {
+                            stock += redisUtils.getSkuAllStatusStockStatus4(itemVo);
+                        } else {
+                            stock += redisUtils.getSkuAllStatusStock(itemVo, null);
+                        }
+                    } else if (filterParam.getType().equals(1)) {
+                        stock += redisUtils.getSkuAllStatusStockType1(itemVo);
                     }
                 }
                 mgtGoodsSkuListVo.setSurplusStock(stock);

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

@@ -2114,6 +2114,20 @@ public class GoblinRedisUtils {
         }
     }
 
+    // 获取盲盒下藏品的库存 各种状态下不能算库存的排除掉
+    public int getSkuAllStatusStockType1(GoblinGoodsSkuInfoVo info) {
+        if (
+                info != null
+                        && (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 int getSkuAllStatusStockStatus4(GoblinGoodsSkuInfoVo info) {
         if (