Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

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

@@ -8,8 +8,6 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
 
 @ApiModel(value = "GoblinStoreGoodsCategoryVo", description = "店铺商品分类")
 @Data

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

@@ -30,6 +30,7 @@ import java.time.LocalDateTime;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @ApiSupport(order = 149005)
 @Api(tags = "店铺商品分类")
@@ -69,21 +70,21 @@ public class GoblinStoreMgtCategoryController {
                                    @NotBlank(message = "平台分类不能为空") @RequestParam String catesid,
 //                                   @NotBlank(message = "平台分类不能为空") @RequestParam String catetid,
                                    @NotBlank(message = "店铺分类名称不能为空") @RequestParam String catename,
-                                   @Min(value = 0, message = "排序不能小于0") @RequestParam(required = false) Integer sort) {
+                                   @Min(value = 1, message = "排序不能小于0") @RequestParam(required = false) Integer sort) {
         String currentUid = CurrentUtil.getCurrentUid();
         if (!goblinRedisUtils.hasStoreId(currentUid, storeId)) {
             return ResponseDto.failure(ErrorMapping.get("149002"));
         }
         List<GoblinSelfGoodsCategoryVo> selfGoodsCategoryVos = goblinRedisUtils.getSelfGoodsCategoryVos();
         if (CollectionUtils.isEmpty(selfGoodsCategoryVos)) {
-            log.warn("店铺商品分类管理:添加:平台分类未创建[UID={},storeId={},catefid={},catesid={}]", currentUid, storeId, catefid, catesid);
+            log.warn("店铺商品分类管理:添加:平台分类未创建[UID={},storeId={},catefid={},catesid={},catename={}]", currentUid, storeId, catefid, catesid, catename);
             return ResponseDto.failure(ErrorMapping.get("149001"));
         }
         List<String> catePidList = Arrays.asList(catefid, catesid);
         Map<String, GoblinSelfGoodsCategoryVo> filterMap = selfGoodsCategoryVos.stream()
                 .filter(r -> catePidList.contains(r.getCateId())).collect(Collectors.toMap(GoblinSelfGoodsCategoryVo::getCateId, Function.identity()));
         if (CollectionUtils.isEmpty(filterMap) || filterMap.size() < 2) {
-            log.warn("店铺商品分类管理:添加:平台分类ID有误[UID={},storeId={},catefid={},catesid={}]", currentUid, storeId, catefid, catesid);
+            log.warn("店铺商品分类管理:添加:平台分类ID有误[UID={},storeId={},catefid={},catesid={},catename={}]", currentUid, storeId, catefid, catesid, catename);
             return ResponseDto.failure(ErrorMapping.get("149001"));
         }
         ArrayList<GoblinStoreGoodsCategoryVo> addStoreGoodsCategoryVoList = ObjectUtil.getGoblinStoreGoodsCategoryVoArrayList();
@@ -99,6 +100,11 @@ public class GoblinStoreMgtCategoryController {
                 addStoreGoodsCategoryVoList.add(storeGoodsCategoryVo);
             });
         } else {// 存在则判断，是否为已存在的父级分类
+            if (storeGoodsCategoryVosCache.stream().anyMatch(r -> r.getName().equals(catename))) {
+                log.warn("店铺商品分类管理:添加:分类名称重复[UID={},storeId={},catefid={},catesid={},catename={}]", currentUid, storeId, catefid, catesid, catename);
+                return ResponseDto.failure(ErrorMapping.get("149007"));
+            }
+
             Map<String, GoblinStoreGoodsCategoryVo> existFilterMap = storeGoodsCategoryVosCache.stream().filter(r -> catePidList.contains(r.getCateId()))
                     .collect(Collectors.toMap(GoblinStoreGoodsCategoryVo::getCateId, Function.identity()));
             GoblinStoreGoodsCategoryVo fStoreGoodsCategoryVo = existFilterMap.get(catefid);
@@ -133,7 +139,7 @@ public class GoblinStoreMgtCategoryController {
         storeGoodsCategoryVo.setCreatedAt(now);
         addStoreGoodsCategoryVoList.add(storeGoodsCategoryVo);
 
-        goblinStoreMgtCategoryService.add(currentUid, addStoreGoodsCategoryVoList, storeGoodsCategoryVosCache);
+        goblinStoreMgtCategoryService.add(storeId, addStoreGoodsCategoryVoList, storeGoodsCategoryVosCache);
 
         return ResponseDto.success(storeGoodsCategoryVo.getCateId());
     }
@@ -150,7 +156,7 @@ public class GoblinStoreMgtCategoryController {
     public ResponseDto<Object> edit(@NotBlank(message = "店铺ID不能为空") @RequestParam String storeId,
                                     @NotBlank(message = "店铺分类ID不能为空") @RequestParam String cateid,
                                     @NotBlank(message = "店铺分类名称不能为空") @RequestParam String catename,
-                                    @Min(value = 0, message = "排序不能小于0") @RequestParam(required = false) Integer sort) {
+                                    @Min(value = 1, message = "排序不能小于0") @RequestParam(required = false) Integer sort) {
         String currentUid = CurrentUtil.getCurrentUid();
         if (!goblinRedisUtils.hasStoreId(currentUid, storeId)) {
             return ResponseDto.failure(ErrorMapping.get("149002"));

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
         goblinMongoUtils.setGoodsInfoVo(goodsInfoVo);
         goblinMongoUtils.setGoodsSkuInfoVos(goodsSkuInfoVoList);
 
+        // TODO: 2022/1/18 zhanggb==
+        goodsSkuInfoVoList.forEach(r -> goblinRedisUtils.setSkuStock(null, r.getSkuId(), r.getSkuStock()));
+
         String spuId = goodsInfoVo.getSpuId();
 
         LinkedList<String> toMqSqls = CollectionUtil.linkedListString();

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/errors.properties

@@ -21,7 +21,7 @@
 149004=
 149005=
 149006=添加商品失败，规格信息无效
-149007=
+149007=商品分类名称重复，请核实
 149008=
 149009=
 149010=商品不存在，请核实