BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 0329f13fbf89c2026b2ab590d461f1f6c94e7224

Authored by YunaiV
1 parent f99e2aec

分佣：增加获得分销排行分页 API mock

Inline Side-by-side
Showing 10 changed files with 83 additions and 27 deletions
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/brokerage/AppBrokerageRecordController.java renamed to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageRecordController.java
  View file @0329f13
1   -package cn.iocoder.yudao.module.member.controller.app.brokerage;
  1 +package cn.iocoder.yudao.module.trade.controller.app.brokerage;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 5 import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
6   -import cn.iocoder.yudao.module.member.controller.app.brokerage.vo.record.AppBrokerageRecordPageReqVO;
7   -import cn.iocoder.yudao.module.member.controller.app.brokerage.vo.record.AppBrokerageRecordRespVO;
  6 +import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.record.AppBrokerageRecordPageReqVO;
  7 +import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.record.AppBrokerageRecordRespVO;
8 8 import io.swagger.v3.oas.annotations.Operation;
9 9 import io.swagger.v3.oas.annotations.tags.Tag;
10 10 import lombok.extern.slf4j.Slf4j;
... ... @@ -21,7 +21,7 @@ import static java.util.Arrays.asList;
21 21  
22 22 @Tag(name = "用户 APP - 分销用户")
23 23 @RestController
24   -@RequestMapping("/member/brokerage-record")
  24 +@RequestMapping("/trade/brokerage-record")
25 25 @Validated
26 26 @Slf4j
27 27 public class AppBrokerageRecordController {
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/brokerage/AppBrokerageUserController.java renamed to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageUserController.java
  View file @0329f13
1   -package cn.iocoder.yudao.module.member.controller.app.brokerage;
  1 +package cn.iocoder.yudao.module.trade.controller.app.brokerage;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 5 import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
6   -import cn.iocoder.yudao.module.member.controller.app.brokerage.vo.user.AppBrokerageUserRankPageReqVO;
7   -import cn.iocoder.yudao.module.member.controller.app.brokerage.vo.user.AppBrokerageUserRankRespVO;
8   -import cn.iocoder.yudao.module.member.controller.app.brokerage.vo.user.AppBrokerageUserSummaryRespVO;
  6 +import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user.AppBrokerageUserRankByPriceRespVO;
  7 +import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user.AppBrokerageUserRankByUserCountRespVO;
  8 +import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user.AppBrokerageUserRankPageReqVO;
  9 +import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user.AppBrokerageUserSummaryRespVO;
9 10 import io.swagger.v3.oas.annotations.Operation;
  11 +import io.swagger.v3.oas.annotations.Parameter;
10 12 import io.swagger.v3.oas.annotations.tags.Tag;
11 13 import lombok.extern.slf4j.Slf4j;
  14 +import org.springframework.format.annotation.DateTimeFormat;
12 15 import org.springframework.validation.annotation.Validated;
13 16 import org.springframework.web.bind.annotation.GetMapping;
14 17 import org.springframework.web.bind.annotation.RequestMapping;
  18 +import org.springframework.web.bind.annotation.RequestParam;
15 19 import org.springframework.web.bind.annotation.RestController;
16 20  
  21 +import java.time.LocalDateTime;
  22 +
17 23 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  24 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
18 25 import static java.util.Arrays.asList;
19 26  
20 27 @Tag(name = "用户 APP - 分销用户")
21 28 @RestController
22   -@RequestMapping("/member/brokerage-user")
  29 +@RequestMapping("/trade/brokerage-user")
23 30 @Validated
24 31 @Slf4j
25 32 public class AppBrokerageUserController {
... ... @@ -37,23 +44,50 @@ public class AppBrokerageUserController {
37 44 return success(respVO);
38 45 }
39 46  
40   - @GetMapping("/rank-page")
41   - @Operation(summary = "获得分销用户排行分页")
  47 + @GetMapping("/rank-page-by-user-count")
  48 + @Operation(summary = "获得分销用户排行分页（基于用户量）")
42 49 @PreAuthenticated
43   - public CommonResult<PageResult<AppBrokerageUserRankRespVO>> getBrokerageUserRankPage(AppBrokerageUserRankPageReqVO pageReqVO) {
44   - AppBrokerageUserRankRespVO vo1 = new AppBrokerageUserRankRespVO()
  50 + public CommonResult<PageResult<AppBrokerageUserRankByUserCountRespVO>> getBrokerageUserRankPageByUserCount(AppBrokerageUserRankPageReqVO pageReqVO) {
  51 + AppBrokerageUserRankByUserCountRespVO vo1 = new AppBrokerageUserRankByUserCountRespVO()
45 52 .setUserId(1L).setNickname("芋1**艿").setAvatar("http://www.iocoder.cn/images/common/wechat_mp_2017_07_31_bak.jpg")
46 53 .setBrokerageUserCount(10);
47   - AppBrokerageUserRankRespVO vo2 = new AppBrokerageUserRankRespVO()
  54 + AppBrokerageUserRankByUserCountRespVO vo2 = new AppBrokerageUserRankByUserCountRespVO()
48 55 .setUserId(2L).setNickname("芋2**艿").setAvatar("http://www.iocoder.cn/images/common/wechat_mp_2017_07_31_bak.jpg")
49 56 .setBrokerageUserCount(6);
50   - AppBrokerageUserRankRespVO vo3 = new AppBrokerageUserRankRespVO()
  57 + AppBrokerageUserRankByUserCountRespVO vo3 = new AppBrokerageUserRankByUserCountRespVO()
51 58 .setUserId(3L).setNickname("芋3**艿").setAvatar("http://www.iocoder.cn/images/common/wechat_mp_2017_07_31_bak.jpg")
52 59 .setBrokerageUserCount(4);
53   - AppBrokerageUserRankRespVO vo4 = new AppBrokerageUserRankRespVO()
  60 + AppBrokerageUserRankByUserCountRespVO vo4 = new AppBrokerageUserRankByUserCountRespVO()
54 61 .setUserId(3L).setNickname("芋3**艿").setAvatar("http://www.iocoder.cn/images/common/wechat_mp_2017_07_31_bak.jpg")
55 62 .setBrokerageUserCount(4);
56 63 return success(new PageResult<>(asList(vo1, vo2, vo3, vo4), 10L));
57 64 }
58 65  
  66 + @GetMapping("/rank-page-by-price")
  67 + @Operation(summary = "获得分销用户排行分页（基于佣金）")
  68 + @PreAuthenticated
  69 + public CommonResult<PageResult<AppBrokerageUserRankByPriceRespVO>> getBrokerageUserRankPageByPrice(AppBrokerageUserRankPageReqVO pageReqVO) {
  70 + AppBrokerageUserRankByPriceRespVO vo1 = new AppBrokerageUserRankByPriceRespVO()
  71 + .setUserId(1L).setNickname("芋1**艿").setAvatar("http://www.iocoder.cn/images/common/wechat_mp_2017_07_31_bak.jpg")
  72 + .setBrokeragePrice(10);
  73 + AppBrokerageUserRankByPriceRespVO vo2 = new AppBrokerageUserRankByPriceRespVO()
  74 + .setUserId(2L).setNickname("芋2**艿").setAvatar("http://www.iocoder.cn/images/common/wechat_mp_2017_07_31_bak.jpg")
  75 + .setBrokeragePrice(6);
  76 + AppBrokerageUserRankByPriceRespVO vo3 = new AppBrokerageUserRankByPriceRespVO()
  77 + .setUserId(3L).setNickname("芋3**艿").setAvatar("http://www.iocoder.cn/images/common/wechat_mp_2017_07_31_bak.jpg")
  78 + .setBrokeragePrice(4);
  79 + AppBrokerageUserRankByPriceRespVO vo4 = new AppBrokerageUserRankByPriceRespVO()
  80 + .setUserId(3L).setNickname("芋3**艿").setAvatar("http://www.iocoder.cn/images/common/wechat_mp_2017_07_31_bak.jpg")
  81 + .setBrokeragePrice(4);
  82 + return success(new PageResult<>(asList(vo1, vo2, vo3, vo4), 10L));
  83 + }
  84 +
  85 + @GetMapping("/get-rank-by-price")
  86 + @Operation(summary = "获得分销用户排行（基于佣金）")
  87 + @Parameter(name = "times", description = "时间段", required = true)
  88 + public CommonResult<Integer> getBrokerageUserRankByPrice(
  89 + @RequestParam("times") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) LocalDateTime[] times) {
  90 + return success(1);
  91 + }
  92 +
59 93 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/brokerage/AppBrokerageWithdrawController.java renamed to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageWithdrawController.java
  View file @0329f13
1   -package cn.iocoder.yudao.module.member.controller.app.brokerage;
  1 +package cn.iocoder.yudao.module.trade.controller.app.brokerage;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 5 import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
6   -import cn.iocoder.yudao.module.member.controller.app.brokerage.vo.withdraw.AppBrokerageWithdrawRespVO;
  6 +import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.withdraw.AppBrokerageWithdrawRespVO;
7 7 import io.swagger.v3.oas.annotations.Operation;
8 8 import io.swagger.v3.oas.annotations.tags.Tag;
9 9 import lombok.extern.slf4j.Slf4j;
... ... @@ -19,7 +19,7 @@ import static java.util.Arrays.asList;
19 19  
20 20 @Tag(name = "用户 APP - 分销提现")
21 21 @RestController
22   -@RequestMapping("/member/brokerage-withdraw")
  22 +@RequestMapping("/trade/brokerage-withdraw")
23 23 @Validated
24 24 @Slf4j
25 25 public class AppBrokerageWithdrawController {
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/brokerage/vo/record/AppBrokerageRecordPageReqVO.java renamed to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/record/AppBrokerageRecordPageReqVO.java
  View file @0329f13
1   -package cn.iocoder.yudao.module.member.controller.app.brokerage.vo.record;
  1 +package cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.record;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 4 import io.swagger.v3.oas.annotations.media.Schema;
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/brokerage/vo/record/AppBrokerageRecordRespVO.java renamed to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/record/AppBrokerageRecordRespVO.java
  View file @0329f13
1   -package cn.iocoder.yudao.module.member.controller.app.brokerage.vo.record;
  1 +package cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.record;
2 2  
3 3 import io.swagger.v3.oas.annotations.media.Schema;
4 4 import lombok.Data;
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/user/AppBrokerageUserRankByPriceRespVO.java 0 → 100644
  View file @0329f13
  1 +package cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user;
  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 AppBrokerageUserRankByPriceRespVO {
  9 +
  10 + @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
  11 + private Long userId;
  12 +
  13 + @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "小王")
  14 + private String nickname;
  15 +
  16 + @Schema(description = "用户头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "http://www.iocoder.cn/xxx.jpg")
  17 + private String avatar;
  18 +
  19 + @Schema(description = "佣金金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
  20 + private Integer brokeragePrice;
  21 +
  22 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/brokerage/vo/user/AppBrokerageUserRankRespVO.java renamed to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/user/AppBrokerageUserRankByUserCountRespVO.java
  View file @0329f13
1   -package cn.iocoder.yudao.module.member.controller.app.brokerage.vo.user;
  1 +package cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user;
2 2  
3 3 import io.swagger.v3.oas.annotations.media.Schema;
4 4 import lombok.Data;
5 5  
6   -@Schema(description = "用户 App - 分销排行用户 Response VO")
  6 +@Schema(description = "用户 App - 分销排行用户（基于用户量） Response VO")
7 7 @Data
8   -public class AppBrokerageUserRankRespVO {
  8 +public class AppBrokerageUserRankByUserCountRespVO {
9 9  
10 10 @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
11 11 private Long userId;
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/brokerage/vo/user/AppBrokerageUserRankPageReqVO.java renamed to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/user/AppBrokerageUserRankPageReqVO.java
  View file @0329f13
1   -package cn.iocoder.yudao.module.member.controller.app.brokerage.vo.user;
  1 +package cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 4 import io.swagger.v3.oas.annotations.media.Schema;
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/brokerage/vo/user/AppBrokerageUserSummaryRespVO.java renamed to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/user/AppBrokerageUserSummaryRespVO.java
  View file @0329f13
1   -package cn.iocoder.yudao.module.member.controller.app.brokerage.vo.user;
  1 +package cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user;
2 2  
3 3 import io.swagger.v3.oas.annotations.media.Schema;
4 4 import lombok.Data;
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/brokerage/vo/withdraw/AppBrokerageWithdrawRespVO.java renamed to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/withdraw/AppBrokerageWithdrawRespVO.java
  View file @0329f13
1   -package cn.iocoder.yudao.module.member.controller.app.brokerage.vo.withdraw;
  1 +package cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.withdraw;
2 2  
3 3 import io.swagger.v3.oas.annotations.media.Schema;
4 4 import lombok.Data;
... ...