BJ_ZTEITS-Developers / parking-cloud-yudao

Commit c233ce1a206a8edaf3dbfacc9d6efe4c21c03872

Authored by puhui999
2 parents e163ae8b 9980b125

合并分支修复差异

Inline Side-by-side
Showing 34 changed files with 518 additions and 517 deletions
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java
  View file @c233ce1
@@ -46,6 +46,18 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> { @@ -46,6 +46,18 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
46 return selectOne(new LambdaQueryWrapper<T>().eq(field1, value1).eq(field2, value2)); 46 return selectOne(new LambdaQueryWrapper<T>().eq(field1, value1).eq(field2, value2));
47 } 47 }
48 48
  49 + default T selectOne(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Object value2,
  50 + SFunction<T, ?> field3, Object value3) {
  51 + return selectOne(new LambdaQueryWrapper<T>().eq(field1, value1).eq(field2, value2)
  52 + .eq(field3, value3));
  53 + }
  54 +
  55 + default T selectOne(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Object value2,
  56 + SFunction<T, ?> field3, Object value3, SFunction<T, ?> field4, Object value4) {
  57 + return selectOne(new LambdaQueryWrapper<T>().eq(field1, value1).eq(field2, value2)
  58 + .eq(field3, value3).eq(field4, value4));
  59 + }
  60 +
49 default Long selectCount() { 61 default Long selectCount() {
50 return selectCount(new QueryWrapper<T>()); 62 return selectCount(new QueryWrapper<T>());
51 } 63 }
yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/sku/dto/ProductSkuRespDTO.java
  View file @c233ce1
1 package cn.iocoder.yudao.module.product.api.sku.dto; 1 package cn.iocoder.yudao.module.product.api.sku.dto;
2 2
3 -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;  
4 import lombok.Data; 3 import lombok.Data;
5 4
6 import java.util.List; 5 import java.util.List;
@@ -22,13 +21,9 @@ public class ProductSkuRespDTO { @@ -22,13 +21,9 @@ public class ProductSkuRespDTO {
22 * SPU 编号 21 * SPU 编号
23 */ 22 */
24 private Long spuId; 23 private Long spuId;
25 - /**  
26 - * SPU 名字  
27 - */  
28 - private String spuName;  
29 24
30 /** 25 /**
31 - * 属性数组，JSON 格式 26 + * 属性数组
32 */ 27 */
33 private List<Property> properties; 28 private List<Property> properties;
34 /** 29 /**
@@ -52,12 +47,6 @@ public class ProductSkuRespDTO { @@ -52,12 +47,6 @@ public class ProductSkuRespDTO {
52 */ 47 */
53 private String picUrl; 48 private String picUrl;
54 /** 49 /**
55 - * SKU 状态  
56 - * <p>  
57 - * 枚举 {@link CommonStatusEnum}  
58 - */  
59 - private Integer status;  
60 - /**  
61 * 库存 50 * 库存
62 */ 51 */
63 private Integer stock; 52 private Integer stock;
@@ -85,11 +74,19 @@ public class ProductSkuRespDTO { @@ -85,11 +74,19 @@ public class ProductSkuRespDTO {
85 */ 74 */
86 private Long propertyId; 75 private Long propertyId;
87 /** 76 /**
  77 + * 属性名字
  78 + */
  79 + private String propertyName;
  80 +
  81 + /**
88 * 属性值编号 82 * 属性值编号
89 */ 83 */
90 private Long valueId; 84 private Long valueId;
  85 + /**
  86 + * 属性值名字
  87 + */
  88 + private String valueName;
91 89
92 } 90 }
93 91
94 -  
95 } 92 }
yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/spu/dto/ProductSpuRespDTO.java
  View file @c233ce1
@@ -28,17 +28,23 @@ public class ProductSpuRespDTO { @@ -28,17 +28,23 @@ public class ProductSpuRespDTO {
28 */ 28 */
29 private String name; 29 private String name;
30 /** 30 /**
31 - * 商品编码 31 + * 关键字
32 */ 32 */
33 - private String code; 33 + private String keyword;
34 /** 34 /**
35 - * 促销语 35 + * 商品简介
36 */ 36 */
37 - private String sellPoint; 37 + private String introduction;
38 /** 38 /**
39 * 商品详情 39 * 商品详情
40 */ 40 */
41 private String description; 41 private String description;
  42 + // TODO @芋艿：是不是要删除
  43 + /**
  44 + * 商品条码（一维码）
  45 + */
  46 + private String barCode;
  47 +
42 /** 48 /**
43 * 商品分类编号 49 * 商品分类编号
44 */ 50 */
@@ -48,13 +54,13 @@ public class ProductSpuRespDTO { @@ -48,13 +54,13 @@ public class ProductSpuRespDTO {
48 */ 54 */
49 private Long brandId; 55 private Long brandId;
50 /** 56 /**
51 - * 商品图片的数组  
52 - * <p>  
53 - * 1. 第一张图片将作为商品主图，支持同时上传多张图；  
54 - * 2. 建议使用尺寸 800x800 像素以上、大小不超过 1M 的正方形图片；  
55 - * 3. 至少 1 张，最多上传 10 张 57 + * 商品封面图
  58 + */
  59 + private String picUrl;
  60 + /**
  61 + * 商品轮播图
56 */ 62 */
57 - private List<String> picUrls; 63 + private List<String> sliderPicUrls;
58 /** 64 /**
59 * 商品视频 65 * 商品视频
60 */ 66 */
@@ -75,36 +81,27 @@ public class ProductSpuRespDTO { @@ -75,36 +81,27 @@ public class ProductSpuRespDTO {
75 81
76 /** 82 /**
77 * 规格类型 83 * 规格类型
  84 + *
  85 + * false - 单规格
  86 + * true - 多规格
78 */ 87 */
79 private Boolean specType; 88 private Boolean specType;
80 /** 89 /**
81 - * 最小价格，单位使用：分  
82 - * <p>  
83 - * 基于其对应的 {@link ProductSkuRespDTO#getPrice()} 最小值  
84 - */  
85 - private Integer minPrice;  
86 - /**  
87 - * 最大价格，单位使用：分  
88 - * <p>  
89 - * 基于其对应的 {@link ProductSkuRespDTO#getPrice()} 最大值 90 + * 商品价格，单位使用：分
90 */ 91 */
91 - private Integer maxPrice; 92 + private Integer price;
92 /** 93 /**
93 * 市场价，单位使用：分 94 * 市场价，单位使用：分
94 - * <p>  
95 - * 基于其对应的 {@link ProductSkuRespDTO#getMarketPrice()} 最大值  
96 */ 95 */
97 private Integer marketPrice; 96 private Integer marketPrice;
98 /** 97 /**
99 - * 总库存  
100 - * <p>  
101 - * 基于其对应的 {@link ProductSkuRespDTO#getStock()} 求和 98 + * 成本价，单位使用：分
102 */ 99 */
103 - private Integer totalStock; 100 + private Integer costPrice;
104 /** 101 /**
105 - * 是否展示库存 102 + * 库存
106 */ 103 */
107 - private Boolean showStock; 104 + private Integer stock;
108 105
109 // ========== 统计相关字段 ========= 106 // ========== 统计相关字段 =========
110 107
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/sku/ProductSkuApiImpl.java
  View file @c233ce1
@@ -15,7 +15,8 @@ import java.util.Collections; @@ -15,7 +15,8 @@ import java.util.Collections;
15 import java.util.List; 15 import java.util.List;
16 16
17 /** 17 /**
18 - * TODO LeeYan9: 类注释; 18 + * 商品 SKU API 实现类
  19 + *
19 * @author LeeYan9 20 * @author LeeYan9
20 * @since 2022-09-06 21 * @since 2022-09-06
21 */ 22 */
@@ -28,8 +29,8 @@ public class ProductSkuApiImpl implements ProductSkuApi { @@ -28,8 +29,8 @@ public class ProductSkuApiImpl implements ProductSkuApi {
28 29
29 @Override 30 @Override
30 public ProductSkuRespDTO getSku(Long id) { 31 public ProductSkuRespDTO getSku(Long id) {
31 - // TODO TODO LeeYan9: 需要实现  
32 - return null; 32 + ProductSkuDO sku = productSkuService.getSku(id);
  33 + return ProductSkuConvert.INSTANCE.convert02(sku);
33 } 34 }
34 35
35 @Override 36 @Override
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.http
  View file @c233ce1
1 -### 获得订单交易的分页 TODO 1 +### 获得订单交易的分页（默认）
2 GET {{appApi}}/product/spu/page?pageNo=1&pageSize=10 2 GET {{appApi}}/product/spu/page?pageNo=1&pageSize=10
3 Authorization: Bearer {{appToken}} 3 Authorization: Bearer {{appToken}}
4 tenant-id: {{appTenentId}} 4 tenant-id: {{appTenentId}}
5 5
  6 +### 获得订单交易的分页（价格）
  7 +GET {{appApi}}/product/spu/page?pageNo=1&pageSize=10&sortField=price&sortAsc=true
  8 +Authorization: Bearer {{appToken}}
  9 +tenant-id: {{appTenentId}}
  10 +
  11 +### 获得订单交易的分页（销售）
  12 +GET {{appApi}}/product/spu/page?pageNo=1&pageSize=10&sortField=salesCount&sortAsc=true
  13 +Authorization: Bearer {{appToken}}
  14 +tenant-id: {{appTenentId}}
  15 +
6 ### 获得商品 SPU 明细 16 ### 获得商品 SPU 明细
7 -GET {{appApi}}/product/spu/get-detail?id=4 17 +GET {{appApi}}/product/spu/get-detail?id=102
8 tenant-id: {{appTenentId}} 18 tenant-id: {{appTenentId}}
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
  View file @c233ce1
@@ -49,8 +49,8 @@ public class AppProductSpuController { @@ -49,8 +49,8 @@ public class AppProductSpuController {
49 @GetMapping("/page") 49 @GetMapping("/page")
50 @Operation(summary = "获得商品 SPU 分页") 50 @Operation(summary = "获得商品 SPU 分页")
51 public CommonResult<PageResult<AppProductSpuPageItemRespVO>> getSpuPage(@Valid AppProductSpuPageReqVO pageVO) { 51 public CommonResult<PageResult<AppProductSpuPageItemRespVO>> getSpuPage(@Valid AppProductSpuPageReqVO pageVO) {
52 - PageResult<ProductSpuDO> pageResult = productSpuService.getSpuPage(pageVO, ProductSpuStatusEnum.ENABLE.getStatus());  
53 - return success(ProductSpuConvert.INSTANCE.convertPage02(pageResult)); 52 + PageResult<ProductSpuDO> pageResult = productSpuService.getSpuPage(pageVO);
  53 + return success(ProductSpuConvert.INSTANCE.convertPageForGetSpuPage(pageResult));
54 } 54 }
55 55
56 @GetMapping("/get-detail") 56 @GetMapping("/get-detail")
@@ -73,7 +73,7 @@ public class AppProductSpuController { @@ -73,7 +73,7 @@ public class AppProductSpuController {
73 List<ProductPropertyValueDetailRespBO> propertyValues = productPropertyValueService 73 List<ProductPropertyValueDetailRespBO> propertyValues = productPropertyValueService
74 .getPropertyValueDetailList(ProductSkuConvert.INSTANCE.convertPropertyValueIds(skus)); 74 .getPropertyValueDetailList(ProductSkuConvert.INSTANCE.convertPropertyValueIds(skus));
75 // 拼接 75 // 拼接
76 - return success(ProductSpuConvert.INSTANCE.convert(spu, skus, propertyValues)); 76 + return success(ProductSpuConvert.INSTANCE.convertForGetSpuDetail(spu, skus, propertyValues));
77 } 77 }
78 78
79 } 79 }
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java
  View file @c233ce1
@@ -18,17 +18,17 @@ public class AppProductSpuDetailRespVO { @@ -18,17 +18,17 @@ public class AppProductSpuDetailRespVO {
18 @Schema(description = "商品名称", required = true, example = "芋道") 18 @Schema(description = "商品名称", required = true, example = "芋道")
19 private String name; 19 private String name;
20 20
21 - @Schema(description = "促销语", example = "好吃！")  
22 - private String sellPoint;  
23 -  
24 @Schema(description = "商品详情", required = true, example = "我是商品描述") 21 @Schema(description = "商品详情", required = true, example = "我是商品描述")
25 private String description; 22 private String description;
26 23
27 @Schema(description = "商品分类编号", required = true, example = "1") 24 @Schema(description = "商品分类编号", required = true, example = "1")
28 private Long categoryId; 25 private Long categoryId;
29 26
30 - @Schema(description = "商品图片的数组", required = true)  
31 - private List<String> picUrls; 27 + @Schema(description = "商品封面图", required = true)
  28 + private String picUrl;
  29 +
  30 + @Schema(description = "商品轮播图", required = true)
  31 + private List<String> sliderPicUrls;
32 32
33 @Schema(description = "商品视频", required = true) 33 @Schema(description = "商品视频", required = true)
34 private String videoUrl; 34 private String videoUrl;
@@ -38,14 +38,14 @@ public class AppProductSpuDetailRespVO { @@ -38,14 +38,14 @@ public class AppProductSpuDetailRespVO {
38 @Schema(description = "规格类型", required = true, example = "true") 38 @Schema(description = "规格类型", required = true, example = "true")
39 private Boolean specType; 39 private Boolean specType;
40 40
41 - @Schema(description = "是否展示库存", required = true, example = "true")  
42 - private Boolean showStock; 41 + @Schema(description = "商品价格，单位使用：分", required = true, example = "1024")
  42 + private Integer price;
43 43
44 - @Schema(description = " 最小价格，单位使用：分", required = true, example = "1024")  
45 - private Integer minPrice; 44 + @Schema(description = "市场价，单位使用：分", required = true, example = "1024")
  45 + private Integer marketPrice;
46 46
47 - @Schema(description = "最大价格，单位使用：分", required = true, example = "1024")  
48 - private Integer maxPrice; 47 + @Schema(description = "库存", required = true, example = "666")
  48 + private Integer stock;
49 49
50 /** 50 /**
51 * SKU 数组 51 * SKU 数组
@@ -72,7 +72,7 @@ public class AppProductSpuDetailRespVO { @@ -72,7 +72,7 @@ public class AppProductSpuDetailRespVO {
72 @Schema(description = "销售价格，单位：分", required = true, example = "1024") 72 @Schema(description = "销售价格，单位：分", required = true, example = "1024")
73 private Integer price; 73 private Integer price;
74 74
75 - @Schema(description = "市场价", example = "1024") 75 + @Schema(description = "市场价，单位使用：分", required = true, example = "1024")
76 private Integer marketPrice; 76 private Integer marketPrice;
77 77
78 @Schema(description = "图片地址", required = true, example = "https://www.iocoder.cn/xx.png") 78 @Schema(description = "图片地址", required = true, example = "https://www.iocoder.cn/xx.png")
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuPageItemRespVO.java
  View file @c233ce1
@@ -3,8 +3,6 @@ package cn.iocoder.yudao.module.product.controller.app.spu.vo; @@ -3,8 +3,6 @@ package cn.iocoder.yudao.module.product.controller.app.spu.vo;
3 import io.swagger.v3.oas.annotations.media.Schema; 3 import io.swagger.v3.oas.annotations.media.Schema;
4 import lombok.Data; 4 import lombok.Data;
5 5
6 -import javax.validation.constraints.NotEmpty;  
7 -import javax.validation.constraints.NotNull;  
8 import java.util.List; 6 import java.util.List;
9 7
10 @Schema(description = "用户 App - 商品 SPU 分页项 Response VO") 8 @Schema(description = "用户 App - 商品 SPU 分页项 Response VO")
@@ -15,25 +13,31 @@ public class AppProductSpuPageItemRespVO { @@ -15,25 +13,31 @@ public class AppProductSpuPageItemRespVO {
15 private Long id; 13 private Long id;
16 14
17 @Schema(description = "商品名称", required = true, example = "芋道") 15 @Schema(description = "商品名称", required = true, example = "芋道")
18 - @NotEmpty(message = "商品名称不能为空")  
19 private String name; 16 private String name;
20 17
21 @Schema(description = "分类编号", required = true) 18 @Schema(description = "分类编号", required = true)
22 - @NotNull(message = "分类编号不能为空")  
23 private Long categoryId; 19 private Long categoryId;
24 20
25 - @Schema(description = "商品图片的数组", required = true)  
26 - private List<String> picUrls; 21 + @Schema(description = "商品封面图", required = true)
  22 + private String picUrl;
27 23
28 - @Schema(description = " 最小价格，单位使用：分", required = true, example = "1024")  
29 - private Integer minPrice; 24 + @Schema(description = "商品轮播图", required = true)
  25 + private List<String> sliderPicUrls;
30 26
31 - @Schema(description = "最大价格，单位使用：分", required = true, example = "1024")  
32 - private Integer maxPrice; 27 + // ========== SKU 相关字段 =========
  28 +
  29 + @Schema(description = "规格类型", required = true, example = "true")
  30 + private Boolean specType;
  31 +
  32 + @Schema(description = "商品价格，单位使用：分", required = true, example = "1024")
  33 + private Integer price;
  34 +
  35 + @Schema(description = "库存", required = true, example = "666")
  36 + private Integer stock;
33 37
34 // ========== 统计相关字段 ========= 38 // ========== 统计相关字段 =========
35 39
36 - @Schema(description = "商品销量", example = "1024") 40 + @Schema(description = "商品销量", required = true, example = "1024")
37 private Integer salesCount; 41 private Integer salesCount;
38 42
39 } 43 }
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuPageReqVO.java
  View file @c233ce1
@@ -19,18 +19,23 @@ public class AppProductSpuPageReqVO extends PageParam { @@ -19,18 +19,23 @@ public class AppProductSpuPageReqVO extends PageParam {
19 public static final String SORT_FIELD_PRICE = "price"; 19 public static final String SORT_FIELD_PRICE = "price";
20 public static final String SORT_FIELD_SALES_COUNT = "salesCount"; 20 public static final String SORT_FIELD_SALES_COUNT = "salesCount";
21 21
  22 + public static final String RECOMMEND_TYPE_HOT = "hot";
  23 +
22 @Schema(description = "分类编号", example = "1") 24 @Schema(description = "分类编号", example = "1")
23 private Long categoryId; 25 private Long categoryId;
24 26
25 @Schema(description = "关键字", example = "好看") 27 @Schema(description = "关键字", example = "好看")
26 private String keyword; 28 private String keyword;
27 29
28 - @Schema(description = "排序字段", example = "price") // 参见 AppSpuPageReqVO.SORT_FIELD_XXX 常量 30 + @Schema(description = "排序字段", example = "price") // 参见 AppProductSpuPageReqVO.SORT_FIELD_XXX 常量
29 private String sortField; 31 private String sortField;
30 32
31 @Schema(description = "排序方式", example = "true") 33 @Schema(description = "排序方式", example = "true")
32 private Boolean sortAsc; 34 private Boolean sortAsc;
33 35
  36 + @Schema(description = "推荐类型", example = "hot") // 参见 AppProductSpuPageReqVO.RECOMMEND_TYPE_XXX 常亮
  37 + private String recommendType;
  38 +
34 @AssertTrue(message = "排序字段不合法") 39 @AssertTrue(message = "排序字段不合法")
35 @JsonIgnore 40 @JsonIgnore
36 public boolean isSortFieldValid() { 41 public boolean isSortFieldValid() {
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java
  View file @c233ce1
@@ -34,7 +34,7 @@ public interface ProductSpuConvert { @@ -34,7 +34,7 @@ public interface ProductSpuConvert {
34 ProductSpuConvert INSTANCE = Mappers.getMapper(ProductSpuConvert.class); 34 ProductSpuConvert INSTANCE = Mappers.getMapper(ProductSpuConvert.class);
35 35
36 ProductSpuDO convert(ProductSpuCreateReqVO bean); 36 ProductSpuDO convert(ProductSpuCreateReqVO bean);
37 - 37 + // TODO 还是使用convert，重命名改动太多
38 ProductSpuDO convert(ProductSpuUpdateReqVO bean); 38 ProductSpuDO convert(ProductSpuUpdateReqVO bean);
39 39
40 List<ProductSpuDO> convertList(List<ProductSpuDO> list); 40 List<ProductSpuDO> convertList(List<ProductSpuDO> list);
@@ -47,11 +47,11 @@ public interface ProductSpuConvert { @@ -47,11 +47,11 @@ public interface ProductSpuConvert {
47 47
48 List<ProductSpuSimpleRespVO> convertList02(List<ProductSpuDO> list); 48 List<ProductSpuSimpleRespVO> convertList02(List<ProductSpuDO> list);
49 49
50 - default AppProductSpuDetailRespVO convert(ProductSpuDO spu, List<ProductSkuDO> skus,  
51 - List<ProductPropertyValueDetailRespBO> propertyValues) {  
52 - AppProductSpuDetailRespVO spuVO = convert02(spu)  
53 - .setSalesCount(spu.getSalesCount() + defaultIfNull(spu.getVirtualSalesCount(), 0));  
54 - spuVO.setSkus(convertList03(skus)); 50 +
  51 + default ProductSpuDetailRespVO convert03(ProductSpuDO spu, List<ProductSkuDO> skus,
  52 + List<ProductPropertyValueDetailRespBO> propertyValues) {
  53 + ProductSpuDetailRespVO spuVO = convert03(spu);
  54 + spuVO.setSkus(convertList04(skus));
55 // 处理商品属性 55 // 处理商品属性
56 Map<Long, ProductPropertyValueDetailRespBO> propertyValueMap = convertMap(propertyValues, ProductPropertyValueDetailRespBO::getValueId); 56 Map<Long, ProductPropertyValueDetailRespBO> propertyValueMap = convertMap(propertyValues, ProductPropertyValueDetailRespBO::getValueId);
57 for (int i = 0; i < skus.size(); i++) { 57 for (int i = 0; i < skus.size(); i++) {
@@ -59,7 +59,7 @@ public interface ProductSpuConvert { @@ -59,7 +59,7 @@ public interface ProductSpuConvert {
59 if (CollUtil.isEmpty(properties)) { 59 if (CollUtil.isEmpty(properties)) {
60 continue; 60 continue;
61 } 61 }
62 - AppProductSpuDetailRespVO.Sku sku = spuVO.getSkus().get(i); 62 + ProductSkuRespVO sku = spuVO.getSkus().get(i);
63 sku.setProperties(new ArrayList<>(properties.size())); 63 sku.setProperties(new ArrayList<>(properties.size()));
64 // 遍历每个 properties，设置到 AppSpuDetailRespVO.Sku 中 64 // 遍历每个 properties，设置到 AppSpuDetailRespVO.Sku 中
65 properties.forEach(property -> { 65 properties.forEach(property -> {
@@ -67,21 +67,30 @@ public interface ProductSpuConvert { @@ -67,21 +67,30 @@ public interface ProductSpuConvert {
67 if (propertyValue == null) { 67 if (propertyValue == null) {
68 return; 68 return;
69 } 69 }
70 - sku.getProperties().add(convert03(propertyValue)); 70 + //sku.getProperties().add(convert04(propertyValue)); TODO 需要重写
71 }); 71 });
72 } 72 }
73 return spuVO; 73 return spuVO;
74 } 74 }
75 - AppProductSpuDetailRespVO convert02(ProductSpuDO spu);  
76 - List<AppProductSpuDetailRespVO.Sku> convertList03(List<ProductSkuDO> skus);  
77 - AppProductPropertyValueDetailRespVO convert03(ProductPropertyValueDetailRespBO propertyValue); 75 + ProductSpuDetailRespVO convert03(ProductSpuDO spu);
  76 + List<ProductSkuRespVO> convertList04(List<ProductSkuDO> skus);
  77 + ProductPropertyValueDetailRespVO convert04(ProductPropertyValueDetailRespBO propertyValue);
78 78
79 - PageResult<AppProductSpuPageItemRespVO> convertPage02(PageResult<ProductSpuDO> page); 79 + // ========== 用户 App 相关 ==========
80 80
81 - default ProductSpuDetailRespVO convert03(ProductSpuDO spu, List<ProductSkuDO> skus,  
82 - List<ProductPropertyValueDetailRespBO> propertyValues) {  
83 - ProductSpuDetailRespVO spuVO = convert03(spu);  
84 - spuVO.setSkus(convertList04(skus)); 81 + default PageResult<AppProductSpuPageItemRespVO> convertPageForGetSpuPage(PageResult<ProductSpuDO> page) {
  82 + // 累加虚拟销量
  83 + page.getList().forEach(spu -> spu.setSalesCount(spu.getSalesCount() + spu.getVirtualSalesCount()));
  84 + // 然后进行转换
  85 + return convertPageForGetSpuPage0(page);
  86 + }
  87 + PageResult<AppProductSpuPageItemRespVO> convertPageForGetSpuPage0(PageResult<ProductSpuDO> page);
  88 +
  89 + default AppProductSpuDetailRespVO convertForGetSpuDetail(ProductSpuDO spu, List<ProductSkuDO> skus,
  90 + List<ProductPropertyValueDetailRespBO> propertyValues) {
  91 + AppProductSpuDetailRespVO spuVO = convertForGetSpuDetail(spu)
  92 + .setSalesCount(spu.getSalesCount() + defaultIfNull(spu.getVirtualSalesCount(), 0));
  93 + spuVO.setSkus(convertListForGetSpuDetail(skus));
85 // 处理商品属性 94 // 处理商品属性
86 Map<Long, ProductPropertyValueDetailRespBO> propertyValueMap = convertMap(propertyValues, ProductPropertyValueDetailRespBO::getValueId); 95 Map<Long, ProductPropertyValueDetailRespBO> propertyValueMap = convertMap(propertyValues, ProductPropertyValueDetailRespBO::getValueId);
87 for (int i = 0; i < skus.size(); i++) { 96 for (int i = 0; i < skus.size(); i++) {
@@ -89,7 +98,7 @@ public interface ProductSpuConvert { @@ -89,7 +98,7 @@ public interface ProductSpuConvert {
89 if (CollUtil.isEmpty(properties)) { 98 if (CollUtil.isEmpty(properties)) {
90 continue; 99 continue;
91 } 100 }
92 - ProductSkuRespVO sku = spuVO.getSkus().get(i); 101 + AppProductSpuDetailRespVO.Sku sku = spuVO.getSkus().get(i);
93 sku.setProperties(new ArrayList<>(properties.size())); 102 sku.setProperties(new ArrayList<>(properties.size()));
94 // 遍历每个 properties，设置到 AppSpuDetailRespVO.Sku 中 103 // 遍历每个 properties，设置到 AppSpuDetailRespVO.Sku 中
95 properties.forEach(property -> { 104 properties.forEach(property -> {
@@ -97,13 +106,13 @@ public interface ProductSpuConvert { @@ -97,13 +106,13 @@ public interface ProductSpuConvert {
97 if (propertyValue == null) { 106 if (propertyValue == null) {
98 return; 107 return;
99 } 108 }
100 - //sku.getProperties().add(convert04(propertyValue)); TODO 需要重写 109 + sku.getProperties().add(convertForGetSpuDetail(propertyValue));
101 }); 110 });
102 } 111 }
103 return spuVO; 112 return spuVO;
104 } 113 }
105 - ProductSpuDetailRespVO convert03(ProductSpuDO spu);  
106 - List<ProductSkuRespVO> convertList04(List<ProductSkuDO> skus);  
107 - ProductPropertyValueDetailRespVO convert04(ProductPropertyValueDetailRespBO propertyValue); 114 + AppProductSpuDetailRespVO convertForGetSpuDetail(ProductSpuDO spu);
  115 + List<AppProductSpuDetailRespVO.Sku> convertListForGetSpuDetail(List<ProductSkuDO> skus);
  116 + AppProductPropertyValueDetailRespVO convertForGetSpuDetail(ProductPropertyValueDetailRespBO propertyValue);
108 117
109 } 118 }
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/sku/ProductSkuDO.java
  View file @c233ce1
@@ -110,12 +110,29 @@ public class ProductSkuDO extends TenantBaseDO { @@ -110,12 +110,29 @@ public class ProductSkuDO extends TenantBaseDO {
110 * 关联 {@link ProductPropertyDO#getId()} 110 * 关联 {@link ProductPropertyDO#getId()}
111 */ 111 */
112 private Long propertyId; 112 private Long propertyId;
  113 + ///**
  114 + // * 属性名字
  115 + // *
  116 + // * 冗余 {@link ProductPropertyDO#getName()}
  117 + // *
  118 + // * 注意：每次属性名字发生变化时，需要更新该冗余
  119 + // */ TODO 与已有代码逻辑存在冲突
  120 + //private String propertyName;
  121 +
113 /** 122 /**
114 * 属性值编号 123 * 属性值编号
115 * 124 *
116 * 关联 {@link ProductPropertyValueDO#getId()} 125 * 关联 {@link ProductPropertyValueDO#getId()}
117 */ 126 */
118 private Long valueId; 127 private Long valueId;
  128 + ///**
  129 + // * 属性值名字
  130 + // *
  131 + // * 冗余 {@link ProductPropertyValueDO#getName()}
  132 + // *
  133 + // * 注意：每次属性值名字发生变化时，需要更新该冗余
  134 + // */ TODO 与已有代码逻辑存在冲突
  135 + //private String valueName;
119 136
120 } 137 }
121 138
@@ -140,9 +157,5 @@ public class ProductSkuDO extends TenantBaseDO { @@ -140,9 +157,5 @@ public class ProductSkuDO extends TenantBaseDO {
140 // TODO 芋艿：pinkStock from y 157 // TODO 芋艿：pinkStock from y
141 // TODO 芋艿：seckillStock from y 158 // TODO 芋艿：seckillStock from y
142 159
143 - // TODO 芋艿：quota from c  
144 - // TODO 芋艿：quotaShow from c  
145 - // TODO 芋艿：attrValue from c  
146 -  
147 } 160 }
148 161
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyServiceImpl.java
  View file @c233ce1
@@ -68,6 +68,7 @@ public class ProductPropertyServiceImpl implements ProductPropertyService { @@ -68,6 +68,7 @@ public class ProductPropertyServiceImpl implements ProductPropertyService {
68 // 更新 68 // 更新
69 ProductPropertyDO updateObj = ProductPropertyConvert.INSTANCE.convert(updateReqVO); 69 ProductPropertyDO updateObj = ProductPropertyConvert.INSTANCE.convert(updateReqVO);
70 productPropertyMapper.updateById(updateObj); 70 productPropertyMapper.updateById(updateObj);
  71 + // TODO 芋艿：更新时，需要看看 sku 表
71 } 72 }
72 73
73 @Override 74 @Override
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyValueServiceImpl.java
  View file @c233ce1
@@ -68,6 +68,7 @@ public class ProductPropertyValueServiceImpl implements ProductPropertyValueServ @@ -68,6 +68,7 @@ public class ProductPropertyValueServiceImpl implements ProductPropertyValueServ
68 // 更新 68 // 更新
69 ProductPropertyValueDO updateObj = ProductPropertyValueConvert.INSTANCE.convert(updateReqVO); 69 ProductPropertyValueDO updateObj = ProductPropertyValueConvert.INSTANCE.convert(updateReqVO);
70 productPropertyValueMapper.updateById(updateObj); 70 productPropertyValueMapper.updateById(updateObj);
  71 + // TODO 芋艿：更新时，需要看看 sku 表
71 } 72 }
72 73
73 @Override 74 @Override
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
  View file @c233ce1
@@ -169,7 +169,7 @@ public class ProductSkuServiceImpl implements ProductSkuService { @@ -169,7 +169,7 @@ public class ProductSkuServiceImpl implements ProductSkuService {
169 // 拆分三个集合，新插入的、需要更新的、需要删除的 169 // 拆分三个集合，新插入的、需要更新的、需要删除的
170 List<ProductSkuDO> insertSkus = new ArrayList<>(); 170 List<ProductSkuDO> insertSkus = new ArrayList<>();
171 List<ProductSkuDO> updateSkus = new ArrayList<>(); 171 List<ProductSkuDO> updateSkus = new ArrayList<>();
172 - List<ProductSkuDO> allUpdateSkus = ProductSkuConvert.INSTANCE.convertList06(skus, null); 172 + List<ProductSkuDO> allUpdateSkus = ProductSkuConvert.INSTANCE.convertList06(skus, spuId);
173 allUpdateSkus.forEach(sku -> { 173 allUpdateSkus.forEach(sku -> {
174 String propertiesKey = ProductSkuConvert.INSTANCE.buildPropertyKey(sku); 174 String propertiesKey = ProductSkuConvert.INSTANCE.buildPropertyKey(sku);
175 // 1、找得到的，进行更新 175 // 1、找得到的，进行更新
yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceTest.java
  View file @c233ce1
@@ -54,12 +54,18 @@ public class ProductSkuServiceTest extends BaseDbUnitTest { @@ -54,12 +54,18 @@ public class ProductSkuServiceTest extends BaseDbUnitTest {
54 // mock 数据 54 // mock 数据
55 ProductSkuDO sku01 = randomPojo(ProductSkuDO.class, o -> { // 测试更新 55 ProductSkuDO sku01 = randomPojo(ProductSkuDO.class, o -> { // 测试更新
56 o.setSpuId(1L); 56 o.setSpuId(1L);
57 - o.setProperties(singletonList(new ProductSkuDO.Property(10L, 20L))); 57 + //o.setProperties(singletonList(new ProductSkuDO.Property(
  58 + // 10L, "颜色", 20L, "红色"))); TODO 新增字段已注释
  59 + o.setProperties(singletonList(new ProductSkuDO.Property(
  60 + 10L, 20L)));
58 }); 61 });
59 productSkuMapper.insert(sku01); 62 productSkuMapper.insert(sku01);
60 ProductSkuDO sku02 = randomPojo(ProductSkuDO.class, o -> { // 测试删除 63 ProductSkuDO sku02 = randomPojo(ProductSkuDO.class, o -> { // 测试删除
61 o.setSpuId(1L); 64 o.setSpuId(1L);
62 - o.setProperties(singletonList(new ProductSkuDO.Property(10L, 30L))); 65 + //o.setProperties(singletonList(new ProductSkuDO.Property(
  66 + // 10L, "颜色", 30L, "蓝色"))); TODO 新增字段已注释
  67 + o.setProperties(singletonList(new ProductSkuDO.Property(
  68 + 10L, 30L)));
63 }); 69 });
64 productSkuMapper.insert(sku02); 70 productSkuMapper.insert(sku02);
65 // 准备参数 71 // 准备参数
yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
  View file @c233ce1
@@ -14,7 +14,6 @@ public interface ErrorCodeConstants { @@ -14,7 +14,6 @@ public interface ErrorCodeConstants {
14 // ========== Order 模块 1-011-000-000 ========== 14 // ========== Order 模块 1-011-000-000 ==========
15 ErrorCode ORDER_CREATE_SKU_NOT_FOUND = new ErrorCode(1011000001, "商品 SKU 不存在"); 15 ErrorCode ORDER_CREATE_SKU_NOT_FOUND = new ErrorCode(1011000001, "商品 SKU 不存在");
16 ErrorCode ORDER_CREATE_SPU_NOT_SALE = new ErrorCode(1011000002, "商品 SPU 不可售卖"); 16 ErrorCode ORDER_CREATE_SPU_NOT_SALE = new ErrorCode(1011000002, "商品 SPU 不可售卖");
17 - ErrorCode ORDER_CREATE_SKU_NOT_SALE = new ErrorCode(1011000003, "商品 SKU 不可售卖");  
18 ErrorCode ORDER_CREATE_SKU_STOCK_NOT_ENOUGH = new ErrorCode(1011000004, "商品 SKU 库存不足"); 17 ErrorCode ORDER_CREATE_SKU_STOCK_NOT_ENOUGH = new ErrorCode(1011000004, "商品 SKU 库存不足");
19 ErrorCode ORDER_CREATE_SPU_NOT_FOUND = new ErrorCode(1011000005, "商品 SPU 不可售卖"); 18 ErrorCode ORDER_CREATE_SPU_NOT_FOUND = new ErrorCode(1011000005, "商品 SPU 不可售卖");
20 ErrorCode ORDER_CREATE_ADDRESS_NOT_FOUND = new ErrorCode(1011000006, "收货地址不存在"); 19 ErrorCode ORDER_CREATE_ADDRESS_NOT_FOUND = new ErrorCode(1011000006, "收货地址不存在");
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/sku/AppProductSkuBaseRespVO.java
  View file @c233ce1
@@ -17,12 +17,12 @@ public class AppProductSkuBaseRespVO { @@ -17,12 +17,12 @@ public class AppProductSkuBaseRespVO {
17 @Schema(description = "主键", required = true, example = "1024") 17 @Schema(description = "主键", required = true, example = "1024")
18 private Long id; 18 private Long id;
19 19
20 - @Schema(description = "商品 SKU 名字", required = true, example = "芋道")  
21 - private String name;  
22 -  
23 @Schema(description = "图片地址", example = "https://www.iocoder.cn/xx.png") 20 @Schema(description = "图片地址", example = "https://www.iocoder.cn/xx.png")
24 private String picUrl; 21 private String picUrl;
25 22
  23 + @Schema(description = "销售价格，单位：分", required = true, example = "100")
  24 + private Integer price;
  25 +
26 @Schema(description = "库存", required = true, example = "1") 26 @Schema(description = "库存", required = true, example = "1")
27 private Integer stock; 27 private Integer stock;
28 28
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/spu/AppProductSpuBaseRespVO.java
  View file @c233ce1
@@ -20,6 +20,6 @@ public class AppProductSpuBaseRespVO { @@ -20,6 +20,6 @@ public class AppProductSpuBaseRespVO {
20 private String name; 20 private String name;
21 21
22 @Schema(description = "商品主图地址", example = "https://www.iocoder.cn/xx.png") 22 @Schema(description = "商品主图地址", example = "https://www.iocoder.cn/xx.png")
23 - private List<String> picUrls; 23 + private String picUrl;
24 24
25 } 25 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/TradeCartController.http
  View file @c233ce1
1 -### 请求 /trade/cart/add-count 接口 => 成功  
2 -POST {{appApi}}/trade/cart/add-count 1 +### 请求 /trade/cart/add 接口 => 成功
  2 +POST {{appApi}}/trade/cart/add
3 tenant-id: {{appTenentId}} 3 tenant-id: {{appTenentId}}
4 Authorization: Bearer {{appToken}} 4 Authorization: Bearer {{appToken}}
5 Content-Type: application/json 5 Content-Type: application/json
6 6
7 { 7 {
8 "skuId": 1, 8 "skuId": 1,
9 - "count": 1 9 + "count": 10,
  10 + "addStatus": true
10 } 11 }
11 12
12 -### 请求 /trade/cart/update-count 接口 => 成功  
13 -PUT {{appApi}}/trade/cart/update-count 13 +### 请求 /trade/cart/update 接口 => 成功
  14 +PUT {{appApi}}/trade/cart/update
14 tenant-id: {{appTenentId}} 15 tenant-id: {{appTenentId}}
15 Authorization: Bearer {{appToken}} 16 Authorization: Bearer {{appToken}}
16 Content-Type: application/json 17 Content-Type: application/json
17 18
18 { 19 {
19 - "skuId": 1, 20 + "id": 35,
20 "count": 5 21 "count": 5
21 } 22 }
22 23
23 -### 请求 /trade/cart/update-selected 接口 => 成功  
24 -PUT {{appApi}}/trade/cart/update-selected  
25 -tenant-id: {{appTenentId}}  
26 -Authorization: Bearer {{appToken}}  
27 -Content-Type: application/json  
28 -  
29 -{  
30 - "skuIds": [1],  
31 - "selected": false  
32 -}  
33 -  
34 ### 请求 /trade/cart/delete 接口 => 成功 24 ### 请求 /trade/cart/delete 接口 => 成功
35 -DELETE {{appApi}}/trade/cart/delete?skuIds=1 25 +DELETE {{appApi}}/trade/cart/delete?ids=1
36 tenant-id: {{appTenentId}} 26 tenant-id: {{appTenentId}}
37 Authorization: Bearer {{appToken}} 27 Authorization: Bearer {{appToken}}
38 28
@@ -41,7 +31,7 @@ GET {{appApi}}/trade/cart/get-count @@ -41,7 +31,7 @@ GET {{appApi}}/trade/cart/get-count
41 tenant-id: {{appTenentId}} 31 tenant-id: {{appTenentId}}
42 Authorization: Bearer {{appToken}} 32 Authorization: Bearer {{appToken}}
43 33
44 -### 请求 /trade/cart/get-detail 接口 => 成功  
45 -GET {{appApi}}/trade/cart/get-detail 34 +### 请求 /trade/cart/list 接口 => 成功
  35 +GET {{appApi}}/trade/cart/list
46 tenant-id: {{appTenentId}} 36 tenant-id: {{appTenentId}}
47 Authorization: Bearer {{appToken}} 37 Authorization: Bearer {{appToken}}
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/TradeCartController.java
  View file @c233ce1
@@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.trade.controller.app.cart; @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.trade.controller.app.cart;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated; 4 import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
5 -import cn.iocoder.yudao.module.trade.controller.app.cart.vo.AppTradeCartDetailRespVO;  
6 -import cn.iocoder.yudao.module.trade.controller.app.cart.vo.AppTradeCartItemAddCountReqVO;  
7 -import cn.iocoder.yudao.module.trade.controller.app.cart.vo.AppTradeCartItemUpdateCountReqVO;  
8 -import cn.iocoder.yudao.module.trade.controller.app.cart.vo.AppTradeCartItemUpdateSelectedReqVO; 5 +import cn.iocoder.yudao.module.trade.controller.app.cart.vo.AppTradeCartListRespVO;
  6 +import cn.iocoder.yudao.module.trade.controller.app.cart.vo.AppTradeCartAddReqVO;
  7 +import cn.iocoder.yudao.module.trade.controller.app.cart.vo.AppTradeCartResetReqVO;
  8 +import cn.iocoder.yudao.module.trade.controller.app.cart.vo.AppTradeCartUpdateReqVO;
9 import cn.iocoder.yudao.module.trade.service.cart.TradeCartService; 9 import cn.iocoder.yudao.module.trade.service.cart.TradeCartService;
10 import io.swagger.v3.oas.annotations.Operation; 10 import io.swagger.v3.oas.annotations.Operation;
11 import io.swagger.v3.oas.annotations.Parameter; 11 import io.swagger.v3.oas.annotations.Parameter;
@@ -33,37 +33,35 @@ public class TradeCartController { @@ -33,37 +33,35 @@ public class TradeCartController {
33 @Resource 33 @Resource
34 private TradeCartService cartService; 34 private TradeCartService cartService;
35 35
36 - @PostMapping("/add-count")  
37 - @Operation(summary = "添加商品到购物车") 36 + @PostMapping("/add")
  37 + @Operation(summary = "添加购物车商品")
38 @PreAuthenticated 38 @PreAuthenticated
39 - public CommonResult<Boolean> addCartItemCount(@Valid @RequestBody AppTradeCartItemAddCountReqVO addCountReqVO) {  
40 - cartService.addCartItemCount(getLoginUserId(), addCountReqVO);  
41 - return success(true); 39 + public CommonResult<Long> addCart(@Valid @RequestBody AppTradeCartAddReqVO addCountReqVO) {
  40 + return success(cartService.addCart(getLoginUserId(), addCountReqVO));
42 } 41 }
43 42
44 - @PutMapping("update-count")  
45 - @Operation(summary = "更新购物车商品数量") 43 + @PutMapping("/update")
  44 + @Operation(summary = "更新购物车商品")
46 @PreAuthenticated 45 @PreAuthenticated
47 - public CommonResult<Boolean> updateCartItemQuantity(@Valid @RequestBody AppTradeCartItemUpdateCountReqVO updateCountReqVO) {  
48 - cartService.updateCartItemCount(getLoginUserId(), updateCountReqVO); 46 + public CommonResult<Boolean> updateCart(@Valid @RequestBody AppTradeCartUpdateReqVO updateReqVO) {
  47 + cartService.updateCart(getLoginUserId(), updateReqVO);
49 return success(true); 48 return success(true);
50 } 49 }
51 50
52 - @PutMapping("update-selected")  
53 - @Operation(summary = "更新购物车商品是否选中") 51 + @PutMapping("/reset")
  52 + @Operation(summary = "重置购物车商品")
54 @PreAuthenticated 53 @PreAuthenticated
55 - public CommonResult<Boolean> updateCartItemSelected(@Valid @RequestBody AppTradeCartItemUpdateSelectedReqVO updateSelectedReqVO) {  
56 - cartService.updateCartItemSelected(getLoginUserId(), updateSelectedReqVO);  
57 - // 获得目前购物车明细 54 + public CommonResult<Boolean> resetCart(@Valid @RequestBody AppTradeCartResetReqVO updateReqVO) {
  55 + cartService.resetCart(getLoginUserId(), updateReqVO);
58 return success(true); 56 return success(true);
59 } 57 }
60 58
61 @DeleteMapping("/delete") 59 @DeleteMapping("/delete")
62 @Operation(summary = "删除购物车商品") 60 @Operation(summary = "删除购物车商品")
63 - @Parameter(name = "skuIds", description = "商品 SKU 编号的数组", required = true, example = "1024,2048") 61 + @Parameter(name = "ids", description = "购物车商品编号", required = true, example = "1024,2048")
64 @PreAuthenticated 62 @PreAuthenticated
65 - public CommonResult<Boolean> deleteCartItem(@RequestParam("skuIds") List<Long> skuIds) {  
66 - cartService.deleteCartItems(getLoginUserId(), skuIds); 63 + public CommonResult<Boolean> deleteCart(@RequestParam("ids") List<Long> ids) {
  64 + cartService.deleteCart(getLoginUserId(), ids);
67 return success(true); 65 return success(true);
68 } 66 }
69 67
@@ -74,11 +72,11 @@ public class TradeCartController { @@ -74,11 +72,11 @@ public class TradeCartController {
74 return success(cartService.getCartCount(getLoginUserId())); 72 return success(cartService.getCartCount(getLoginUserId()));
75 } 73 }
76 74
77 - @GetMapping("/get-detail")  
78 - @Operation(summary = "查询用户的购物车的详情") 75 + @GetMapping("/list")
  76 + @Operation(summary = "查询用户的购物车列表")
79 @PreAuthenticated 77 @PreAuthenticated
80 - public CommonResult<AppTradeCartDetailRespVO> getCartDetail() {  
81 - return success(cartService.getCartDetail(getLoginUserId())); 78 + public CommonResult<AppTradeCartListRespVO> getCartList() {
  79 + return success(cartService.getCartList(getLoginUserId()));
82 } 80 }
83 81
84 } 82 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartItemAddCountReqVO.java renamed to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartAddReqVO.java
  View file @c233ce1
@@ -3,12 +3,11 @@ package cn.iocoder.yudao.module.trade.controller.app.cart.vo; @@ -3,12 +3,11 @@ package cn.iocoder.yudao.module.trade.controller.app.cart.vo;
3 import io.swagger.v3.oas.annotations.media.Schema; 3 import io.swagger.v3.oas.annotations.media.Schema;
4 import lombok.Data; 4 import lombok.Data;
5 5
6 -import javax.validation.constraints.Min;  
7 import javax.validation.constraints.NotNull; 6 import javax.validation.constraints.NotNull;
8 7
9 @Schema(description = "用户 App - 购物车添加购物项 Request VO") 8 @Schema(description = "用户 App - 购物车添加购物项 Request VO")
10 @Data 9 @Data
11 -public class AppTradeCartItemAddCountReqVO { 10 +public class AppTradeCartAddReqVO {
12 11
13 @Schema(description = "商品 SKU 编号", required = true,example = "1024") 12 @Schema(description = "商品 SKU 编号", required = true,example = "1024")
14 @NotNull(message = "商品 SKU 编号不能为空") 13 @NotNull(message = "商品 SKU 编号不能为空")
@@ -16,7 +15,10 @@ public class AppTradeCartItemAddCountReqVO { @@ -16,7 +15,10 @@ public class AppTradeCartItemAddCountReqVO {
16 15
17 @Schema(description = "新增商品数量", required = true, example = "1") 16 @Schema(description = "新增商品数量", required = true, example = "1")
18 @NotNull(message = "数量不能为空") 17 @NotNull(message = "数量不能为空")
19 - @Min(message = "数量必须大于 0", value = 1L)  
20 private Integer count; 18 private Integer count;
21 19
  20 + @Schema(description = "是否添加到购物车", required = true, example = "true")
  21 + @NotNull(message = "是否添加购物车不能为空")
  22 + private Boolean addStatus;
  23 +
22 } 24 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartDetailRespVO.java deleted
View file @e163ae8
1 -package cn.iocoder.yudao.module.trade.controller.app.cart.vo;  
2 -  
3 -import cn.iocoder.yudao.module.trade.controller.app.base.sku.AppProductSkuBaseRespVO;  
4 -import io.swagger.v3.oas.annotations.media.Schema;  
5 -import lombok.Data;  
6 -  
7 -import java.util.List;  
8 -  
9 -@Schema(description = "用户 App - 用户的购物车明细 Response VO")  
10 -@Data  
11 -public class AppTradeCartDetailRespVO {  
12 -  
13 - /**  
14 - * 商品分组数组  
15 - */  
16 - private List<ItemGroup> itemGroups;  
17 -  
18 - /**  
19 - * 费用  
20 - */  
21 - private Order order;  
22 -  
23 - @Schema(description = "商品分组") // 多个商品，参加同一个活动，从而形成分组  
24 - @Data  
25 - public static class ItemGroup {  
26 -  
27 - /**  
28 - * 商品数组  
29 - */  
30 - private List<Sku> items;  
31 - /**  
32 - * 营销活动，订单级别  
33 - */  
34 - private Promotion promotion;  
35 -  
36 - }  
37 -  
38 - @Schema(description = "商品 SKU")  
39 - @Data  
40 - public static class Sku extends AppProductSkuBaseRespVO {  
41 -  
42 - /**  
43 - * SPU 信息  
44 - */  
45 - private AppProductSkuBaseRespVO spu;  
46 -  
47 - // ========== 购物车相关的字段 ==========  
48 -  
49 - @Schema(description = "商品数量", required = true, example = "1")  
50 - private Integer count;  
51 - @Schema(description = "是否选中", required = true, example = "true")  
52 - private Boolean selected;  
53 -  
54 - // ========== 价格相关的字段，对应 PriceCalculateRespDTO.OrderItem 的属性 ==========  
55 -  
56 - // TODO 芋艿：后续可以去除一些无用的字段  
57 -  
58 - @Schema(description = "商品原价（单）", required = true, example = "100")  
59 - private Integer originalPrice;  
60 - @Schema(description = "商品原价（总）", required = true, example = "200")  
61 - private Integer totalOriginalPrice;  
62 - @Schema(description = "商品级优惠（总）", required = true, example = "300")  
63 - private Integer totalPromotionPrice;  
64 - @Schema(description = "最终购买金额（总）", required = true, example = "400")  
65 - private Integer totalPresentPrice;  
66 - @Schema(description = "最终购买金额（单）", required = true, example = "500")  
67 - private Integer presentPrice;  
68 - @Schema(description = "应付金额（总）", required = true, example = "600")  
69 - private Integer totalPayPrice;  
70 -  
71 - // ========== 营销相关的字段 ==========  
72 - /**  
73 - * 营销活动，商品级别  
74 - */  
75 - private Promotion promotion;  
76 -  
77 - }  
78 -  
79 - @Schema(description = "订单") // 对应 PriceCalculateRespDTO.Order 类，用于费用（合计）  
80 - @Data  
81 - public static class Order {  
82 -  
83 - // TODO 芋艿：后续可以去除一些无用的字段  
84 -  
85 - @Schema(description = "商品原价（总）", required = true, example = "100")  
86 - private Integer skuOriginalPrice;  
87 - @Schema(description = "商品优惠（总）", required = true, example = "200")  
88 - private Integer skuPromotionPrice;  
89 - @Schema(description = "订单优惠（总）", required = true, example = "300")  
90 - private Integer orderPromotionPrice;  
91 - @Schema(description = "运费金额", required = true, example = "400")  
92 - private Integer deliveryPrice;  
93 - @Schema(description = "应付金额（总）", required = true, example = "500")  
94 - private Integer payPrice;  
95 -  
96 - }  
97 -  
98 - @Schema(description = "营销活动") // 对应 PriceCalculateRespDTO.Promotion 类的属性  
99 - @Data  
100 - public static class Promotion {  
101 -  
102 - @Schema(description = "营销编号", required = true, example = "1024") // 营销活动的编号、优惠劵的编号  
103 - private Long id;  
104 - @Schema(description = "营销名字", required = true, example = "xx 活动")  
105 - private String name;  
106 - @Schema(description = "营销类型", required = true, example = "1")  
107 - private Integer type;  
108 -  
109 - // ========== 匹配情况 ==========  
110 - @Schema(description = "是否满足优惠条件", required = true, example = "true")  
111 - private Boolean meet;  
112 - @Schema(description = "满足条件的提示", required = true, example = "圣诞价:省 150.00 元")  
113 - private String meetTip;  
114 -  
115 - }  
116 -  
117 -}  
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartItemUpdateSelectedReqVO.java deleted
View file @e163ae8
1 -package cn.iocoder.yudao.module.trade.controller.app.cart.vo;  
2 -  
3 -import io.swagger.v3.oas.annotations.media.Schema;  
4 -import lombok.Data;  
5 -  
6 -import javax.validation.constraints.NotNull;  
7 -import java.util.Collection;  
8 -  
9 -@Schema(description = "用户 App - 购物车更新是否选中 Request VO")  
10 -@Data  
11 -public class AppTradeCartItemUpdateSelectedReqVO {  
12 -  
13 - @Schema(description = "商品 SKU 编号列表", required = true, example = "1024,2048")  
14 - @NotNull(message = "商品 SKU 编号列表不能为空")  
15 - private Collection<Long> skuIds;  
16 -  
17 - @Schema(description = "是否选中", required = true, example = "true")  
18 - @NotNull(message = "是否选中不能为空")  
19 - private Boolean selected;  
20 -  
21 -}  
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartListRespVO.java 0 → 100644
  View file @c233ce1
  1 +package cn.iocoder.yudao.module.trade.controller.app.cart.vo;
  2 +
  3 +import cn.iocoder.yudao.module.trade.controller.app.base.sku.AppProductSkuBaseRespVO;
  4 +import cn.iocoder.yudao.module.trade.controller.app.base.spu.AppProductSpuBaseRespVO;
  5 +import io.swagger.v3.oas.annotations.media.Schema;
  6 +import lombok.Data;
  7 +
  8 +import java.util.List;
  9 +
  10 +@Schema(description = "用户 App - 用户的购物列表 Response VO")
  11 +@Data
  12 +public class AppTradeCartListRespVO {
  13 +
  14 + /**
  15 + * 有效的购物项数组
  16 + */
  17 + private List<Cart> validList;
  18 +
  19 + /**
  20 + * 无效的购物项数组
  21 + */
  22 + private List<Cart> invalidList;
  23 +
  24 + @Schema(description = "购物项")
  25 + @Data
  26 + public static class Cart {
  27 +
  28 + @Schema(description = "购物项的编号", required = true, example = "1024")
  29 + private Long id;
  30 +
  31 + @Schema(description = "商品数量", required = true, example = "1")
  32 + private Integer count;
  33 +
  34 + /**
  35 + * 商品 SPU
  36 + */
  37 + private AppProductSpuBaseRespVO spu;
  38 + /**
  39 + * 商品 SKU
  40 + */
  41 + private AppProductSkuBaseRespVO sku;
  42 +
  43 + }
  44 +
  45 +}
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartItemUpdateCountReqVO.java renamed to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartResetReqVO.java
  View file @c233ce1
@@ -6,11 +6,15 @@ import lombok.Data; @@ -6,11 +6,15 @@ import lombok.Data;
6 import javax.validation.constraints.Min; 6 import javax.validation.constraints.Min;
7 import javax.validation.constraints.NotNull; 7 import javax.validation.constraints.NotNull;
8 8
9 -@Schema(description = "用户 App - 购物车更新数量 Request VO") 9 +@Schema(description = "用户 App - 购物车重置 Request VO")
10 @Data 10 @Data
11 -public class AppTradeCartItemUpdateCountReqVO { 11 +public class AppTradeCartResetReqVO {
12 12
13 - @Schema(description = "商品 SKU 编号", required = true, example = "1024") 13 + @Schema(description = "编号", required = true, example = "1024")
  14 + @NotNull(message = "编号不能为空")
  15 + private Long id;
  16 +
  17 + @Schema(description = "商品 SKU 编号", required = true,example = "1024")
14 @NotNull(message = "商品 SKU 编号不能为空") 18 @NotNull(message = "商品 SKU 编号不能为空")
15 private Long skuId; 19 private Long skuId;
16 20
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartUpdateReqVO.java 0 → 100644
  View file @c233ce1
  1 +package cn.iocoder.yudao.module.trade.controller.app.cart.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import javax.validation.constraints.Min;
  7 +import javax.validation.constraints.NotNull;
  8 +
  9 +@Schema(description = "用户 App - 购物车更新 Request VO")
  10 +@Data
  11 +public class AppTradeCartUpdateReqVO {
  12 +
  13 + @Schema(description = "编号", required = true, example = "1024")
  14 + @NotNull(message = "编号不能为空")
  15 + private Long id;
  16 +
  17 + @Schema(description = "商品数量", required = true, example = "1")
  18 + @NotNull(message = "数量不能为空")
  19 + @Min(message = "数量必须大于 0", value = 1L)
  20 + private Integer count;
  21 +
  22 +}
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/cart/TradeCartConvert.java
  View file @c233ce1
1 package cn.iocoder.yudao.module.trade.convert.cart; 1 package cn.iocoder.yudao.module.trade.convert.cart;
2 2
3 -import cn.iocoder.yudao.module.promotion.api.price.dto.PriceCalculateReqDTO;  
4 -import cn.iocoder.yudao.module.promotion.api.price.dto.PriceCalculateRespDTO;  
5 -import cn.iocoder.yudao.module.trade.controller.app.cart.vo.AppTradeCartDetailRespVO;  
6 -import cn.iocoder.yudao.module.trade.dal.dataobject.cart.TradeCartItemDO; 3 +import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuRespDTO;
  4 +import cn.iocoder.yudao.module.product.api.spu.dto.ProductSpuRespDTO;
  5 +import cn.iocoder.yudao.module.product.enums.spu.ProductSpuStatusEnum;
  6 +import cn.iocoder.yudao.module.trade.controller.app.base.sku.AppProductSkuBaseRespVO;
  7 +import cn.iocoder.yudao.module.trade.controller.app.base.spu.AppProductSpuBaseRespVO;
  8 +import cn.iocoder.yudao.module.trade.controller.app.cart.vo.AppTradeCartListRespVO;
  9 +import cn.iocoder.yudao.module.trade.dal.dataobject.cart.TradeCartDO;
7 import org.mapstruct.Mapper; 10 import org.mapstruct.Mapper;
8 -import org.mapstruct.Mapping;  
9 -import org.mapstruct.Mappings;  
10 import org.mapstruct.factory.Mappers; 11 import org.mapstruct.factory.Mappers;
11 12
12 -import java.util.Collections; 13 +import java.util.ArrayList;
13 import java.util.List; 14 import java.util.List;
  15 +import java.util.Map;
14 16
15 -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; 17 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
16 18
17 @Mapper 19 @Mapper
18 public interface TradeCartConvert { 20 public interface TradeCartConvert {
19 21
20 TradeCartConvert INSTANCE = Mappers.getMapper(TradeCartConvert.class); 22 TradeCartConvert INSTANCE = Mappers.getMapper(TradeCartConvert.class);
21 23
22 - default AppTradeCartDetailRespVO buildEmptyAppTradeCartDetailRespVO() {  
23 - return new AppTradeCartDetailRespVO().setItemGroups(Collections.emptyList())  
24 - .setOrder(new AppTradeCartDetailRespVO.Order().setSkuOriginalPrice(0).setSkuPromotionPrice(0)  
25 - .setOrderPromotionPrice(0).setDeliveryPrice(0).setPayPrice(0)); 24 + default AppTradeCartListRespVO convertList(List<TradeCartDO> carts,
  25 + List<ProductSpuRespDTO> spus, List<ProductSkuRespDTO> skus) {
  26 + Map<Long, ProductSpuRespDTO> spuMap = convertMap(spus, ProductSpuRespDTO::getId);
  27 + Map<Long, ProductSkuRespDTO> skuMap = convertMap(skus, ProductSkuRespDTO::getId);
  28 + // 遍历，开始转换
  29 + List<AppTradeCartListRespVO.Cart> validList = new ArrayList<>(carts.size());
  30 + List<AppTradeCartListRespVO.Cart> invalidList = new ArrayList<>();
  31 + carts.forEach(cart -> {
  32 + AppTradeCartListRespVO.Cart cartVO = new AppTradeCartListRespVO.Cart();
  33 + cartVO.setId(cart.getId()).setCount(cart.getCount());
  34 + ProductSpuRespDTO spu = spuMap.get(cart.getSpuId());
  35 + ProductSkuRespDTO sku = skuMap.get(cart.getSkuId());
  36 + cartVO.setSpu(convert(spu)).setSku(convert(sku));
  37 + // 如果 SPU 不存在，或者下架，或者库存不足，说明是无效的
  38 + if (spu == null
  39 + || !ProductSpuStatusEnum.isEnable(spu.getStatus())
  40 + || spu.getStock() <= 0) {
  41 + invalidList.add(cartVO);
  42 + } else {
  43 + // 虽然 SKU 可能也会不存在，但是可以通过购物车重新选择
  44 + validList.add(cartVO);
  45 + }
  46 + });
  47 + return new AppTradeCartListRespVO().setValidList(validList).setInvalidList(invalidList);
26 } 48 }
27 -  
28 - default PriceCalculateReqDTO convert(Long userId, List<TradeCartItemDO> cartItems) {  
29 - return new PriceCalculateReqDTO().setUserId(userId)  
30 - .setItems(convertList(cartItems, cartItem -> new PriceCalculateReqDTO.Item().setSkuId(cartItem.getSkuId())  
31 - .setCount(cartItem.getSelected() ? cartItem.getCount() : 0)));  
32 - }  
33 -  
34 - // ========== AppTradeCartDetailRespVO 相关 ==========  
35 -  
36 - AppTradeCartDetailRespVO.Promotion convert(PriceCalculateRespDTO.Promotion bean);  
37 -  
38 - @Mappings({  
39 - @Mapping(source = "cartItem.count", target = "count")  
40 - })  
41 - AppTradeCartDetailRespVO.Sku convert(PriceCalculateRespDTO.OrderItem orderItem, TradeCartItemDO cartItem);  
42 -  
43 - AppTradeCartDetailRespVO.Order convert(PriceCalculateRespDTO.Order bean); 49 + AppProductSpuBaseRespVO convert(ProductSpuRespDTO spu);
  50 + AppProductSkuBaseRespVO convert(ProductSkuRespDTO sku);
44 51
45 } 52 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/TradeCartItemDO.java renamed to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/TradeCartDO.java
  View file @c233ce1
@@ -9,13 +9,15 @@ import lombok.experimental.Accessors; @@ -9,13 +9,15 @@ import lombok.experimental.Accessors;
9 /** 9 /**
10 * 购物车的商品信息 DO 10 * 购物车的商品信息 DO
11 * 11 *
  12 + * 每个商品，对应一条记录，通过 {@link #spuId} 和 {@link #skuId} 关联
  13 + *
12 * @author 芋道源码 14 * @author 芋道源码
13 */ 15 */
14 -@TableName("trade_cart_item") 16 +@TableName("trade_cart")
15 @Data 17 @Data
16 @EqualsAndHashCode(callSuper = true) 18 @EqualsAndHashCode(callSuper = true)
17 @Accessors(chain = true) 19 @Accessors(chain = true)
18 -public class TradeCartItemDO extends BaseDO { 20 +public class TradeCartDO extends BaseDO {
19 21
20 // ========= 基础字段 BEGIN ========= 22 // ========= 基础字段 BEGIN =========
21 23
@@ -23,14 +25,6 @@ public class TradeCartItemDO extends BaseDO { @@ -23,14 +25,6 @@ public class TradeCartItemDO extends BaseDO {
23 * 编号，唯一自增 25 * 编号，唯一自增
24 */ 26 */
25 private Long id; 27 private Long id;
26 - /**  
27 - * 是否选中  
28 - */  
29 - private Boolean selected;  
30 -  
31 - // ========= 基础字段 END =========  
32 -  
33 - // ========= 买家信息 BEGIN =========  
34 28
35 /** 29 /**
36 * 用户编号 30 * 用户编号
@@ -39,7 +33,25 @@ public class TradeCartItemDO extends BaseDO { @@ -39,7 +33,25 @@ public class TradeCartItemDO extends BaseDO {
39 */ 33 */
40 private Long userId; 34 private Long userId;
41 35
42 - // ========= 买家信息 END ========= 36 + /**
  37 + * 是否添加到购物车
  38 + *
  39 + * false - 未添加：用户点击【立即购买】
  40 + * true - 已添加：用户点击【添加购物车】
  41 + *
  42 + * 为什么要设计这个字段？
  43 + * 配合 orderStatus 字段，可以知道有多少商品，用户点击了【立即购买】，最终多少【确认下单】
  44 + */
  45 + private Boolean addStatus;
  46 + /**
  47 + * 是否提交订单
  48 + *
  49 + * false - 未下单：立即购买，或者添加到购物车，此时设置为 false
  50 + * true - 已下单：确认下单，此时设置为 true
  51 + */
  52 + private Boolean orderStatus;
  53 +
  54 + // ========= 基础字段 END =========
43 55
44 // ========= 商品信息 BEGIN ========= 56 // ========= 商品信息 BEGIN =========
45 57
@@ -64,27 +76,11 @@ public class TradeCartItemDO extends BaseDO { @@ -64,27 +76,11 @@ public class TradeCartItemDO extends BaseDO {
64 76
65 // ========= 优惠信息 BEGIN ========= 77 // ========= 优惠信息 BEGIN =========
66 78
67 -// /**  
68 -// * 商品营销活动编号  
69 -// */  
70 -// private Long activityId; // discount_id  
71 -// /**  
72 -// * 商品营销活动类型  
73 -// */  
74 -// private Integer activityType;  
75 // TODO 芋艿：combination_id 拼团 ID 79 // TODO 芋艿：combination_id 拼团 ID
76 // TODO 芋艿：seckill_id 秒杀产品 ID 80 // TODO 芋艿：seckill_id 秒杀产品 ID
77 // TODO 芋艿：bargain_id 砍价 ID 81 // TODO 芋艿：bargain_id 砍价 ID
  82 + // TODO 芋艿：pinkId 团长拼团 ID
78 83
79 // ========= 优惠信息 END ========= 84 // ========= 优惠信息 END =========
80 85
81 - // TODO 待确定字段：mf  
82 - // TODO 芋艿：distribution_card_no 推广员  
83 - // TODO 芋艿：is_pay 未购买、已购买  
84 - // TODO 芋艿：is_new 是否立即购买  
85 -  
86 - // TODO 待确定字段: yv  
87 - // TODO isPay: 是否购买  
88 - // TODO isNew：是否立即购买  
89 -  
90 } 86 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/cart/TradeCartItemMapper.java deleted
View file @e163ae8
1 -package cn.iocoder.yudao.module.trade.dal.mysql.cart;  
2 -  
3 -import cn.hutool.core.collection.CollUtil;  
4 -import cn.hutool.core.map.MapUtil;  
5 -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;  
6 -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;  
7 -import cn.iocoder.yudao.module.trade.dal.dataobject.cart.TradeCartItemDO;  
8 -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;  
9 -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;  
10 -import org.apache.ibatis.annotations.Mapper;  
11 -  
12 -import java.util.Collection;  
13 -import java.util.List;  
14 -import java.util.Map;  
15 -  
16 -@Mapper  
17 -public interface TradeCartItemMapper extends BaseMapperX<TradeCartItemDO> {  
18 -  
19 - default TradeCartItemDO selectByUserIdAndSkuId(Long userId, Long skuId) {  
20 - return selectOne(TradeCartItemDO::getUserId, userId,  
21 - TradeCartItemDO::getSkuId, skuId);  
22 - }  
23 -  
24 - default List<TradeCartItemDO> selectListByUserIdAndSkuIds(Long userId, Collection<Long> skuIds) {  
25 - return selectList(new LambdaQueryWrapper<TradeCartItemDO>().eq(TradeCartItemDO::getUserId, userId)  
26 - .in(TradeCartItemDO::getSkuId, skuIds));  
27 - }  
28 -  
29 - default void updateByIds(Collection<Long> ids, TradeCartItemDO updateObject) {  
30 - update(updateObject, new LambdaQueryWrapper<TradeCartItemDO>().in(TradeCartItemDO::getId, ids));  
31 - }  
32 -  
33 - default Integer selectSumByUserId(Long userId) {  
34 - // SQL sum 查询  
35 - List<Map<String, Object>> result = selectMaps(new QueryWrapper<TradeCartItemDO>()  
36 - .select("SUM(count) AS sumCount")  
37 - .eq("user_id", userId));  
38 - // 获得数量  
39 - return CollUtil.isNotEmpty(result) ? MapUtil.getInt(result.get(0), "sumCount") : 0;  
40 - }  
41 -  
42 - default List<TradeCartItemDO> selectListByUserId(Long userId, Boolean selected) {  
43 - return selectList(new LambdaQueryWrapperX<TradeCartItemDO>().eq(TradeCartItemDO::getUserId, userId)  
44 - .eqIfPresent(TradeCartItemDO::getSelected, selected));  
45 - }  
46 -  
47 -}  
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/cart/TradeCartMapper.java 0 → 100644
  View file @c233ce1
  1 +package cn.iocoder.yudao.module.trade.dal.mysql.cart;
  2 +
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.hutool.core.map.MapUtil;
  5 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  6 +import cn.iocoder.yudao.module.trade.dal.dataobject.cart.TradeCartDO;
  7 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  8 +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
  9 +import org.apache.ibatis.annotations.Mapper;
  10 +
  11 +import java.util.Collection;
  12 +import java.util.List;
  13 +import java.util.Map;
  14 +
  15 +@Mapper
  16 +public interface TradeCartMapper extends BaseMapperX<TradeCartDO> {
  17 +
  18 + default TradeCartDO selectByUserIdAndSkuId(Long userId, Long skuId,
  19 + Boolean addStatus, Boolean orderStatus) {
  20 + return selectOne(TradeCartDO::getUserId, userId,
  21 + TradeCartDO::getSkuId, skuId,
  22 + TradeCartDO::getAddStatus, addStatus,
  23 + TradeCartDO::getOrderStatus, orderStatus);
  24 + }
  25 +
  26 + default Integer selectSumByUserId(Long userId) {
  27 + // SQL sum 查询
  28 + List<Map<String, Object>> result = selectMaps(new QueryWrapper<TradeCartDO>()
  29 + .select("SUM(count) AS sumCount")
  30 + .eq("user_id", userId)
  31 + .eq("add_status", true) // 只计算添加到购物车中的
  32 + .eq("order_status", false)); // 必须未下单
  33 + // 获得数量
  34 + return CollUtil.getFirst(result) != null ? MapUtil.getInt(result.get(0), "sumCount") : 0;
  35 + }
  36 +
  37 + default TradeCartDO selectById(Long id, Long userId) {
  38 + return selectOne(TradeCartDO::getId, id,
  39 + TradeCartDO::getUserId, userId);
  40 + }
  41 +
  42 + default List<TradeCartDO> selectListByIds(Collection<Long> ids, Long userId) {
  43 + return selectList(new LambdaQueryWrapper<TradeCartDO>()
  44 + .in(TradeCartDO::getId, ids)
  45 + .eq(TradeCartDO::getUserId, userId));
  46 + }
  47 +
  48 + default List<TradeCartDO> selectListByUserId(Long userId, Boolean addStatus, Boolean orderStatus) {
  49 + return selectList(new LambdaQueryWrapper<TradeCartDO>()
  50 + .eq(TradeCartDO::getUserId, userId)
  51 + .eq(TradeCartDO::getAddStatus, addStatus)
  52 + .eq(TradeCartDO::getOrderStatus, orderStatus));
  53 + }
  54 +
  55 + default void updateByIds(Collection<Long> ids, TradeCartDO updateObject) {
  56 + update(updateObject, new LambdaQueryWrapper<TradeCartDO>().in(TradeCartDO::getId, ids));
  57 + }
  58 +
  59 +}
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/cart/TradeCartService.java
  View file @c233ce1
1 package cn.iocoder.yudao.module.trade.service.cart; 1 package cn.iocoder.yudao.module.trade.service.cart;
2 2
3 -import cn.iocoder.yudao.module.trade.controller.app.cart.vo.AppTradeCartDetailRespVO;  
4 -import cn.iocoder.yudao.module.trade.controller.app.cart.vo.AppTradeCartItemAddCountReqVO;  
5 -import cn.iocoder.yudao.module.trade.controller.app.cart.vo.AppTradeCartItemUpdateCountReqVO;  
6 -import cn.iocoder.yudao.module.trade.controller.app.cart.vo.AppTradeCartItemUpdateSelectedReqVO; 3 +import cn.iocoder.yudao.module.trade.controller.app.cart.vo.AppTradeCartAddReqVO;
  4 +import cn.iocoder.yudao.module.trade.controller.app.cart.vo.AppTradeCartListRespVO;
  5 +import cn.iocoder.yudao.module.trade.controller.app.cart.vo.AppTradeCartResetReqVO;
  6 +import cn.iocoder.yudao.module.trade.controller.app.cart.vo.AppTradeCartUpdateReqVO;
7 7
8 import javax.validation.Valid; 8 import javax.validation.Valid;
9 import java.util.Collection; 9 import java.util.Collection;
@@ -19,9 +19,10 @@ public interface TradeCartService { @@ -19,9 +19,10 @@ public interface TradeCartService {
19 * 添加商品到购物车 19 * 添加商品到购物车
20 * 20 *
21 * @param userId 用户编号 21 * @param userId 用户编号
22 - * @param addCountReqVO 添加信息 22 + * @param addReqVO 添加信息
  23 + * @return 购物项的编号
23 */ 24 */
24 - void addCartItemCount(Long userId, @Valid AppTradeCartItemAddCountReqVO addCountReqVO); 25 + Long addCart(Long userId, @Valid AppTradeCartAddReqVO addReqVO);
25 26
26 /** 27 /**
27 * 更新购物车商品数量 28 * 更新购物车商品数量
@@ -29,23 +30,25 @@ public interface TradeCartService { @@ -29,23 +30,25 @@ public interface TradeCartService {
29 * @param userId 用户编号 30 * @param userId 用户编号
30 * @param updateCountReqVO 更新信息 31 * @param updateCountReqVO 更新信息
31 */ 32 */
32 - void updateCartItemCount(Long userId, AppTradeCartItemUpdateCountReqVO updateCountReqVO); 33 + void updateCart(Long userId, AppTradeCartUpdateReqVO updateCountReqVO);
33 34
34 /** 35 /**
35 - * 更新购物车商品是否选中 36 + * 重置购物车商品
  37 + *
  38 + * 使用场景：在一个购物车项对应的商品失效（例如说 SPU 被下架），可以重新选择对应的 SKU
36 * 39 *
37 * @param userId 用户编号 40 * @param userId 用户编号
38 - * @param updateSelectedReqVO 更新信息 41 + * @param updateReqVO 重置信息
39 */ 42 */
40 - void updateCartItemSelected(Long userId, AppTradeCartItemUpdateSelectedReqVO updateSelectedReqVO); 43 + void resetCart(Long userId, AppTradeCartResetReqVO updateReqVO);
41 44
42 /** 45 /**
43 * 删除购物车商品 46 * 删除购物车商品
44 * 47 *
45 * @param userId 用户编号 48 * @param userId 用户编号
46 - * @param skuIds SKU 编号的数组 49 + * @param ids 购物项的编号
47 */ 50 */
48 - void deleteCartItems(Long userId, Collection<Long> skuIds); 51 + void deleteCart(Long userId, Collection<Long> ids);
49 52
50 /** 53 /**
51 * 查询用户在购物车中的商品数量 54 * 查询用户在购物车中的商品数量
@@ -56,11 +59,11 @@ public interface TradeCartService { @@ -56,11 +59,11 @@ public interface TradeCartService {
56 Integer getCartCount(Long userId); 59 Integer getCartCount(Long userId);
57 60
58 /** 61 /**
59 - * 查询用户的购物车详情 62 + * 查询用户的购物车列表
60 * 63 *
61 * @param userId 用户编号 64 * @param userId 用户编号
62 - * @return 购物车详情 65 + * @return 购物车列表
63 */ 66 */
64 - AppTradeCartDetailRespVO getCartDetail(Long userId); 67 + AppTradeCartListRespVO getCartList(Long userId);
65 68
66 } 69 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/cart/TradeCartServiceImpl.java
  View file @c233ce1
1 package cn.iocoder.yudao.module.trade.service.cart; 1 package cn.iocoder.yudao.module.trade.service.cart;
2 2
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 -import cn.hutool.core.lang.Assert;  
5 -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;  
6 -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;  
7 -import cn.iocoder.yudao.module.promotion.api.price.PriceApi;  
8 -import cn.iocoder.yudao.module.promotion.api.price.dto.PriceCalculateRespDTO;  
9 -import cn.iocoder.yudao.module.promotion.enums.common.PromotionLevelEnum;  
10 import cn.iocoder.yudao.module.product.api.sku.ProductSkuApi; 4 import cn.iocoder.yudao.module.product.api.sku.ProductSkuApi;
11 import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuRespDTO; 5 import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuRespDTO;
12 -import cn.iocoder.yudao.module.trade.controller.app.cart.vo.AppTradeCartDetailRespVO;  
13 -import cn.iocoder.yudao.module.trade.controller.app.cart.vo.AppTradeCartItemAddCountReqVO;  
14 -import cn.iocoder.yudao.module.trade.controller.app.cart.vo.AppTradeCartItemUpdateCountReqVO;  
15 -import cn.iocoder.yudao.module.trade.controller.app.cart.vo.AppTradeCartItemUpdateSelectedReqVO; 6 +import cn.iocoder.yudao.module.product.api.spu.ProductSpuApi;
  7 +import cn.iocoder.yudao.module.product.api.spu.dto.ProductSpuRespDTO;
  8 +import cn.iocoder.yudao.module.trade.controller.app.cart.vo.AppTradeCartAddReqVO;
  9 +import cn.iocoder.yudao.module.trade.controller.app.cart.vo.AppTradeCartListRespVO;
  10 +import cn.iocoder.yudao.module.trade.controller.app.cart.vo.AppTradeCartResetReqVO;
  11 +import cn.iocoder.yudao.module.trade.controller.app.cart.vo.AppTradeCartUpdateReqVO;
16 import cn.iocoder.yudao.module.trade.convert.cart.TradeCartConvert; 12 import cn.iocoder.yudao.module.trade.convert.cart.TradeCartConvert;
17 -import cn.iocoder.yudao.module.trade.dal.dataobject.cart.TradeCartItemDO;  
18 -import cn.iocoder.yudao.module.trade.dal.mysql.cart.TradeCartItemMapper; 13 +import cn.iocoder.yudao.module.trade.dal.dataobject.cart.TradeCartDO;
  14 +import cn.iocoder.yudao.module.trade.dal.mysql.cart.TradeCartMapper;
19 import org.springframework.stereotype.Service; 15 import org.springframework.stereotype.Service;
  16 +import org.springframework.transaction.annotation.Transactional;
20 import org.springframework.validation.annotation.Validated; 17 import org.springframework.validation.annotation.Validated;
21 18
22 import javax.annotation.Resource; 19 import javax.annotation.Resource;
23 -import java.util.ArrayList;  
24 import java.util.Collection; 20 import java.util.Collection;
  21 +import java.util.Comparator;
25 import java.util.List; 22 import java.util.List;
26 -import java.util.Map;  
27 23
28 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; 24 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
29 -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; 25 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
30 import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.SKU_NOT_EXISTS; 26 import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.SKU_NOT_EXISTS;
31 import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.SKU_STOCK_NOT_ENOUGH; 27 import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.SKU_STOCK_NOT_ENOUGH;
32 import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.CARD_ITEM_NOT_FOUND; 28 import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.CARD_ITEM_NOT_FOUND;
  29 +import static java.util.Collections.emptyList;
33 30
34 /** 31 /**
35 * 购物车 Service 实现类 32 * 购物车 Service 实现类
36 * 33 *
  34 + * // TODO 芋艿：秒杀、拼团、砍价对购物车的影响
  35 + * // TODO 芋艿：未来优化：购物车的价格计算，支持营销信息
  36 + *
37 * @author 芋道源码 37 * @author 芋道源码
38 */ 38 */
39 @Service 39 @Service
@@ -41,123 +41,134 @@ import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.CARD_ITEM_N @@ -41,123 +41,134 @@ import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.CARD_ITEM_N
41 public class TradeCartServiceImpl implements TradeCartService { 41 public class TradeCartServiceImpl implements TradeCartService {
42 42
43 @Resource 43 @Resource
44 - private TradeCartItemMapper cartItemMapper; 44 + private TradeCartMapper cartMapper;
45 45
46 @Resource 46 @Resource
47 - private ProductSkuApi productSkuApi; 47 + private ProductSpuApi productSpuApi;
48 @Resource 48 @Resource
49 - private PriceApi priceApi; 49 + private ProductSkuApi productSkuApi;
50 50
51 @Override 51 @Override
52 - public void addCartItemCount(Long userId, AppTradeCartItemAddCountReqVO addCountReqVO) {  
53 - Long skuId = addCountReqVO.getSkuId();  
54 - Integer count = addCountReqVO.getCount();  
55 - // 查询 CartItemDO  
56 - TradeCartItemDO tradeItem = cartItemMapper.selectByUserIdAndSkuId(userId, addCountReqVO.getSkuId());  
57 -  
58 - // 存在，则进行数量更新  
59 - if (tradeItem != null) {  
60 - checkProductSku(skuId, tradeItem.getCount() + count);  
61 - cartItemMapper.updateById(new TradeCartItemDO().setId(tradeItem.getId())  
62 - .setSelected(true).setCount(tradeItem.getCount() + count));  
63 - return; 52 + public Long addCart(Long userId, AppTradeCartAddReqVO addReqVO) {
  53 + // 查询 TradeCartDO
  54 + TradeCartDO cart = cartMapper.selectByUserIdAndSkuId(userId, addReqVO.getSkuId(),
  55 + addReqVO.getAddStatus(), false);
  56 + // 校验 SKU
  57 + Integer count = cart != null && addReqVO.getAddStatus() ?
  58 + cart.getCount() + addReqVO.getCount() : addReqVO.getCount();
  59 + ProductSkuRespDTO sku = checkProductSku(addReqVO.getSkuId(), count);
  60 +
  61 + // 情况零：特殊，count 小于等于 0，说明前端项目删除
  62 + // 情况一：存在，则进行数量更新
  63 + if (cart != null) {
  64 + // 特殊情况，如果 count 小于等于 0，说明前端想要删除
  65 + if (count <= 0) {
  66 + cartMapper.deleteById(cart.getId());
  67 + } else {
  68 + cartMapper.updateById(new TradeCartDO().setId(cart.getId()).setCount(count));
  69 + }
  70 + return cart.getId();
  71 + // 情况二：不存在，则进行插入
  72 + } else {
  73 + cart = new TradeCartDO().setUserId(userId)
  74 + .setSpuId(sku.getSpuId()).setSkuId(sku.getId()).setCount(count)
  75 + .setAddStatus(addReqVO.getAddStatus()).setOrderStatus(false);
  76 + cartMapper.insert(cart);
64 } 77 }
65 -  
66 - // 不存在，则进行插入  
67 - ProductSkuRespDTO sku = checkProductSku(skuId, count);  
68 - cartItemMapper.insert(new TradeCartItemDO().setUserId(userId).setSpuId(sku.getSpuId()).setSkuId(sku.getId())  
69 - .setSelected(true).setCount(count)); 78 + return cart.getId();
70 } 79 }
71 80
72 @Override 81 @Override
73 - public void updateCartItemCount(Long userId, AppTradeCartItemUpdateCountReqVO updateCountReqVO) {  
74 - // 校验 TradeCartItemDO 存在  
75 - TradeCartItemDO tradeItem = cartItemMapper.selectByUserIdAndSkuId(userId, updateCountReqVO.getSkuId());  
76 - if (tradeItem == null) { 82 + public void updateCart(Long userId, AppTradeCartUpdateReqVO updateReqVO) {
  83 + // 校验 TradeCartDO 存在
  84 + TradeCartDO cart = cartMapper.selectById(updateReqVO.getId(), userId);
  85 + if (cart == null) {
77 throw exception(CARD_ITEM_NOT_FOUND); 86 throw exception(CARD_ITEM_NOT_FOUND);
78 } 87 }
79 // 校验商品 SKU 88 // 校验商品 SKU
80 - checkProductSku(updateCountReqVO.getSkuId(), updateCountReqVO.getCount()); 89 + checkProductSku(cart.getSkuId(), updateReqVO.getCount());
81 90
82 // 更新数量 91 // 更新数量
83 - cartItemMapper.updateById(new TradeCartItemDO().setId(tradeItem.getId()).setCount(updateCountReqVO.getCount())); 92 + cartMapper.updateById(new TradeCartDO().setId(cart.getId())
  93 + .setCount(updateReqVO.getCount()));
84 } 94 }
85 95
86 @Override 96 @Override
87 - public void updateCartItemSelected(Long userId, AppTradeCartItemUpdateSelectedReqVO updateSelectedReqVO) {  
88 - // 查询 CartItemDO 列表  
89 - List<TradeCartItemDO> cartItems = cartItemMapper.selectListByUserIdAndSkuIds(userId, updateSelectedReqVO.getSkuIds());  
90 - if (CollUtil.isEmpty(cartItems)) {  
91 - return; 97 + @Transactional(rollbackFor = Exception.class)
  98 + public void resetCart(Long userId, AppTradeCartResetReqVO resetReqVO) {
  99 + // 第一步：删除原本的购物项
  100 + TradeCartDO oldCart = cartMapper.selectById(resetReqVO.getId(), userId);
  101 + if (oldCart == null) {
  102 + throw exception(CARD_ITEM_NOT_FOUND);
  103 + }
  104 + cartMapper.deleteById(oldCart.getId());
  105 +
  106 + // 第二步：添加新的购物项
  107 + TradeCartDO newCart = cartMapper.selectByUserIdAndSkuId(userId, resetReqVO.getSkuId(),
  108 + true, false);
  109 + if (newCart != null) {
  110 + updateCart(userId, new AppTradeCartUpdateReqVO()
  111 + .setId(newCart.getId()).setCount(resetReqVO.getCount()));
  112 + } else {
  113 + addCart(userId, new AppTradeCartAddReqVO().setAddStatus(true)
  114 + .setSkuId(resetReqVO.getSkuId()).setCount(resetReqVO.getCount()));
92 } 115 }
93 -  
94 - // 更新选中  
95 - cartItemMapper.updateByIds(CollectionUtils.convertList(cartItems, TradeCartItemDO::getId),  
96 - new TradeCartItemDO().setSelected(updateSelectedReqVO.getSelected()));  
97 } 116 }
98 117
99 /** 118 /**
100 * 购物车删除商品 119 * 购物车删除商品
101 * 120 *
102 * @param userId 用户编号 121 * @param userId 用户编号
103 - * @param skuIds 商品 SKU 编号的数组 122 + * @param ids 商品 SKU 编号的数组
104 */ 123 */
105 @Override 124 @Override
106 - public void deleteCartItems(Long userId, Collection<Long> skuIds) {  
107 - // 查询 CartItemDO 列表  
108 - List<TradeCartItemDO> cartItems = cartItemMapper.selectListByUserIdAndSkuIds(userId, skuIds);  
109 - if (CollUtil.isEmpty(cartItems)) { 125 + public void deleteCart(Long userId, Collection<Long> ids) {
  126 + // 查询 TradeCartDO 列表
  127 + List<TradeCartDO> carts = cartMapper.selectListByIds(ids, userId);
  128 + if (CollUtil.isEmpty(carts)) {
110 return; 129 return;
111 } 130 }
112 131
113 // 批量标记删除 132 // 批量标记删除
114 - cartItemMapper.deleteBatchIds(CollectionUtils.convertSet(cartItems, TradeCartItemDO::getId)); 133 + cartMapper.deleteBatchIds(ids);
115 } 134 }
116 135
117 @Override 136 @Override
118 public Integer getCartCount(Long userId) { 137 public Integer getCartCount(Long userId) {
119 - return cartItemMapper.selectSumByUserId(userId); 138 + return cartMapper.selectSumByUserId(userId);
120 } 139 }
121 140
122 @Override 141 @Override
123 - public AppTradeCartDetailRespVO getCartDetail(Long userId) {  
124 - // 获得购物车的商品  
125 - List<TradeCartItemDO> cartItems = cartItemMapper.selectListByUserId(userId, null); 142 + public AppTradeCartListRespVO getCartList(Long userId) {
  143 + // 获得购物车的商品，只查询未下单的
  144 + List<TradeCartDO> carts = cartMapper.selectListByUserId(userId, true, false);
  145 + carts.sort(Comparator.comparing(TradeCartDO::getId).reversed());
126 // 如果未空，则返回空结果 146 // 如果未空，则返回空结果
127 - if (CollUtil.isEmpty(cartItems)) {  
128 - return TradeCartConvert.INSTANCE.buildEmptyAppTradeCartDetailRespVO(); 147 + if (CollUtil.isEmpty(carts)) {
  148 + return new AppTradeCartListRespVO().setValidList(emptyList())
  149 + .setInvalidList(emptyList());
129 } 150 }
130 151
131 - // 调用价格服务，计算价格  
132 - PriceCalculateRespDTO priceCalculate = priceApi.calculatePrice(TradeCartConvert.INSTANCE.convert(userId, cartItems));  
133 -  
134 - // 转换返回  
135 - Map<Long, TradeCartItemDO> cartItemMap = convertMap(cartItems, TradeCartItemDO::getSkuId);  
136 - Map<Long, PriceCalculateRespDTO.OrderItem> orderItemMap = convertMap(priceCalculate.getOrder().getItems(),  
137 - PriceCalculateRespDTO.OrderItem::getSkuId);  
138 - List<AppTradeCartDetailRespVO.ItemGroup> itemGroups = new ArrayList<>(cartItems.size());  
139 - // ① 场景一，营销活动，订单级别 TODO 芋艿：待测试  
140 - priceCalculate.getPromotions().stream().filter(promotion -> PromotionLevelEnum.ORDER.getLevel().equals(promotion.getLevel()))  
141 - .forEach(promotion -> {  
142 - AppTradeCartDetailRespVO.ItemGroup itemGroup = new AppTradeCartDetailRespVO.ItemGroup().setItems(new ArrayList<>())  
143 - .setPromotion(TradeCartConvert.INSTANCE.convert(promotion));  
144 - itemGroups.add(itemGroup);  
145 - promotion.getItems().forEach(promotionItem -> {  
146 - PriceCalculateRespDTO.OrderItem orderItem = orderItemMap.remove(promotionItem.getSkuId());  
147 - Assert.notNull(orderItem, "商品 SKU({}) 对应的订单项不能为空", promotionItem.getSkuId());  
148 - TradeCartItemDO cartItem = cartItemMap.get(orderItem.getSkuId());  
149 - itemGroup.getItems().add(TradeCartConvert.INSTANCE.convert(orderItem, cartItem)); // TODO spu  
150 - });  
151 - });  
152 - // ② 场景二，营销活动，商品级别  
153 - orderItemMap.values().forEach(orderItem -> {  
154 - AppTradeCartDetailRespVO.ItemGroup itemGroup = new AppTradeCartDetailRespVO.ItemGroup().setItems(new ArrayList<>(1)).setPromotion(null);  
155 - itemGroups.add(itemGroup);  
156 - TradeCartItemDO cartItem = cartItemMap.get(orderItem.getSkuId());  
157 - itemGroup.getItems().add(TradeCartConvert.INSTANCE.convert(orderItem, cartItem)); // TODO spu 152 + // 查询 SPU、SKU 列表
  153 + List<ProductSpuRespDTO> spus = productSpuApi.getSpuList(convertSet(carts, TradeCartDO::getSpuId));
  154 + List<ProductSkuRespDTO> skus = productSkuApi.getSkuList(convertSet(carts, TradeCartDO::getSkuId));
  155 +
  156 + // 如果 SPU 被删除，则删除购物车对应的商品。延迟删除
  157 + deleteCartIfSpuDeleted(carts, spus);
  158 +
  159 + // 拼接数据
  160 + return TradeCartConvert.INSTANCE.convertList(carts, spus, skus);
  161 + }
  162 +
  163 + private void deleteCartIfSpuDeleted(List<TradeCartDO> carts, List<ProductSpuRespDTO> spus) {
  164 + // 如果 SPU 被删除，则删除购物车对应的商品。延迟删除
  165 + carts.removeIf(cart -> {
  166 + if (spus.stream().noneMatch(spu -> spu.getId().equals(cart.getSpuId()))) {
  167 + cartMapper.deleteById(cart.getId());
  168 + return true;
  169 + }
  170 + return false;
158 }); 171 });
159 - return new AppTradeCartDetailRespVO().setItemGroups(itemGroups)  
160 - .setOrder(TradeCartConvert.INSTANCE.convert(priceCalculate.getOrder()));  
161 } 172 }
162 173
163 /** 174 /**
@@ -172,7 +183,7 @@ public class TradeCartServiceImpl implements TradeCartService { @@ -172,7 +183,7 @@ public class TradeCartServiceImpl implements TradeCartService {
172 */ 183 */
173 private ProductSkuRespDTO checkProductSku(Long skuId, Integer count) { 184 private ProductSkuRespDTO checkProductSku(Long skuId, Integer count) {
174 ProductSkuRespDTO sku = productSkuApi.getSku(skuId); 185 ProductSkuRespDTO sku = productSkuApi.getSku(skuId);
175 - if (sku == null || CommonStatusEnum.DISABLE.getStatus().equals(sku.getStatus())) { 186 + if (sku == null) {
176 throw exception(SKU_NOT_EXISTS); 187 throw exception(SKU_NOT_EXISTS);
177 } 188 }
178 if (count > sku.getStock()) { 189 if (count > sku.getStock()) {
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
  View file @c233ce1
@@ -5,7 +5,6 @@ import cn.hutool.core.util.IdUtil; @@ -5,7 +5,6 @@ import cn.hutool.core.util.IdUtil;
5 import cn.hutool.core.util.ObjectUtil; 5 import cn.hutool.core.util.ObjectUtil;
6 import cn.hutool.core.util.StrUtil; 6 import cn.hutool.core.util.StrUtil;
7 import cn.iocoder.yudao.framework.common.core.KeyValue; 7 import cn.iocoder.yudao.framework.common.core.KeyValue;
8 -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;  
9 import cn.iocoder.yudao.framework.common.enums.TerminalEnum; 8 import cn.iocoder.yudao.framework.common.enums.TerminalEnum;
10 import cn.iocoder.yudao.framework.common.pojo.PageResult; 9 import cn.iocoder.yudao.framework.common.pojo.PageResult;
11 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; 10 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
@@ -125,15 +124,10 @@ public class TradeOrderServiceImpl implements TradeOrderService { @@ -125,15 +124,10 @@ public class TradeOrderServiceImpl implements TradeOrderService {
125 if (items.size() != skus.size()) { 124 if (items.size() != skus.size()) {
126 throw exception(ORDER_CREATE_SKU_NOT_FOUND); 125 throw exception(ORDER_CREATE_SKU_NOT_FOUND);
127 } 126 }
128 - // 校验是否禁用 or 库存不足 127 + // 校验库存不足
129 Map<Long, ProductSkuRespDTO> skuMap = convertMap(skus, ProductSkuRespDTO::getId); 128 Map<Long, ProductSkuRespDTO> skuMap = convertMap(skus, ProductSkuRespDTO::getId);
130 items.forEach(item -> { 129 items.forEach(item -> {
131 ProductSkuRespDTO sku = skuMap.get(item.getSkuId()); 130 ProductSkuRespDTO sku = skuMap.get(item.getSkuId());
132 - // SKU 禁用  
133 - if (ObjectUtil.notEqual(CommonStatusEnum.ENABLE.getStatus(), sku.getStatus())) {  
134 - throw exception(ORDER_CREATE_SKU_NOT_SALE);  
135 - }  
136 - // SKU 库存不足  
137 if (item.getCount() > sku.getStock()) { 131 if (item.getCount() > sku.getStock()) {
138 throw exception(ErrorCodeConstants.ORDER_CREATE_SKU_STOCK_NOT_ENOUGH); 132 throw exception(ErrorCodeConstants.ORDER_CREATE_SKU_STOCK_NOT_ENOUGH);
139 } 133 }
yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceTest.java
  View file @c233ce1
@@ -99,10 +99,10 @@ public class TradeOrderServiceTest extends BaseDbUnitTest { @@ -99,10 +99,10 @@ public class TradeOrderServiceTest extends BaseDbUnitTest {
99 new AppTradeOrderCreateReqVO.Item().setSkuId(2L).setCount(4))); 99 new AppTradeOrderCreateReqVO.Item().setSkuId(2L).setCount(4)));
100 // mock 方法（商品 SKU 检查） 100 // mock 方法（商品 SKU 检查）
101 ProductSkuRespDTO sku01 = randomPojo(ProductSkuRespDTO.class, o -> o.setId(1L).setSpuId(11L) 101 ProductSkuRespDTO sku01 = randomPojo(ProductSkuRespDTO.class, o -> o.setId(1L).setSpuId(11L)
102 - .setPrice(50).setStock(100).setStatus(CommonStatusEnum.ENABLE.getStatus()) 102 + .setPrice(50).setStock(100)
103 .setProperties(singletonList(new ProductSkuRespDTO.Property().setPropertyId(111L).setValueId(222L)))); 103 .setProperties(singletonList(new ProductSkuRespDTO.Property().setPropertyId(111L).setValueId(222L))));
104 ProductSkuRespDTO sku02 = randomPojo(ProductSkuRespDTO.class, o -> o.setId(2L).setSpuId(21L) 104 ProductSkuRespDTO sku02 = randomPojo(ProductSkuRespDTO.class, o -> o.setId(2L).setSpuId(21L)
105 - .setPrice(20).setStock(50).setStatus(CommonStatusEnum.ENABLE.getStatus())) 105 + .setPrice(20).setStock(50))
106 .setProperties(singletonList(new ProductSkuRespDTO.Property().setPropertyId(333L).setValueId(444L))); 106 .setProperties(singletonList(new ProductSkuRespDTO.Property().setPropertyId(333L).setValueId(444L)));
107 when(productSkuApi.getSkuList(eq(asSet(1L, 2L)))).thenReturn(Arrays.asList(sku01, sku02)); 107 when(productSkuApi.getSkuList(eq(asSet(1L, 2L)))).thenReturn(Arrays.asList(sku01, sku02));
108 // mock 方法（商品 SPU 检查） 108 // mock 方法（商品 SPU 检查）
@@ -201,7 +201,7 @@ public class TradeOrderServiceTest extends BaseDbUnitTest { @@ -201,7 +201,7 @@ public class TradeOrderServiceTest extends BaseDbUnitTest {
201 assertEquals(tradeOrderItemDO01.getProperties().size(), 1); 201 assertEquals(tradeOrderItemDO01.getProperties().size(), 1);
202 assertEquals(tradeOrderItemDO01.getProperties().get(0).getPropertyId(), 111L); 202 assertEquals(tradeOrderItemDO01.getProperties().get(0).getPropertyId(), 111L);
203 assertEquals(tradeOrderItemDO01.getProperties().get(0).getValueId(), 222L); 203 assertEquals(tradeOrderItemDO01.getProperties().get(0).getValueId(), 222L);
204 - assertEquals(tradeOrderItemDO01.getSpuName(), sku01.getSpuName()); 204 + //assertEquals(tradeOrderItemDO01.getSpuName(), sku01.getSpuName()); TODO 找不到spuName
205 assertEquals(tradeOrderItemDO01.getPicUrl(), sku01.getPicUrl()); 205 assertEquals(tradeOrderItemDO01.getPicUrl(), sku01.getPicUrl());
206 assertEquals(tradeOrderItemDO01.getCount(), 3); 206 assertEquals(tradeOrderItemDO01.getCount(), 3);
207 assertEquals(tradeOrderItemDO01.getOriginalPrice(), 150); 207 assertEquals(tradeOrderItemDO01.getOriginalPrice(), 150);
@@ -221,7 +221,7 @@ public class TradeOrderServiceTest extends BaseDbUnitTest { @@ -221,7 +221,7 @@ public class TradeOrderServiceTest extends BaseDbUnitTest {
221 assertEquals(tradeOrderItemDO02.getProperties().size(), 1); 221 assertEquals(tradeOrderItemDO02.getProperties().size(), 1);
222 assertEquals(tradeOrderItemDO02.getProperties().get(0).getPropertyId(), 333L); 222 assertEquals(tradeOrderItemDO02.getProperties().get(0).getPropertyId(), 333L);
223 assertEquals(tradeOrderItemDO02.getProperties().get(0).getValueId(), 444L); 223 assertEquals(tradeOrderItemDO02.getProperties().get(0).getValueId(), 444L);
224 - assertEquals(tradeOrderItemDO02.getSpuName(), sku02.getSpuName()); 224 + //assertEquals(tradeOrderItemDO02.getSpuName(), sku02.getSpuName()); TODO 找不到spuName
225 assertEquals(tradeOrderItemDO02.getPicUrl(), sku02.getPicUrl()); 225 assertEquals(tradeOrderItemDO02.getPicUrl(), sku02.getPicUrl());
226 assertEquals(tradeOrderItemDO02.getCount(), 4); 226 assertEquals(tradeOrderItemDO02.getCount(), 4);
227 assertEquals(tradeOrderItemDO02.getOriginalPrice(), 80); 227 assertEquals(tradeOrderItemDO02.getOriginalPrice(), 80);