BJ_ZTEITS-Developers / parking-cloud-yudao

Commit b7c0fef63f45aa5c56ed5c7686c693d657edfaf2

Authored by chenchen
2 parents a93b9a61 2672b3e2

Merge branch 'feature/mall_product' into mall_product_aftersalelog 

# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-biz-trade/pom.xml
#	yudao-module-mall/yudao-module-trade-biz/pom.xml
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceImpl.java
#	yudao-server/pom.xml
Inline Side-by-side
Showing 17 changed files with 271 additions and 70 deletions
yudao-dependencies/pom.xml
  View file @b7c0fef
@@ -98,6 +98,11 @@ @@ -98,6 +98,11 @@
98 </dependency> 98 </dependency>
99 <dependency> 99 <dependency>
100 <groupId>cn.iocoder.boot</groupId> 100 <groupId>cn.iocoder.boot</groupId>
  101 + <artifactId>yudao-spring-boot-starter-biz-trade</artifactId>
  102 + <version>${revision}</version>
  103 + </dependency>
  104 + <dependency>
  105 + <groupId>cn.iocoder.boot</groupId>
101 <artifactId>yudao-spring-boot-starter-biz-dict</artifactId> 106 <artifactId>yudao-spring-boot-starter-biz-dict</artifactId>
102 <version>${revision}</version> 107 <version>${revision}</version>
103 </dependency> 108 </dependency>
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/vo/AppCommentPageReqVO.java
  View file @b7c0fef
@@ -8,7 +8,7 @@ import lombok.ToString; @@ -8,7 +8,7 @@ import lombok.ToString;
8 8
9 import javax.validation.constraints.NotNull; 9 import javax.validation.constraints.NotNull;
10 10
11 -@Schema(description = "用户APP - 商品评价分页 Request VO") 11 +@Schema(description = "用户 App - 商品评价分页 Request VO")
12 @Data 12 @Data
13 @EqualsAndHashCode(callSuper = true) 13 @EqualsAndHashCode(callSuper = true)
14 @ToString(callSuper = true) 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 @b7c0fef
@@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull; @@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull;
8 import javax.validation.constraints.Size; 8 import javax.validation.constraints.Size;
9 import java.util.List; 9 import java.util.List;
10 10
11 -@Schema(description = "用户APP - 商品评价创建 Request VO") 11 +@Schema(description = "用户 App - 商品评价创建 Request VO")
12 @Data 12 @Data
13 @ToString(callSuper = true) 13 @ToString(callSuper = true)
14 public class AppProductCommentCreateReqVO { 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 @b7c0fef
@@ -14,11 +14,11 @@ import java.util.List; @@ -14,11 +14,11 @@ import java.util.List;
14 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 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 * @author HUIHUI 19 * @author HUIHUI
20 */ 20 */
21 -@Schema(description = "用户APP - 商品评价详情 Response VO") 21 +@Schema(description = "用户 App - 商品评价详情 Response VO")
22 @Data 22 @Data
23 @ToString(callSuper = true) 23 @ToString(callSuper = true)
24 public class AppProductCommentRespVO { 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 @b7c0fef
@@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 import io.swagger.v3.oas.annotations.media.Schema; 4 import io.swagger.v3.oas.annotations.media.Schema;
5 import lombok.Data; 5 import lombok.Data;
6 6
7 -@Schema(description = "用户APP - 商品收藏分页查询 Request VO") 7 +@Schema(description = "用户 App - 商品收藏分页查询 Request VO")
8 @Data 8 @Data
9 public class AppFavoritePageReqVO extends PageParam { 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 @b7c0fef
@@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
4 import lombok.Data; 4 import lombok.Data;
5 import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; 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 @Data 8 @Data
9 public class AppFavoriteRespVO { 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 @b7c0fef
@@ -38,7 +38,7 @@ public class AppCombinationActivityController { @@ -38,7 +38,7 @@ public class AppCombinationActivityController {
38 activity1.setName("618 大拼团"); 38 activity1.setName("618 大拼团");
39 activity1.setUserSize(3); 39 activity1.setUserSize(3);
40 activity1.setSpuId(2048L); 40 activity1.setSpuId(2048L);
41 - activity1.setPicUrl("商品图片地址"); 41 + activity1.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
42 activity1.setMarketPrice(50); 42 activity1.setMarketPrice(50);
43 activity1.setCombinationPrice(100); 43 activity1.setCombinationPrice(100);
44 activityList.add(activity1); 44 activityList.add(activity1);
@@ -48,7 +48,7 @@ public class AppCombinationActivityController { @@ -48,7 +48,7 @@ public class AppCombinationActivityController {
48 activity2.setName("双十一拼团"); 48 activity2.setName("双十一拼团");
49 activity2.setUserSize(5); 49 activity2.setUserSize(5);
50 activity2.setSpuId(4096L); 50 activity2.setSpuId(4096L);
51 - activity2.setPicUrl("商品图片地址"); 51 + activity2.setPicUrl("https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132");
52 activity2.setMarketPrice(100); 52 activity2.setMarketPrice(100);
53 activity2.setCombinationPrice(200); 53 activity2.setCombinationPrice(200);
54 activityList.add(activity2); 54 activityList.add(activity2);
@@ -94,34 +94,31 @@ public class AppCombinationActivityController { @@ -94,34 +94,31 @@ public class AppCombinationActivityController {
94 obj.setName("晚九点限时秒杀"); 94 obj.setName("晚九点限时秒杀");
95 obj.setStatus(1); 95 obj.setStatus(1);
96 obj.setStartTime(LocalDateTime.of(2023, 6, 15, 0, 0, 0)); 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 obj.setUserSize(2); 98 obj.setUserSize(2);
99 obj.setSuccessCount(100); 99 obj.setSuccessCount(100);
100 obj.setSpuId(633L); 100 obj.setSpuId(633L);
  101 + obj.setSingleLimitCount(2);
  102 + obj.setTotalLimitCount(3);
  103 +
101 // 创建一个Product对象的列表 104 // 创建一个Product对象的列表
102 List<AppCombinationActivityDetailRespVO.Product> productList = new ArrayList<>(); 105 List<AppCombinationActivityDetailRespVO.Product> productList = new ArrayList<>();
103 // 创建三个新的Product对象并设置其属性的值 106 // 创建三个新的Product对象并设置其属性的值
104 AppCombinationActivityDetailRespVO.Product product1 = new AppCombinationActivityDetailRespVO.Product(); 107 AppCombinationActivityDetailRespVO.Product product1 = new AppCombinationActivityDetailRespVO.Product();
105 product1.setSkuId(1L); 108 product1.setSkuId(1L);
106 product1.setCombinationPrice(100); 109 product1.setCombinationPrice(100);
107 - product1.setQuota(50);  
108 - product1.setLimitCount(3);  
109 // 将第一个Product对象添加到列表中 110 // 将第一个Product对象添加到列表中
110 productList.add(product1); 111 productList.add(product1);
111 // 创建第二个Product对象并设置其属性的值 112 // 创建第二个Product对象并设置其属性的值
112 AppCombinationActivityDetailRespVO.Product product2 = new AppCombinationActivityDetailRespVO.Product(); 113 AppCombinationActivityDetailRespVO.Product product2 = new AppCombinationActivityDetailRespVO.Product();
113 product2.setSkuId(2L); 114 product2.setSkuId(2L);
114 product2.setCombinationPrice(200); 115 product2.setCombinationPrice(200);
115 - product2.setQuota(100);  
116 - product2.setLimitCount(4);  
117 // 将第二个Product对象添加到列表中 116 // 将第二个Product对象添加到列表中
118 productList.add(product2); 117 productList.add(product2);
119 // 创建第三个Product对象并设置其属性的值 118 // 创建第三个Product对象并设置其属性的值
120 AppCombinationActivityDetailRespVO.Product product3 = new AppCombinationActivityDetailRespVO.Product(); 119 AppCombinationActivityDetailRespVO.Product product3 = new AppCombinationActivityDetailRespVO.Product();
121 product3.setSkuId(3L); 120 product3.setSkuId(3L);
122 product3.setCombinationPrice(300); 121 product3.setCombinationPrice(300);
123 - product3.setQuota(150);  
124 - product3.setLimitCount(5);  
125 // 将第三个Product对象添加到列表中 122 // 将第三个Product对象添加到列表中
126 productList.add(product3); 123 productList.add(product3);
127 // 将Product列表设置为对象的属性值 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 @b7c0fef
@@ -34,6 +34,12 @@ public class AppCombinationActivityDetailRespVO { @@ -34,6 +34,12 @@ public class AppCombinationActivityDetailRespVO {
34 @Schema(description = "商品 SPU 编号", required = true, example = "2048") 34 @Schema(description = "商品 SPU 编号", required = true, example = "2048")
35 private Long spuId; 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 @Schema(description = "商品信息数组", required = true) 43 @Schema(description = "商品信息数组", required = true)
38 private List<Product> products; 44 private List<Product> products;
39 45
@@ -47,12 +53,6 @@ public class AppCombinationActivityDetailRespVO { @@ -47,12 +53,6 @@ public class AppCombinationActivityDetailRespVO {
47 @Schema(description = "拼团金额，单位：分", required = true, example = "100") 53 @Schema(description = "拼团金额，单位：分", required = true, example = "100")
48 private Integer combinationPrice; 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 @b7c0fef
1 package cn.iocoder.yudao.module.promotion.controller.app.seckill; 1 package cn.iocoder.yudao.module.promotion.controller.app.seckill;
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.module.promotion.controller.app.seckill.vo.AppSeckillActivitiDetailRespVO; 4 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  5 +import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity.AppSeckillActivityDetailRespVO;
  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;
  8 +import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity.AppSeckillActivityRespVO;
  9 +import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.config.AppSeckillConfigRespVO;
5 import io.swagger.v3.oas.annotations.Operation; 10 import io.swagger.v3.oas.annotations.Operation;
6 import io.swagger.v3.oas.annotations.Parameter; 11 import io.swagger.v3.oas.annotations.Parameter;
7 import io.swagger.v3.oas.annotations.tags.Tag; 12 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -23,43 +28,104 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @@ -23,43 +28,104 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
23 @Validated 28 @Validated
24 public class AppSeckillActivityController { 29 public class AppSeckillActivityController {
25 30
  31 + @GetMapping("/get-now")
  32 + @Operation(summary = "获得当前秒杀活动") // 提供给首页使用
  33 + // TODO 芋艿：需要增加 spring cache
  34 + public CommonResult<AppSeckillActivityNowRespVO> getNowSeckillActivity() {
  35 + AppSeckillActivityNowRespVO respVO = new AppSeckillActivityNowRespVO();
  36 + respVO.setConfig(new AppSeckillConfigRespVO().setId(10L).setStartTime("01:00").setEndTime("09:59"));
  37 + List<AppSeckillActivityRespVO> activityList = new ArrayList<>();
  38 + AppSeckillActivityRespVO activity1 = new AppSeckillActivityRespVO();
  39 + activity1.setId(1L);
  40 + activity1.setName("618 大秒杀");
  41 + activity1.setSpuId(2048L);
  42 + activity1.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
  43 + activity1.setMarketPrice(50);
  44 + activity1.setSeckillPrice(100);
  45 + activityList.add(activity1);
  46 +
  47 + AppSeckillActivityRespVO activity2 = new AppSeckillActivityRespVO();
  48 + activity2.setId(2L);
  49 + activity2.setName("双十一大秒杀");
  50 + activity2.setSpuId(4096L);
  51 + activity2.setPicUrl("https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132");
  52 + activity2.setMarketPrice(100);
  53 + activity2.setSeckillPrice(200);
  54 + activityList.add(activity2);
  55 + respVO.setActivities(activityList);
  56 + return success(respVO);
  57 + }
  58 +
  59 + @GetMapping("/page")
  60 + @Operation(summary = "获得秒杀活动分页")
  61 + // TODO @芋艿：分页参数
  62 + public CommonResult<PageResult<AppSeckillActivityRespVO>> getSeckillActivityPage(AppSeckillActivityPageReqVO pageReqVO) {
  63 + List<AppSeckillActivityRespVO> activityList = new ArrayList<>();
  64 + AppSeckillActivityRespVO activity1 = new AppSeckillActivityRespVO();
  65 + activity1.setId(1L);
  66 + activity1.setName("618 大秒杀");
  67 + activity1.setSpuId(2048L);
  68 + activity1.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
  69 + activity1.setMarketPrice(50);
  70 + activity1.setSeckillPrice(100);
  71 + activity1.setUnitName("个");
  72 + activity1.setStock(1);
  73 + activity1.setTotalStock(2);
  74 + activityList.add(activity1);
  75 +
  76 + AppSeckillActivityRespVO activity2 = new AppSeckillActivityRespVO();
  77 + activity2.setId(2L);
  78 + activity2.setName("双十一大秒杀");
  79 + activity2.setSpuId(4096L);
  80 + activity2.setPicUrl("https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132");
  81 + activity2.setMarketPrice(100);
  82 + activity2.setSeckillPrice(200);
  83 + activity2.setUnitName("套");
  84 + activity2.setStock(2);
  85 + activity2.setTotalStock(3);
  86 + activityList.add(activity2);
  87 + return success(new PageResult<>(activityList, 100L));
  88 + }
  89 +
26 @GetMapping("/get-detail") 90 @GetMapping("/get-detail")
27 @Operation(summary = "获得秒杀活动明细") 91 @Operation(summary = "获得秒杀活动明细")
28 @Parameter(name = "id", description = "活动编号", required = true, example = "1024") 92 @Parameter(name = "id", description = "活动编号", required = true, example = "1024")
29 - public CommonResult<AppSeckillActivitiDetailRespVO> getSeckillActivity(@RequestParam("id") Long id) { 93 + public CommonResult<AppSeckillActivityDetailRespVO> getSeckillActivity(@RequestParam("id") Long id) {
30 // TODO 芋艿：如果禁用的时候，需要抛出异常； 94 // TODO 芋艿：如果禁用的时候，需要抛出异常；
31 - AppSeckillActivitiDetailRespVO obj = new AppSeckillActivitiDetailRespVO(); 95 + AppSeckillActivityDetailRespVO obj = new AppSeckillActivityDetailRespVO();
32 // 设置其属性的值 96 // 设置其属性的值
33 obj.setId(id); 97 obj.setId(id);
34 obj.setName("晚九点限时秒杀"); 98 obj.setName("晚九点限时秒杀");
35 obj.setStatus(1); 99 obj.setStatus(1);
36 - obj.setStartTime(LocalDateTime.of(2023, 6, 11, 0, 0, 0));  
37 - 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));
38 obj.setSpuId(633L); 102 obj.setSpuId(633L);
  103 + obj.setSingleLimitCount(2);
  104 + obj.setTotalLimitCount(3);
  105 + obj.setStock(100);
  106 + obj.setTotalStock(200);
  107 +
39 // 创建一个Product对象的列表 108 // 创建一个Product对象的列表
40 - List<AppSeckillActivitiDetailRespVO.Product> productList = new ArrayList<>(); 109 + List<AppSeckillActivityDetailRespVO.Product> productList = new ArrayList<>();
41 // 创建三个新的Product对象并设置其属性的值 110 // 创建三个新的Product对象并设置其属性的值
42 - AppSeckillActivitiDetailRespVO.Product product1 = new AppSeckillActivitiDetailRespVO.Product(); 111 + AppSeckillActivityDetailRespVO.Product product1 = new AppSeckillActivityDetailRespVO.Product();
43 product1.setSkuId(1L); 112 product1.setSkuId(1L);
44 product1.setSeckillPrice(100); 113 product1.setSeckillPrice(100);
45 - product1.setQuota(50);  
46 - product1.setLimitCount(3); 114 + product1.setStock(50);
47 // 将第一个Product对象添加到列表中 115 // 将第一个Product对象添加到列表中
48 productList.add(product1); 116 productList.add(product1);
49 // 创建第二个Product对象并设置其属性的值 117 // 创建第二个Product对象并设置其属性的值
50 - AppSeckillActivitiDetailRespVO.Product product2 = new AppSeckillActivitiDetailRespVO.Product(); 118 + AppSeckillActivityDetailRespVO.Product product2 = new AppSeckillActivityDetailRespVO.Product();
51 product2.setSkuId(2L); 119 product2.setSkuId(2L);
52 product2.setSeckillPrice(200); 120 product2.setSeckillPrice(200);
53 - product2.setQuota(100);  
54 - product2.setLimitCount(4); 121 + product2.setStock(100);
55 // 将第二个Product对象添加到列表中 122 // 将第二个Product对象添加到列表中
56 productList.add(product2); 123 productList.add(product2);
57 // 创建第三个Product对象并设置其属性的值 124 // 创建第三个Product对象并设置其属性的值
58 - AppSeckillActivitiDetailRespVO.Product product3 = new AppSeckillActivitiDetailRespVO.Product(); 125 + AppSeckillActivityDetailRespVO.Product product3 = new AppSeckillActivityDetailRespVO.Product();
59 product3.setSkuId(3L); 126 product3.setSkuId(3L);
60 product3.setSeckillPrice(300); 127 product3.setSeckillPrice(300);
61 - product3.setQuota(150);  
62 - product3.setLimitCount(5); 128 + product3.setStock(150);
63 // 将第三个Product对象添加到列表中 129 // 将第三个Product对象添加到列表中
64 productList.add(product3); 130 productList.add(product3);
65 // 将Product列表设置为对象的属性值 131 // 将Product列表设置为对象的属性值
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillConfigController.java 0 → 100644
  View file @b7c0fef
  1 +package cn.iocoder.yudao.module.promotion.controller.app.seckill;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  4 +import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.config.AppSeckillConfigRespVO;
  5 +import io.swagger.v3.oas.annotations.Operation;
  6 +import io.swagger.v3.oas.annotations.tags.Tag;
  7 +import org.springframework.validation.annotation.Validated;
  8 +import org.springframework.web.bind.annotation.GetMapping;
  9 +import org.springframework.web.bind.annotation.RequestMapping;
  10 +import org.springframework.web.bind.annotation.RestController;
  11 +
  12 +import java.util.Arrays;
  13 +import java.util.List;
  14 +
  15 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  16 +
  17 +@Tag(name = "用户 App - 秒杀时间段")
  18 +@RestController
  19 +@RequestMapping("/promotion/seckill-config")
  20 +@Validated
  21 +public class AppSeckillConfigController {
  22 +
  23 + @GetMapping("/list")
  24 + @Operation(summary = "获得秒杀时间段列表")
  25 + public CommonResult<List<AppSeckillConfigRespVO>> getSeckillConfigList() {
  26 + return success(Arrays.asList(
  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")),
  30 + new AppSeckillConfigRespVO().setId(2L).setStartTime("10:00").setEndTime("12:59"),
  31 + new AppSeckillConfigRespVO().setId(2L).setStartTime("13:00").setEndTime("22:59"),
  32 + new AppSeckillConfigRespVO().setId(2L).setStartTime("23:00").setEndTime("23:59")
  33 + ));
  34 + }
  35 +
  36 +}
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/vo/AppSeckillActivitiDetailRespVO.java renamed to yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/vo/activity/AppSeckillActivityDetailRespVO.java
  View file @b7c0fef
1 -package cn.iocoder.yudao.module.promotion.controller.app.seckill.vo; 1 +package cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity;
2 2
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;
@@ -6,9 +6,9 @@ import lombok.Data; @@ -6,9 +6,9 @@ import lombok.Data;
6 import java.time.LocalDateTime; 6 import java.time.LocalDateTime;
7 import java.util.List; 7 import java.util.List;
8 8
9 -@Schema(description = "用户 App - 秒杀活动 Response VO") 9 +@Schema(description = "用户 App - 秒杀活动的详细 Response VO")
10 @Data 10 @Data
11 -public class AppSeckillActivitiDetailRespVO { 11 +public class AppSeckillActivityDetailRespVO {
12 12
13 @Schema(description = "秒杀活动编号", required = true, example = "1024") 13 @Schema(description = "秒杀活动编号", required = true, example = "1024")
14 private Long id; 14 private Long id;
@@ -30,6 +30,18 @@ public class AppSeckillActivitiDetailRespVO { @@ -30,6 +30,18 @@ public class AppSeckillActivitiDetailRespVO {
30 @Schema(description = "商品 SPU 编号", required = true, example = "2048") 30 @Schema(description = "商品 SPU 编号", required = true, example = "2048")
31 private Long spuId; 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 @Schema(description = "商品信息数组", required = true) 45 @Schema(description = "商品信息数组", required = true)
34 private List<Product> products; 46 private List<Product> products;
35 47
@@ -44,10 +56,7 @@ public class AppSeckillActivitiDetailRespVO { @@ -44,10 +56,7 @@ public class AppSeckillActivitiDetailRespVO {
44 private Integer seckillPrice; 56 private Integer seckillPrice;
45 57
46 @Schema(description = "秒杀限量库存", required = true, example = "50") 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/AppSeckillActivityNowRespVO.java 0 → 100644
  View file @b7c0fef
  1 +package cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity;
  2 +
  3 +import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.config.AppSeckillConfigRespVO;
  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 AppSeckillActivityNowRespVO {
  12 +
  13 + @Schema(description = "秒杀时间段", required = true)
  14 + private AppSeckillConfigRespVO config;
  15 +
  16 + @Schema(description = "秒杀活动数组", required = true)
  17 + private List<AppSeckillActivityRespVO> activities;
  18 +
  19 +}
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 @b7c0fef
  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 0 → 100644
  View file @b7c0fef
  1 +package cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +@Schema(description = "用户 App - 秒杀活动 Response VO")
  7 +@Data
  8 +public class AppSeckillActivityRespVO {
  9 +
  10 + @Schema(description = "秒杀活动编号", required = true, example = "1024")
  11 + private Long id;
  12 +
  13 + @Schema(description = "秒杀活动名称", required = true, example = "晚九点限时秒杀")
  14 + private String name;
  15 +
  16 + @Schema(description = "商品 SPU 编号", required = true, example = "2048")
  17 + private Long spuId;
  18 +
  19 + @Schema(description = "商品图片", required = true, example = "4096") // 从 SPU 的 picUrl 读取
  20 + private String picUrl;
  21 + @Schema(description = "单位名", requiredMode = Schema.RequiredMode.REQUIRED, example = "个")
  22 + private String unitName;
  23 + @Schema(description = "商品市场价，单位：分", required = true, example = "50") // 从 SPU 的 marketPrice 读取
  24 + private Integer marketPrice;
  25 +
  26 + @Schema(description = "秒杀库存（剩余）", required = true, example = "100")
  27 + private Integer stock;
  28 + @Schema(description = "秒杀库存（总共）", required = true, example = "200")
  29 + private Integer totalStock;
  30 +
  31 + @Schema(description = "秒杀金额，单位：分", required = true, example = "100") // 从秒杀商品里取最低价
  32 + private Integer seckillPrice;
  33 +
  34 +}
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/vo/config/AppSeckillConfigRespVO.java 0 → 100644
  View file @b7c0fef
  1 +package cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.config;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import java.util.List;
  7 +
  8 +@Schema(description = "用户 App - 秒杀时间段 Response VO")
  9 +@Data
  10 +public class AppSeckillConfigRespVO {
  11 +
  12 + @Schema(description = "秒杀时间段编号", required = true, example = "1024")
  13 + private Long id;
  14 +
  15 + @Schema(description = "开始时间点", required = true, example = "09:00")
  16 + private String startTime;
  17 + @Schema(description = "结束时间点", required = true, example = "09:59")
  18 + private String endTime;
  19 +
  20 + @Schema(description = "轮播图", required = true)
  21 + private List<String> sliderPicUrls;
  22 +
  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 @b7c0fef
@@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull; @@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull;
7 import javax.validation.constraints.Size; 7 import javax.validation.constraints.Size;
8 import java.util.List; 8 import java.util.List;
9 9
10 -@Schema(description = "用户APP - 商品评价创建 Request VO") 10 +@Schema(description = "用户 App - 商品评价创建 Request VO")
11 @Data 11 @Data
12 public class AppTradeOrderItemCommentCreateReqVO { 12 public class AppTradeOrderItemCommentCreateReqVO {
13 13
yudao-server/pom.xml
  View file @b7c0fef
@@ -54,11 +54,11 @@ @@ -54,11 +54,11 @@
54 <!-- <version>${revision}</version>--> 54 <!-- <version>${revision}</version>-->
55 <!-- </dependency>--> 55 <!-- </dependency>-->
56 <!-- 支付服务 --> 56 <!-- 支付服务 -->
57 -<!-- <dependency>-->  
58 -<!-- <groupId>cn.iocoder.boot</groupId>-->  
59 -<!-- <artifactId>yudao-module-pay-biz</artifactId>-->  
60 -<!-- <version>${revision}</version>-->  
61 -<!-- </dependency>--> 57 + <dependency>
  58 + <groupId>cn.iocoder.boot</groupId>
  59 + <artifactId>yudao-module-pay-biz</artifactId>
  60 + <version>${revision}</version>
  61 + </dependency>
62 62
63 <!-- 微信公众号模块。默认注释，保证编译速度 --> 63 <!-- 微信公众号模块。默认注释，保证编译速度 -->
64 <!-- <dependency>--> 64 <!-- <dependency>-->
@@ -68,27 +68,21 @@ @@ -68,27 +68,21 @@
68 <!-- </dependency>--> 68 <!-- </dependency>-->
69 69
70 <!-- 商城相关模块。默认注释，保证编译速度 --> 70 <!-- 商城相关模块。默认注释，保证编译速度 -->
71 -<!-- <dependency>-->  
72 -<!-- <groupId>cn.iocoder.boot</groupId>-->  
73 -<!-- <artifactId>yudao-module-promotion-biz</artifactId>-->  
74 -<!-- <version>${revision}</version>-->  
75 -<!-- </dependency>-->  
76 -<!-- <dependency>-->  
77 -<!-- <groupId>cn.iocoder.boot</groupId>-->  
78 -<!-- <artifactId>yudao-module-product-biz</artifactId>-->  
79 -<!-- <version>${revision}</version>-->  
80 -<!-- </dependency>-->  
81 -<!-- <dependency>-->  
82 -<!-- <groupId>cn.iocoder.boot</groupId>-->  
83 -<!-- <artifactId>yudao-module-trade-biz</artifactId>-->  
84 -<!-- <version>${revision}</version>-->  
85 -<!-- </dependency>-->  
86 -  
87 -<!-- <dependency>-->  
88 -<!-- <groupId>cn.iocoder.boot</groupId>-->  
89 -<!-- <artifactId>yudao-module-point-biz</artifactId>-->  
90 -<!-- <version>${revision}</version>-->  
91 -<!-- </dependency>--> 71 + <dependency>
  72 + <groupId>cn.iocoder.boot</groupId>
  73 + <artifactId>yudao-module-promotion-biz</artifactId>
  74 + <version>${revision}</version>
  75 + </dependency>
  76 + <dependency>
  77 + <groupId>cn.iocoder.boot</groupId>
  78 + <artifactId>yudao-module-product-biz</artifactId>
  79 + <version>${revision}</version>
  80 + </dependency>
  81 + <dependency>
  82 + <groupId>cn.iocoder.boot</groupId>
  83 + <artifactId>yudao-module-trade-biz</artifactId>
  84 + <version>${revision}</version>
  85 + </dependency>
92 86
93 <!-- spring boot 配置所需依赖 --> 87 <!-- spring boot 配置所需依赖 -->
94 <dependency> 88 <dependency>