From 1be63596037370c85f35ee3cbf0b791c07d13e72 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 1 Dec 2024 15:00:50 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=91=E5=95=86=E5=9F=8E=EF=BC=9A=E5=88=86=E9=94=80=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=9A=84=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../brokerage/vo/user/BrokerageUserCreateReqVO.java | 12 ------------ .../service/brokerage/BrokerageUserService.java | 3 ++- .../service/brokerage/BrokerageUserServiceImpl.java | 13 ++++++------- 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserCreateReqVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserCreateReqVO.java index 449c838282..f93149afb8 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserCreateReqVO.java +++ b/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 { @Schema(description = "推广员编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "4587") private Long bindUserId; - @Schema(description = "推广资格", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "推广资格不能为空") - private Boolean brokerageEnabled; - - @Schema(description = "可用佣金", requiredMode = Schema.RequiredMode.REQUIRED, example = "11089") - @NotNull(message = "可用佣金不能为空") - private Integer price; - - @Schema(description = "冻结佣金", requiredMode = Schema.RequiredMode.REQUIRED, example = "30916") - @NotNull(message = "冻结佣金不能为空") - private Integer frozenPrice; - } diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserService.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserService.java index 6e95278338..8ba46c0023 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserService.java +++ b/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 { boolean bindBrokerageUser(@NotNull Long userId, @NotNull Long bindUserId); /** - * 创建分销用户 + * 【管理员】创建分销用户 + * * @param createReqVO 请求 * @return 编号 */ diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java index 903f28321a..490f2cec8c 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java +++ b/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 { if (brokerageUserDO == null) { throw exception(BROKERAGE_USER_NOT_EXISTS); } - return brokerageUserDO; } @@ -208,18 +207,18 @@ public class BrokerageUserServiceImpl implements BrokerageUserService { @Override @Transactional(rollbackFor = Exception.class) public Long createBrokerageUser(BrokerageUserCreateReqVO createReqVO) { - // 1. 校验分销用户是否已存在 + // 1.1 校验分销用户是否已存在 BrokerageUserDO brokerageUser = brokerageUserMapper.selectById(createReqVO.getUserId()); if (brokerageUser != null) { throw exception(BROKERAGE_CREATE_USER_EXISTS); } - - // 2.1 创建分销人 + // 1.2 校验是否能绑定用户 brokerageUser = BeanUtils.toBean(createReqVO, BrokerageUserDO.class).setId(createReqVO.getUserId()) - .setBrokerageTime(LocalDateTime.now()).setBindUserId(null); + .setBrokerageTime(LocalDateTime.now()); + validateCanBindUser(brokerageUser, createReqVO.getBindUserId()); + + // 2. 创建分销人 brokerageUserMapper.insert(brokerageUser); - // 2.2 绑定推广员 - updateBrokerageUserId(brokerageUser.getId(), createReqVO.getBindUserId()); return brokerageUser.getId(); }