Commit a47d744f648cdd60165f757254d176dd5116d919
1 parent
cd51d57f
分销:绑定分销的 url 调整
Showing
4 changed files
with
11 additions
and
10 deletions
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/brokerage/BrokerageApiImpl.java
| ... | ... | @@ -27,7 +27,7 @@ public class BrokerageApiImpl implements BrokerageApi { |
| 27 | 27 | |
| 28 | 28 | @Override |
| 29 | 29 | public boolean bindUser(Long userId, Long bindUserId, Boolean isNewUser) { |
| 30 | - return brokerageUserService.bindUser(userId, bindUserId, isNewUser); | |
| 30 | + return brokerageUserService.bindBrokerageUser(userId, bindUserId, isNewUser); | |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | } | ... | ... |
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageUserController.java
| ... | ... | @@ -43,6 +43,13 @@ public class AppBrokerageUserController { |
| 43 | 43 | return success(respVO); |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | + @PutMapping("/bind") | |
| 47 | + @Operation(summary = "绑定推广员") | |
| 48 | + @PreAuthenticated | |
| 49 | + public CommonResult<Boolean> bindBrokerageUser(@Valid @RequestBody AppBrokerageUserBindReqVO reqVO) { | |
| 50 | + return success(brokerageUserService.bindBrokerageUser(getLoginUserId(), reqVO.getBindUserId(), false)); | |
| 51 | + } | |
| 52 | + | |
| 46 | 53 | // TODO 芋艿:临时 mock => |
| 47 | 54 | @GetMapping("/get-summary") |
| 48 | 55 | @Operation(summary = "获得个人分销统计") |
| ... | ... | @@ -119,15 +126,9 @@ public class AppBrokerageUserController { |
| 119 | 126 | @GetMapping("/get-rank-by-price") |
| 120 | 127 | @Operation(summary = "获得分销用户排行(基于佣金)") |
| 121 | 128 | @Parameter(name = "times", description = "时间段", required = true) |
| 122 | - public CommonResult<Integer> getBrokerageUserRankByPrice( | |
| 129 | + public CommonResult<Integer> bindBrokerageUser( | |
| 123 | 130 | @RequestParam("times") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) LocalDateTime[] times) { |
| 124 | 131 | return success(1); |
| 125 | 132 | } |
| 126 | 133 | |
| 127 | - @PutMapping("/bind-user") | |
| 128 | - @Operation(summary = "绑定推广员") | |
| 129 | - public CommonResult<Boolean> getBrokerageUserRankByPrice(@Valid AppBrokerageUserBindReqVO reqVO) { | |
| 130 | - return success(brokerageUserService.bindUser(getLoginUserId(), reqVO.getBindUserId(), false)); | |
| 131 | - } | |
| 132 | - | |
| 133 | 134 | } | ... | ... |
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/BrokerageUserService.java
| ... | ... | @@ -103,6 +103,6 @@ public interface BrokerageUserService { |
| 103 | 103 | * @param isNewUser 是否为新用户 |
| 104 | 104 | * @return 是否绑定 |
| 105 | 105 | */ |
| 106 | - boolean bindUser(Long userId, Long bindUserId, Boolean isNewUser); | |
| 106 | + boolean bindBrokerageUser(Long userId, Long bindUserId, Boolean isNewUser); | |
| 107 | 107 | |
| 108 | 108 | } | ... | ... |
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/BrokerageUserServiceImpl.java
| ... | ... | @@ -135,7 +135,7 @@ public class BrokerageUserServiceImpl implements BrokerageUserService { |
| 135 | 135 | |
| 136 | 136 | // TODO @疯狂:因为现在 user 会存在使用验证码直接注册,所以 isNewUser 不太好传递;我们是不是可以约定绑定的时间,createTime 在 30 秒内,就认为新用户; |
| 137 | 137 | @Override |
| 138 | - public boolean bindUser(Long userId, Long bindUserId, Boolean isNewUser) { | |
| 138 | + public boolean bindBrokerageUser(Long userId, Long bindUserId, Boolean isNewUser) { | |
| 139 | 139 | // TODO @疯狂:userId 为空,搞到参数校验里哇; |
| 140 | 140 | if (userId == null) { |
| 141 | 141 | throw exception(0); | ... | ... |