BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 426594ae001a2465a3476ad18202386a0979550f

Authored by YunaiV
1 parent 5858f57f

分销：调整 app 的 price 到 brokeragePrice

Inline Side-by-side
Showing 9 changed files with 18 additions and 17 deletions
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/BrokerageUserRespVO.java
  View file @426594a
... ... @@ -19,7 +19,6 @@ public class BrokerageUserRespVO extends BrokerageUserBaseVO {
19 19 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
20 20 private LocalDateTime createTime;
21 21  
22   -
23 22 // ========== 用户信息 ==========
24 23  
25 24 @Schema(description = "用户头像", example = "https://www.iocoder.cn/xxx.png")
... ... @@ -27,7 +26,6 @@ public class BrokerageUserRespVO extends BrokerageUserBaseVO {
27 26 @Schema(description = "用户昵称", example = "李四")
28 27 private String nickname;
29 28  
30   -
31 29 // ========== 推广信息 ==========
32 30  
33 31 @Schema(description = "推广用户数量（一级）", example = "20019")
... ... @@ -37,7 +35,6 @@ public class BrokerageUserRespVO extends BrokerageUserBaseVO {
37 35 @Schema(description = "推广订单金额", example = "20019")
38 36 private Integer brokerageOrderPrice;
39 37  
40   -
41 38 // ========== 提现信息 ==========
42 39  
43 40 @Schema(description = "已提现金额", example = "20019")
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageUserController.java
  View file @426594a
... ... @@ -37,6 +37,7 @@ public class AppBrokerageUserController {
37 37 @PreAuthenticated
38 38 public CommonResult<AppBrokerageUserRespVO> getBrokerageUser() {
39 39 AppBrokerageUserRespVO respVO = new AppBrokerageUserRespVO()
  40 + .setBrokerageEnabled(true)
40 41 .setPrice(2000)
41 42 .setFrozenPrice(3000);
42 43 return success(respVO);
... ... @@ -49,7 +50,7 @@ public class AppBrokerageUserController {
49 50 public CommonResult<AppBrokerageUserMySummaryRespVO> getBrokerageUserSummary() {
50 51 AppBrokerageUserMySummaryRespVO respVO = new AppBrokerageUserMySummaryRespVO()
51 52 .setYesterdayPrice(1)
52   - .setPrice(2)
  53 + .setBrokeragePrice(2)
53 54 .setFrozenPrice(3)
54 55 .setWithdrawPrice(4)
55 56 .setFirstBrokerageUserCount(166)
... ... @@ -84,16 +85,16 @@ public class AppBrokerageUserController {
84 85 public CommonResult<PageResult<AppBrokerageUserRankByPriceRespVO>> getBrokerageUserChildSummaryPageByPrice(AppBrokerageUserRankPageReqVO pageReqVO) {
85 86 AppBrokerageUserRankByPriceRespVO vo1 = new AppBrokerageUserRankByPriceRespVO()
86 87 .setId(1L).setNickname("芋1**艿").setAvatar("http://www.iocoder.cn/images/common/wechat_mp_2017_07_31_bak.jpg")
87   - .setPrice(10);
  88 + .setBrokeragePrice(10);
88 89 AppBrokerageUserRankByPriceRespVO vo2 = new AppBrokerageUserRankByPriceRespVO()
89 90 .setId(2L).setNickname("芋2**艿").setAvatar("http://www.iocoder.cn/images/common/wechat_mp_2017_07_31_bak.jpg")
90   - .setPrice(6);
  91 + .setBrokeragePrice(6);
91 92 AppBrokerageUserRankByPriceRespVO vo3 = new AppBrokerageUserRankByPriceRespVO()
92 93 .setId(3L).setNickname("芋3**艿").setAvatar("http://www.iocoder.cn/images/common/wechat_mp_2017_07_31_bak.jpg")
93   - .setPrice(4);
  94 + .setBrokeragePrice(4);
94 95 AppBrokerageUserRankByPriceRespVO vo4 = new AppBrokerageUserRankByPriceRespVO()
95 96 .setId(3L).setNickname("芋3**艿").setAvatar("http://www.iocoder.cn/images/common/wechat_mp_2017_07_31_bak.jpg")
96   - .setPrice(4);
  97 + .setBrokeragePrice(4);
97 98 return success(new PageResult<>(asList(vo1, vo2, vo3, vo4), 10L));
98 99 }
99 100  
... ... @@ -105,11 +106,11 @@ public class AppBrokerageUserController {
105 106 AppBrokerageUserChildSummaryPageReqVO pageReqVO) {
106 107 AppBrokerageUserChildSummaryRespVO vo1 = new AppBrokerageUserChildSummaryRespVO()
107 108 .setId(1L).setNickname("芋1**艿").setAvatar("http://www.iocoder.cn/images/common/wechat_mp_2017_07_31_bak.jpg")
108   - .setPrice(10).setPrice(20).setBrokerageOrderCount(30)
  109 + .setBrokeragePrice(10).setBrokeragePrice(20).setBrokerageOrderCount(30)
109 110 .setBrokerageTime(LocalDateTime.now());
110 111 AppBrokerageUserChildSummaryRespVO vo2 = new AppBrokerageUserChildSummaryRespVO()
111 112 .setId(1L).setNickname("芋2**艿").setAvatar("http://www.iocoder.cn/images/common/wechat_mp_2017_07_31_bak.jpg")
112   - .setPrice(20).setPrice(30).setBrokerageOrderCount(40)
  113 + .setBrokeragePrice(20).setBrokeragePrice(30).setBrokerageOrderCount(40)
113 114 .setBrokerageTime(LocalDateTime.now());
114 115 return success(new PageResult<>(asList(vo1, vo2), 10L));
115 116 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/user/AppBrokerageUserChildSummaryRespVO.java
  View file @426594a
... ... @@ -19,7 +19,7 @@ public class AppBrokerageUserChildSummaryRespVO {
19 19 private String avatar;
20 20  
21 21 @Schema(description = "佣金金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
22   - private Integer price;
  22 + private Integer brokeragePrice;
23 23  
24 24 @Schema(description = "分销订单数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "20")
25 25 private Integer brokerageOrderCount;
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/user/AppBrokerageUserMySummaryRespVO.java
  View file @426594a
... ... @@ -14,7 +14,7 @@ public class AppBrokerageUserMySummaryRespVO {
14 14 private Integer withdrawPrice;
15 15  
16 16 @Schema(description = "可用的佣金，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "2408")
17   - private Integer price;
  17 + private Integer brokeragePrice;
18 18  
19 19 @Schema(description = "冻结的佣金，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "234")
20 20 private Integer frozenPrice;
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/user/AppBrokerageUserRankByPriceRespVO.java
  View file @426594a
... ... @@ -17,6 +17,6 @@ public class AppBrokerageUserRankByPriceRespVO {
17 17 private String avatar;
18 18  
19 19 @Schema(description = "佣金金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
20   - private Integer price;
  20 + private Integer brokeragePrice;
21 21  
22 22 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/user/AppBrokerageUserRespVO.java
  View file @426594a
... ... @@ -7,6 +7,9 @@ import lombok.Data;
7 7 @Data
8 8 public class AppBrokerageUserRespVO {
9 9  
  10 + @Schema(description = "是否有分销资格", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
  11 + private Boolean brokerageEnabled;
  12 +
10 13 @Schema(description = "可用的佣金，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "2408")
11 14 private Integer price;
12 15  
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/record/BrokerageRecordConvert.java
  View file @426594a
... ... @@ -41,7 +41,7 @@ public interface BrokerageRecordConvert {
41 41 : BrokerageRecordStatusEnum.SETTLEMENT.getStatus();
42 42 return new BrokerageRecordDO().setUserId(user.getId())
43 43 .setBizType(bizType.getType()).setBizId(bizId)
44   - .setPrice(brokeragePrice).setTotalPrice(user.getPrice())
  44 + .setPrice(brokeragePrice).setTotalPrice(user.getBrokeragePrice())
45 45 .setTitle(title)
46 46 .setDescription(StrUtil.format(bizType.getDescription(), String.valueOf(brokeragePrice / 100.0)))
47 47 .setStatus(status).setFrozenDays(brokerageFrozenDays).setUnfreezeTime(unfreezeTime);
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/user/BrokerageUserDO.java
  View file @426594a
... ... @@ -43,7 +43,7 @@ public class BrokerageUserDO extends BaseDO {
43 43 private LocalDateTime bindUserTime;
44 44  
45 45 /**
46   - * 推广资格
  46 + * 是否有分销资格
47 47 */
48 48 private Boolean brokerageEnabled;
49 49 /**
... ... @@ -54,7 +54,7 @@ public class BrokerageUserDO extends BaseDO {
54 54 /**
55 55 * 可用佣金
56 56 */
57   - private Integer price;
  57 + private Integer brokeragePrice;
58 58 /**
59 59 * 冻结佣金
60 60 */
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/BrokerageUserServiceImpl.java
  View file @426594a
... ... @@ -146,7 +146,7 @@ public class BrokerageUserServiceImpl implements BrokerageUserService {
146 146 BrokerageUserDO brokerageUser = brokerageUserMapper.selectById(userId);
147 147 if (brokerageUser == null) { // 分销用户不存在的情况：1. 新注册；2. 旧数据；3. 分销功能关闭后又打开
148 148 isNewBrokerageUser = true;
149   - brokerageUser = new BrokerageUserDO().setId(userId).setBrokerageEnabled(false).setPrice(0).setFrozenPrice(0);
  149 + brokerageUser = new BrokerageUserDO().setId(userId).setBrokerageEnabled(false).setBrokeragePrice(0).setFrozenPrice(0);
150 150 }
151 151  
152 152 // 2.1 校验能否绑定
... ...