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

YunaiV
1 parent d795dbc7
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
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/vo/AppProductCommentCreateReqVO.java
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/vo/AppProductCommentRespVO.java
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/favorite/vo/AppFavoritePageReqVO.java
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/favorite/vo/AppFavoriteRespVO.java
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillConfigController.java
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/vo/activity/AppSeckillActivityPageReqVO.java
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/vo/activity/AppSeckillActivityRespVO.java
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/vo/config/AppSeckillConfigRespVO.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/item/AppTradeOrderItemCommentCreateReqVO.java
@@ -8,7 +8,7 @@ import lombok.ToString;
 import javax.validation.constraints.NotNull;
-@Schema(description = "用户APP - 商品评价分页 Request VO")
+@Schema(description = "用户 App - 商品评价分页 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
@@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.util.List;
-@Schema(description = "用户APP - 商品评价创建 Request VO")
+@Schema(description = "用户 App - 商品评价创建 Request VO")
 @Data
 @ToString(callSuper = true)
 public class AppProductCommentCreateReqVO {
@@ -14,11 +14,11 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 /**
- * 用户APP - 商品评价详情 Response VO
+ * 用户 App - 商品评价详情 Response VO
  *
  * @author HUIHUI
  */
-@Schema(description = "用户APP - 商品评价详情 Response VO")
+@Schema(description = "用户 App - 商品评价详情 Response VO")
 @Data
 @ToString(callSuper = true)
 public class AppProductCommentRespVO {
@@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-@Schema(description = "用户APP - 商品收藏分页查询 Request VO")
+@Schema(description = "用户 App - 商品收藏分页查询 Request VO")
 @Data
 public class AppFavoritePageReqVO extends PageParam {
 }
@@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
-@Schema(description = "用户APP - 商品收藏 Response VO")
+@Schema(description = "用户 App - 商品收藏 Response VO")
 @Data
 public class AppFavoriteRespVO {
@@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity.AppSeckillActivityDetailRespVO;
 import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity.AppSeckillActivityNowRespVO;
+import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity.AppSeckillActivityPageReqVO;
 import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity.AppSeckillActivityRespVO;
 import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.config.AppSeckillConfigRespVO;
 import io.swagger.v3.oas.annotations.Operation;
@@ -58,7 +59,7 @@ public class AppSeckillActivityController {
     @GetMapping("/page")
     @Operation(summary = "获得秒杀活动分页")
     // TODO @芋艿：分页参数
-    public CommonResult<PageResult<AppSeckillActivityRespVO>> getSeckillActivityPage() {
+    public CommonResult<PageResult<AppSeckillActivityRespVO>> getSeckillActivityPage(AppSeckillActivityPageReqVO pageReqVO) {
         List<AppSeckillActivityRespVO> activityList = new ArrayList<>();
         AppSeckillActivityRespVO activity1 = new AppSeckillActivityRespVO();
         activity1.setId(1L);
@@ -67,6 +68,9 @@ public class AppSeckillActivityController {
         activity1.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
         activity1.setMarketPrice(50);
         activity1.setSeckillPrice(100);
+        activity1.setUnitName("个");
+        activity1.setStock(1);
+        activity1.setTotalStock(2);
         activityList.add(activity1);
         AppSeckillActivityRespVO activity2 = new AppSeckillActivityRespVO();
@@ -76,6 +80,9 @@ public class AppSeckillActivityController {
         activity2.setPicUrl("https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132");
         activity2.setMarketPrice(100);
         activity2.setSeckillPrice(200);
+        activity2.setUnitName("套");
+        activity2.setStock(2);
+        activity2.setTotalStock(3);
         activityList.add(activity2);
         return success(new PageResult<>(activityList, 100L));
     }
@@ -22,11 +22,14 @@ public class AppSeckillConfigController {
     @GetMapping("/list")
     @Operation(summary = "获得秒杀时间段列表")
-    public CommonResult<List<AppSeckillConfigRespVO>> getConfigList() {
+    public CommonResult<List<AppSeckillConfigRespVO>> getSeckillConfigList() {
         return success(Arrays.asList(
-                new AppSeckillConfigRespVO().setId(1L).setStartTime("00:00").setEndTime("09:59"),
+                new AppSeckillConfigRespVO().setId(1L).setStartTime("00:00").setEndTime("09:59")
+                        .setSliderPicUrls(Arrays.asList("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg",
+                                "https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132")),
                 new AppSeckillConfigRespVO().setId(2L).setStartTime("10:00").setEndTime("12:59"),
-                new AppSeckillConfigRespVO().setId(2L).setStartTime("13:00").setEndTime("23:59")
+                new AppSeckillConfigRespVO().setId(2L).setStartTime("13:00").setEndTime("22:59"),
+                new AppSeckillConfigRespVO().setId(2L).setStartTime("23:00").setEndTime("23:59")
         ));
     }
+package cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@Schema(description = "用户 App - 商品评价分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class AppSeckillActivityPageReqVO extends PageParam {
+
+    @Schema(description = "秒杀配置编号", example = "1024")
+    private Long configId;
+
+}
@@ -18,10 +18,16 @@ public class AppSeckillActivityRespVO {
     @Schema(description = "商品图片", required = true, example = "4096") // 从 SPU 的 picUrl 读取
     private String picUrl;
-
+    @Schema(description = "单位名", requiredMode = Schema.RequiredMode.REQUIRED, example = "个")
+    private String unitName;
     @Schema(description = "商品市场价，单位：分", required = true, example = "50") // 从 SPU 的 marketPrice 读取
     private Integer marketPrice;
+    @Schema(description = "秒杀库存（剩余）", required = true, example = "100")
+    private Integer stock;
+    @Schema(description = "秒杀库存（总共）", required = true, example = "200")
+    private Integer totalStock;
+
     @Schema(description = "秒杀金额，单位：分", required = true, example = "100") // 从秒杀商品里取最低价
     private Integer seckillPrice;
@@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.config;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import java.util.List;
+
 @Schema(description = "用户 App - 秒杀时间段 Response VO")
 @Data
 public class AppSeckillConfigRespVO {
@@ -15,4 +17,7 @@ public class AppSeckillConfigRespVO {
     @Schema(description = "结束时间点", required = true, example = "09:59")
     private String endTime;
+    @Schema(description = "轮播图", required = true)
+    private List<String> sliderPicUrls;
+
 }
@@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.util.List;
-@Schema(description = "用户APP - 商品评价创建 Request VO")
+@Schema(description = "用户 App - 商品评价创建 Request VO")
 @Data
 public class AppTradeOrderItemCommentCreateReqVO {