修改 店铺列表 告警、 是否展示商品

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

@@ -32,6 +32,8 @@ public class GoblinGoodsSkuInfoDetailVo implements Serializable, Cloneable {
     private String skuAppear;
     @ApiModelProperty(position = 11, value = "商品ID[64]")
     private String spuId;
+    @ApiModelProperty(position = 12, value = "库存是否告警，true 告警，false没有告警")
+    private boolean stockLess;
 
     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

@@ -9,6 +9,7 @@ import com.liquidnet.service.goblin.constant.GoblinRedisConst;
 import com.liquidnet.service.goblin.constant.GoblinStatusConst;
 import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.entity.*;
+import com.liquidnet.service.goblin.enums.GoblinStoreConf;
 import com.liquidnet.service.goblin.service.GoblinFrontService;
 import com.liquidnet.service.goblin.util.GoblinMongoUtils;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
@@ -257,6 +258,23 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
         }
         return goblinFrontSeckillVo;
     }
+    //获取库存设置的报警数量
+    public int getStockCount(String storeId){
+        String configVal="";
+        List<GoblinStoreConfigVo> listVo=goblinRedisUtils.getStoreConfigVos(storeId);
+        //ONOFF_SOLD_OUT_SHOW  ON  开启
+        for(GoblinStoreConfigVo goblinStoreConfigVo:listVo){
+            //获取是 售罄是否开启
+            if(goblinStoreConfigVo.getConfigKey().equals(GoblinStoreConf.LIMIT_WARNING_STOCK)){
+                configVal=goblinStoreConfigVo.getConfigVal();
+            }
+        }
+        if(StringUtil.isNotBlank(configVal)){
+            return Integer.parseInt(configVal);
+        }else{
+            return -1;
+        }
+    }
     /**
      * 获得商品详情
      */
@@ -268,13 +286,23 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
         goblinFrontGoodDetailVo.setGoblinGoodsInfoVo(goblinGoodsInfoDetailVo);
         //skuIdList
         if(null!=goblinGoodsInfoVo){
+           int limit= getStockCount(goblinGoodsInfoVo.getStoreId());
             List<String> skuIdList=goblinGoodsInfoVo.getSkuIdList();
             ArrayList<GoblinGoodsSkuInfoDetailVo> list=ObjectUtil.goblinGoodsSkuInfoDetailVos();
             for(String sku:skuIdList){
                 GoblinGoodsSkuInfoVo goblinGoodsSkuInfoVo=goblinRedisUtils.getGoodsSkuInfoVo(sku);
-                GoblinGoodsSkuInfoDetailVo goblinGoodsSkuInfoDetailVo=GoblinGoodsSkuInfoDetailVo.getNew();
-                BeanUtils.copyProperties(goblinGoodsSkuInfoVo,goblinGoodsSkuInfoDetailVo);
-                list.add(goblinGoodsSkuInfoDetailVo);
+                if(null!=goblinGoodsSkuInfoVo){
+                    //获取 sku 库存数量
+                    int stock=goblinRedisUtils.getSkuStock(null,goblinGoodsSkuInfoVo.getSkuId());
+                    GoblinGoodsSkuInfoDetailVo goblinGoodsSkuInfoDetailVo=GoblinGoodsSkuInfoDetailVo.getNew();
+                    BeanUtils.copyProperties(goblinGoodsSkuInfoVo,goblinGoodsSkuInfoDetailVo);
+                    if(limit>=stock){
+                        goblinGoodsSkuInfoDetailVo.setStockLess(true);
+                    }else{
+                        goblinGoodsSkuInfoDetailVo.setStockLess(false);
+                    }
+                    list.add(goblinGoodsSkuInfoDetailVo);
+                }
             }
             //goblinGoodsInfoVo
             GoblinStoreInfoVo goblinStoreInfoVo=this.getStore(goblinGoodsInfoVo.getStoreId());
@@ -444,6 +472,15 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
         return list1;
     }
     public GoblinFrontCategoryListVo getStoreGoodes(String storeId,String categoryId,String name){
+        String configVal="";
+        List<GoblinStoreConfigVo> listVo=goblinRedisUtils.getStoreConfigVos(storeId);
+        //ONOFF_SOLD_OUT_SHOW  ON  开启
+        for(GoblinStoreConfigVo goblinStoreConfigVo:listVo){
+            //获取是 售罄是否开启
+            if(goblinStoreConfigVo.getConfigKey().equals(GoblinStoreConf.ONOFF_SOLD_OUT_SHOW)){
+                configVal=goblinStoreConfigVo.getConfigVal();
+            }
+        }
         //
         Query query = new Query();
         query.addCriteria(Criteria.where("storeId").is(storeId).and("spuAppear").is("0").and("delFlg").is("0").and("shelvesStatus").is("3"));
@@ -461,21 +498,22 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
         query.with(Sort.by(Sort.Direction.DESC, "count"));
         // 查询总数
         List<GoblinGoodsInfoVo> list = mongoTemplate.find(query, GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
-        /*if(list.size()>0){
-            //找到 销量
-            for(GoblinGoodsInfoVo goblinGoodsInfoVo:list){
-                Integer counts=goblinRedisUtils.getSpuSaleCount(goblinGoodsInfoVo.getSpuId());
-                if(counts==null){
-                    goblinGoodsInfoVo.setCount(0);
-                }else{
-                    goblinGoodsInfoVo.setCount(counts);
+        // 计算库存
+        Iterator<GoblinGoodsInfoVo> iterator = list.iterator();
+        //删掉库存没有的商品
+        while(iterator.hasNext()){
+            GoblinGoodsInfoVo goblinGoodsInfoVo=iterator.next();
+            List<String> skuIdList =goblinGoodsInfoVo.getSkuIdList();
+            int count=0;
+            for(String skuId:skuIdList){
+                count=count+goblinRedisUtils.getSkuStock(null,skuId);
+            }
+            if(StringUtil.isNotBlank(configVal)&&!configVal.equals("ON")){
+                if(count==0){
+                    iterator.remove();
                 }
             }
-            Collections.sort(list, new Comparator<GoblinGoodsInfoVo>() {
-                public int compare(GoblinGoodsInfoVo arg0, GoblinGoodsInfoVo arg1) {
-                    return -(arg0.getCount().compareTo(arg1.getCount()));
-                }});
-        }*/
+        }
         ArrayList<GoblinGoodsInfoListVo> listVos=ObjectUtil.getGoblinGoodsInfoListVo();
         for(GoblinGoodsInfoVo goblinGoodsInfoVo:list){
             GoblinGoodsInfoListVo goblinGoodsInfoListVo= GoblinGoodsInfoListVo.getNew();