BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 49d726019a127199168c4ff1ccd846146e339856

Authored by puhui999
2 parents cd4940d7 fc570b60

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

Inline Side-by-side
Showing 14 changed files with 84 additions and 37 deletions
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/vo/AppCommentPageReqVO.java
  View file @49d7260
... ... @@ -8,7 +8,7 @@ import lombok.ToString;
8 8  
9 9 import javax.validation.constraints.NotNull;
10 10  
11   -@Schema(description = "用户APP - 商品评价分页 Request VO")
  11 +@Schema(description = "用户 App - 商品评价分页 Request VO")
12 12 @Data
13 13 @EqualsAndHashCode(callSuper = true)
14 14 @ToString(callSuper = true)
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/vo/AppProductCommentCreateReqVO.java
  View file @49d7260
... ... @@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull;
8 8 import javax.validation.constraints.Size;
9 9 import java.util.List;
10 10  
11   -@Schema(description = "用户APP - 商品评价创建 Request VO")
  11 +@Schema(description = "用户 App - 商品评价创建 Request VO")
12 12 @Data
13 13 @ToString(callSuper = true)
14 14 public class AppProductCommentCreateReqVO {
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/vo/AppProductCommentRespVO.java
  View file @49d7260
... ... @@ -14,11 +14,11 @@ import java.util.List;
14 14 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
15 15  
16 16 /**
17   - * 用户APP - 商品评价详情 Response VO
  17 + * 用户 App - 商品评价详情 Response VO
18 18 *
19 19 * @author HUIHUI
20 20 */
21   -@Schema(description = "用户APP - 商品评价详情 Response VO")
  21 +@Schema(description = "用户 App - 商品评价详情 Response VO")
22 22 @Data
23 23 @ToString(callSuper = true)
24 24 public class AppProductCommentRespVO {
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/favorite/vo/AppFavoritePageReqVO.java
  View file @49d7260
... ... @@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 4 import io.swagger.v3.oas.annotations.media.Schema;
5 5 import lombok.Data;
6 6  
7   -@Schema(description = "用户APP - 商品收藏分页查询 Request VO")
  7 +@Schema(description = "用户 App - 商品收藏分页查询 Request VO")
8 8 @Data
9 9 public class AppFavoritePageReqVO extends PageParam {
10 10 }
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/favorite/vo/AppFavoriteRespVO.java
  View file @49d7260
... ... @@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
4 4 import lombok.Data;
5 5 import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
6 6  
7   -@Schema(description = "用户APP - 商品收藏 Response VO")
  7 +@Schema(description = "用户 App - 商品收藏 Response VO")
8 8 @Data
9 9 public class AppFavoriteRespVO {
10 10  
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java
  View file @49d7260
... ... @@ -94,34 +94,31 @@ public class AppCombinationActivityController {
94 94 obj.setName("晚九点限时秒杀");
95 95 obj.setStatus(1);
96 96 obj.setStartTime(LocalDateTime.of(2023, 6, 15, 0, 0, 0));
97   - obj.setEndTime(LocalDateTime.of(2023, 6, 15, 23, 59, 0));
  97 + obj.setEndTime(LocalDateTime.of(2023, 6, 20, 23, 59, 0));
98 98 obj.setUserSize(2);
99 99 obj.setSuccessCount(100);
100 100 obj.setSpuId(633L);
  101 + obj.setSingleLimitCount(2);
  102 + obj.setTotalLimitCount(3);
  103 +
101 104 // 创建一个Product对象的列表
102 105 List<AppCombinationActivityDetailRespVO.Product> productList = new ArrayList<>();
103 106 // 创建三个新的Product对象并设置其属性的值
104 107 AppCombinationActivityDetailRespVO.Product product1 = new AppCombinationActivityDetailRespVO.Product();
105 108 product1.setSkuId(1L);
106 109 product1.setCombinationPrice(100);
107   - product1.setQuota(50);
108   - product1.setLimitCount(3);
109 110 // 将第一个Product对象添加到列表中
110 111 productList.add(product1);
111 112 // 创建第二个Product对象并设置其属性的值
112 113 AppCombinationActivityDetailRespVO.Product product2 = new AppCombinationActivityDetailRespVO.Product();
113 114 product2.setSkuId(2L);
114 115 product2.setCombinationPrice(200);
115   - product2.setQuota(100);
116   - product2.setLimitCount(4);
117 116 // 将第二个Product对象添加到列表中
118 117 productList.add(product2);
119 118 // 创建第三个Product对象并设置其属性的值
120 119 AppCombinationActivityDetailRespVO.Product product3 = new AppCombinationActivityDetailRespVO.Product();
121 120 product3.setSkuId(3L);
122 121 product3.setCombinationPrice(300);
123   - product3.setQuota(150);
124   - product3.setLimitCount(5);
125 122 // 将第三个Product对象添加到列表中
126 123 productList.add(product3);
127 124 // 将Product列表设置为对象的属性值
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/vo/activity/AppCombinationActivityDetailRespVO.java
  View file @49d7260
... ... @@ -34,6 +34,12 @@ public class AppCombinationActivityDetailRespVO {
34 34 @Schema(description = "商品 SPU 编号", required = true, example = "2048")
35 35 private Long spuId;
36 36  
  37 + @Schema(description = "总共限购数量", example = "10")
  38 + private Integer totalLimitCount;
  39 +
  40 + @Schema(description = "单次限购数量", example = "5")
  41 + private Integer singleLimitCount;
  42 +
37 43 @Schema(description = "商品信息数组", required = true)
38 44 private List<Product> products;
39 45  
... ... @@ -47,12 +53,6 @@ public class AppCombinationActivityDetailRespVO {
47 53 @Schema(description = "拼团金额，单位：分", required = true, example = "100")
48 54 private Integer combinationPrice;
49 55  
50   - @Schema(description = "拼团限量库存", required = true, example = "50")
51   - private Integer quota;
52   -
53   - @Schema(description = "每人限购数量", required = true, example = "10")
54   - private Integer limitCount;
55   -
56 56 }
57 57  
58 58 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java
  View file @49d7260
... ... @@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 5 import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity.AppSeckillActivityDetailRespVO;
6 6 import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity.AppSeckillActivityNowRespVO;
  7 +import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity.AppSeckillActivityPageReqVO;
7 8 import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity.AppSeckillActivityRespVO;
8 9 import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.config.AppSeckillConfigRespVO;
9 10 import io.swagger.v3.oas.annotations.Operation;
... ... @@ -58,7 +59,7 @@ public class AppSeckillActivityController {
58 59 @GetMapping("/page")
59 60 @Operation(summary = "获得秒杀活动分页")
60 61 // TODO @芋艿：分页参数
61   - public CommonResult<PageResult<AppSeckillActivityRespVO>> getSeckillActivityPage() {
  62 + public CommonResult<PageResult<AppSeckillActivityRespVO>> getSeckillActivityPage(AppSeckillActivityPageReqVO pageReqVO) {
62 63 List<AppSeckillActivityRespVO> activityList = new ArrayList<>();
63 64 AppSeckillActivityRespVO activity1 = new AppSeckillActivityRespVO();
64 65 activity1.setId(1L);
... ... @@ -67,6 +68,9 @@ public class AppSeckillActivityController {
67 68 activity1.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
68 69 activity1.setMarketPrice(50);
69 70 activity1.setSeckillPrice(100);
  71 + activity1.setUnitName("个");
  72 + activity1.setStock(1);
  73 + activity1.setTotalStock(2);
70 74 activityList.add(activity1);
71 75  
72 76 AppSeckillActivityRespVO activity2 = new AppSeckillActivityRespVO();
... ... @@ -76,6 +80,9 @@ public class AppSeckillActivityController {
76 80 activity2.setPicUrl("https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132");
77 81 activity2.setMarketPrice(100);
78 82 activity2.setSeckillPrice(200);
  83 + activity2.setUnitName("套");
  84 + activity2.setStock(2);
  85 + activity2.setTotalStock(3);
79 86 activityList.add(activity2);
80 87 return success(new PageResult<>(activityList, 100L));
81 88 }
... ... @@ -90,33 +97,35 @@ public class AppSeckillActivityController {
90 97 obj.setId(id);
91 98 obj.setName("晚九点限时秒杀");
92 99 obj.setStatus(1);
93   - obj.setStartTime(LocalDateTime.of(2023, 6, 11, 0, 0, 0));
94   - obj.setEndTime(LocalDateTime.of(2023, 6, 11, 23, 59, 0));
  100 + obj.setStartTime(LocalDateTime.of(2023, 6, 16, 0, 0, 0));
  101 + obj.setEndTime(LocalDateTime.of(2023, 6, 20, 23, 59, 0));
95 102 obj.setSpuId(633L);
  103 + obj.setSingleLimitCount(2);
  104 + obj.setTotalLimitCount(3);
  105 + obj.setStock(100);
  106 + obj.setTotalStock(200);
  107 +
96 108 // 创建一个Product对象的列表
97 109 List<AppSeckillActivityDetailRespVO.Product> productList = new ArrayList<>();
98 110 // 创建三个新的Product对象并设置其属性的值
99 111 AppSeckillActivityDetailRespVO.Product product1 = new AppSeckillActivityDetailRespVO.Product();
100 112 product1.setSkuId(1L);
101 113 product1.setSeckillPrice(100);
102   - product1.setQuota(50);
103   - product1.setLimitCount(3);
  114 + product1.setStock(50);
104 115 // 将第一个Product对象添加到列表中
105 116 productList.add(product1);
106 117 // 创建第二个Product对象并设置其属性的值
107 118 AppSeckillActivityDetailRespVO.Product product2 = new AppSeckillActivityDetailRespVO.Product();
108 119 product2.setSkuId(2L);
109 120 product2.setSeckillPrice(200);
110   - product2.setQuota(100);
111   - product2.setLimitCount(4);
  121 + product2.setStock(100);
112 122 // 将第二个Product对象添加到列表中
113 123 productList.add(product2);
114 124 // 创建第三个Product对象并设置其属性的值
115 125 AppSeckillActivityDetailRespVO.Product product3 = new AppSeckillActivityDetailRespVO.Product();
116 126 product3.setSkuId(3L);
117 127 product3.setSeckillPrice(300);
118   - product3.setQuota(150);
119   - product3.setLimitCount(5);
  128 + product3.setStock(150);
120 129 // 将第三个Product对象添加到列表中
121 130 productList.add(product3);
122 131 // 将Product列表设置为对象的属性值
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillConfigController.java
  View file @49d7260
... ... @@ -22,11 +22,14 @@ public class AppSeckillConfigController {
22 22  
23 23 @GetMapping("/list")
24 24 @Operation(summary = "获得秒杀时间段列表")
25   - public CommonResult<List<AppSeckillConfigRespVO>> getConfigList() {
  25 + public CommonResult<List<AppSeckillConfigRespVO>> getSeckillConfigList() {
26 26 return success(Arrays.asList(
27   - new AppSeckillConfigRespVO().setId(1L).setStartTime("00:00").setEndTime("09:59"),
  27 + new AppSeckillConfigRespVO().setId(1L).setStartTime("00:00").setEndTime("09:59")
  28 + .setSliderPicUrls(Arrays.asList("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg",
  29 + "https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132")),
28 30 new AppSeckillConfigRespVO().setId(2L).setStartTime("10:00").setEndTime("12:59"),
29   - new AppSeckillConfigRespVO().setId(2L).setStartTime("13:00").setEndTime("23:59")
  31 + new AppSeckillConfigRespVO().setId(2L).setStartTime("13:00").setEndTime("22:59"),
  32 + new AppSeckillConfigRespVO().setId(2L).setStartTime("23:00").setEndTime("23:59")
30 33 ));
31 34 }
32 35  
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/vo/activity/AppSeckillActivityDetailRespVO.java
  View file @49d7260
... ... @@ -30,6 +30,18 @@ public class AppSeckillActivityDetailRespVO {
30 30 @Schema(description = "商品 SPU 编号", required = true, example = "2048")
31 31 private Long spuId;
32 32  
  33 + @Schema(description = "总共限购数量", example = "10")
  34 + private Integer totalLimitCount;
  35 +
  36 + @Schema(description = "单次限购数量", example = "5")
  37 + private Integer singleLimitCount;
  38 +
  39 + @Schema(description = "秒杀库存（剩余）", required = true, example = "50")
  40 + private Integer stock;
  41 +
  42 + @Schema(description = "秒杀库存（总计）", required = true, example = "100")
  43 + private Integer totalStock;
  44 +
33 45 @Schema(description = "商品信息数组", required = true)
34 46 private List<Product> products;
35 47  
... ... @@ -44,10 +56,7 @@ public class AppSeckillActivityDetailRespVO {
44 56 private Integer seckillPrice;
45 57  
46 58 @Schema(description = "秒杀限量库存", required = true, example = "50")
47   - private Integer quota;
48   -
49   - @Schema(description = "每人限购数量", required = true, example = "10")
50   - private Integer limitCount;
  59 + private Integer stock;
51 60  
52 61 }
53 62  
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/vo/activity/AppSeckillActivityPageReqVO.java 0 → 100644
  View file @49d7260
  1 +package cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
  4 +import io.swagger.v3.oas.annotations.media.Schema;
  5 +import lombok.Data;
  6 +import lombok.EqualsAndHashCode;
  7 +import lombok.ToString;
  8 +
  9 +@Schema(description = "用户 App - 商品评价分页 Request VO")
  10 +@Data
  11 +@EqualsAndHashCode(callSuper = true)
  12 +@ToString(callSuper = true)
  13 +public class AppSeckillActivityPageReqVO extends PageParam {
  14 +
  15 + @Schema(description = "秒杀配置编号", example = "1024")
  16 + private Long configId;
  17 +
  18 +}
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/vo/activity/AppSeckillActivityRespVO.java
  View file @49d7260
... ... @@ -18,10 +18,16 @@ public class AppSeckillActivityRespVO {
18 18  
19 19 @Schema(description = "商品图片", required = true, example = "4096") // 从 SPU 的 picUrl 读取
20 20 private String picUrl;
21   -
  21 + @Schema(description = "单位名", requiredMode = Schema.RequiredMode.REQUIRED, example = "个")
  22 + private String unitName;
22 23 @Schema(description = "商品市场价，单位：分", required = true, example = "50") // 从 SPU 的 marketPrice 读取
23 24 private Integer marketPrice;
24 25  
  26 + @Schema(description = "秒杀库存（剩余）", required = true, example = "100")
  27 + private Integer stock;
  28 + @Schema(description = "秒杀库存（总共）", required = true, example = "200")
  29 + private Integer totalStock;
  30 +
25 31 @Schema(description = "秒杀金额，单位：分", required = true, example = "100") // 从秒杀商品里取最低价
26 32 private Integer seckillPrice;
27 33  
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/vo/config/AppSeckillConfigRespVO.java
  View file @49d7260
... ... @@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.config;
3 3 import io.swagger.v3.oas.annotations.media.Schema;
4 4 import lombok.Data;
5 5  
  6 +import java.util.List;
  7 +
6 8 @Schema(description = "用户 App - 秒杀时间段 Response VO")
7 9 @Data
8 10 public class AppSeckillConfigRespVO {
... ... @@ -15,4 +17,7 @@ public class AppSeckillConfigRespVO {
15 17 @Schema(description = "结束时间点", required = true, example = "09:59")
16 18 private String endTime;
17 19  
  20 + @Schema(description = "轮播图", required = true)
  21 + private List<String> sliderPicUrls;
  22 +
18 23 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/item/AppTradeOrderItemCommentCreateReqVO.java
  View file @49d7260
... ... @@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull;
7 7 import javax.validation.constraints.Size;
8 8 import java.util.List;
9 9  
10   -@Schema(description = "用户APP - 商品评价创建 Request VO")
  10 +@Schema(description = "用户 App - 商品评价创建 Request VO")
11 11 @Data
12 12 public class AppTradeOrderItemCommentCreateReqVO {
13 13  
... ...