Procházet zdrojové kódy

【代码优化】商城:分销用户的创建

YunaiV před 8 měsíci
rodič
revize
1be6359603

+ 0 - 12
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;
-
 }

+ 2 - 1
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 编号
      */

+ 6 - 7
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();
     }