Commit 1be63596037370c85f35ee3cbf0b791c07d13e72
1 parent
844f573b
【代码优化】商城:分销用户的创建
Showing
3 changed files
with
8 additions
and
20 deletions
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserCreateReqVO.java
| @@ -15,16 +15,4 @@ public class BrokerageUserCreateReqVO { | @@ -15,16 +15,4 @@ public class BrokerageUserCreateReqVO { | ||
| 15 | @Schema(description = "推广员编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "4587") | 15 | @Schema(description = "推广员编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "4587") |
| 16 | private Long bindUserId; | 16 | private Long bindUserId; |
| 17 | 17 | ||
| 18 | - @Schema(description = "推广资格", requiredMode = Schema.RequiredMode.REQUIRED) | ||
| 19 | - @NotNull(message = "推广资格不能为空") | ||
| 20 | - private Boolean brokerageEnabled; | ||
| 21 | - | ||
| 22 | - @Schema(description = "可用佣金", requiredMode = Schema.RequiredMode.REQUIRED, example = "11089") | ||
| 23 | - @NotNull(message = "可用佣金不能为空") | ||
| 24 | - private Integer price; | ||
| 25 | - | ||
| 26 | - @Schema(description = "冻结佣金", requiredMode = Schema.RequiredMode.REQUIRED, example = "30916") | ||
| 27 | - @NotNull(message = "冻结佣金不能为空") | ||
| 28 | - private Integer frozenPrice; | ||
| 29 | - | ||
| 30 | } | 18 | } |
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserService.java
| @@ -110,7 +110,8 @@ public interface BrokerageUserService { | @@ -110,7 +110,8 @@ public interface BrokerageUserService { | ||
| 110 | boolean bindBrokerageUser(@NotNull Long userId, @NotNull Long bindUserId); | 110 | boolean bindBrokerageUser(@NotNull Long userId, @NotNull Long bindUserId); |
| 111 | 111 | ||
| 112 | /** | 112 | /** |
| 113 | - * 创建分销用户 | 113 | + * 【管理员】创建分销用户 |
| 114 | + * | ||
| 114 | * @param createReqVO 请求 | 115 | * @param createReqVO 请求 |
| 115 | * @return 编号 | 116 | * @return 编号 |
| 116 | */ | 117 | */ |
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java
| @@ -113,7 +113,6 @@ public class BrokerageUserServiceImpl implements BrokerageUserService { | @@ -113,7 +113,6 @@ public class BrokerageUserServiceImpl implements BrokerageUserService { | ||
| 113 | if (brokerageUserDO == null) { | 113 | if (brokerageUserDO == null) { |
| 114 | throw exception(BROKERAGE_USER_NOT_EXISTS); | 114 | throw exception(BROKERAGE_USER_NOT_EXISTS); |
| 115 | } | 115 | } |
| 116 | - | ||
| 117 | return brokerageUserDO; | 116 | return brokerageUserDO; |
| 118 | } | 117 | } |
| 119 | 118 | ||
| @@ -208,18 +207,18 @@ public class BrokerageUserServiceImpl implements BrokerageUserService { | @@ -208,18 +207,18 @@ public class BrokerageUserServiceImpl implements BrokerageUserService { | ||
| 208 | @Override | 207 | @Override |
| 209 | @Transactional(rollbackFor = Exception.class) | 208 | @Transactional(rollbackFor = Exception.class) |
| 210 | public Long createBrokerageUser(BrokerageUserCreateReqVO createReqVO) { | 209 | public Long createBrokerageUser(BrokerageUserCreateReqVO createReqVO) { |
| 211 | - // 1. 校验分销用户是否已存在 | 210 | + // 1.1 校验分销用户是否已存在 |
| 212 | BrokerageUserDO brokerageUser = brokerageUserMapper.selectById(createReqVO.getUserId()); | 211 | BrokerageUserDO brokerageUser = brokerageUserMapper.selectById(createReqVO.getUserId()); |
| 213 | if (brokerageUser != null) { | 212 | if (brokerageUser != null) { |
| 214 | throw exception(BROKERAGE_CREATE_USER_EXISTS); | 213 | throw exception(BROKERAGE_CREATE_USER_EXISTS); |
| 215 | } | 214 | } |
| 216 | - | ||
| 217 | - // 2.1 创建分销人 | 215 | + // 1.2 校验是否能绑定用户 |
| 218 | brokerageUser = BeanUtils.toBean(createReqVO, BrokerageUserDO.class).setId(createReqVO.getUserId()) | 216 | brokerageUser = BeanUtils.toBean(createReqVO, BrokerageUserDO.class).setId(createReqVO.getUserId()) |
| 219 | - .setBrokerageTime(LocalDateTime.now()).setBindUserId(null); | 217 | + .setBrokerageTime(LocalDateTime.now()); |
| 218 | + validateCanBindUser(brokerageUser, createReqVO.getBindUserId()); | ||
| 219 | + | ||
| 220 | + // 2. 创建分销人 | ||
| 220 | brokerageUserMapper.insert(brokerageUser); | 221 | brokerageUserMapper.insert(brokerageUser); |
| 221 | - // 2.2 绑定推广员 | ||
| 222 | - updateBrokerageUserId(brokerageUser.getId(), createReqVO.getBindUserId()); | ||
| 223 | return brokerageUser.getId(); | 222 | return brokerageUser.getId(); |
| 224 | } | 223 | } |
| 225 | 224 |