会员管理代码

baqing-shop/src/main/java/com/ruoyi/web/modules/home/constant/CategoryAppConstants.java

@@ -0,0 +1,35 @@
+package com.ruoyi.web.modules.home.constant;
+
+/**
+ * C 端商品分类常量
+ */
+public final class CategoryAppConstants
+{
+    private CategoryAppConstants()
+    {
+    }
+
+    public static final String DEFAULT_SORT = "sales_desc";
+
+    public static final String SORT_SALES_DESC = "sales_desc";
+
+    public static final String SORT_SALES_ASC = "sales_asc";
+
+    public static final String SORT_PRICE_DESC = "price_desc";
+
+    public static final String SORT_PRICE_ASC = "price_asc";
+
+    public static final String MSG_CATEGORY_REQUIRED = "请选择商品分类";
+
+    public static final String MSG_CATEGORY_INVISIBLE = "分类不存在或不可见";
+
+    public static final String MSG_SORT_INVALID = "排序参数无效";
+
+    public static boolean isValidSortBy(String sortBy)
+    {
+        return SORT_SALES_DESC.equals(sortBy)
+                || SORT_SALES_ASC.equals(sortBy)
+                || SORT_PRICE_DESC.equals(sortBy)
+                || SORT_PRICE_ASC.equals(sortBy);
+    }
+}

baqing-shop/src/main/java/com/ruoyi/web/modules/home/controller/CategoryAppController.java

@@ -0,0 +1,49 @@
+package com.ruoyi.web.modules.home.controller;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.web.modules.home.dto.CategoryGoodsQuery;
+import com.ruoyi.web.modules.home.service.ICategoryAppService;
+import com.ruoyi.web.modules.home.vo.HomeHotGoodsVO;
+
+/**
+ * C 端商品分类（全部分类树、二级 Tab、分类商品列表）
+ */
+@RestController
+@RequestMapping("/api/category")
+public class CategoryAppController extends BaseController
+{
+    @Autowired
+    private ICategoryAppService categoryAppService;
+
+    @Anonymous
+    @GetMapping("/tree")
+    public AjaxResult tree()
+    {
+        return success(categoryAppService.listCategoryTree());
+    }
+
+    @Anonymous
+    @GetMapping("/{level1Id}/level2-tabs")
+    public AjaxResult level2Tabs(@PathVariable("level1Id") Long level1Id)
+    {
+        return success(categoryAppService.listLevel2Tabs(level1Id));
+    }
+
+    @Anonymous
+    @GetMapping("/goods")
+    public TableDataInfo goods(CategoryGoodsQuery query)
+    {
+        startPage();
+        List<HomeHotGoodsVO> list = categoryAppService.listCategoryGoods(query);
+        return getDataTable(list);
+    }
+}

baqing-shop/src/main/java/com/ruoyi/web/modules/home/dto/CategoryGoodsQuery.java

@@ -0,0 +1,31 @@
+package com.ruoyi.web.modules.home.dto;
+
+/**
+ * C 端分类商品列表查询
+ */
+public class CategoryGoodsQuery
+{
+    private Long categoryId;
+
+    private String sortBy;
+
+    public Long getCategoryId()
+    {
+        return categoryId;
+    }
+
+    public void setCategoryId(Long categoryId)
+    {
+        this.categoryId = categoryId;
+    }
+
+    public String getSortBy()
+    {
+        return sortBy;
+    }
+
+    public void setSortBy(String sortBy)
+    {
+        this.sortBy = sortBy;
+    }
+}

baqing-shop/src/main/java/com/ruoyi/web/modules/home/mapper/CategoryAppMapper.java

@@ -0,0 +1,23 @@
+package com.ruoyi.web.modules.home.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+import com.ruoyi.web.modules.category.vo.CategoryVisibleChildVO;
+import com.ruoyi.web.modules.home.vo.HomeHotGoodsVO;
+
+/**
+ * C 端商品分类只读 Mapper
+ */
+public interface CategoryAppMapper
+{
+    /**
+     * 平台一级下可见二级 Tab
+     */
+    List<CategoryVisibleChildVO> selectPlatformLevel2Tabs(@Param("level1Id") Long level1Id);
+
+    /**
+     * 二级分类下出售中商品（分页由 PageHelper 控制）
+     */
+    List<HomeHotGoodsVO> selectGoodsByCategory(@Param("categoryId") Long categoryId,
+            @Param("sortBy") String sortBy);
+}

baqing-shop/src/main/java/com/ruoyi/web/modules/home/service/ICategoryAppService.java

@@ -0,0 +1,19 @@
+package com.ruoyi.web.modules.home.service;
+
+import java.util.List;
+import com.ruoyi.web.modules.category.vo.CategoryVisibleChildVO;
+import com.ruoyi.web.modules.category.vo.CategoryVisibleVO;
+import com.ruoyi.web.modules.home.dto.CategoryGoodsQuery;
+import com.ruoyi.web.modules.home.vo.HomeHotGoodsVO;
+
+/**
+ * C 端商品分类 Service
+ */
+public interface ICategoryAppService
+{
+    List<CategoryVisibleVO> listCategoryTree();
+
+    List<CategoryVisibleChildVO> listLevel2Tabs(Long level1Id);
+
+    List<HomeHotGoodsVO> listCategoryGoods(CategoryGoodsQuery query);
+}

baqing-shop/src/main/java/com/ruoyi/web/modules/home/service/impl/CategoryAppServiceImpl.java

@@ -0,0 +1,89 @@
+package com.ruoyi.web.modules.home.service.impl;
+
+import java.util.Collections;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.web.modules.category.constant.CategoryConstants;
+import com.ruoyi.web.modules.category.domain.BizGoodsCategory;
+import com.ruoyi.web.modules.category.facade.ICategoryFacade;
+import com.ruoyi.web.modules.category.mapper.BizGoodsCategoryMapper;
+import com.ruoyi.web.modules.category.vo.CategoryVisibleChildVO;
+import com.ruoyi.web.modules.category.vo.CategoryVisibleVO;
+import com.ruoyi.web.modules.home.constant.CategoryAppConstants;
+import com.ruoyi.web.modules.home.dto.CategoryGoodsQuery;
+import com.ruoyi.web.modules.home.mapper.CategoryAppMapper;
+import com.ruoyi.web.modules.home.service.ICategoryAppService;
+import com.ruoyi.web.modules.home.vo.HomeHotGoodsVO;
+
+/**
+ * C 端商品分类 Service 实现
+ */
+@Service
+public class CategoryAppServiceImpl implements ICategoryAppService
+{
+    @Autowired
+    private ICategoryFacade categoryFacade;
+
+    @Autowired
+    private BizGoodsCategoryMapper categoryMapper;
+
+    @Autowired
+    private CategoryAppMapper categoryAppMapper;
+
+    @Override
+    public List<CategoryVisibleVO> listCategoryTree()
+    {
+        List<CategoryVisibleVO> list = categoryFacade.listVisibleByShopId(null);
+        return list != null ? list : Collections.emptyList();
+    }
+
+    @Override
+    public List<CategoryVisibleChildVO> listLevel2Tabs(Long level1Id)
+    {
+        assertPlatformLevel1Visible(level1Id);
+        List<CategoryVisibleChildVO> list = categoryAppMapper.selectPlatformLevel2Tabs(level1Id);
+        return list != null ? list : Collections.emptyList();
+    }
+
+    @Override
+    public List<HomeHotGoodsVO> listCategoryGoods(CategoryGoodsQuery query)
+    {
+        if (query == null || query.getCategoryId() == null)
+        {
+            throw new ServiceException(CategoryAppConstants.MSG_CATEGORY_REQUIRED);
+        }
+        if (!categoryFacade.isCategoryVisible(query.getCategoryId()))
+        {
+            throw new ServiceException(CategoryAppConstants.MSG_CATEGORY_INVISIBLE);
+        }
+        String sortBy = StringUtils.isEmpty(query.getSortBy())
+                ? CategoryAppConstants.DEFAULT_SORT
+                : query.getSortBy();
+        if (!CategoryAppConstants.isValidSortBy(sortBy))
+        {
+            throw new ServiceException(CategoryAppConstants.MSG_SORT_INVALID);
+        }
+        List<HomeHotGoodsVO> list = categoryAppMapper.selectGoodsByCategory(query.getCategoryId(), sortBy);
+        return list != null ? list : Collections.emptyList();
+    }
+
+    private void assertPlatformLevel1Visible(Long level1Id)
+    {
+        if (level1Id == null)
+        {
+            throw new ServiceException(CategoryAppConstants.MSG_CATEGORY_INVISIBLE);
+        }
+        BizGoodsCategory level1 = categoryMapper.selectByIdIgnoreShop(level1Id);
+        if (level1 == null
+                || level1.getShopId() != null
+                || !CategoryConstants.LEVEL_ONE.equals(level1.getCategoryLevel())
+                || !CategoryConstants.SHOW_YES.equals(level1.getShowFlag())
+                || !CategoryConstants.DEL_FLAG_NORMAL.equals(level1.getDelFlag()))
+        {
+            throw new ServiceException(CategoryAppConstants.MSG_CATEGORY_INVISIBLE);
+        }
+    }
+}

baqing-shop/src/main/resources/mapper/home/CategoryAppMapper.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.web.modules.home.mapper.CategoryAppMapper">
+
+    <select id="selectPlatformLevel2Tabs" resultType="com.ruoyi.web.modules.category.vo.CategoryVisibleChildVO">
+        select category_id as categoryId,
+               category_name as categoryName,
+               category_pic as categoryPic,
+               hot_flag as hotFlag,
+               sort_no as sortNo
+        from biz_goods_category
+        where shop_id is null
+          and category_level = '2'
+          and parent_id = #{level1Id}
+          and show_flag = '1'
+          and del_flag = '0'
+        order by sort_no asc, create_time asc
+    </select>
+
+    <select id="selectGoodsByCategory" resultType="com.ruoyi.web.modules.home.vo.HomeHotGoodsVO">
+        select g.goods_id as goodsId,
+               g.goods_sn as goodsSn,
+               g.goods_name as goodsName,
+               g.main_pic as mainPic,
+               g.sale_price as salePrice,
+               s.shop_id as shopId,
+               s.shop_name as shopName
+        from biz_goods g
+        inner join biz_shop s on g.shop_id = s.shop_id and s.del_flag = '0'
+        where g.goods_status = '2'
+          and g.del_flag = '0'
+          and g.category_id = #{categoryId}
+        order by
+        <choose>
+            <when test="sortBy == 'sales_asc'">
+                g.sales_count asc, g.goods_sn asc
+            </when>
+            <when test="sortBy == 'price_desc'">
+                g.sale_price desc, g.goods_sn asc
+            </when>
+            <when test="sortBy == 'price_asc'">
+                g.sale_price asc, g.goods_sn asc
+            </when>
+            <otherwise>
+                g.sales_count desc, g.goods_sn asc
+            </otherwise>
+        </choose>
+    </select>
+
+</mapper>

baqing-shop/src/test/java/com/ruoyi/web/modules/home/controller/CategoryAppControllerTest.java

@@ -0,0 +1,218 @@
+package com.ruoyi.web.modules.home.controller;
+
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import java.math.BigDecimal;
+import java.util.Arrays;
+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.junit.jupiter.MockitoExtension;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.util.NestedServletException;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.web.modules.category.vo.CategoryVisibleChildVO;
+import com.ruoyi.web.modules.category.vo.CategoryVisibleVO;
+import com.ruoyi.web.modules.home.constant.CategoryAppConstants;
+import com.ruoyi.web.modules.home.service.ICategoryAppService;
+import com.ruoyi.web.modules.home.vo.HomeHotGoodsVO;
+
+/**
+ * C 端商品分类接口测试（CGC-API-001～020）
+ */
+@ExtendWith(MockitoExtension.class)
+class CategoryAppControllerTest
+{
+    @Mock
+    private ICategoryAppService categoryAppService;
+
+    @InjectMocks
+    private CategoryAppController controller;
+
+    private MockMvc mockMvc;
+
+    @BeforeEach
+    void setUp()
+    {
+        mockMvc = MockMvcBuilders.standaloneSetup(controller).build();
+    }
+
+    @Test
+    void tree_returns200WithoutToken() throws Exception
+    {
+        CategoryVisibleVO l1 = new CategoryVisibleVO();
+        l1.setCategoryId(1L);
+        l1.setCategoryName("兽药");
+        l1.setSortNo(0);
+        CategoryVisibleChildVO child = new CategoryVisibleChildVO();
+        child.setCategoryId(11L);
+        child.setCategoryName("抗生素");
+        l1.getChildren().add(child);
+        when(categoryAppService.listCategoryTree()).thenReturn(Collections.singletonList(l1));
+
+        mockMvc.perform(get("/api/category/tree"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(200))
+                .andExpect(jsonPath("$.data[0].categoryId").value(1))
+                .andExpect(jsonPath("$.data[0].categoryName").value("兽药"))
+                .andExpect(jsonPath("$.data[0].children[0].categoryId").value(11))
+                .andExpect(jsonPath("$.data[0].children[0].categoryName").value("抗生素"));
+    }
+
+    @Test
+    void tree_emptyList() throws Exception
+    {
+        when(categoryAppService.listCategoryTree()).thenReturn(Collections.emptyList());
+
+        mockMvc.perform(get("/api/category/tree"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(200))
+                .andExpect(jsonPath("$.data").isArray())
+                .andExpect(jsonPath("$.data").isEmpty());
+    }
+
+    @Test
+    void level2Tabs_returns200() throws Exception
+    {
+        CategoryVisibleChildVO tab1 = new CategoryVisibleChildVO();
+        tab1.setCategoryId(11L);
+        tab1.setCategoryName("抗生素");
+        tab1.setSortNo(0);
+        CategoryVisibleChildVO tab2 = new CategoryVisibleChildVO();
+        tab2.setCategoryId(12L);
+        tab2.setCategoryName("驱虫药");
+        tab2.setSortNo(1);
+        when(categoryAppService.listLevel2Tabs(1L)).thenReturn(Arrays.asList(tab1, tab2));
+
+        mockMvc.perform(get("/api/category/1/level2-tabs"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(200))
+                .andExpect(jsonPath("$.data.length()").value(2))
+                .andExpect(jsonPath("$.data[0].categoryName").value("抗生素"));
+    }
+
+    @Test
+    void level2Tabs_invalidLevel1Rejected()
+    {
+        when(categoryAppService.listLevel2Tabs(99999L))
+                .thenThrow(new ServiceException(CategoryAppConstants.MSG_CATEGORY_INVISIBLE));
+
+        NestedServletException ex = assertThrows(NestedServletException.class,
+                () -> mockMvc.perform(get("/api/category/99999/level2-tabs")).andReturn());
+        assertInstanceOf(ServiceException.class, ex.getCause());
+    }
+
+    @Test
+    void goods_returns200WithPagination() throws Exception
+    {
+        when(categoryAppService.listCategoryGoods(any())).thenReturn(Collections.singletonList(goods(1L, "G001")));
+
+        mockMvc.perform(get("/api/category/goods")
+                .param("categoryId", "11")
+                .param("pageNum", "1")
+                .param("pageSize", "10"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(200))
+                .andExpect(jsonPath("$.rows[0].goodsId").value(1))
+                .andExpect(jsonPath("$.rows[0].goodsSn").value("G001"))
+                .andExpect(jsonPath("$.rows[0].goodsName").value("测试商品"))
+                .andExpect(jsonPath("$.rows[0].mainPic").value("/pic/g1.jpg"))
+                .andExpect(jsonPath("$.rows[0].salePrice").value(88.50))
+                .andExpect(jsonPath("$.rows[0].shopId").value(101))
+                .andExpect(jsonPath("$.rows[0].shopName").value("测试店"));
+    }
+
+    @Test
+    void goods_missingCategoryIdRejected()
+    {
+        when(categoryAppService.listCategoryGoods(any()))
+                .thenThrow(new ServiceException(CategoryAppConstants.MSG_CATEGORY_REQUIRED));
+
+        NestedServletException ex = assertThrows(NestedServletException.class,
+                () -> mockMvc.perform(get("/api/category/goods")).andReturn());
+        assertInstanceOf(ServiceException.class, ex.getCause());
+    }
+
+    @Test
+    void goods_invisibleCategoryRejected()
+    {
+        when(categoryAppService.listCategoryGoods(any()))
+                .thenThrow(new ServiceException(CategoryAppConstants.MSG_CATEGORY_INVISIBLE));
+
+        NestedServletException ex = assertThrows(NestedServletException.class,
+                () -> mockMvc.perform(get("/api/category/goods").param("categoryId", "99")).andReturn());
+        assertInstanceOf(ServiceException.class, ex.getCause());
+    }
+
+    @Test
+    void goods_invalidSortRejected()
+    {
+        when(categoryAppService.listCategoryGoods(any()))
+                .thenThrow(new ServiceException(CategoryAppConstants.MSG_SORT_INVALID));
+
+        NestedServletException ex = assertThrows(NestedServletException.class,
+                () -> mockMvc.perform(get("/api/category/goods")
+                        .param("categoryId", "11")
+                        .param("sortBy", "foo")).andReturn());
+        assertInstanceOf(ServiceException.class, ex.getCause());
+    }
+
+    @Test
+    void goods_emptyList() throws Exception
+    {
+        when(categoryAppService.listCategoryGoods(any())).thenReturn(Collections.emptyList());
+
+        mockMvc.perform(get("/api/category/goods").param("categoryId", "11"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(200))
+                .andExpect(jsonPath("$.rows").isArray())
+                .andExpect(jsonPath("$.rows").isEmpty());
+    }
+
+    @Test
+    void goods_returnsMultipleItems() throws Exception
+    {
+        when(categoryAppService.listCategoryGoods(any())).thenReturn(Arrays.asList(
+                goods(1L, "G001"),
+                goods(2L, "G002")));
+
+        mockMvc.perform(get("/api/category/goods").param("categoryId", "11"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.rows.length()").value(2));
+    }
+
+    @Test
+    void goods_preservesOrder() throws Exception
+    {
+        when(categoryAppService.listCategoryGoods(any())).thenReturn(Arrays.asList(
+                goods(1L, "G001"),
+                goods(3L, "G003")));
+
+        mockMvc.perform(get("/api/category/goods").param("categoryId", "11"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.rows[0].goodsId").value(1))
+                .andExpect(jsonPath("$.rows[1].goodsId").value(3));
+    }
+
+    private static HomeHotGoodsVO goods(Long goodsId, String goodsSn)
+    {
+        HomeHotGoodsVO vo = new HomeHotGoodsVO();
+        vo.setGoodsId(goodsId);
+        vo.setGoodsSn(goodsSn);
+        vo.setGoodsName("测试商品");
+        vo.setMainPic("/pic/g1.jpg");
+        vo.setSalePrice(new BigDecimal("88.50"));
+        vo.setShopId(101L);
+        vo.setShopName("测试店");
+        return vo;
+    }
+}

baqing-shop/src/test/java/com/ruoyi/web/modules/home/service/CategoryAppServiceImplTest.java

@@ -0,0 +1,251 @@
+package com.ruoyi.web.modules.home.service;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.web.modules.category.constant.CategoryConstants;
+import com.ruoyi.web.modules.category.domain.BizGoodsCategory;
+import com.ruoyi.web.modules.category.facade.ICategoryFacade;
+import com.ruoyi.web.modules.category.mapper.BizGoodsCategoryMapper;
+import com.ruoyi.web.modules.category.vo.CategoryVisibleChildVO;
+import com.ruoyi.web.modules.category.vo.CategoryVisibleVO;
+import com.ruoyi.web.modules.home.constant.CategoryAppConstants;
+import com.ruoyi.web.modules.home.dto.CategoryGoodsQuery;
+import com.ruoyi.web.modules.home.mapper.CategoryAppMapper;
+import com.ruoyi.web.modules.home.service.impl.CategoryAppServiceImpl;
+import com.ruoyi.web.modules.home.vo.HomeHotGoodsVO;
+
+/**
+ * C 端商品分类 Service 单元测试（CGC-UT-001～012）
+ */
+@ExtendWith(MockitoExtension.class)
+class CategoryAppServiceImplTest
+{
+    @Mock
+    private ICategoryFacade categoryFacade;
+
+    @Mock
+    private BizGoodsCategoryMapper categoryMapper;
+
+    @Mock
+    private CategoryAppMapper categoryAppMapper;
+
+    @InjectMocks
+    private CategoryAppServiceImpl categoryAppService;
+
+    @Test
+    void listCategoryTree_delegatesPlatformFacade()
+    {
+        CategoryVisibleVO l1 = visibleLevel1(1L, "兽药");
+        when(categoryFacade.listVisibleByShopId(null)).thenReturn(Collections.singletonList(l1));
+
+        List<CategoryVisibleVO> result = categoryAppService.listCategoryTree();
+
+        verify(categoryFacade).listVisibleByShopId(null);
+        assertEquals(1, result.size());
+        assertEquals("兽药", result.get(0).getCategoryName());
+    }
+
+    @Test
+    void listCategoryTree_emptyListWhenNoData()
+    {
+        when(categoryFacade.listVisibleByShopId(null)).thenReturn(Collections.emptyList());
+
+        List<CategoryVisibleVO> result = categoryAppService.listCategoryTree();
+
+        assertNotNull(result);
+        assertTrue(result.isEmpty());
+    }
+
+    @Test
+    void listCategoryTree_nullFacadeResultReturnsEmpty()
+    {
+        when(categoryFacade.listVisibleByShopId(null)).thenReturn(null);
+
+        List<CategoryVisibleVO> result = categoryAppService.listCategoryTree();
+
+        assertNotNull(result);
+        assertTrue(result.isEmpty());
+    }
+
+    @Test
+    void listLevel2Tabs_returnsVisibleChildren()
+    {
+        when(categoryMapper.selectByIdIgnoreShop(1L)).thenReturn(platformLevel1(1L));
+        CategoryVisibleChildVO tab1 = level2Tab(11L, "抗生素", 0);
+        CategoryVisibleChildVO tab2 = level2Tab(12L, "驱虫药", 1);
+        when(categoryAppMapper.selectPlatformLevel2Tabs(1L)).thenReturn(Arrays.asList(tab1, tab2));
+
+        List<CategoryVisibleChildVO> result = categoryAppService.listLevel2Tabs(1L);
+
+        assertEquals(2, result.size());
+        assertEquals("抗生素", result.get(0).getCategoryName());
+    }
+
+    @Test
+    void listLevel2Tabs_hiddenLevel1Rejected()
+    {
+        BizGoodsCategory hidden = platformLevel1(99L);
+        hidden.setShowFlag(CategoryConstants.SHOW_NO);
+        when(categoryMapper.selectByIdIgnoreShop(99L)).thenReturn(hidden);
+
+        ServiceException ex = assertThrows(ServiceException.class,
+                () -> categoryAppService.listLevel2Tabs(99L));
+
+        assertEquals(CategoryAppConstants.MSG_CATEGORY_INVISIBLE, ex.getMessage());
+    }
+
+    @Test
+    void listCategoryGoods_missingCategoryIdRejected()
+    {
+        CategoryGoodsQuery query = new CategoryGoodsQuery();
+
+        ServiceException ex = assertThrows(ServiceException.class,
+                () -> categoryAppService.listCategoryGoods(query));
+
+        assertEquals(CategoryAppConstants.MSG_CATEGORY_REQUIRED, ex.getMessage());
+    }
+
+    @Test
+    void listCategoryGoods_invisibleCategoryRejected()
+    {
+        CategoryGoodsQuery query = new CategoryGoodsQuery();
+        query.setCategoryId(20L);
+        when(categoryFacade.isCategoryVisible(20L)).thenReturn(false);
+
+        ServiceException ex = assertThrows(ServiceException.class,
+                () -> categoryAppService.listCategoryGoods(query));
+
+        assertEquals(CategoryAppConstants.MSG_CATEGORY_INVISIBLE, ex.getMessage());
+    }
+
+    @Test
+    void listCategoryGoods_defaultSalesDescSort()
+    {
+        CategoryGoodsQuery query = new CategoryGoodsQuery();
+        query.setCategoryId(11L);
+        when(categoryFacade.isCategoryVisible(11L)).thenReturn(true);
+        when(categoryAppMapper.selectGoodsByCategory(11L, CategoryAppConstants.DEFAULT_SORT))
+                .thenReturn(Collections.singletonList(goods(1L, "G001")));
+
+        categoryAppService.listCategoryGoods(query);
+
+        verify(categoryAppMapper).selectGoodsByCategory(11L, CategoryAppConstants.SORT_SALES_DESC);
+    }
+
+    @Test
+    void listCategoryGoods_priceAscSort()
+    {
+        CategoryGoodsQuery query = new CategoryGoodsQuery();
+        query.setCategoryId(11L);
+        query.setSortBy(CategoryAppConstants.SORT_PRICE_ASC);
+        when(categoryFacade.isCategoryVisible(11L)).thenReturn(true);
+        when(categoryAppMapper.selectGoodsByCategory(11L, CategoryAppConstants.SORT_PRICE_ASC))
+                .thenReturn(Collections.singletonList(goods(1L, "G001")));
+
+        categoryAppService.listCategoryGoods(query);
+
+        verify(categoryAppMapper).selectGoodsByCategory(11L, CategoryAppConstants.SORT_PRICE_ASC);
+    }
+
+    @Test
+    void listCategoryGoods_invalidSortRejected()
+    {
+        CategoryGoodsQuery query = new CategoryGoodsQuery();
+        query.setCategoryId(11L);
+        query.setSortBy("invalid");
+        when(categoryFacade.isCategoryVisible(11L)).thenReturn(true);
+
+        ServiceException ex = assertThrows(ServiceException.class,
+                () -> categoryAppService.listCategoryGoods(query));
+
+        assertEquals(CategoryAppConstants.MSG_SORT_INVALID, ex.getMessage());
+    }
+
+    @Test
+    void listCategoryGoods_preservesMapperOrder()
+    {
+        CategoryGoodsQuery query = new CategoryGoodsQuery();
+        query.setCategoryId(11L);
+        when(categoryFacade.isCategoryVisible(11L)).thenReturn(true);
+        HomeHotGoodsVO g1 = goods(1L, "G001");
+        HomeHotGoodsVO g3 = goods(3L, "G003");
+        when(categoryAppMapper.selectGoodsByCategory(11L, CategoryAppConstants.DEFAULT_SORT))
+                .thenReturn(Arrays.asList(g1, g3));
+
+        List<HomeHotGoodsVO> result = categoryAppService.listCategoryGoods(query);
+
+        assertEquals(1L, result.get(0).getGoodsId());
+        assertEquals(3L, result.get(1).getGoodsId());
+    }
+
+    @Test
+    void listCategoryGoods_emptyListWhenNoGoods()
+    {
+        CategoryGoodsQuery query = new CategoryGoodsQuery();
+        query.setCategoryId(11L);
+        when(categoryFacade.isCategoryVisible(11L)).thenReturn(true);
+        when(categoryAppMapper.selectGoodsByCategory(11L, CategoryAppConstants.DEFAULT_SORT))
+                .thenReturn(Collections.emptyList());
+
+        List<HomeHotGoodsVO> result = categoryAppService.listCategoryGoods(query);
+
+        assertNotNull(result);
+        assertTrue(result.isEmpty());
+    }
+
+    private static CategoryVisibleVO visibleLevel1(Long id, String name)
+    {
+        CategoryVisibleVO vo = new CategoryVisibleVO();
+        vo.setCategoryId(id);
+        vo.setCategoryName(name);
+        vo.setSortNo(0);
+        return vo;
+    }
+
+    private static BizGoodsCategory platformLevel1(Long id)
+    {
+        BizGoodsCategory c = new BizGoodsCategory();
+        c.setCategoryId(id);
+        c.setShopId(null);
+        c.setCategoryLevel(CategoryConstants.LEVEL_ONE);
+        c.setShowFlag(CategoryConstants.SHOW_YES);
+        c.setDelFlag(CategoryConstants.DEL_FLAG_NORMAL);
+        return c;
+    }
+
+    private static CategoryVisibleChildVO level2Tab(Long id, String name, int sortNo)
+    {
+        CategoryVisibleChildVO vo = new CategoryVisibleChildVO();
+        vo.setCategoryId(id);
+        vo.setCategoryName(name);
+        vo.setSortNo(sortNo);
+        return vo;
+    }
+
+    private static HomeHotGoodsVO goods(Long goodsId, String goodsSn)
+    {
+        HomeHotGoodsVO vo = new HomeHotGoodsVO();
+        vo.setGoodsId(goodsId);
+        vo.setGoodsSn(goodsSn);
+        vo.setGoodsName("商品" + goodsSn);
+        vo.setMainPic("/pic/" + goodsSn + ".jpg");
+        vo.setSalePrice(new BigDecimal("88.50"));
+        vo.setShopId(101L);
+        vo.setShopName("测试店");
+        return vo;
+    }
+}