Commit 07fe52939d1cb24654e1cfabe8c289a84a414611

Authored by YunaiV
1 parent 5b324f90

mall + promotion:mock banner mock 接口

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/banner/vo/BannerRespVO.java
@@ -4,22 +4,12 @@ import io.swagger.v3.oas.annotations.media.Schema; @@ -4,22 +4,12 @@ import io.swagger.v3.oas.annotations.media.Schema;
4 import lombok.Data; 4 import lombok.Data;
5 import lombok.ToString; 5 import lombok.ToString;
6 6
7 -import javax.validation.constraints.NotNull;  
8 -import java.time.LocalDateTime;  
9 -  
10 -/**  
11 - * @author xia  
12 - */  
13 @Schema(description = "管理后台 - Banner Response VO") 7 @Schema(description = "管理后台 - Banner Response VO")
14 @Data 8 @Data
15 @ToString(callSuper = true) 9 @ToString(callSuper = true)
16 public class BannerRespVO extends BannerBaseVO { 10 public class BannerRespVO extends BannerBaseVO {
17 11
18 - @Schema(description = "banner编号", requiredMode = Schema.RequiredMode.REQUIRED)  
19 - @NotNull(message = "banner编号不能为空") 12 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED)
20 private Long id; 13 private Long id;
21 14
22 - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)  
23 - private LocalDateTime createTime;  
24 -  
25 } 15 }
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/banner/AppBannerController.java
1 package cn.iocoder.yudao.module.promotion.controller.app.banner; 1 package cn.iocoder.yudao.module.promotion.controller.app.banner;
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.admin.banner.vo.BannerRespVO;  
5 -import cn.iocoder.yudao.module.promotion.convert.banner.BannerConvert;  
6 -import cn.iocoder.yudao.module.promotion.dal.dataobject.banner.BannerDO;  
7 -import cn.iocoder.yudao.module.promotion.service.banner.BannerService; 4 +import cn.iocoder.yudao.module.promotion.controller.app.banner.vo.AppBannerRespVO;
8 import io.swagger.v3.oas.annotations.Operation; 5 import io.swagger.v3.oas.annotations.Operation;
9 import io.swagger.v3.oas.annotations.tags.Tag; 6 import io.swagger.v3.oas.annotations.tags.Tag;
10 -import org.springframework.security.access.prepost.PreAuthorize;  
11 import org.springframework.validation.annotation.Validated; 7 import org.springframework.validation.annotation.Validated;
12 import org.springframework.web.bind.annotation.GetMapping; 8 import org.springframework.web.bind.annotation.GetMapping;
13 import org.springframework.web.bind.annotation.RequestMapping; 9 import org.springframework.web.bind.annotation.RequestMapping;
  10 +import org.springframework.web.bind.annotation.RequestParam;
14 import org.springframework.web.bind.annotation.RestController; 11 import org.springframework.web.bind.annotation.RestController;
15 12
16 -import javax.annotation.Resource; 13 +import java.util.ArrayList;
17 import java.util.List; 14 import java.util.List;
18 15
19 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 16 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
20 17
21 -/**  
22 - * @author: XIA  
23 - */  
24 @RestController 18 @RestController
25 -@RequestMapping("/market/banner")  
26 -@Tag(name = "用户APP- 首页Banner") 19 +@RequestMapping("/promotion/banner")
  20 +@Tag(name = "用户 APP - 首页 Banner")
27 @Validated 21 @Validated
28 public class AppBannerController { 22 public class AppBannerController {
29 23
30 - @Resource  
31 - private BannerService bannerService;  
32 -  
33 - // TODO @xia:新建一个 AppBannerRespVO,只返回必要的字段。status 要过滤下。然后 sort 下结果  
34 @GetMapping("/list") 24 @GetMapping("/list")
35 - @Operation(summary = "获得banner列表")  
36 - @PreAuthorize("@ss.hasPermission('market:banner:query')")  
37 - public CommonResult<List<BannerRespVO>> getBannerList() {  
38 - List<BannerDO> list = bannerService.getBannerList();  
39 - return success(BannerConvert.INSTANCE.convertList(list)); 25 + @Operation(summary = "获得 banner 列表")
  26 + // todo @芋艿:swagger 注解,待补全
  27 + // TODO @芋艿:可以增加缓存,提升性能
  28 + // TODO @芋艿:position = 1 时,首页;position = 10 时,拼团活动页
  29 + public CommonResult<List<AppBannerRespVO>> getBannerList(@RequestParam("position") Integer position) {
  30 + List<AppBannerRespVO> bannerList = new ArrayList<>();
  31 + AppBannerRespVO banner1 = new AppBannerRespVO();
  32 + banner1.setUrl("https://www.example.com/link1");
  33 + banner1.setPicUrl("https://api.java.crmeb.net/crmebimage/public/content/2022/08/04/0f78716213f64bfa83f191d51a832cbf73f6axavoy.jpg");
  34 + bannerList.add(banner1);
  35 + AppBannerRespVO banner2 = new AppBannerRespVO();
  36 + banner2.setUrl("https://www.example.com/link2");
  37 + banner2.setPicUrl("https://api.java.crmeb.net/crmebimage/public/content/2023/01/11/be09e755268b43ee90b0db3a3e1b7132r7a6t2wvsm.jpg");
  38 + bannerList.add(banner2);
  39 + return success(bannerList);
40 } 40 }
41 41
42 } 42 }
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/banner/vo/AppBannerRespVO.java 0 → 100644
  1 +package cn.iocoder.yudao.module.promotion.controller.app.banner.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import javax.validation.constraints.NotNull;
  7 +
  8 +@Schema(description = "用户 App - Banner Response VO")
  9 +@Data
  10 +public class AppBannerRespVO {
  11 +
  12 + @Schema(description = "跳转链接", requiredMode = Schema.RequiredMode.REQUIRED)
  13 + @NotNull(message = "跳转链接不能为空")
  14 + private String url;
  15 +
  16 + @Schema(description = "图片地址", requiredMode = Schema.RequiredMode.REQUIRED)
  17 + @NotNull(message = "图片地址不能为空")
  18 + private String picUrl;
  19 +
  20 +}
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java
@@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; @@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 import cn.iocoder.yudao.framework.common.pojo.PageParam; 4 import cn.iocoder.yudao.framework.common.pojo.PageParam;
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.activity.AppCombinationActivityDetailRespVO; 6 import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.activity.AppCombinationActivityDetailRespVO;
7 -import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.activity.AppCombinationActivityPageItemRespVO; 7 +import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.activity.AppCombinationActivityRespVO;
8 import io.swagger.v3.oas.annotations.Operation; 8 import io.swagger.v3.oas.annotations.Operation;
9 import io.swagger.v3.oas.annotations.Parameter; 9 import io.swagger.v3.oas.annotations.Parameter;
10 import io.swagger.v3.oas.annotations.tags.Tag; 10 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -26,11 +26,41 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @@ -26,11 +26,41 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
26 @Validated 26 @Validated
27 public class AppCombinationActivityController { 27 public class AppCombinationActivityController {
28 28
  29 + @GetMapping("/list")
  30 + @Operation(summary = "获得拼团活动列表", description = "用于小程序首页")
  31 + // TODO 芋艿:增加 Spring Cache
  32 + // TODO 芋艿:缺少 swagger 注解
  33 + public CommonResult<List<AppCombinationActivityRespVO>> getCombinationActivityList(
  34 + @RequestParam(name = "count", defaultValue = "6") Integer count) {
  35 + List<AppCombinationActivityRespVO> activityList = new ArrayList<>();
  36 + AppCombinationActivityRespVO activity1 = new AppCombinationActivityRespVO();
  37 + activity1.setId(1L);
  38 + activity1.setName("618 大拼团");
  39 + activity1.setUserSize(3);
  40 + activity1.setSpuId(2048L);
  41 + activity1.setPicUrl("商品图片地址");
  42 + activity1.setMarketPrice(50);
  43 + activity1.setCombinationPrice(100);
  44 + activityList.add(activity1);
  45 +
  46 + AppCombinationActivityRespVO activity2 = new AppCombinationActivityRespVO();
  47 + activity2.setId(2L);
  48 + activity2.setName("双十一拼团");
  49 + activity2.setUserSize(5);
  50 + activity2.setSpuId(4096L);
  51 + activity2.setPicUrl("商品图片地址");
  52 + activity2.setMarketPrice(100);
  53 + activity2.setCombinationPrice(200);
  54 + activityList.add(activity2);
  55 +
  56 + return success(activityList);
  57 + }
  58 +
29 @GetMapping("/page") 59 @GetMapping("/page")
30 @Operation(summary = "获得拼团活动分页") 60 @Operation(summary = "获得拼团活动分页")
31 - public CommonResult<PageResult<AppCombinationActivityPageItemRespVO>> getCombinationActivityPage(PageParam pageParam) {  
32 - List<AppCombinationActivityPageItemRespVO> activityList = new ArrayList<>();  
33 - AppCombinationActivityPageItemRespVO activity1 = new AppCombinationActivityPageItemRespVO(); 61 + public CommonResult<PageResult<AppCombinationActivityRespVO>> getCombinationActivityPage(PageParam pageParam) {
  62 + List<AppCombinationActivityRespVO> activityList = new ArrayList<>();
  63 + AppCombinationActivityRespVO activity1 = new AppCombinationActivityRespVO();
34 activity1.setId(1L); 64 activity1.setId(1L);
35 activity1.setName("618 大拼团"); 65 activity1.setName("618 大拼团");
36 activity1.setUserSize(3); 66 activity1.setUserSize(3);
@@ -40,7 +70,7 @@ public class AppCombinationActivityController { @@ -40,7 +70,7 @@ public class AppCombinationActivityController {
40 activity1.setCombinationPrice(100); 70 activity1.setCombinationPrice(100);
41 activityList.add(activity1); 71 activityList.add(activity1);
42 72
43 - AppCombinationActivityPageItemRespVO activity2 = new AppCombinationActivityPageItemRespVO(); 73 + AppCombinationActivityRespVO activity2 = new AppCombinationActivityRespVO();
44 activity2.setId(2L); 74 activity2.setId(2L);
45 activity2.setName("双十一拼团"); 75 activity2.setName("双十一拼团");
46 activity2.setUserSize(5); 76 activity2.setUserSize(5);
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java
@@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; @@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 import cn.iocoder.yudao.framework.common.util.date.DateUtils; 4 import cn.iocoder.yudao.framework.common.util.date.DateUtils;
5 import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.record.AppCombinationRecordDetailRespVO; 5 import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.record.AppCombinationRecordDetailRespVO;
6 import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.record.AppCombinationRecordRespVO; 6 import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.record.AppCombinationRecordRespVO;
  7 +import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.record.AppCombinationRecordSummaryRespVO;
7 import io.swagger.v3.oas.annotations.Operation; 8 import io.swagger.v3.oas.annotations.Operation;
8 import io.swagger.v3.oas.annotations.Parameter; 9 import io.swagger.v3.oas.annotations.Parameter;
9 import io.swagger.v3.oas.annotations.tags.Tag; 10 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -27,6 +28,23 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @@ -27,6 +28,23 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
27 @Validated 28 @Validated
28 public class AppCombinationRecordController { 29 public class AppCombinationRecordController {
29 30
  31 + @GetMapping("/get-summary")
  32 + @Operation(summary = "获得拼团活动的概要信息", description = "用于小程序首页")
  33 + // TODO 芋艿:增加 @Cache 缓存,1 分钟过期
  34 + public CommonResult<AppCombinationRecordSummaryRespVO> getCombinationSummary() {
  35 + AppCombinationRecordSummaryRespVO summary = new AppCombinationRecordSummaryRespVO();
  36 + summary.setUserCount(1024);
  37 + summary.setAvatars(new ArrayList<>());
  38 + summary.getAvatars().add("https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTLjFK35Wvia9lJKHoXfQuHhk0qZbvpPNxrAiaEKF7aL2k4I8kuqrdTWwliamdPHeyAA7DjAg725X2GIQ/132");
  39 + summary.getAvatars().add("https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTK1pXgdj5DvBMwrbe8v3tFibSWeQATEsAibt3fllD8XwJ460P2r6KS3WCQvDefuv1bVpDhNCle6CTCA/132");
  40 + summary.getAvatars().add("https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTL7KRGHBE62N0awFyBesmmxiaCicf1fJ7E7UCh6zA8GWlT1QC1zT01gG4OxI7BWDESkdPZ5o7tno4hA/132");
  41 + summary.getAvatars().add("https://thirdwx.qlogo.cn/mmopen/vi_32/ouwtwJycbic2JrCoZjETict0klxd1uRuicRneKk00ewMcCClxVcVHQT91Sh9MJGtwibf1fOicD1WpwSP4icJM6eQq1AA/132");
  42 + summary.getAvatars().add("https://thirdwx.qlogo.cn/mmopen/vi_32/RpUrhwens58qc99OcGs993xL4M5QPOe05ekqF9Eia440kRicAlicicIdQWicHBmy2bzLgHzHguWEzHHxnIgeictL7bLA/132");
  43 + summary.getAvatars().add("https://thirdwx.qlogo.cn/mmopen/vi_32/S4tfqmxc8GZGsKc1K4mnhpvtG16gtMrLnTQfDibhr7jJich9LRI5RQKZDoqEjZM3azMib5nic7F4ZXKMEgYyLO08KA/132");
  44 + summary.getAvatars().add("https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132");
  45 + return success(summary);
  46 + }
  47 +
30 @GetMapping("/get-head-list") 48 @GetMapping("/get-head-list")
31 @Operation(summary = "获得最近 n 条拼团记录(团长发起的)") 49 @Operation(summary = "获得最近 n 条拼团记录(团长发起的)")
32 // TODO @芋艿:注解要补全 50 // TODO @芋艿:注解要补全
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/vo/activity/AppCombinationActivityPageItemRespVO.java renamed to yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/vo/activity/AppCombinationActivityRespVO.java
@@ -3,9 +3,9 @@ package cn.iocoder.yudao.module.promotion.controller.app.combination.vo.activity @@ -3,9 +3,9 @@ package cn.iocoder.yudao.module.promotion.controller.app.combination.vo.activity
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 -@Schema(description = "用户 App - 拼团活动分页项 Response VO") 6 +@Schema(description = "用户 App - 拼团活动 Response VO")
7 @Data 7 @Data
8 -public class AppCombinationActivityPageItemRespVO { 8 +public class AppCombinationActivityRespVO {
9 9
10 @Schema(description = "拼团活动编号", required = true, example = "1024") 10 @Schema(description = "拼团活动编号", required = true, example = "1024")
11 private Long id; 11 private Long id;
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/vo/record/AppCombinationRecordSummaryRespVO.java 0 → 100644
  1 +package cn.iocoder.yudao.module.promotion.controller.app.combination.vo.record;
  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 AppCombinationRecordSummaryRespVO {
  11 +
  12 + @Schema(description = "拼团用户数量", required = true, example = "1024")
  13 + private Integer userCount;
  14 +
  15 + @Schema(description = "拼团用户头像列表", required = true) // 只返回最近的 7 个
  16 + private List<String> avatars;
  17 +
  18 +}