BJ_ZTEITS-Developers / parking-cloud-yudao

Commit fc570b6062026e8cdb3a1e9feeea98c4e62a8643

Authored by YunaiV
1 parent d795dbc7

mall + promotion：完善秒杀活动的 mock 返回

Inline Side-by-side
Showing 11 changed files with 51 additions and 12 deletions
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/vo/AppCommentPageReqVO.java
  View file @fc570b6
... ... @@ -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 @fc570b6
... ... @@ -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 @fc570b6
... ... @@ -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 @fc570b6
... ... @@ -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 @fc570b6
... ... @@ -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/seckill/AppSeckillActivityController.java
  View file @fc570b6
... ... @@ -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 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillConfigController.java
  View file @fc570b6
... ... @@ -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/AppSeckillActivityPageReqVO.java 0 → 100644
  View file @fc570b6
  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 @fc570b6
... ... @@ -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 @fc570b6
... ... @@ -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 @fc570b6
... ... @@ -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  
... ...