Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product

# Conflicts:
#	sql/mysql/optional/mall.sql

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/favorite/AppFavoriteController.java

@@ -1,22 +1,28 @@
 package cn.iocoder.yudao.module.product.controller.app.favorite;
 
-import cn.hutool.core.lang.Assert;
+import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoritePageReqVO;
 import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoriteReqVO;
-import cn.iocoder.yudao.module.product.service.favorite.ProductFavoriteService;
 import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoriteRespVO;
+import cn.iocoder.yudao.module.product.convert.favorite.ProductFavoriteConvert;
+import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
+import cn.iocoder.yudao.module.product.service.favorite.ProductFavoriteService;
+import cn.iocoder.yudao.module.product.service.spu.ProductSpuService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.module.product.enums.favorite.ProductFavoriteTypeEnum.COLLECT;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
 @Tag(name = "用户 APP - 商品收藏")
 @RestController
@@ -25,31 +31,48 @@ public class AppFavoriteController {
 
     @Resource
     private ProductFavoriteService productFavoriteService;
+    @Resource
+    private ProductSpuService productSpuService;
 
-    // TODO @jason：创建；create
-    @PostMapping(value = "/collect")
+    @PostMapping(value = "/create")
     @Operation(summary = "商品收藏")
-    public CommonResult<Boolean> collect(@RequestBody @Valid AppFavoriteReqVO reqVO) {
-        Assert.isTrue(Objects.equals(COLLECT.getType(), reqVO.getType()), "参数type 不匹配");
-        return success(productFavoriteService.collect(reqVO));
+    //@PreAuthenticated  TODO 暂时注释
+    public CommonResult<Long> createFavorite(@RequestBody @Valid AppFavoriteReqVO reqVO) {
+        return success(productFavoriteService.createFavorite(getLoginUserId(), reqVO));
     }
 
-    // TODO @jason：创建；delete；使用 @DeleteMapping
-    @PostMapping(value = "/cancelCollect")
-    @Operation(summary = "取消商品收藏(通过商品详情)")
-    public CommonResult<Boolean> cancelCollect(@RequestBody @Valid AppFavoriteReqVO reqVO) {
-        // TODO @jason：是不是不用校验呀？
-        Assert.isTrue(Objects.equals(COLLECT.getType(), reqVO.getType()), "参数type 不匹配");
-        return success(productFavoriteService.cancelCollect(reqVO));
+    @DeleteMapping(value = "/delete")
+    @Operation(summary = "取消商品收藏")
+    public CommonResult<Boolean> deleteFavorite(@RequestBody @Valid AppFavoriteReqVO reqVO) {
+        productFavoriteService.deleteFavorite(getLoginUserId(), reqVO);
+        return success(Boolean.TRUE);
     }
 
-    // TODO @jason：page；分页
-    @GetMapping(value = "/collectList")
-    @Operation(summary = "商品收藏列表")
-    public CommonResult<PageResult<AppFavoriteRespVO>> pageCollectList(AppFavoritePageReqVO reqVO) {
-        return success(productFavoriteService.pageCollectList(reqVO));
+    @GetMapping(value = "/page")
+    @Operation(summary = "分页获取商品收藏列表")
+    public CommonResult<PageResult<AppFavoriteRespVO>> getFavoritePage(AppFavoritePageReqVO reqVO) {
+        PageResult<ProductFavoriteDO> favoritePage = productFavoriteService.getFavoritePage(getLoginUserId(), reqVO);
+        if (CollUtil.isEmpty(favoritePage.getList())) {
+            return success(PageResult.empty());
+        }
+
+        // 得到商品 spu 信息
+        List<ProductFavoriteDO> favorites = favoritePage.getList();
+        List<Long> spuIds = convertList(favorites, ProductFavoriteDO::getSpuId);
+        List<ProductSpuDO> spus = productSpuService.getSpuList(spuIds);
+
+        // 转换 VO 结果
+        PageResult<AppFavoriteRespVO> pageResult = new PageResult<>(favoritePage.getTotal());
+        pageResult.setList(ProductFavoriteConvert.INSTANCE.convertList(favorites, spus));
+        return success(pageResult);
     }
 
-    // TODO @json：需要在给一个，用户查询某个商品是否收藏；详情页要用
+
+    @GetMapping(value = "/exits")
+    @Operation(summary = "检查是否收藏过商品")
+    public CommonResult<Boolean> isFavoriteExists(AppFavoriteReqVO reqVO) {
+        ProductFavoriteDO favoriteDO = productFavoriteService.getFavorite(getLoginUserId(), reqVO);
+        return success(Objects.nonNull(favoriteDO));
+    }
 
 }

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/favorite/vo/AppFavoriteReqVO.java

@@ -9,7 +9,7 @@ import javax.validation.constraints.NotNull;
 
 import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
 
-@Schema(description = "用户 APP - 商品收藏创建 Request VO")
+@Schema(description = "用户 APP - 商品收藏 Request VO") // 用于收藏、取消收藏、获取收藏
 @Data
 public class AppFavoriteReqVO {
 

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/favorite/vo/AppFavoriteRespVO.java

@@ -2,21 +2,19 @@ package cn.iocoder.yudao.module.product.controller.app.favorite.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
 
 @Schema(description = "用户APP - 商品收藏 Response VO")
 @Data
 public class AppFavoriteRespVO {
 
-    // TODO @jason：required true 哈
-    @Schema(description = "编号", example = "1")
+    @Schema(description = "编号", requiredMode = REQUIRED, example = "1")
     private Long id;
 
-    // TODO @jason：required true 哈
-    @Schema(description = "商品 SPU 编号", example = "29502")
+    @Schema(description = "商品 SPU 编号", requiredMode = REQUIRED, example = "29502")
     private Long spuId;
 
-    // TODO @jason：required true 哈
-    @Schema(description = "类型", example = "1")
+    @Schema(description = "类型", requiredMode = REQUIRED, example = "1")
     private Integer type;
 
     // ========== 商品相关字段 ==========

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/favorite/ProductFavoriteConvert.java

@@ -1,14 +1,38 @@
 package cn.iocoder.yudao.module.product.convert.favorite;
 
 import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoriteReqVO;
+import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoriteRespVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
 import org.mapstruct.factory.Mappers;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
+
 @Mapper
 public interface ProductFavoriteConvert {
 
     ProductFavoriteConvert INSTANCE = Mappers.getMapper(ProductFavoriteConvert.class);
 
     ProductFavoriteDO convert(Long userId, AppFavoriteReqVO reqVO);
+
+    @Mapping(target = "id", source = "favorite.id")
+    @Mapping(target = "spuName", source = "spu.name")
+    AppFavoriteRespVO convert(ProductSpuDO spu, ProductFavoriteDO favorite);
+
+    default List<AppFavoriteRespVO> convertList(List<ProductFavoriteDO> favorites, List<ProductSpuDO> spus) {
+        List<AppFavoriteRespVO> resultList = new ArrayList<>(favorites.size());
+        Map<Long, ProductSpuDO> spuMap = convertMap(spus, ProductSpuDO::getId);
+        for (ProductFavoriteDO favorite : favorites) {
+            ProductSpuDO spuDO = spuMap.get(favorite.getSpuId());
+            resultList.add(convert(spuDO, favorite));
+        }
+        return resultList;
+    }
+
 }

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/delivery/DeliveryTemplateDO.java

@@ -1,30 +0,0 @@
-package cn.iocoder.yudao.module.product.dal.dataobject.delivery;
-
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-/**
- * 配送模板 SPU DO
- *
- * @author 芋道源码
- */
-@TableName("delivery_template")
-@KeySequence("delivery_template_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class DeliveryTemplateDO extends BaseDO {
-
-    /**
-     * 编号，自增
-     */
-    @TableId
-    private Long id;
-
-}

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/favorite/ProductFavoriteDO.java

@@ -1,14 +1,15 @@
 package cn.iocoder.yudao.module.product.dal.dataobject.favorite;
 
-import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
+import cn.iocoder.yudao.module.product.enums.favorite.ProductFavoriteTypeEnum;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
 /**
- * 喜爱商品 DO
+ * 商品收藏 DO
  *
  * @author 芋道源码
  */
@@ -20,7 +21,7 @@ import lombok.*;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class ProductFavoriteDO extends TenantBaseDO { // TODO @jason：如无必要，使用 BaseDO 哈。例如说 tenant_id 在业务里，是否需要使用到
+public class ProductFavoriteDO extends BaseDO {
 
     /**
      * 编号，主键自增
@@ -40,7 +41,9 @@ public class ProductFavoriteDO extends TenantBaseDO { // TODO @jason：如无必
      */
     private Long spuId;
     /**
-     * 类型  1 收藏；2 点赞 // TODO @jason：不要注释 1 收藏 2 点赞；而是注释好，它对应的枚举类
+     * 类型
+     *
+     * 枚举 {@link ProductFavoriteTypeEnum}
      */
     private Integer type;
 

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java

@@ -1,10 +1,8 @@
 package cn.iocoder.yudao.module.product.dal.dataobject.spu;
 
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.brand.ProductBrandDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.category.ProductCategoryDO;
-import cn.iocoder.yudao.module.product.dal.dataobject.delivery.DeliveryTemplateDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 import cn.iocoder.yudao.module.product.enums.spu.ProductSpuStatusEnum;
 import com.baomidou.mybatisplus.annotation.KeySequence;
@@ -143,7 +141,7 @@ public class ProductSpuDO extends BaseDO {
     /**
      * 物流配置模板编号
      *
-     * 关联 {@link DeliveryTemplateDO#getId()}
+     * 关联 { TradeDeliveryExpressTemplateDO#getId()}
      */
     private Long deliveryTemplateId;
 

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/favorite/ProductFavoriteMapper.java

@@ -1,38 +1,28 @@
 package cn.iocoder.yudao.module.product.dal.mysql.favorite;
 
-import cn.hutool.core.lang.Assert;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils;
 import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDO;
-import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoriteRespVO;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface ProductFavoriteMapper extends BaseMapperX<ProductFavoriteDO> {
 
-    default  ProductFavoriteDO selectByUserAndSpuAndType(Long userId, Long spuId, Integer type) {
-        Assert.notNull(userId, "the userId argument  must not be null");
-        Assert.notNull(spuId, "the spuId argument must not be null");
-        Assert.notNull(type, "the type argument must not be null");
+    default ProductFavoriteDO selectByUserAndSpuAndType(Long userId, Long spuId, Integer type) {
         return selectOne(new LambdaQueryWrapperX<ProductFavoriteDO>()
                 .eq(ProductFavoriteDO::getUserId, userId)
                 .eq(ProductFavoriteDO::getSpuId, spuId)
                 .eq(ProductFavoriteDO::getType, type));
     }
 
-    default PageResult<AppFavoriteRespVO> selectPageByUserAndType(Long userId, Integer type, PageParam pageParam){
-        Page<AppFavoriteRespVO> page =  MyBatisUtils.buildPage(pageParam);
-        page = selectFavoriteProductList(page, userId, type);
-        return new PageResult<>(page.getRecords(), page.getTotal());
+    default PageResult<ProductFavoriteDO> selectPageByUserAndType(Long userId, Integer type, PageParam pageParam) {
+        return selectPage(pageParam, new LambdaQueryWrapper<ProductFavoriteDO>()
+                .eq(ProductFavoriteDO::getUserId, userId)
+                .eq(ProductFavoriteDO::getType, type)
+                .orderByDesc(ProductFavoriteDO::getId));
     }
 
-    // TODO @jason：内存中拼接哈。这样好兼容更多的 db 类型；
-    Page<AppFavoriteRespVO> selectFavoriteProductList(Page<AppFavoriteRespVO> page,
-                                                      @Param("userId") Long userId,
-                                                      @Param("type") Integer type);
 }

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/favorite/ProductFavoriteService.java

@@ -4,31 +4,47 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoritePageReqVO;
 import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoriteReqVO;
 import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoriteRespVO;
+import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDO;
 
 import javax.validation.Valid;
 
 /**
- * 喜爱商品 Service 接口
+ * 商品收藏 Service 接口
  *
  * @author jason
  */
 public interface ProductFavoriteService {
 
     /**
-     * 商品收藏
-     * @param reqVO 请求vo
+     * 创建商品收藏
+     *
+     * @param userId 用户 id
+     * @param reqVO 请求 vo
      */
-    Boolean collect(@Valid  AppFavoriteReqVO reqVO);
+    Long createFavorite(Long userId, @Valid AppFavoriteReqVO reqVO);
 
     /**
-     * 取消商品收藏 (通过商品详情页面)
-     * @param reqVO 请求vo
+     * 取消商品收藏
+     *
+     * @param userId 用户 id
+     * @param reqVO 请求 vo
      */
-    Boolean cancelCollect(@Valid AppFavoriteReqVO reqVO);
+    void deleteFavorite(Long userId, @Valid AppFavoriteReqVO reqVO);
 
     /**
      * 分页查询用户收藏列表
+     *
+     * @param userId 用户 id
      * @param reqVO 请求 vo
      */
-    PageResult<AppFavoriteRespVO> pageCollectList(@Valid AppFavoritePageReqVO reqVO);
+    PageResult<ProductFavoriteDO> getFavoritePage(Long userId, @Valid AppFavoritePageReqVO reqVO);
+
+    /**
+     * 获取收藏过商品
+     *
+     * @param userId 用户id
+     * @param reqVO 请求 vo
+     */
+    ProductFavoriteDO getFavorite(Long userId, @Valid AppFavoriteReqVO reqVO);
+
 }

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/favorite/ProductFavoriteServiceImpl.java

@@ -6,7 +6,6 @@ import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoriteReq
 import cn.iocoder.yudao.module.product.convert.favorite.ProductFavoriteConvert;
 import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDO;
 import cn.iocoder.yudao.module.product.dal.mysql.favorite.ProductFavoriteMapper;
-import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoriteRespVO;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -15,9 +14,8 @@ import javax.validation.Valid;
 import java.util.Objects;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.COLLECTION_EXISTS;
-import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.COLLECTION_NOT_EXISTS;
+import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.FAVORITE_EXISTS;
+import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.FAVORITE_NOT_EXISTS;
 
 /**
  * 商品收藏 Service 实现类
@@ -29,41 +27,40 @@ import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.COLLECTIO
 public class ProductFavoriteServiceImpl implements ProductFavoriteService {
 
     @Resource
-    private ProductFavoriteMapper mapper;
+    private ProductFavoriteMapper productFavoriteMapper;
 
     @Override
-    public Boolean collect(@Valid AppFavoriteReqVO reqVO) {
-        // TODO @jason：userId 要从 Controller 传递过来，Service 不能有转台
-        Long userId = getLoginUserId();
-       // TODO @jason：代码缩进不对；
-        ProductFavoriteDO favoriteDO = mapper.selectByUserAndSpuAndType(userId, reqVO.getSpuId(), reqVO.getType());
-        if (Objects.nonNull(favoriteDO)) {
-            throw exception(COLLECTION_EXISTS);
+    public Long createFavorite(Long userId, @Valid AppFavoriteReqVO reqVO) {
+        ProductFavoriteDO favorite = productFavoriteMapper.selectByUserAndSpuAndType(
+                userId, reqVO.getSpuId(), reqVO.getType());
+        if (Objects.nonNull(favorite)) {
+            throw exception(FAVORITE_EXISTS);
         }
 
-        // TODO @jason：插入只有成功，不用判断 1
         ProductFavoriteDO entity = ProductFavoriteConvert.INSTANCE.convert(userId, reqVO);
-        int count = mapper.insert(entity);
-        return count == 1;
+        productFavoriteMapper.insert(entity);
+        return entity.getId();
     }
 
     @Override
-    public Boolean cancelCollect(@Valid AppFavoriteReqVO reqVO) {
-        // TODO @jason：代码缩进不对；
-        Long loginUserId = getLoginUserId();
-        ProductFavoriteDO favoriteDO = mapper.selectByUserAndSpuAndType(loginUserId, reqVO.getSpuId(), reqVO.getType());
-        if (Objects.isNull(favoriteDO)) {
-            throw exception(COLLECTION_NOT_EXISTS);
+    public void deleteFavorite(Long userId, @Valid AppFavoriteReqVO reqVO) {
+        ProductFavoriteDO favorite = productFavoriteMapper.selectByUserAndSpuAndType(
+                userId, reqVO.getSpuId(), reqVO.getType());
+        if (Objects.isNull(favorite)) {
+            throw exception(FAVORITE_NOT_EXISTS);
         }
-        // TODO @jason：插入只有成功，不用判断 1
-        int count = mapper.deleteById(favoriteDO.getId());
-        return count == 1;
+
+        productFavoriteMapper.deleteById(favorite.getId());
     }
 
     @Override
-    public PageResult<AppFavoriteRespVO> pageCollectList(@Valid AppFavoritePageReqVO reqVO) {
-        Long userId = getLoginUserId();
-        return mapper.selectPageByUserAndType(userId, reqVO.getType(), reqVO);
+    public PageResult<ProductFavoriteDO> getFavoritePage(Long userId, @Valid AppFavoritePageReqVO reqVO) {
+        return productFavoriteMapper.selectPageByUserAndType(userId, reqVO.getType(), reqVO);
+    }
+
+    @Override
+    public ProductFavoriteDO getFavorite(Long userId, @Valid AppFavoriteReqVO reqVO) {
+        return productFavoriteMapper.selectByUserAndSpuAndType(userId, reqVO.getSpuId(), reqVO.getType());
     }
 
 }

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java

@@ -2,8 +2,11 @@ package cn.iocoder.yudao.module.product.service.spu;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.product.controller.admin.category.vo.ProductCategoryListReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateOrUpdateReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.spu.vo.*;
@@ -203,8 +206,16 @@ public class ProductSpuServiceImpl implements ProductSpuService {
 
     @Override
     public PageResult<ProductSpuDO> getSpuPage(AppProductSpuPageReqVO pageReqVO) {
-        //return productSpuMapper.selectPage(pageReqVO); TODO 有差异接口接受参数类型不对
-        return null;
+        // 查找时，如果查找某个分类编号，则包含它的子分类。因为顶级分类不包含商品
+        Set<Long> categoryIds = new HashSet<>();
+        if (pageReqVO.getCategoryId() != null && pageReqVO.getCategoryId() > 0) {
+            categoryIds.add(pageReqVO.getCategoryId());
+            List<ProductCategoryDO> categoryChildren = categoryService.getEnableCategoryList(new ProductCategoryListReqVO()
+                    .setParentId(pageReqVO.getCategoryId()).setStatus(CommonStatusEnum.ENABLE.getStatus()));
+            categoryIds.addAll(CollectionUtils.convertList(categoryChildren, ProductCategoryDO::getId));
+        }
+        // 分页查询
+        return productSpuMapper.selectPage(pageReqVO, categoryIds);
     }
 
     @Override

yudao-module-mall/yudao-module-product-biz/src/main/resources/mapper/favorite/ProductFavoriteMapper.xml

@@ -1,22 +0,0 @@
-<?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="cn.iocoder.yudao.module.product.dal.mysql.favorite.ProductFavoriteMapper">
-
-    <!--
-        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
-        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
-        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
-        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
-     -->
-
-    <select id="selectFavoriteProductList"
-            resultType="cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoriteRespVO">
-        SELECT f.id, f.type, f.spu_id as spuId , p.name as spuName, p.pic_url as picUrl , p.price
-        FROM product_favorite f
-        INNER JOIN product_spu p ON f.spu_id = p.id and f.deleted = 0
-        where f.type = #{type} and f.user_id = #{userId}
-        ORDER BY f.id DESC
-
-    </select>
-
-</mapper>