BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 867293a4f9ea5ae12eec52d18782159748a041a7

Authored by 芋道源码
Committed by Gitee
2 parents a440b354 5a5a4246

!724 会员中心商品收藏 

Merge pull request !724 from niou233/feature/mall_product_org
Inline Side-by-side
Showing 11 changed files with 196 additions and 0 deletions
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java
  View file @867293a
@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
12 import com.baomidou.mybatisplus.core.toolkit.support.SFunction; 12 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
13 import com.baomidou.mybatisplus.extension.toolkit.Db; 13 import com.baomidou.mybatisplus.extension.toolkit.Db;
14 import com.github.yulichang.base.MPJBaseMapper; 14 import com.github.yulichang.base.MPJBaseMapper;
  15 +import com.github.yulichang.interfaces.MPJBaseJoin;
15 import org.apache.ibatis.annotations.Param; 16 import org.apache.ibatis.annotations.Param;
16 17
17 import java.util.Collection; 18 import java.util.Collection;
@@ -132,4 +133,10 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> { @@ -132,4 +133,10 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
132 Db.saveOrUpdateBatch(collection); 133 Db.saveOrUpdateBatch(collection);
133 } 134 }
134 135
  136 + default <DTO> PageResult<DTO> selectJoinPage(PageParam pageParam, Class<DTO> resultTypeClass, MPJBaseJoin<T> joinQueryWrapper) {
  137 + IPage<DTO> mpPage = MyBatisUtils.buildPage(pageParam);
  138 + selectJoinPage(mpPage, resultTypeClass, joinQueryWrapper);
  139 + // 转换返回
  140 + return new PageResult<>(mpPage.getRecords(), mpPage.getTotal());
  141 + }
135 } 142 }
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/favorite/ProductFavoriteController.java 0 → 100644
  View file @867293a
  1 +package cn.iocoder.yudao.module.product.controller.admin.favorite;
  2 +
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  5 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  6 +import cn.iocoder.yudao.module.product.controller.admin.favorite.vo.ProductFavoritePageReqVO;
  7 +import cn.iocoder.yudao.module.product.controller.admin.favorite.vo.ProductFavoriteRespVO;
  8 +import cn.iocoder.yudao.module.product.convert.favorite.ProductFavoriteConvert;
  9 +import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDO;
  10 +import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
  11 +import cn.iocoder.yudao.module.product.service.favorite.ProductFavoriteService;
  12 +import cn.iocoder.yudao.module.product.service.spu.ProductSpuService;
  13 +import io.swagger.v3.oas.annotations.Operation;
  14 +import io.swagger.v3.oas.annotations.tags.Tag;
  15 +import org.springframework.security.access.prepost.PreAuthorize;
  16 +import org.springframework.validation.annotation.Validated;
  17 +import org.springframework.web.bind.annotation.GetMapping;
  18 +import org.springframework.web.bind.annotation.RequestMapping;
  19 +import org.springframework.web.bind.annotation.RestController;
  20 +
  21 +import javax.annotation.Resource;
  22 +import javax.validation.Valid;
  23 +import java.util.List;
  24 +
  25 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  26 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
  27 +
  28 +@Tag(name = "管理后台 - 商品收藏")
  29 +@RestController
  30 +@RequestMapping("/product/favorite")
  31 +@Validated
  32 +public class ProductFavoriteController {
  33 +
  34 + @Resource
  35 + private ProductFavoriteService productFavoriteService;
  36 +
  37 + @Resource
  38 + private ProductSpuService productSpuService;
  39 +
  40 + @GetMapping("/page")
  41 + @Operation(summary = "获得商品收藏分页")
  42 + @PreAuthorize("@ss.hasPermission('product:favorite:query')")
  43 + public CommonResult<PageResult<ProductFavoriteRespVO>> getFavoritePage(@Valid ProductFavoritePageReqVO pageVO) {
  44 + PageResult<ProductFavoriteDO> favoritePage = productFavoriteService.getFavoritePage(pageVO);
  45 + if (CollUtil.isEmpty(favoritePage.getList())) {
  46 + return success(PageResult.empty());
  47 + }
  48 +
  49 + List<ProductSpuDO> list = productSpuService.getSpuList(convertSet(favoritePage.getList(), ProductFavoriteDO::getSpuId));
  50 +
  51 + // 得到商品 spu 信息
  52 + List<ProductFavoriteRespVO> favorites = ProductFavoriteConvert.INSTANCE.convertList2admin(favoritePage.getList(), list);
  53 +
  54 + // 转换 VO 结果
  55 + PageResult<ProductFavoriteRespVO> pageResult = new PageResult<>(favoritePage.getTotal());
  56 + pageResult.setList(favorites);
  57 +
  58 + return success(pageResult);
  59 + }
  60 +}
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/favorite/vo/ProductFavoriteBaseVO.java 0 → 100644
  View file @867293a
  1 +package cn.iocoder.yudao.module.product.controller.admin.favorite.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import javax.validation.constraints.NotNull;
  7 +
  8 +/**
  9 + * 商品收藏 Base VO，提供给添加、修改、详细的子 VO 使用
  10 + * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
  11 + */
  12 +@Data
  13 +public class ProductFavoriteBaseVO {
  14 +
  15 + @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "5036")
  16 + @NotNull(message = "用户编号不能为空")
  17 + private Long userId;
  18 +
  19 +}
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/favorite/vo/ProductFavoritePageReqVO.java 0 → 100644
  View file @867293a
  1 +package cn.iocoder.yudao.module.product.controller.admin.favorite.vo;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
  4 +import io.swagger.v3.oas.annotations.media.Schema;
  5 +import lombok.Data;
  6 +import lombok.EqualsAndHashCode;
  7 +import lombok.ToString;
  8 +
  9 +@Schema(description = "管理后台 - 商品收藏分页 Request VO")
  10 +@Data
  11 +@EqualsAndHashCode(callSuper = true)
  12 +@ToString(callSuper = true)
  13 +public class ProductFavoritePageReqVO extends PageParam {
  14 +
  15 + @Schema(description = "用户编号", example = "5036")
  16 + private Long userId;
  17 +}
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/favorite/vo/ProductFavoriteReqVO.java 0 → 100644
  View file @867293a
  1 +package cn.iocoder.yudao.module.product.controller.admin.favorite.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +import lombok.ToString;
  6 +
  7 +import javax.validation.constraints.NotNull;
  8 +
  9 +@Schema(description = "管理后台 - 商品收藏的单个 Response VO")
  10 +@Data
  11 +@ToString(callSuper = true)
  12 +public class ProductFavoriteReqVO extends ProductFavoriteBaseVO {
  13 +
  14 + @Schema(description = "商品 SPU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "32734")
  15 + @NotNull(message = "商品 SPU 编号不能为空")
  16 + private Long spuId;
  17 +}
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/favorite/vo/ProductFavoriteRespVO.java 0 → 100644
  View file @867293a
  1 +package cn.iocoder.yudao.module.product.controller.admin.favorite.vo;
  2 +
  3 +import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuRespVO;
  4 +import io.swagger.v3.oas.annotations.media.Schema;
  5 +import lombok.Data;
  6 +import lombok.ToString;
  7 +
  8 +@Schema(description = "管理后台 - 商品收藏 Response VO")
  9 +@Data
  10 +@ToString(callSuper = true)
  11 +public class ProductFavoriteRespVO extends ProductSpuRespVO {
  12 +
  13 + @Schema(description = "userId", requiredMode = Schema.RequiredMode.REQUIRED, example = "111")
  14 + private Long userId;
  15 +
  16 + @Schema(description = "spuId", requiredMode = Schema.RequiredMode.REQUIRED, example = "111")
  17 + private Long spuId;
  18 +}
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/favorite/ProductFavoriteConvert.java
  View file @867293a
1 package cn.iocoder.yudao.module.product.convert.favorite; 1 package cn.iocoder.yudao.module.product.convert.favorite;
2 2
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.product.controller.admin.favorite.vo.ProductFavoriteRespVO;
3 import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoriteRespVO; 5 import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoriteRespVO;
4 import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDO; 6 import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDO;
  7 +import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDetailDO;
5 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO; 8 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
6 import org.mapstruct.Mapper; 9 import org.mapstruct.Mapper;
7 import org.mapstruct.Mapping; 10 import org.mapstruct.Mapping;
@@ -10,6 +13,7 @@ import org.mapstruct.factory.Mappers; @@ -10,6 +13,7 @@ import org.mapstruct.factory.Mappers;
10 import java.util.ArrayList; 13 import java.util.ArrayList;
11 import java.util.List; 14 import java.util.List;
12 import java.util.Map; 15 import java.util.Map;
  16 +import java.util.Optional;
13 17
14 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; 18 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
15 19
@@ -34,4 +38,20 @@ public interface ProductFavoriteConvert { @@ -34,4 +38,20 @@ public interface ProductFavoriteConvert {
34 return resultList; 38 return resultList;
35 } 39 }
36 40
  41 + @Mapping(target = "id", source = "favorite.id")
  42 + @Mapping(target = "userId", source = "favorite.userId")
  43 + @Mapping(target = "spuId", source = "favorite.spuId")
  44 + @Mapping(target = "createTime", source = "favorite.createTime")
  45 + ProductFavoriteRespVO convert2admin(ProductSpuDO spu, ProductFavoriteDO favorite);
  46 +
  47 + default List<ProductFavoriteRespVO> convertList2admin(List<ProductFavoriteDO> favorites, List<ProductSpuDO> spus) {
  48 + List<ProductFavoriteRespVO> resultList = new ArrayList<>(spus.size());
  49 + for (ProductFavoriteDO favorite : favorites) {
  50 + Optional<ProductSpuDO> spu = spus.stream().filter(e -> e.getId().equals(favorite.getSpuId())).findFirst();
  51 + resultList.add(convert2admin(spu.get(), favorite));
  52 + }
  53 + return resultList;
  54 + }
  55 +
  56 + PageResult<ProductFavoriteRespVO> convertPage(PageResult<ProductFavoriteDetailDO> page);
37 } 57 }
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/favorite/ProductFavoriteDetailDO.java 0 → 100644
  View file @867293a
  1 +package cn.iocoder.yudao.module.product.dal.dataobject.favorite;
  2 +
  3 +import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
  4 +import lombok.Data;
  5 +
  6 +/**
  7 + * 商品收藏 DO
  8 + *
  9 + * @author 芋道源码
  10 + */
  11 +@Data
  12 +public class ProductFavoriteDetailDO extends ProductFavoriteDO {
  13 +
  14 + ProductSpuDO spuDO;
  15 +}
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/favorite/ProductFavoriteMapper.java
  View file @867293a
@@ -2,9 +2,11 @@ package cn.iocoder.yudao.module.product.dal.mysql.favorite; @@ -2,9 +2,11 @@ package cn.iocoder.yudao.module.product.dal.mysql.favorite;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; 4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  5 +import cn.iocoder.yudao.module.product.controller.admin.favorite.vo.ProductFavoritePageReqVO;
5 import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoritePageReqVO; 6 import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoritePageReqVO;
6 import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDO; 7 import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDO;
7 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 8 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  9 +import com.github.yulichang.wrapper.MPJLambdaWrapper;
8 import org.apache.ibatis.annotations.Mapper; 10 import org.apache.ibatis.annotations.Mapper;
9 11
10 @Mapper 12 @Mapper
@@ -21,6 +23,13 @@ public interface ProductFavoriteMapper extends BaseMapperX&lt;ProductFavoriteDO&gt; { @@ -21,6 +23,13 @@ public interface ProductFavoriteMapper extends BaseMapperX&lt;ProductFavoriteDO&gt; {
21 .orderByDesc(ProductFavoriteDO::getId)); 23 .orderByDesc(ProductFavoriteDO::getId));
22 } 24 }
23 25
  26 + default PageResult<ProductFavoriteDO> selectPageByUserId(ProductFavoritePageReqVO reqVO) {
  27 + return selectPage(reqVO, new MPJLambdaWrapper<ProductFavoriteDO>()
  28 + .selectAll(ProductFavoriteDO.class)
  29 + .eq(ProductFavoriteDO::getUserId, reqVO.getUserId())
  30 + .orderByDesc(ProductFavoriteDO::getCreateTime));
  31 + }
  32 +
24 default Long selectCountByUserId(Long userId) { 33 default Long selectCountByUserId(Long userId) {
25 return selectCount(ProductFavoriteDO::getUserId, userId); 34 return selectCount(ProductFavoriteDO::getUserId, userId);
26 } 35 }
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/favorite/ProductFavoriteService.java
  View file @867293a
1 package cn.iocoder.yudao.module.product.service.favorite; 1 package cn.iocoder.yudao.module.product.service.favorite;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.product.controller.admin.favorite.vo.ProductFavoritePageReqVO;
4 import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoritePageReqVO; 5 import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoritePageReqVO;
5 import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDO; 6 import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDO;
6 7
@@ -38,6 +39,13 @@ public interface ProductFavoriteService { @@ -38,6 +39,13 @@ public interface ProductFavoriteService {
38 PageResult<ProductFavoriteDO> getFavoritePage(Long userId, @Valid AppFavoritePageReqVO reqVO); 39 PageResult<ProductFavoriteDO> getFavoritePage(Long userId, @Valid AppFavoritePageReqVO reqVO);
39 40
40 /** 41 /**
  42 + * 分页查询用户收藏列表
  43 + *
  44 + * @param reqVO 请求 vo
  45 + */
  46 + PageResult<ProductFavoriteDO> getFavoritePage(@Valid ProductFavoritePageReqVO reqVO);
  47 +
  48 + /**
41 * 获取收藏过商品 49 * 获取收藏过商品
42 * 50 *
43 * @param userId 用户编号 51 * @param userId 用户编号
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/favorite/ProductFavoriteServiceImpl.java
  View file @867293a
1 package cn.iocoder.yudao.module.product.service.favorite; 1 package cn.iocoder.yudao.module.product.service.favorite;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.product.controller.admin.favorite.vo.ProductFavoritePageReqVO;
4 import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoritePageReqVO; 5 import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoritePageReqVO;
5 import cn.iocoder.yudao.module.product.convert.favorite.ProductFavoriteConvert; 6 import cn.iocoder.yudao.module.product.convert.favorite.ProductFavoriteConvert;
6 import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDO; 7 import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDO;
@@ -55,6 +56,11 @@ public class ProductFavoriteServiceImpl implements ProductFavoriteService { @@ -55,6 +56,11 @@ public class ProductFavoriteServiceImpl implements ProductFavoriteService {
55 } 56 }
56 57
57 @Override 58 @Override
  59 + public PageResult<ProductFavoriteDO> getFavoritePage(@Valid ProductFavoritePageReqVO reqVO) {
  60 + return productFavoriteMapper.selectPageByUserId(reqVO);
  61 + }
  62 +
  63 + @Override
58 public ProductFavoriteDO getFavorite(Long userId, Long spuId) { 64 public ProductFavoriteDO getFavorite(Long userId, Long spuId) {
59 return productFavoriteMapper.selectByUserIdAndSpuId(userId, spuId); 65 return productFavoriteMapper.selectByUserIdAndSpuId(userId, spuId);
60 } 66 }