平台商品类别管理

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

@@ -17,6 +17,7 @@ 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.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.web.modules.category.domain.BizGoodsCategory;
 import com.ruoyi.web.modules.category.exception.CategoryBatchDeleteException;
@@ -34,9 +35,10 @@ public class PlatformCategoryController extends BaseController
 
     @PreAuthorize("@ss.hasPermi('agri:category:list')")
     @GetMapping("/list")
-    public AjaxResult list(@RequestParam(value = "keyword", required = false) String keyword)
+    public TableDataInfo list(@RequestParam(value = "keyword", required = false) String keyword)
     {
-        return success(platformCategoryService.selectPlatformCategoryList(keyword));
+        startPage();
+        return getDataTable(platformCategoryService.selectPlatformCategoryRowList(keyword));
     }
 
     @PreAuthorize("@ss.hasPermi('agri:category:list')")

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

@@ -17,6 +17,7 @@ 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.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.web.modules.category.domain.BizGoodsCategory;
 import com.ruoyi.web.modules.category.exception.CategoryBatchDeleteException;
@@ -32,11 +33,19 @@ public class SellerCategoryController extends BaseController
     @Autowired
     private ICategoryService categoryService;
 
+    @PreAuthorize("@ss.hasPermi('agri:seller:category:list')")
+    @GetMapping("/scope")
+    public AjaxResult scope()
+    {
+        return success(categoryService.selectCategoryScope());
+    }
+
     @PreAuthorize("@ss.hasPermi('agri:seller:category:list')")
     @GetMapping("/list")
-    public AjaxResult list(@RequestParam(value = "keyword", required = false) String keyword)
+    public TableDataInfo list(@RequestParam(value = "keyword", required = false) String keyword)
     {
-        return success(categoryService.selectCategoryList(keyword));
+        startPage();
+        return getDataTable(categoryService.selectCategoryRowList(keyword));
     }
 
     @PreAuthorize("@ss.hasPermi('agri:seller:category:list')")

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

@@ -3,7 +3,8 @@ 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.CategoryRowVO;
+import com.ruoyi.web.modules.category.vo.CategoryScopeVO;
 import com.ruoyi.web.modules.category.vo.CategoryTreeResultVO;
 
 /**
@@ -11,7 +12,9 @@ import com.ruoyi.web.modules.category.vo.CategoryTreeResultVO;
  */
 public interface ICategoryService
 {
-    CategoryListVO selectCategoryList(String keyword);
+    CategoryScopeVO selectCategoryScope();
+
+    List<CategoryRowVO> selectCategoryRowList(String keyword);
 
     CategoryTreeResultVO selectCategoryTree(String keyword);
 

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

@@ -3,7 +3,8 @@ 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.CategoryRowVO;
+import com.ruoyi.web.modules.category.vo.CategoryScopeVO;
 import com.ruoyi.web.modules.category.vo.CategoryTreeResultVO;
 
 /**
@@ -11,7 +12,7 @@ import com.ruoyi.web.modules.category.vo.CategoryTreeResultVO;
  */
 public interface IPlatformCategoryService
 {
-    CategoryListVO selectPlatformCategoryList(String keyword);
+    List<CategoryRowVO> selectPlatformCategoryRowList(String keyword);
 
     CategoryTreeResultVO selectPlatformCategoryTree(String keyword);
 

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

@@ -21,8 +21,8 @@ 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;
 import com.ruoyi.web.modules.category.vo.CategoryRowVO;
+import com.ruoyi.web.modules.category.vo.CategoryScopeVO;
 import com.ruoyi.web.modules.category.vo.CategoryTreeResultVO;
 import com.ruoyi.web.modules.category.vo.CategoryTreeVO;
 
@@ -42,9 +42,15 @@ public class CategoryServiceImpl implements ICategoryService, IPlatformCategoryS
     private IShopFacade shopFacade;
 
     @Override
-    public CategoryListVO selectCategoryList(String keyword)
+    public CategoryScopeVO selectCategoryScope()
     {
-        return doSelectCategoryList(requireShopId(), keyword);
+        return doSelectScope(requireShopId());
+    }
+
+    @Override
+    public List<CategoryRowVO> selectCategoryRowList(String keyword)
+    {
+        return doSelectCategoryRowList(requireShopId(), keyword);
     }
 
     @Override
@@ -87,9 +93,9 @@ public class CategoryServiceImpl implements ICategoryService, IPlatformCategoryS
     }
 
     @Override
-    public CategoryListVO selectPlatformCategoryList(String keyword)
+    public List<CategoryRowVO> selectPlatformCategoryRowList(String keyword)
     {
-        return doSelectCategoryList(null, keyword);
+        return doSelectCategoryRowList(null, keyword);
     }
 
     @Override
@@ -131,16 +137,21 @@ public class CategoryServiceImpl implements ICategoryService, IPlatformCategoryS
         doDeleteCategoryByIds(null, categoryIds, operator);
     }
 
-    private CategoryListVO doSelectCategoryList(Long shopId, String keyword)
+    private CategoryScopeVO doSelectScope(Long shopId)
     {
         assertScopeMaintable(shopId);
-        CategoryListVO vo = new CategoryListVO();
+        CategoryScopeVO vo = new CategoryScopeVO();
         vo.setShopId(shopId);
         vo.setShopName(resolveScopeName(shopId));
-        vo.setRows(buildFlatRows(queryList(shopId, keyword)));
         return vo;
     }
 
+    private List<CategoryRowVO> doSelectCategoryRowList(Long shopId, String keyword)
+    {
+        assertScopeMaintable(shopId);
+        return buildFlatRows(queryList(shopId, keyword));
+    }
+
     private CategoryTreeResultVO doSelectCategoryTree(Long shopId, String keyword)
     {
         assertScopeMaintable(shopId);

baqing-shop/src/main/java/com/ruoyi/web/modules/category/vo/CategoryScopeVO.java

@@ -0,0 +1,31 @@
+package com.ruoyi.web.modules.category.vo;
+
+/**
+ * 分类数据范围（店铺/平台）
+ */
+public class CategoryScopeVO
+{
+    private Long shopId;
+
+    private String shopName;
+
+    public Long getShopId()
+    {
+        return shopId;
+    }
+
+    public void setShopId(Long shopId)
+    {
+        this.shopId = shopId;
+    }
+
+    public String getShopName()
+    {
+        return shopName;
+    }
+
+    public void setShopName(String shopName)
+    {
+        this.shopName = shopName;
+    }
+}

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

@@ -25,6 +25,7 @@ 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.CategoryRowVO;
 import com.ruoyi.web.modules.category.vo.CategoryTreeResultVO;
 import com.ruoyi.web.modules.category.vo.CategoryTreeVO;
 
@@ -52,6 +53,20 @@ class PlatformCategoryControllerTest
         lenient().doReturn("admin").when(controller).getUsername();
     }
 
+    @Test
+    void list_returns200() throws Exception
+    {
+        CategoryRowVO row = new CategoryRowVO();
+        row.setCategoryId(1L);
+        row.setCategoryName("肥料");
+        when(platformCategoryService.selectPlatformCategoryRowList(null)).thenReturn(Collections.singletonList(row));
+
+        mockMvc.perform(get("/agri/category/list"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(200))
+                .andExpect(jsonPath("$.rows[0].categoryName").value("肥料"));
+    }
+
     @Test
     void tree_returns200() throws Exception
     {

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

@@ -27,7 +27,6 @@ import com.ruoyi.web.modules.category.domain.BizGoodsCategory;
 import com.ruoyi.web.modules.category.exception.CategoryBatchDeleteException;
 import com.ruoyi.web.modules.category.service.ICategoryService;
 import com.ruoyi.web.modules.category.support.SellerShopContext;
-import com.ruoyi.web.modules.category.vo.CategoryListVO;
 import com.ruoyi.web.modules.category.vo.CategoryRowVO;
 
 /**
@@ -64,20 +63,15 @@ class SellerCategoryControllerTest
     @Test
     void list_returns200() throws Exception
     {
-        CategoryListVO vo = new CategoryListVO();
-        vo.setShopId(1L);
-        vo.setShopName("测试店");
         CategoryRowVO row = new CategoryRowVO();
         row.setCategoryId(1L);
         row.setCategoryName("肥料");
-        vo.setRows(Collections.singletonList(row));
-        when(categoryService.selectCategoryList(null)).thenReturn(vo);
+        when(categoryService.selectCategoryRowList(null)).thenReturn(Collections.singletonList(row));
 
         mockMvc.perform(get("/agri/seller/category/list"))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.code").value(200))
-                .andExpect(jsonPath("$.data.shopId").value(1))
-                .andExpect(jsonPath("$.data.rows[0].categoryName").value("肥料"));
+                .andExpect(jsonPath("$.rows[0].categoryName").value("肥料"));
     }
 
     @Test