平台商品类别管理

baqing-shop/src/main/java/com/ruoyi/web/modules/category/constant/CategoryConstants.java

@@ -28,4 +28,7 @@ public final class CategoryConstants
     public static final String HOT_NO = "0";
 
     public static final String HEADER_SHOP_ID = "X-Shop-Id";
+
+    /** 平台分类展示名（shop_id 为 NULL） */
+    public static final String PLATFORM_SCOPE_NAME = "平台分类";
 }

baqing-shop/src/main/java/com/ruoyi/web/modules/category/controller/PlatformCategoryController.java

@@ -0,0 +1,100 @@
+package com.ruoyi.web.modules.category.controller;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.modules.category.domain.BizGoodsCategory;
+import com.ruoyi.web.modules.category.exception.CategoryBatchDeleteException;
+import com.ruoyi.web.modules.category.service.IPlatformCategoryService;
+
+/**
+ * 平台端商品分类（shop_id 为 NULL，最多两级）
+ */
+@RestController
+@RequestMapping("/agri/category")
+public class PlatformCategoryController extends BaseController
+{
+    @Autowired
+    private IPlatformCategoryService platformCategoryService;
+
+    @PreAuthorize("@ss.hasPermi('agri:category:list')")
+    @GetMapping("/list")
+    public AjaxResult list(@RequestParam(value = "keyword", required = false) String keyword)
+    {
+        return success(platformCategoryService.selectPlatformCategoryList(keyword));
+    }
+
+    @PreAuthorize("@ss.hasPermi('agri:category:list')")
+    @GetMapping("/tree")
+    public AjaxResult tree(@RequestParam(value = "keyword", required = false) String keyword)
+    {
+        return success(platformCategoryService.selectPlatformCategoryTree(keyword));
+    }
+
+    @PreAuthorize("@ss.hasPermi('agri:category:list')")
+    @GetMapping("/level1Options")
+    public AjaxResult level1Options()
+    {
+        return success(platformCategoryService.selectPlatformLevel1Options());
+    }
+
+    @PreAuthorize("@ss.hasPermi('agri:category:list')")
+    @GetMapping("/level2Options")
+    public AjaxResult level2Options()
+    {
+        return success(platformCategoryService.selectPlatformLevel2Options());
+    }
+
+    @PreAuthorize("@ss.hasPermi('agri:category:add')")
+    @Log(title = "平台商品分类", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody BizGoodsCategory category)
+    {
+        category.setCreateBy(getUsername());
+        return toAjax(platformCategoryService.insertPlatformCategory(category));
+    }
+
+    @PreAuthorize("@ss.hasPermi('agri:category:edit')")
+    @Log(title = "平台商品分类", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody BizGoodsCategory category)
+    {
+        category.setUpdateBy(getUsername());
+        return toAjax(platformCategoryService.updatePlatformCategory(category));
+    }
+
+    @PreAuthorize("@ss.hasPermi('agri:category:remove')")
+    @Log(title = "平台商品分类", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{categoryIds}")
+    public AjaxResult remove(@PathVariable("categoryIds") Long[] categoryIds)
+    {
+        try
+        {
+            platformCategoryService.deletePlatformCategoryByIds(categoryIds, getUsername());
+            return success();
+        }
+        catch (CategoryBatchDeleteException e)
+        {
+            Map<String, Object> data = new HashMap<>();
+            data.put("reasons", e.getReasons());
+            AjaxResult result = AjaxResult.error(e.getMessage());
+            result.put(AjaxResult.DATA_TAG, data);
+            return result;
+        }
+    }
+}

baqing-shop/src/main/java/com/ruoyi/web/modules/category/service/IPlatformCategoryService.java

@@ -0,0 +1,27 @@
+package com.ruoyi.web.modules.category.service;
+
+import java.util.List;
+import com.ruoyi.web.modules.category.domain.BizGoodsCategory;
+import com.ruoyi.web.modules.category.vo.CategoryLevel2OptionVO;
+import com.ruoyi.web.modules.category.vo.CategoryListVO;
+import com.ruoyi.web.modules.category.vo.CategoryTreeResultVO;
+
+/**
+ * 平台端商品分类 Service（shop_id 为 NULL）
+ */
+public interface IPlatformCategoryService
+{
+    CategoryListVO selectPlatformCategoryList(String keyword);
+
+    CategoryTreeResultVO selectPlatformCategoryTree(String keyword);
+
+    List<BizGoodsCategory> selectPlatformLevel1Options();
+
+    List<CategoryLevel2OptionVO> selectPlatformLevel2Options();
+
+    int insertPlatformCategory(BizGoodsCategory category);
+
+    int updatePlatformCategory(BizGoodsCategory category);
+
+    void deletePlatformCategoryByIds(Long[] categoryIds, String operator);
+}

baqing-shop/src/main/java/com/ruoyi/web/modules/category/service/impl/CategoryServiceImpl.java

@@ -18,6 +18,7 @@ import com.ruoyi.web.modules.category.facade.IGoodsFacade;
 import com.ruoyi.web.modules.category.facade.IShopFacade;
 import com.ruoyi.web.modules.category.mapper.BizGoodsCategoryMapper;
 import com.ruoyi.web.modules.category.service.ICategoryService;
+import com.ruoyi.web.modules.category.service.IPlatformCategoryService;
 import com.ruoyi.web.modules.category.support.SellerShopContext;
 import com.ruoyi.web.modules.category.vo.CategoryLevel2OptionVO;
 import com.ruoyi.web.modules.category.vo.CategoryListVO;
@@ -26,10 +27,10 @@ import com.ruoyi.web.modules.category.vo.CategoryTreeResultVO;
 import com.ruoyi.web.modules.category.vo.CategoryTreeVO;
 
 /**
- * 商品分类业务实现
+ * 商品分类业务实现（商家端 shop_id 非空；平台端 shop_id 为 NULL）
  */
 @Service
-public class CategoryServiceImpl implements ICategoryService
+public class CategoryServiceImpl implements ICategoryService, IPlatformCategoryService
 {
     @Autowired
     private BizGoodsCategoryMapper categoryMapper;
@@ -43,41 +44,125 @@ public class CategoryServiceImpl implements ICategoryService
     @Override
     public CategoryListVO selectCategoryList(String keyword)
     {
-        Long shopId = requireShopId();
-        List<BizGoodsCategory> list = queryList(shopId, keyword);
+        return doSelectCategoryList(requireShopId(), keyword);
+    }
+
+    @Override
+    public CategoryTreeResultVO selectCategoryTree(String keyword)
+    {
+        return doSelectCategoryTree(requireShopId(), keyword);
+    }
+
+    @Override
+    public List<BizGoodsCategory> selectLevel1Options()
+    {
+        return doSelectLevel1Options(requireShopId());
+    }
+
+    @Override
+    public List<CategoryLevel2OptionVO> selectLevel2Options()
+    {
+        return doSelectLevel2Options(requireShopId());
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int insertCategory(BizGoodsCategory category)
+    {
+        return doInsertCategory(requireShopId(), category);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int updateCategory(BizGoodsCategory category)
+    {
+        return doUpdateCategory(requireShopId(), category);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteCategoryByIds(Long[] categoryIds, String operator)
+    {
+        doDeleteCategoryByIds(requireShopId(), categoryIds, operator);
+    }
+
+    @Override
+    public CategoryListVO selectPlatformCategoryList(String keyword)
+    {
+        return doSelectCategoryList(null, keyword);
+    }
+
+    @Override
+    public CategoryTreeResultVO selectPlatformCategoryTree(String keyword)
+    {
+        return doSelectCategoryTree(null, keyword);
+    }
+
+    @Override
+    public List<BizGoodsCategory> selectPlatformLevel1Options()
+    {
+        return doSelectLevel1Options(null);
+    }
+
+    @Override
+    public List<CategoryLevel2OptionVO> selectPlatformLevel2Options()
+    {
+        return doSelectLevel2Options(null);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int insertPlatformCategory(BizGoodsCategory category)
+    {
+        return doInsertCategory(null, category);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int updatePlatformCategory(BizGoodsCategory category)
+    {
+        return doUpdateCategory(null, category);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deletePlatformCategoryByIds(Long[] categoryIds, String operator)
+    {
+        doDeleteCategoryByIds(null, categoryIds, operator);
+    }
+
+    private CategoryListVO doSelectCategoryList(Long shopId, String keyword)
+    {
+        assertScopeMaintable(shopId);
         CategoryListVO vo = new CategoryListVO();
         vo.setShopId(shopId);
-        vo.setShopName(shopFacade.getShopName(shopId));
-        vo.setRows(buildFlatRows(list));
+        vo.setShopName(resolveScopeName(shopId));
+        vo.setRows(buildFlatRows(queryList(shopId, keyword)));
         return vo;
     }
 
-    @Override
-    public CategoryTreeResultVO selectCategoryTree(String keyword)
+    private CategoryTreeResultVO doSelectCategoryTree(Long shopId, String keyword)
     {
-        Long shopId = requireShopId();
-        List<BizGoodsCategory> list = queryList(shopId, keyword);
+        assertScopeMaintable(shopId);
         CategoryTreeResultVO result = new CategoryTreeResultVO();
         result.setShopId(shopId);
-        result.setShopName(shopFacade.getShopName(shopId));
-        result.setTree(buildTree(list));
+        result.setShopName(resolveScopeName(shopId));
+        result.setTree(buildTree(queryList(shopId, keyword)));
         return result;
     }
 
-    @Override
-    public List<BizGoodsCategory> selectLevel1Options()
+    private List<BizGoodsCategory> doSelectLevel1Options(Long shopId)
     {
-        Long shopId = requireShopId();
+        assertScopeMaintable(shopId);
         BizGoodsCategory query = new BizGoodsCategory();
         query.setShopId(shopId);
         query.setCategoryLevel(CategoryConstants.LEVEL_ONE);
         return categoryMapper.selectList(query);
     }
 
-    @Override
-    public List<CategoryLevel2OptionVO> selectLevel2Options()
+    private List<CategoryLevel2OptionVO> doSelectLevel2Options(Long shopId)
     {
-        Long shopId = requireShopId();
+        assertScopeMaintable(shopId);
         BizGoodsCategory query = new BizGoodsCategory();
         query.setShopId(shopId);
         List<BizGoodsCategory> all = categoryMapper.selectList(query);
@@ -98,14 +183,11 @@ public class CategoryServiceImpl implements ICategoryService
         return options;
     }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public int insertCategory(BizGoodsCategory category)
+    private int doInsertCategory(Long shopId, BizGoodsCategory category)
     {
-        Long shopId = requireShopId();
-        shopFacade.assertShopMaintable(shopId);
+        assertScopeMaintable(shopId);
         validateFields(category);
-        normalizeLevelOnSave(category, shopId, true);
+        normalizeLevelOnSave(category, shopId);
         if (categoryMapper.countByName(shopId, category.getParentId(), category.getCategoryName(), null) > 0)
         {
             throw new ServiceException("同级分类名称已存在");
@@ -115,12 +197,9 @@ public class CategoryServiceImpl implements ICategoryService
         return categoryMapper.insert(category);
     }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public int updateCategory(BizGoodsCategory category)
+    private int doUpdateCategory(Long shopId, BizGoodsCategory category)
     {
-        Long shopId = requireShopId();
-        shopFacade.assertShopMaintable(shopId);
+        assertScopeMaintable(shopId);
         if (category.getCategoryId() == null)
         {
             throw new ServiceException("分类ID不能为空");
@@ -150,12 +229,9 @@ public class CategoryServiceImpl implements ICategoryService
         return categoryMapper.update(category);
     }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void deleteCategoryByIds(Long[] categoryIds, String operator)
+    private void doDeleteCategoryByIds(Long shopId, Long[] categoryIds, String operator)
     {
-        Long shopId = requireShopId();
-        shopFacade.assertShopMaintable(shopId);
+        assertScopeMaintable(shopId);
         if (categoryIds == null || categoryIds.length == 0)
         {
             throw new ServiceException("请选择要删除的分类");
@@ -178,8 +254,7 @@ public class CategoryServiceImpl implements ICategoryService
         {
             throw new CategoryBatchDeleteException("部分分类不满足删除条件，整批操作已取消", reasons);
         }
-        List<Long> idList = new ArrayList<>(targetIds);
-        categoryMapper.logicDeleteByIds(idList, shopId, operator);
+        categoryMapper.logicDeleteByIds(new ArrayList<>(targetIds), shopId, operator);
     }
 
     private Long requireShopId()
@@ -189,10 +264,26 @@ public class CategoryServiceImpl implements ICategoryService
         {
             throw new ServiceException("请先选择当前店铺");
         }
-        shopFacade.assertShopMaintable(shopId);
         return shopId;
     }
 
+    private void assertScopeMaintable(Long shopId)
+    {
+        if (shopId != null)
+        {
+            shopFacade.assertShopMaintable(shopId);
+        }
+    }
+
+    private String resolveScopeName(Long shopId)
+    {
+        if (shopId == null)
+        {
+            return CategoryConstants.PLATFORM_SCOPE_NAME;
+        }
+        return shopFacade.getShopName(shopId);
+    }
+
     private List<BizGoodsCategory> queryList(Long shopId, String keyword)
     {
         BizGoodsCategory query = new BizGoodsCategory();
@@ -281,7 +372,7 @@ public class CategoryServiceImpl implements ICategoryService
         {
             throw new ServiceException("请上传分类图片");
         }
-        if (category.getSortNo() == null || category.getSortNo() < 0)
+        if (category.getSortNo() < 0)
         {
             throw new ServiceException("排序须为非负整数");
         }
@@ -297,7 +388,7 @@ public class CategoryServiceImpl implements ICategoryService
         }
     }
 
-    private void normalizeLevelOnSave(BizGoodsCategory category, Long shopId, boolean insert)
+    private void normalizeLevelOnSave(BizGoodsCategory category, Long shopId)
     {
         if (CategoryConstants.LEVEL_ONE.equals(category.getCategoryLevel()))
         {
@@ -343,8 +434,7 @@ public class CategoryServiceImpl implements ICategoryService
             }
             if (CategoryConstants.LEVEL_ONE.equals(cat.getCategoryLevel()))
             {
-                List<Long> children = categoryMapper.selectChildIds(shopId, id);
-                result.addAll(children);
+                result.addAll(categoryMapper.selectChildIds(shopId, id));
                 result.add(id);
             }
             else

baqing-shop/src/main/resources/mapper/category/BizGoodsCategoryMapper.xml

@@ -26,11 +26,35 @@
                p.category_name as parent_name
         from biz_goods_category c
         left join biz_goods_category p on c.parent_id = p.category_id and p.del_flag = '0'
+            and ((c.shop_id is null and p.shop_id is null) or (c.shop_id = p.shop_id))
+    </sql>
+
+    <sql id="shopIdCondition">
+        <choose>
+            <when test="shopId != null">
+                and shop_id = #{shopId}
+            </when>
+            <otherwise>
+                and shop_id is null
+            </otherwise>
+        </choose>
+    </sql>
+
+    <sql id="cShopIdCondition">
+        <choose>
+            <when test="shopId != null">
+                and c.shop_id = #{shopId}
+            </when>
+            <otherwise>
+                and c.shop_id is null
+            </otherwise>
+        </choose>
     </sql>
 
     <select id="selectById" resultMap="BizGoodsCategoryResult">
         <include refid="selectVo"/>
-        where c.category_id = #{categoryId} and c.shop_id = #{shopId} and c.del_flag = '0'
+        where c.category_id = #{categoryId} and c.del_flag = '0'
+        <include refid="cShopIdCondition"/>
     </select>
 
     <select id="selectByIdIgnoreShop" resultMap="BizGoodsCategoryResult">
@@ -42,7 +66,8 @@
 
     <select id="selectList" resultMap="BizGoodsCategoryResult">
         <include refid="selectVo"/>
-        where c.shop_id = #{shopId} and c.del_flag = '0'
+        where c.del_flag = '0'
+        <include refid="cShopIdCondition"/>
         <if test="keyword != null and keyword != ''">
             and c.category_name like concat('%', #{keyword}, '%')
         </if>
@@ -54,8 +79,9 @@
 
     <select id="countByName" resultType="int">
         select count(1) from biz_goods_category
-        where shop_id = #{shopId} and parent_id = #{parentId} and category_name = #{categoryName}
+        where parent_id = #{parentId} and category_name = #{categoryName}
           and del_flag = '0'
+        <include refid="shopIdCondition"/>
         <if test="excludeId != null">
             and category_id != #{excludeId}
         </if>
@@ -84,13 +110,15 @@
             update_by = #{updateBy},
             update_time = sysdate()
         </set>
-        where category_id = #{categoryId} and shop_id = #{shopId} and del_flag = '0'
+        where category_id = #{categoryId} and del_flag = '0'
+        <include refid="shopIdCondition"/>
     </update>
 
     <update id="logicDeleteByIds">
         update biz_goods_category
         set del_flag = '2', update_by = #{updateBy}, update_time = sysdate()
-        where shop_id = #{shopId} and del_flag = '0'
+        where del_flag = '0'
+        <include refid="shopIdCondition"/>
           and category_id in
         <foreach collection="ids" item="id" open="(" separator="," close=")">
             #{id}
@@ -99,7 +127,8 @@
 
     <select id="selectChildIds" resultType="long">
         select category_id from biz_goods_category
-        where shop_id = #{shopId} and parent_id = #{parentId} and del_flag = '0'
+        where parent_id = #{parentId} and del_flag = '0'
+        <include refid="shopIdCondition"/>
     </select>
 
 </mapper>

baqing-shop/src/test/java/com/ruoyi/web/modules/category/controller/PlatformCategoryControllerTest.java

@@ -0,0 +1,105 @@
+package com.ruoyi.web.modules.category.controller;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.when;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import java.util.Collections;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Spy;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.ruoyi.web.modules.category.constant.CategoryConstants;
+import com.ruoyi.web.modules.category.domain.BizGoodsCategory;
+import com.ruoyi.web.modules.category.exception.CategoryBatchDeleteException;
+import com.ruoyi.web.modules.category.service.IPlatformCategoryService;
+import com.ruoyi.web.modules.category.vo.CategoryTreeResultVO;
+import com.ruoyi.web.modules.category.vo.CategoryTreeVO;
+
+/**
+ * 平台端分类接口测试
+ */
+@ExtendWith(MockitoExtension.class)
+class PlatformCategoryControllerTest
+{
+    @Mock
+    private IPlatformCategoryService platformCategoryService;
+
+    @Spy
+    @InjectMocks
+    private PlatformCategoryController controller;
+
+    private MockMvc mockMvc;
+
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    @BeforeEach
+    void setUp() throws Exception
+    {
+        mockMvc = MockMvcBuilders.standaloneSetup(controller).build();
+        lenient().doReturn("admin").when(controller).getUsername();
+    }
+
+    @Test
+    void tree_returns200() throws Exception
+    {
+        CategoryTreeResultVO vo = new CategoryTreeResultVO();
+        vo.setShopName(CategoryConstants.PLATFORM_SCOPE_NAME);
+        CategoryTreeVO node = new CategoryTreeVO();
+        node.setCategoryId(1L);
+        node.setCategoryName("肥料");
+        vo.setTree(Collections.singletonList(node));
+        when(platformCategoryService.selectPlatformCategoryTree(null)).thenReturn(vo);
+
+        mockMvc.perform(get("/agri/category/tree"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(200))
+                .andExpect(jsonPath("$.data.shopName").value(CategoryConstants.PLATFORM_SCOPE_NAME))
+                .andExpect(jsonPath("$.data.tree[0].categoryName").value("肥料"));
+    }
+
+    @Test
+    void add_returns200() throws Exception
+    {
+        when(platformCategoryService.insertPlatformCategory(any())).thenReturn(1);
+
+        BizGoodsCategory body = new BizGoodsCategory();
+        body.setCategoryLevel("1");
+        body.setCategoryName("肥料");
+        body.setCategoryPic("/profile/upload/c.jpg");
+        body.setSortNo(0);
+        body.setShowFlag("1");
+        body.setHotFlag("0");
+
+        mockMvc.perform(post("/agri/category")
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(objectMapper.writeValueAsString(body)))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(200));
+    }
+
+    @Test
+    void remove_batchFail_returnsReasons() throws Exception
+    {
+        doThrow(new CategoryBatchDeleteException("部分分类不满足删除条件，整批操作已取消",
+                Collections.singletonList("分类「复合肥」下存在商品，请先处理商品")))
+                .when(platformCategoryService).deletePlatformCategoryByIds(any(), any());
+
+        mockMvc.perform(delete("/agri/category/10"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(500))
+                .andExpect(jsonPath("$.data.reasons[0]").exists());
+    }
+}

baqing-shop/src/test/java/com/ruoyi/web/modules/category/service/CategoryServiceImplTest.java

@@ -5,9 +5,10 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.verify;
 import static org.mockito.ArgumentMatchers.anyLong;
 import java.util.Arrays;
 import java.util.Collections;
@@ -52,7 +53,7 @@ class CategoryServiceImplTest
     void setUp()
     {
         SellerShopContext.setShopId(SHOP_ID);
-        doNothing().when(shopFacade).assertShopMaintable(anyLong());
+        lenient().doNothing().when(shopFacade).assertShopMaintable(anyLong());
     }
 
     @AfterEach
@@ -167,6 +168,20 @@ class CategoryServiceImplTest
                 () -> categoryService.deleteCategoryByIds(new Long[] { 1L }, "tester"));
     }
 
+    @Test
+    void insertPlatformLevel1_shopIdNull()
+    {
+        BizGoodsCategory dto = baseDto();
+        dto.setCategoryLevel(CategoryConstants.LEVEL_ONE);
+        when(categoryMapper.countByName(eq(null), eq(CategoryConstants.PARENT_ROOT), eq("肥料"), eq(null))).thenReturn(0);
+        when(categoryMapper.insert(any())).thenReturn(1);
+
+        int rows = categoryService.insertPlatformCategory(dto);
+
+        assertEquals(1, rows);
+        verify(categoryMapper).insert(any());
+    }
+
     private BizGoodsCategory baseDto()
     {
         BizGoodsCategory c = new BizGoodsCategory();

doc/农资商城web/商品管理/商品分类/商品分类功能需求-草稿.md

@@ -7,6 +7,6 @@
 3. 编辑商品分类：编辑一级和二级分类
 4. 批量/删除商品分类：支持批量删除和单独删除一级和二级分类，删除一级则也删除全部二级
 5. 添加子分类：一级分类下可添加子分类
-6. 店铺管理员可以维护自己的商品分���
+6. 平台端、商家端的商品分类最多支持两级分���
 7. 异常返回：统一格式 code、msg、data。
 8. 技术栈：RuoYi v3.9.2-springboot2 分支 + MySQL-5.7.39。

sql/biz_goods_category.sql

@@ -1,7 +1,8 @@
+-- 商品分类表（平台 + 店铺维度，最多两级）
+-- shop_id 为 NULL：平台分类；非 NULL：对应店铺分类
 CREATE TABLE IF NOT EXISTS `biz_goods_category` (
   `category_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '分类ID',
-  `shop_id` bigint(20) NOT NULL COMMENT '店铺ID',
+  `shop_id` bigint(20) DEFAULT NULL COMMENT '店铺ID；NULL=平台分类',
   `parent_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '0为一级',
   `category_level` char(1) NOT NULL COMMENT '1一级 2二级',
   `category_name` varchar(64) NOT NULL COMMENT '分类名称',