BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 98aae5ed1a176283f937834b9074eb1f755a5b0f

Authored by dongshanshan
1 parent 48b1c19f

feat: 会员商品收藏

Inline Side-by-side
Showing 12 changed files with 314 additions and 2 deletions
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java
  View file @98aae5e
... ... @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
12 12 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
13 13 import com.baomidou.mybatisplus.extension.toolkit.Db;
14 14 import com.github.yulichang.base.MPJBaseMapper;
  15 +import com.github.yulichang.interfaces.MPJBaseJoin;
15 16 import org.apache.ibatis.annotations.Param;
16 17  
17 18 import java.util.Collection;
... ... @@ -132,4 +133,10 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
132 133 Db.saveOrUpdateBatch(collection);
133 134 }
134 135  
  136 + default <DTO> PageResult<DTO> selectJoinPage(PageParam pageParam, @Param("resultTypeClass_Eg1sG") Class<DTO> var2, @Param("ew") MPJBaseJoin<T> queryWrapper) {
  137 + IPage<DTO> mpPage = MyBatisUtils.buildPage(pageParam);
  138 + selectJoinPage(mpPage, var2, queryWrapper);
  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 @98aae5e
  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.framework.security.core.annotations.PreAuthenticated;
  7 +import cn.iocoder.yudao.module.product.controller.admin.favorite.vo.ProductFavoriteBatchReqVO;
  8 +import cn.iocoder.yudao.module.product.controller.admin.favorite.vo.ProductFavoritePageReqVO;
  9 +import cn.iocoder.yudao.module.product.controller.admin.favorite.vo.ProductFavoriteReqVO;
  10 +import cn.iocoder.yudao.module.product.controller.admin.favorite.vo.ProductFavoriteRespVO;
  11 +import cn.iocoder.yudao.module.product.convert.favorite.ProductFavoriteConvert;
  12 +import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDO;
  13 +import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDetailDO;
  14 +import cn.iocoder.yudao.module.product.service.favorite.ProductFavoriteService;
  15 +import io.swagger.v3.oas.annotations.Operation;
  16 +import io.swagger.v3.oas.annotations.Parameter;
  17 +import io.swagger.v3.oas.annotations.tags.Tag;
  18 +import org.springframework.security.access.prepost.PreAuthorize;
  19 +import org.springframework.validation.annotation.Validated;
  20 +import org.springframework.web.bind.annotation.*;
  21 +
  22 +import javax.annotation.Resource;
  23 +import javax.validation.Valid;
  24 +import java.util.List;
  25 +
  26 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  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 + @PostMapping("/create")
  38 + @Operation(summary = "添加单个商品收藏")
  39 + @PreAuthorize("@ss.hasPermission('product:favorite:create')")
  40 + public CommonResult<Long> createFavorite(@Valid @RequestBody ProductFavoriteReqVO reqVO) {
  41 + return success(productFavoriteService.createFavorite(reqVO.getUserId(), reqVO.getSpuId()));
  42 + }
  43 +
  44 + @PostMapping("/create-list")
  45 + @Operation(summary = "添加多个商品收藏")
  46 + @PreAuthorize("@ss.hasPermission('product:favorite:create')")
  47 + public CommonResult<Boolean> createFavoriteList(@Valid @RequestBody ProductFavoriteBatchReqVO reqVO) {
  48 + // todo @jason：待实现；如果有已经收藏的，不用报错，忽略即可；
  49 + return success(Boolean.TRUE);
  50 + }
  51 +
  52 + @DeleteMapping("/delete")
  53 + @Operation(summary = "取消单个商品收藏")
  54 + @PreAuthorize("@ss.hasPermission('product:favorite:delete')")
  55 + public CommonResult<Boolean> deleteFavorite(@Valid @RequestBody ProductFavoriteReqVO reqVO) {
  56 + productFavoriteService.deleteFavorite(reqVO.getUserId(), reqVO.getSpuId());
  57 + return success(Boolean.TRUE);
  58 + }
  59 +
  60 + @DeleteMapping("/delete-list")
  61 + @Operation(summary = "取消单个商品收藏")
  62 + @PreAuthorize("@ss.hasPermission('product:favorite:delete')")
  63 + public CommonResult<Boolean> deleteFavoriteList(@Valid @RequestBody ProductFavoriteBatchReqVO reqVO) {
  64 + // todo @jason：待实现
  65 +// productFavoriteService.deleteFavorite(getLoginUserId(), reqVO.getSpuId());
  66 + return success(Boolean.TRUE);
  67 + }
  68 +
  69 + @GetMapping("/page")
  70 + @Operation(summary = "获得商品收藏分页")
  71 + @PreAuthorize("@ss.hasPermission('product:favorite:query')")
  72 + public CommonResult<PageResult<ProductFavoriteRespVO>> getFavoritePage(@Valid ProductFavoritePageReqVO pageVO) {
  73 + PageResult<ProductFavoriteDetailDO> favoritePage = productFavoriteService.getFavoritePageByFilter(pageVO);
  74 + if (CollUtil.isEmpty(favoritePage.getList())) {
  75 + return success(PageResult.empty());
  76 + }
  77 +
  78 + // 得到商品 spu 信息
  79 + List<ProductFavoriteRespVO> favorites = ProductFavoriteConvert.INSTANCE.convertList2admin(favoritePage.getList());
  80 +
  81 + // 转换 VO 结果
  82 + PageResult<ProductFavoriteRespVO> pageResult = new PageResult<>(favoritePage.getTotal());
  83 + pageResult.setList(favorites);
  84 +
  85 + return success(pageResult);
  86 + }
  87 +
  88 + @PostMapping(value = "/exits")
  89 + @Operation(summary = "检查是否收藏过商品")
  90 + @PreAuthenticated
  91 + public CommonResult<Boolean> isFavoriteExists(@Valid @RequestBody ProductFavoriteReqVO reqVO) {
  92 + ProductFavoriteDO favorite = productFavoriteService.getFavorite(reqVO.getUserId(), reqVO.getSpuId());
  93 + return success(favorite != null);
  94 + }
  95 +
  96 + @GetMapping(value = "/get-count")
  97 + @Operation(summary = "获得商品收藏数量")
  98 + @Parameter(name = "userId", description = "用户编号", required = true)
  99 + @PreAuthenticated
  100 + public CommonResult<Long> getFavoriteCount(@RequestParam("userId") Long userId) {
  101 + return success(productFavoriteService.getFavoriteCount(userId));
  102 + }
  103 +
  104 +}
... ...
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 @98aae5e
  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 +
  20 +
  21 +}
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/favorite/vo/ProductFavoriteBatchReqVO.java 0 → 100644
  View file @98aae5e
  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 +import java.util.List;
  9 +
  10 +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
  11 +
  12 +@Schema(description = "管理后台 - 商品收藏的批量 Request VO")
  13 +@Data
  14 +@ToString(callSuper = true)
  15 +public class ProductFavoriteBatchReqVO extends ProductFavoriteBaseVO{
  16 +
  17 + @Schema(description = "商品 SPU 编号数组", requiredMode = REQUIRED, example = "29502")
  18 + @NotNull(message = "商品 SPU 编号数组不能为空")
  19 + private List<Long> spuIds;
  20 +
  21 +}
... ...
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 @98aae5e
  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 +import org.springframework.format.annotation.DateTimeFormat;
  9 +
  10 +import java.time.LocalDateTime;
  11 +
  12 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
  13 +
  14 +@Schema(description = "管理后台 - 商品收藏分页 Request VO")
  15 +@Data
  16 +@EqualsAndHashCode(callSuper = true)
  17 +@ToString(callSuper = true)
  18 +public class ProductFavoritePageReqVO extends PageParam {
  19 +
  20 + @Schema(description = "用户编号", example = "5036")
  21 + private Long userId;
  22 +
  23 + @Schema(description = "商品 SPU 编号", example = "32734")
  24 + private Long spuId;
  25 +
  26 + @Schema(description = "收藏时间")
  27 + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
  28 + private LocalDateTime[] createTime;
  29 +
  30 + @Schema(description = "商品名称", example = "5036")
  31 + private String name;
  32 +
  33 + @Schema(description = "关键字", example = "5036")
  34 + private String keyword;
  35 +}
... ...
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 @98aae5e
  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 @98aae5e
  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 +
  19 + @Schema(description = "收藏状态", example = "1")
  20 + private Integer favoriteStatus;
  21 +
  22 +}
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/favorite/ProductFavoriteConvert.java
  View file @98aae5e
1 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 5 import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoriteRespVO;
4 6 import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDO;
  7 +import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDetailDO;
5 8 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
6 9 import org.mapstruct.Mapper;
7 10 import org.mapstruct.Mapping;
... ... @@ -34,4 +37,20 @@ public interface ProductFavoriteConvert {
34 37 return resultList;
35 38 }
36 39  
  40 + @Mapping(target = "id", source = "favorite.id")
  41 + @Mapping(target = "userId", source = "favorite.userId")
  42 + @Mapping(target = "spuId", source = "favorite.spuId")
  43 + @Mapping(target = "createTime", source = "favorite.createTime")
  44 + @Mapping(target = "favoriteStatus", constant = "1")
  45 + ProductFavoriteRespVO convert2admin(ProductSpuDO spu, ProductFavoriteDO favorite);
  46 +
  47 + default List<ProductFavoriteRespVO> convertList2admin(List<ProductFavoriteDetailDO> favorites) {
  48 + List<ProductFavoriteRespVO> resultList = new ArrayList<>(favorites.size());
  49 + for (ProductFavoriteDetailDO favorite : favorites) {
  50 + resultList.add(convert2admin(favorite.getSpuDO(), favorite));
  51 + }
  52 + return resultList;
  53 + }
  54 +
  55 + PageResult<ProductFavoriteRespVO> convertPage(PageResult<ProductFavoriteDetailDO> page);
37 56 }
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/favorite/ProductFavoriteDetailDO.java 0 → 100644
  View file @98aae5e
  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 +
  16 +}
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/favorite/ProductFavoriteMapper.java
  View file @98aae5e
... ... @@ -2,9 +2,15 @@ package cn.iocoder.yudao.module.product.dal.mysql.favorite;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  5 +import cn.iocoder.yudao.module.product.controller.admin.favorite.vo.ProductFavoritePageReqVO;
5 6 import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoritePageReqVO;
6 7 import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDO;
  8 +import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDetailDO;
  9 +import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
7 10 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  11 +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
  12 +import com.github.yulichang.wrapper.MPJLambdaWrapper;
  13 +import org.apache.commons.lang3.StringUtils;
8 14 import org.apache.ibatis.annotations.Mapper;
9 15  
10 16 @Mapper
... ... @@ -21,6 +27,36 @@ public interface ProductFavoriteMapper extends BaseMapperX&lt;ProductFavoriteDO&gt; {
21 27 .orderByDesc(ProductFavoriteDO::getId));
22 28 }
23 29  
  30 + default PageResult<ProductFavoriteDetailDO> selectPageByUserAndFields(ProductFavoritePageReqVO reqVO) {
  31 + MPJLambdaWrapper<ProductFavoriteDO> wrapper = new MPJLambdaWrapper<ProductFavoriteDO>()
  32 + .selectAll(ProductFavoriteDO.class)
  33 + .eq(ProductFavoriteDO::getUserId, reqVO.getUserId())
  34 + .selectAssociation(ProductSpuDO.class, ProductFavoriteDetailDO::getSpuDO);
  35 + if(StringUtils.isNotEmpty(reqVO.getName())){
  36 + wrapper.likeRight(ProductSpuDO::getName, reqVO.getName());
  37 + }
  38 + if(StringUtils.isNotEmpty(reqVO.getName()) && StringUtils.isNotEmpty(reqVO.getKeyword())){
  39 + wrapper.or();
  40 + }
  41 + if(StringUtils.isNotEmpty(reqVO.getKeyword())){
  42 + wrapper.likeRight(ProductSpuDO::getKeyword, reqVO.getKeyword());
  43 + }
  44 +
  45 + if(reqVO.getCreateTime() != null){
  46 + if (reqVO.getCreateTime()[0] != null && reqVO.getCreateTime()[1] != null) {
  47 + wrapper.between(ProductFavoriteDO::getCreateTime, reqVO.getCreateTime()[0], reqVO.getCreateTime()[1]);
  48 + }
  49 + if (reqVO.getCreateTime()[0] != null) {
  50 + wrapper.ge(ProductFavoriteDO::getCreateTime, reqVO.getCreateTime()[0]);
  51 + }
  52 + if (reqVO.getCreateTime()[1] != null) {
  53 + wrapper.le(ProductFavoriteDO::getCreateTime, reqVO.getCreateTime()[1]);
  54 + }
  55 + }
  56 +
  57 + return selectJoinPage(reqVO, ProductFavoriteDetailDO.class, wrapper);
  58 + }
  59 +
24 60 default Long selectCountByUserId(Long userId) {
25 61 return selectCount(ProductFavoriteDO::getUserId, userId);
26 62 }
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/favorite/ProductFavoriteService.java
  View file @98aae5e
1 1 package cn.iocoder.yudao.module.product.service.favorite;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.product.controller.admin.favorite.vo.ProductFavoritePageReqVO;
4 5 import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoritePageReqVO;
5 6 import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDO;
  7 +import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDetailDO;
6 8  
7 9 import javax.validation.Valid;
8 10  
... ... @@ -38,6 +40,13 @@ public interface ProductFavoriteService {
38 40 PageResult<ProductFavoriteDO> getFavoritePage(Long userId, @Valid AppFavoritePageReqVO reqVO);
39 41  
40 42 /**
  43 + * 分页查询用户收藏列表
  44 + *
  45 + * @param reqVO 请求 vo
  46 + */
  47 + PageResult<ProductFavoriteDetailDO> getFavoritePageByFilter(@Valid ProductFavoritePageReqVO reqVO);
  48 +
  49 + /**
41 50 * 获取收藏过商品
42 51 *
43 52 * @param userId 用户编号
... ... @@ -52,5 +61,4 @@ public interface ProductFavoriteService {
52 61 * @return 数量
53 62 */
54 63 Long getFavoriteCount(Long userId);
55   -
56 64 }
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/favorite/ProductFavoriteServiceImpl.java
  View file @98aae5e
1 1 package cn.iocoder.yudao.module.product.service.favorite;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.product.controller.admin.favorite.vo.ProductFavoritePageReqVO;
4 5 import cn.iocoder.yudao.module.product.controller.app.favorite.vo.AppFavoritePageReqVO;
5 6 import cn.iocoder.yudao.module.product.convert.favorite.ProductFavoriteConvert;
6 7 import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDO;
  8 +import cn.iocoder.yudao.module.product.dal.dataobject.favorite.ProductFavoriteDetailDO;
7 9 import cn.iocoder.yudao.module.product.dal.mysql.favorite.ProductFavoriteMapper;
8 10 import org.springframework.stereotype.Service;
9 11 import org.springframework.validation.annotation.Validated;
... ... @@ -33,7 +35,6 @@ public class ProductFavoriteServiceImpl implements ProductFavoriteService {
33 35 if (favorite != null) {
34 36 throw exception(FAVORITE_EXISTS);
35 37 }
36   -
37 38 ProductFavoriteDO entity = ProductFavoriteConvert.INSTANCE.convert(userId, spuId);
38 39 productFavoriteMapper.insert(entity);
39 40 return entity.getId();
... ... @@ -55,6 +56,11 @@ public class ProductFavoriteServiceImpl implements ProductFavoriteService {
55 56 }
56 57  
57 58 @Override
  59 + public PageResult<ProductFavoriteDetailDO> getFavoritePageByFilter(@Valid ProductFavoritePageReqVO reqVO) {
  60 + return productFavoriteMapper.selectPageByUserAndFields(reqVO);
  61 + }
  62 +
  63 + @Override
58 64 public ProductFavoriteDO getFavorite(Long userId, Long spuId) {
59 65 return productFavoriteMapper.selectByUserIdAndSpuId(userId, spuId);
60 66 }
... ...