接口增加剩余库存

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsSkuInfoDetailVo.java

@@ -43,6 +43,8 @@ public class GoblinGoodsSkuInfoDetailVo implements Serializable, Cloneable {
 
     @ApiModelProperty(position = 26, value = "限量[0-无限制|X:限购数量]")
     private Integer buyLimit;
+    @ApiModelProperty(position = 27, value = "剩余库存")
+    private Integer restStock;
 
     private static final GoblinGoodsSkuInfoDetailVo obj = new GoblinGoodsSkuInfoDetailVo();
 

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

@@ -327,6 +327,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
                     } else {
                         goblinGoodsSkuInfoDetailVo.setStockLess(false);
                     }
+                    goblinGoodsSkuInfoDetailVo.setRestStock(stock);
                     list.add(goblinGoodsSkuInfoDetailVo);
                 }
             }
@@ -380,7 +381,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
             }
             goblinFrontCubeVo.setGoblinGoodsInfoVoList(goblinGoodsInfoVoArrayList);
 
-        }else{
+        } else {
             return null;
         }
         return goblinFrontCubeVo;
@@ -465,11 +466,11 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
 
     }
 
-    public GoblinGoodsInfoListVoo searchGoodesName(String name,int page,int pageSize) {
+    public GoblinGoodsInfoListVoo searchGoodesName(String name, int page, int pageSize) {
         List<String> listStore = mongoUtils.getStoreInfoVoRegexName(name);
         Pattern pattern = Pattern.compile("^.*" + name + ".*$", Pattern.CASE_INSENSITIVE);
         Query query = new Query();
-        query.addCriteria(Criteria.where("spuAppear").is("0").and("delFlg").is("0").and("shelvesStatus").is("3").and("marketId").is(null).and("cateFid").nin("22196120924543","22196122839313").andOperator(
+        query.addCriteria(Criteria.where("spuAppear").is("0").and("delFlg").is("0").and("shelvesStatus").is("3").and("marketId").is(null).and("cateFid").nin("22196120924543", "22196122839313").andOperator(
                 new Criteria().orOperator(
                         Criteria.where("name").regex(pattern),
                         Criteria.where("storeId").in(listStore),
@@ -484,7 +485,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
         ));
         List<GoblinGoodsInfoVo> list = mongoTemplate.find(query, GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
 
-        GoblinGoodsInfoListVoo goblinGoodsInfoListVoo=GoblinGoodsInfoListVoo.getNew();
+        GoblinGoodsInfoListVoo goblinGoodsInfoListVoo = GoblinGoodsInfoListVoo.getNew();
         goblinGoodsInfoListVoo.setCount(count);
         ArrayList<GoblinGoodsInfoListVo> list1 = ObjectUtil.getGoblinGoodsInfoListVo();
         //遍历
@@ -530,7 +531,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
         }
         //
         Query query = new Query();
-        query.addCriteria(Criteria.where("storeId").is(storeId).and("spuAppear").is("0").and("delFlg").is("0").and("shelvesStatus").is("3").and("marketId").is(null).and("cateFid").nin("22196120924543","22196122839313"));
+        query.addCriteria(Criteria.where("storeId").is(storeId).and("spuAppear").is("0").and("delFlg").is("0").and("shelvesStatus").is("3").and("marketId").is(null).and("cateFid").nin("22196120924543", "22196122839313"));
         if (StringUtil.isNotBlank(categoryId)) {
             query.addCriteria(new Criteria().orOperator(
                     Criteria.where("storeCateFid").is(categoryId),
@@ -857,7 +858,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
                 for (String id : spuids) {
                     GoblinGoodsInfoVo goblinGoodsInfoVo = goblinRedisUtils.getGoodsInfoVo(id);
                     if (null != goblinGoodsInfoVo) {
-                        if(isHidden(goblinGoodsInfoVo.getCateFid())){
+                        if (isHidden(goblinGoodsInfoVo.getCateFid())) {
                             continue;
                         }
                         goblinGoodsInfoVoArrayList.add(goblinGoodsInfoVo);
@@ -912,7 +913,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
             for (int i = 0; i < end; i++) {
                 if (i >= start) {
                     GoblinGoodsInfoVo goblinGoodsInfoVo = goblinRedisUtils.getGoodsInfoVo(spuidss[i]);
-                    if(isHidden(goblinGoodsInfoVo.getCateFid())){
+                    if (isHidden(goblinGoodsInfoVo.getCateFid())) {
                         continue;
                     }
                     goblinGoodsInfoVoArrayList.add(goblinGoodsInfoVo);
@@ -1424,11 +1425,11 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
     }
 
 
-    private boolean isHidden(String fcateId){
+    private boolean isHidden(String fcateId) {
         ArrayList<String> hiddenIds = CollectionUtil.arrayListString();
         hiddenIds.add("22196120924543");
         hiddenIds.add("22196122839313");
-        if(hiddenIds.contains(fcateId)){
+        if (hiddenIds.contains(fcateId)) {
             return true;
         }
         return false;