~API:店铺分类添加参数调整;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/constant/GoblinRedisConst.java

@@ -8,6 +8,11 @@ public class GoblinRedisConst {
      * {goblin:bsc:ustore:${uid}, List<store_id>}
      */
     public static final String BASIC_USTORE = PREFIX.concat("bsc:ustore:");
+    /**
+     * 平台商品分类信息
+     * {goblin:bsc:self_g_c, JsonUtils.toJson(List<com.liquidnet.service.goblin.dto.vo.GoblinSelfGoodsCategoryVo>)}
+     */
+    public static final String BASIC_SELF_GOODS_CATEGORY = PREFIX.concat("bsc:self_g_c");
     /**
      * 店铺信息
      * {goblin:bsc:store:${store_id}, com.liquidnet.service.goblin.dto.vo.GoblinStoreInfoVo}

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

-package com.liquidnet.service.goblin.service.manage;
-
-import com.liquidnet.service.goblin.dto.vo.GoblinServiceSupportVo;
-
-import java.util.List;
-
-public interface IGoblinMgtServiceSupportService {
-    /**
-     * 服务支持列表
-     * 不存在则创建
-     *
-     * @return List<GoblinServiceSupportVo>
-     */
-    List<GoblinServiceSupportVo> list();
-}

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

+package com.liquidnet.service.goblin.service.manage;
+
+import com.liquidnet.service.goblin.dto.vo.GoblinSelfGoodsCategoryVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinSelfTagVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinServiceSupportVo;
+
+import java.util.List;
+
+public interface IGoblinStoreMgtExtraService {
+    /**
+     * 平台分类列表
+     *
+     * @return List<GoblinSelfGoodsCategoryVo>
+     */
+    List<GoblinSelfGoodsCategoryVo> listCategoryVo();
+
+    /**
+     * 平台标签列表
+     *
+     * @param keyword 标签名称匹配关键字
+     * @param belong  标签所属[0-普通标签|1-专属标签]
+     * @return List<GoblinSelfTagVo>
+     */
+    List<GoblinSelfTagVo> listTagVo(String keyword, String belong);
+
+    /**
+     * 服务支持列表
+     *
+     * @return List<GoblinServiceSupportVo>
+     */
+    List<GoblinServiceSupportVo> listServiceSupportVo();
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinSelfCategoryController.java → liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinSelfCategoryAdminController.java

@@ -26,7 +26,7 @@ import java.time.LocalDateTime;
 @Api(tags = "商品分类")
 @Controller
 @RequestMapping("goblin/category")
-public class GoblinSelfCategoryController extends BaseController {
+public class GoblinSelfCategoryAdminController extends BaseController {
     private final String prefix = "zhengzai/goblin/category";
     @Autowired
     IGoblinSelfGoodsCategoryService goblinSelfGoodsCategoryService;
@@ -68,6 +68,7 @@ public class GoblinSelfCategoryController extends BaseController {
         if (null == selfGoodsCategory.getSort()) {
             selfGoodsCategory.setSort(1);
         }
+        selfGoodsCategory.setDelFlg("0");
         selfGoodsCategory.setCounts(0);
         selfGoodsCategory.setCreatedBy(ShiroUtils.getLoginName());
         selfGoodsCategory.setCreatedAt(LocalDateTime.now());

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinSelfExtagController.java → liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinSelfExtagAdminController.java

@@ -29,7 +29,7 @@ import java.util.List;
 @Api(tags = "音乐人标签库")
 @Controller
 @RequestMapping("goblin/extag")
-public class GoblinSelfExtagController extends BaseController {
+public class GoblinSelfExtagAdminController extends BaseController {
     private final String prefix = "zhengzai/goblin/extag";
     private final String tagBelong = "1";
     @Autowired

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinSelfTagController.java → liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinSelfTagAdminController.java

@@ -26,7 +26,7 @@ import java.util.List;
 @Api(tags = "标签库")
 @Controller
 @RequestMapping("goblin/tag")
-public class GoblinSelfTagController extends BaseController {
+public class GoblinSelfTagAdminController extends BaseController {
     private final String prefix = "zhengzai/goblin/tag";
     private final String tagBelong = "0";
     @Autowired

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

@@ -66,7 +66,7 @@ public class GoblinStoreMgtCategoryController {
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "storeId", value = "店铺ID[64]"),
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "catefid", value = "平台一级分类ID[30]"),
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "catesid", value = "平台二级分类ID[30]"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "catetid", value = "平台三级分类ID[30]"),
+//            @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "catetid", value = "平台三级分类ID[30]"),
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "catename", value = "店铺三级分类名称[50]"),
             @ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "sort", value = "排序[数值越小,排序越前]"),
     })
@@ -74,7 +74,7 @@ public class GoblinStoreMgtCategoryController {
     public ResponseDto<Object> add(@NotBlank(message = "店铺ID不能为空") @RequestParam String storeId,
                                    @NotBlank(message = "平台一级分类ID不能为空") @RequestParam String catefid,
                                    @NotBlank(message = "平台二级分类不能为空") @RequestParam String catesid,
-                                   @NotBlank(message = "平台三级分类不能为空") @RequestParam String catetid,
+//                                   @NotBlank(message = "平台三级分类不能为空") @RequestParam String catetid,
                                    @NotBlank(message = "店铺三级分类名称不能为空") @RequestParam String catename,
                                    @Min(value = 0, message = "排序不能小于0") @RequestParam Integer sort) {
         String currentUid = CurrentUtil.getCurrentUid();

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

@@ -7,10 +7,9 @@ import com.liquidnet.service.goblin.dto.manage.vo.GoblinMgtCategorySpecVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinSelfGoodsCategoryVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinSelfTagVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinServiceSupportVo;
-import com.liquidnet.service.goblin.service.manage.IGoblinMgtServiceSupportService;
+import com.liquidnet.service.goblin.service.manage.IGoblinStoreMgtExtraService;
 import com.liquidnet.service.goblin.util.GoblinMongoUtils;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
-import com.liquidnet.service.goblin.util.ObjectUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -23,7 +22,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
-import java.util.ArrayList;
 import java.util.List;
 
 @ApiSupport(order = 149003)
@@ -38,23 +36,26 @@ public class GoblinStoreMgtExtraController {
     @Autowired
     GoblinMongoUtils goblinMongoUtils;
     @Autowired
-    IGoblinMgtServiceSupportService goblinMgtServiceSupportService;
+    IGoblinStoreMgtExtraService goblinStoreMgtExtraService;
+    @Autowired
+
 
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "平台商品分类")
     @GetMapping("sg_categorys")
     public ResponseDto<List<GoblinSelfGoodsCategoryVo>> selfGoodsCategoryList() {
+//        ArrayList<GoblinSelfGoodsCategoryVo> selfGoodsCategoryVos = ObjectUtil.getGoblinSelfGoodsCategoryVoArrayList();
+//        selfGoodsCategoryVos.add(
+//                GoblinSelfGoodsCategoryVo.getNew().setCateId("10000").setName("1级").setSort(1).setGrade("1").setNeIsbn("0").setCatePid(null)
+//        );
+//        selfGoodsCategoryVos.add(
+//                GoblinSelfGoodsCategoryVo.getNew().setCateId("10100").setName("2级").setSort(1).setGrade("2").setNeIsbn("0").setCatePid("10000")
+//        );
+//        selfGoodsCategoryVos.add(
+//                GoblinSelfGoodsCategoryVo.getNew().setCateId("10101").setName("3级").setSort(1).setGrade("3").setNeIsbn("1").setCatePid("10100")
+//        );
         // TODO: 2022/1/11 redis+mongo.get
-        ArrayList<GoblinSelfGoodsCategoryVo> selfGoodsCategoryVos = ObjectUtil.getGoblinSelfGoodsCategoryVoArrayList();
-        selfGoodsCategoryVos.add(
-                GoblinSelfGoodsCategoryVo.getNew().setCateId("10000").setName("1级").setSort(1).setGrade("1").setNeIsbn("0").setCatePid(null)
-        );
-        selfGoodsCategoryVos.add(
-                GoblinSelfGoodsCategoryVo.getNew().setCateId("10100").setName("2级").setSort(1).setGrade("2").setNeIsbn("0").setCatePid("10000")
-        );
-        selfGoodsCategoryVos.add(
-                GoblinSelfGoodsCategoryVo.getNew().setCateId("10101").setName("3级").setSort(1).setGrade("3").setNeIsbn("1").setCatePid("10100")
-        );
+        List<GoblinSelfGoodsCategoryVo> selfGoodsCategoryVos = goblinStoreMgtExtraService.listCategoryVo();
         return ResponseDto.success(selfGoodsCategoryVos);
     }
 
@@ -73,7 +74,7 @@ public class GoblinStoreMgtExtraController {
     @ApiOperation(value = "服务支持列表")
     @PostMapping("list")
     public ResponseDto<List<GoblinServiceSupportVo>> list() {
-        return ResponseDto.success(goblinMgtServiceSupportService.list());
+        return ResponseDto.success(goblinStoreMgtExtraService.listServiceSupportVo());
     }
 
     @ApiOperationSupport(order = 4)
@@ -87,6 +88,6 @@ public class GoblinStoreMgtExtraController {
                                                       @NotBlank(message = "标签所属参数无效")
                                                       @Pattern(regexp = "\\b(0|1)\\b", message = "标签所属[0-普通标签|1-专属标签]")
                                                       @RequestParam String belong) {
-        return ResponseDto.success(goblinMongoUtils.getSelfTagVos(belong, keyword));
+        return ResponseDto.success(goblinStoreMgtExtraService.listTagVo(keyword, belong));
     }
 }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinMgtServiceSupportServiceImpl.java → liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreMgtExtraImpl.java

 package com.liquidnet.service.goblin.service.impl.manage;
 
+import com.liquidnet.service.goblin.dto.vo.GoblinSelfGoodsCategoryVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinSelfTagVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinServiceSupportVo;
-import com.liquidnet.service.goblin.service.manage.IGoblinMgtServiceSupportService;
+import com.liquidnet.service.goblin.service.manage.IGoblinStoreMgtExtraService;
 import com.liquidnet.service.goblin.util.GoblinMongoUtils;
+import com.liquidnet.service.goblin.util.GoblinRedisUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -10,12 +13,24 @@ import org.springframework.util.CollectionUtils;
 import java.util.List;
 
 @Service
-public class GoblinMgtServiceSupportServiceImpl implements IGoblinMgtServiceSupportService {
+public class GoblinStoreMgtExtraImpl implements IGoblinStoreMgtExtraService {
+    @Autowired
+    private GoblinRedisUtils goblinRedisUtils;
     @Autowired
     private GoblinMongoUtils goblinMongoUtils;
 
     @Override
-    public List<GoblinServiceSupportVo> list() {
+    public List<GoblinSelfGoodsCategoryVo> listCategoryVo() {
+        return goblinRedisUtils.getSelfGoodsCategoryVos();
+    }
+
+    @Override
+    public List<GoblinSelfTagVo> listTagVo(String keyword, String belong) {
+        return goblinMongoUtils.getSelfTagVos(belong, keyword);
+    }
+
+    @Override
+    public List<GoblinServiceSupportVo> listServiceSupportVo() {
         List<GoblinServiceSupportVo> serviceSupportVos = goblinMongoUtils.getMgtServiceSupportVos();
         if (CollectionUtils.isEmpty(serviceSupportVos)) {
             serviceSupportVos.add(GoblinServiceSupportVo.getNew().setName("正品保证").setDesc("商品为正版行货").setSsid("101"));

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

@@ -43,6 +43,11 @@ public class GoblinMongoUtils {
 
     /* ---------------------------------------- 平台分类数据源 ---------------------------------------- */
 
+    public List<GoblinSelfGoodsCategoryVo> getSelfGoodsCategoryVos() {
+        return mongoTemplate.find(Query.query(Criteria.where("delFlg").is("0")),
+                GoblinSelfGoodsCategoryVo.class, GoblinSelfGoodsCategoryVo.class.getSimpleName());
+    }
+
     /* ---------------------------------------- 店铺分类数据源 ---------------------------------------- */
 
     public List<GoblinStoreGoodsCategoryVo> getStoreGoodsCategoryVos(String storeId) {
@@ -644,5 +649,4 @@ public class GoblinMongoUtils {
         map.put("total", total);
         return map;
     }
-
 }

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

@@ -72,14 +72,18 @@ public class GoblinRedisUtils {
     /* ---------------------------------------- 平台分类数据源 ---------------------------------------- */
 
     public List<GoblinSelfGoodsCategoryVo> getSelfGoodsCategoryVos() {
-        ArrayList<GoblinSelfGoodsCategoryVo> selfGoodsCategoryVoList = ObjectUtil.getGoblinSelfGoodsCategoryVoArrayList();
-        selfGoodsCategoryVoList.add(GoblinSelfGoodsCategoryVo.getNew().setCateId("10000").setName("一级分类").setSort(1)
-                .setCatePid(null).setGrade("1").setNeIsbn("0").setIcon("https://img.zhengzai.tv/files/2020/08/31/5f4c75095e9bc.png"));
-        selfGoodsCategoryVoList.add(GoblinSelfGoodsCategoryVo.getNew().setCateId("10100").setName("二级分类").setSort(1)
-                .setCatePid("10000").setGrade("2").setNeIsbn("0").setIcon("https://img.zhengzai.tv/files/2020/08/31/5f4c75095e9bc.png"));
-        selfGoodsCategoryVoList.add(GoblinSelfGoodsCategoryVo.getNew().setCateId("10101").setName("三级分类").setSort(1)
-                .setCatePid("10100").setGrade("3").setNeIsbn("1").setIcon("https://img.zhengzai.tv/files/2020/08/31/5f4c75095e9bc.png"));
-        return selfGoodsCategoryVoList;
+        String valStr = (String) redisUtil.get(GoblinRedisConst.BASIC_SELF_GOODS_CATEGORY);
+        boolean valStrIsEmptyFlg = StringUtils.isEmpty(valStr);
+        List<GoblinSelfGoodsCategoryVo> vos = null;
+        if (valStrIsEmptyFlg) {
+            if (!CollectionUtils.isEmpty(vos = goblinMongoUtils.getSelfGoodsCategoryVos())) {
+                redisUtil.set(GoblinRedisConst.BASIC_SELF_GOODS_CATEGORY, JsonUtils.toJson(vos));
+            }
+        } else {
+            vos = JsonUtils.fromJson(valStr, new TypeReference<List<GoblinSelfGoodsCategoryVo>>() {
+            });
+        }
+        return vos;
     }
     /* ---------------------------------------- 店铺分类数据源 ---------------------------------------- */