~API:商品管理:+redis.stock_sku;

~API:商品管理:商品列表+marketId过滤;

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

@@ -49,59 +49,6 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
 
     @Override
     public void goodsAdd(GoblinGoodsInfoVo goodsInfoVo, List<GoblinGoodsSkuInfoVo> goodsSkuInfoVoList) {
-//        String uid = CurrentUtil.getCurrentUid();
-//        LocalDateTime now = LocalDateTime.now();
-
-//        GoblinGoodsInfoVo goodsInfoVo = storeMgtGoodsAddParam.initGoodsInfoVo();
-//        goodsInfoVo.setCreatedBy(uid);
-//        goodsInfoVo.setCreatedAt(now);
-//
-//        ArrayList<GoblinGoodsSpecVo> goodsSpecVoList = ObjectUtil.getGoblinGoodsSpecVoArrayList();
-//        List<GoblinGoodsSkuInfoVo> goodsSkuInfoVoList = ObjectUtil.getGoblinGoodsSkuInfoVoArrayList();
-//
-//        storeMgtGoodsAddParam.initGoodsSkuInfoVo(goodsInfoVo, goodsSkuInfoVoList, goodsSpecVoList);
-
-//        {// 标签处理
-//            List<String> goodsTagIdList = storeMgtGoodsAddParam.getTagList();
-//            List<String> goodsExtagIdList = storeMgtGoodsAddParam.getExtagList();
-//            boolean goodsTagIsEmpty = CollectionUtils.isEmpty(goodsTagIdList);
-//            boolean goodsExtagIsEmpty = CollectionUtils.isEmpty(goodsExtagIdList);
-//
-//            ArrayList<String> tagIdList = CollectionUtil.arrayListString();
-//            tagIdList.addAll(goodsTagIdList);
-//            tagIdList.addAll(goodsExtagIdList);
-//            if (!CollectionUtils.isEmpty(tagIdList)) {
-//                List<GoblinSelfTagVo> selfTagVoList = goblinMongoUtils.getSelfTagVos(tagIdList);
-//                if (!goodsTagIsEmpty) {
-//                    List<GoblinGoodsTagVo> goodsTagVoList = ObjectUtil.getGoblinGoodsTagVoArrayList();
-//                    for (int i = 0; i < tagIdList.size(); i++) {
-//                        String tagId = tagIdList.get(i);
-//                        for (GoblinSelfTagVo r : selfTagVoList) {
-//                            if (r.getTagId().equals(tagId)) {
-//                                goodsTagVoList.add(GoblinGoodsTagVo.getNew().copy(r).setSort(i));
-//                            }
-//                        }
-//                    }
-//                    goodsInfoVo.setTagVoList(goodsTagVoList);
-//                }
-//                if (!goodsExtagIsEmpty) {
-//                    List<GoblinGoodsExtagVo> goodsExtagVoList = ObjectUtil.getGoblinGoodsExtagVoArrayList();
-//                    for (int i = 0; i < tagIdList.size(); i++) {
-//                        String tagId = tagIdList.get(i);
-//                        for (GoblinSelfTagVo r : selfTagVoList) {
-//                            if (r.getTagId().equals(tagId)) {
-//                                goodsExtagVoList.add(GoblinGoodsExtagVo.getNew().copy(r).setSort(i));
-//                            }
-//                        }
-//                    }
-//                    goodsInfoVo.setExtagVoList(goodsExtagVoList);
-//                }
-//            }
-//        }
-//
-//        // 服务保障处理
-//        goodsInfoVo.setServiceSupportVoList(goblinMongoUtils.getServiceSupportVos(storeMgtGoodsAddParam.getSsidList()));
-
         goblinMongoUtils.setGoodsInfoVo(goodsInfoVo);
         goblinMongoUtils.setGoodsSkuInfoVos(goodsSkuInfoVoList);
 
@@ -208,6 +155,8 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
     public boolean goodsEditSku(GoblinStoreMgtGoodsEditSkuParam storeMgtGoodsEditSkuParam, GoblinGoodsInfoVo goodsInfoVo) {
         GoblinGoodsSkuInfoVo editGoodsSkuInfoVo = storeMgtGoodsEditSkuParam.initEditGoodsSkuInfoVo();
         if (goblinMongoUtils.updateGoodsSkuInfoVo(editGoodsSkuInfoVo)) {
+            goblinRedisUtils.setSkuStock(null, editGoodsSkuInfoVo.getSkuId(), editGoodsSkuInfoVo.getSkuStock());
+
             if (!CollectionUtils.isEmpty(storeMgtGoodsEditSkuParam.getSkuSpecList())) {// 更改了规格，需要同步SPU里的规格信息
                 goblinMongoUtils.updateGoodsInfoVo(goodsInfoVo);
             }
@@ -247,6 +196,7 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
         goblinMongoUtils.updateGoodsInfoVo(goodsInfoVo);
 
         // TODO: 2022/1/5 zhanggb redis+sql
+        goblinRedisUtils.setSkuStock(null, addGoodsSkuInfoVo.getSkuId(), addGoodsSkuInfoVo.getSkuStock());
     }
 
     @Override

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

@@ -311,7 +311,7 @@ public class GoblinMongoUtils {
 
     // SPU分页
     public PagedResult<GoblinStoreMgtGoodsListVo> getGoodsInfoVo(GoblinStoreMgtGoodsFilterParam filterParam) {
-        Criteria criteria = Criteria.where("delFlg").is("0").and("storeId").is(filterParam.getStoreId());
+        Criteria criteria = Criteria.where("delFlg").is("0").and("storeId").is(filterParam.getStoreId()).and("marketId").exists(false);
         if (StringUtils.isNotBlank(filterParam.getKeyword())) {
             Pattern pattern = Pattern.compile("^.*" + filterParam.getKeyword() + ".*$", Pattern.CASE_INSENSITIVE);
             criteria.andOperator(