Parcourir la source

trade: 增加分销用户表

owen il y a 1 an
Parent
commit
a68691f2d9
17 fichiers modifiés avec 599 ajouts et 43 suppressions
  1. 56 43
      sql/mysql/brokerage.sql
  2. 4 0
      yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
  3. 71 0
      yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/TradeBrokerageUserController.java
  4. 43 0
      yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/TradeBrokerageUserBaseVO.java
  5. 18 0
      yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/TradeBrokerageUserClearBrokerageUserReqVO.java
  6. 30 0
      yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/TradeBrokerageUserPageReqVO.java
  7. 22 0
      yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/TradeBrokerageUserRespVO.java
  8. 22 0
      yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/TradeBrokerageUserUpdateBrokerageEnabledReqVO.java
  9. 22 0
      yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/TradeBrokerageUserUpdateBrokerageUserReqVO.java
  10. 27 0
      yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/user/TradeBrokerageUserConvert.java
  11. 56 0
      yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/user/TradeBrokerageUserDO.java
  12. 26 0
      yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/user/TradeBrokerageUserMapper.java
  13. 56 0
      yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/TradeBrokerageUserService.java
  14. 63 0
      yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/TradeBrokerageUserServiceImpl.java
  15. 64 0
      yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/user/TradeBrokerageUserServiceImplTest.java
  16. 1 0
      yudao-module-mall/yudao-module-trade-biz/src/test/resources/sql/clean.sql
  17. 18 0
      yudao-module-mall/yudao-module-trade-biz/src/test/resources/sql/create_tables.sql

+ 56 - 43
sql/mysql/brokerage.sql

@@ -1,8 +1,7 @@
--- 增加配置
+-- 增加配置
 create table trade_config
 (
-    id                           bigint auto_increment comment '自增主键'
-        primary key,
+    id                           bigint auto_increment comment '自增主键' primary key,
     brokerage_enabled            bit                                    default 1                 not null comment '是否启用分佣',
     brokerage_enabled_condition  tinyint                                default 0                 not null comment '分佣模式:0-人人分销 1-指定分销',
     brokerage_bind_mode          tinyint                                default 0                 not null comment '分销关系绑定模式: 0-没有推广人,1-新用户',
@@ -21,22 +20,26 @@ create table trade_config
     tenant_id                    bigint                                 default 0                 not null comment '租户编号'
 ) comment '交易中心配置';
 
--- 用户表增加分销相关字段
-alter table member_user
-    add column brokerage_user_id bigint not null comment '推广员编号';
-alter table member_user
-    add column brokerage_bind_time datetime null comment '推广员绑定时间';
-alter table member_user
-    add column brokerage_enabled bit default 1 not null comment '是否成为推广员';
-alter table member_user
-    add column brokerage_time datetime null comment '成为分销员时间';
-alter table member_user
-    add column brokerage_price int default 0 not null comment '可用佣金';
-alter table member_user
-    add column frozen_brokerage_price int default 0 not null comment '冻结佣金';
-
-create index idx_invite_user_id on member_user (brokerage_user_id) comment '推广员编号';
-create index idx_agent on member_user (brokerage_enabled) comment '是否成为推广员';
+-- 增加分销用户扩展表
+create table trade_brokerage_user
+(
+    id                     bigint auto_increment comment '用户编号' primary key,
+    brokerage_user_id      bigint                                                           not null comment '推广员编号',
+    brokerage_bind_time    datetime                                                         null comment '推广员绑定时间',
+    brokerage_enabled      bit                                    default 1                 not null comment '是否成为推广员',
+    brokerage_time         datetime                                                         null comment '成为分销员时间',
+    brokerage_price        int                                    default 0                 not null comment '可用佣金',
+    frozen_brokerage_price int                                    default 0                 not null comment '冻结佣金',
+    creator                varchar(64) collate utf8mb4_unicode_ci default ''                null comment '创建者',
+    create_time            datetime                               default CURRENT_TIMESTAMP not null comment '创建时间',
+    updater                varchar(64) collate utf8mb4_unicode_ci default ''                null comment '更新者',
+    update_time            datetime                               default CURRENT_TIMESTAMP not null on update CURRENT_TIMESTAMP comment '更新时间',
+    deleted                bit                                    default b'0'              not null comment '是否删除',
+    tenant_id              bigint                                 default 0                 not null comment '租户编号'
+) comment '分销用户';
+
+create index idx_invite_user_id on trade_brokerage_user (brokerage_user_id) comment '推广员编号';
+create index idx_agent on trade_brokerage_user (brokerage_enabled) comment '是否成为推广员';
 
 
 create table member_brokerage_record
@@ -150,55 +153,65 @@ values ('brokerage_bank_name', '工商银行', 0, 0),
        ('brokerage_bank_name', '交通银行', 4, 4),
        ('brokerage_bank_name', '招商银行', 5, 5);
 
--- 增加菜单:分销员管理
+
+-- 交易中心配置:菜单 SQL
 INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status, component_name)
-VALUES ('分销员', '', 2, 7, 2262, 'brokerage', 'user', 'member/brokerage/user/index', 0, 'MemberBrokerageUser');
+VALUES ('交易中心配置', '', 2, 0, 2072, 'config', 'ep:setting', 'trade/config/index', 0, 'TradeConfig');
 -- 按钮父菜单ID
+-- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话,需要手动修改 @parentId 的部分的代码
 SELECT @parentId := LAST_INSERT_ID();
 -- 按钮 SQL
 INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
-VALUES ('分销员查询', 'member:brokerage-user:query', 3, 1, @parentId, '', '', '', 0);
-INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
-VALUES ('分销员创建', 'member:brokerage-user:create', 3, 2, @parentId, '', '', '', 0);
-INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
-VALUES ('分销员更新', 'member:brokerage-user:update', 3, 3, @parentId, '', '', '', 0);
+VALUES ('交易中心配置查询', 'trade:config:query', 3, 1, @parentId, '', '', '', 0);
 INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
-VALUES ('分销员删除', 'member:brokerage-user:delete', 3, 4, @parentId, '', '', '', 0);
+VALUES ('交易中心配置保存', 'trade:config:save', 3, 2, @parentId, '', '', '', 0);
 
--- 增加菜单:佣金记录
+
+-- 增加菜单:分销
+INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status, component_name)
+VALUES ('分销', '', 1, 5, 2072, 'brokerage', 'fa-solid:project-diagram', '', 0, '');
+-- 按钮父菜单ID
+SELECT @brokerageMenuId := LAST_INSERT_ID();
+
+-- 增加菜单:分销员
+-- 菜单 SQL
 INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status, component_name)
-VALUES ('佣金记录', '', 2, 8, 2262, 'brokerage-record', 'list', 'member/brokerage/record/index', 0,
-        'MemberBrokerageRecord');
+VALUES ('分销用户', '', 2, 0, @brokerageMenuId, 'brokerage-user', 'fa-solid:user-tie', 'trade/brokerage/user/index', 0,
+        'TradeBrokerageUser');
 -- 按钮父菜单ID
 -- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话,需要手动修改 @parentId 的部分的代码
 SELECT @parentId := LAST_INSERT_ID();
 -- 按钮 SQL
 INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
-VALUES ('佣金记录查询', 'member:member-brokerage-record:query', 3, 1, @parentId, '', 'table', '', 0);
+VALUES ('分销用户查询', 'trade:brokerage-user:query', 3, 1, @parentId, '', '', '', 0);
+INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
+VALUES ('分销用户修改推广员', 'trade:brokerage-user:update-brokerage-user', 3, 2, @parentId, '', '', '', 0);
+INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
+VALUES ('分销用户清除推广员', 'trade:brokerage-user:clear-brokerage-user', 3, 3, @parentId, '', '', '', 0);
+INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
+VALUES ('分销用户修改推广资格', 'trade:brokerage-user:update-brokerage-enable', 3, 4, @parentId, '', '', '', 0);
 
--- 增加菜单:佣金提现
-INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status, component_name)
-VALUES ('佣金提现', '', 2, 9, 2262, 'brokerage-withdraw', '', 'member/brokerage/withdraw/index', 0,
-        'MemberBrokerageWithdraw');
 
+-- 增加菜单:佣金记录
+INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status, component_name)
+VALUES ('佣金记录', '', 2, 1, @brokerageMenuId, 'brokerage-record', 'fa:money', 'trade/brokerage/record/index', 0,
+        'TradeBrokerageRecord');
 -- 按钮父菜单ID
 -- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话,需要手动修改 @parentId 的部分的代码
 SELECT @parentId := LAST_INSERT_ID();
-
 -- 按钮 SQL
 INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
-VALUES ('佣金提现查询', 'member:brokerage-withdraw:query', 3, 1, @parentId, '', '', '', 0);
+VALUES ('佣金记录查询', 'trade:brokerage-record:query', 3, 1, @parentId, '', '', '', 0);
 
--- 交易中心配置:菜单 SQL
+-- 增加菜单:佣金提现
 INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status, component_name)
-VALUES ('交易中心配置', '', 2, 0, 2072, 'config', '', 'trade/config/index', 0, 'TradeConfig');
-
+VALUES ('佣金提现', '', 2, 2, @brokerageMenuId, 'brokerage-withdraw', 'fa:credit-card',
+        'trade/brokerage/withdraw/index', 0, 'TradeBrokerageWithdraw');
 -- 按钮父菜单ID
 -- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话,需要手动修改 @parentId 的部分的代码
 SELECT @parentId := LAST_INSERT_ID();
-
 -- 按钮 SQL
 INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
-VALUES ('交易中心配置查询', 'trade:config:query', 3, 1, @parentId, '', '', '', 0);
+VALUES ('佣金提现查询', 'trade:brokerage-withdraw:query', 3, 1, @parentId, '', '', '', 0);
 INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
-VALUES ('交易中心配置保存', 'trade:config:save', 3, 2, @parentId, '', '', '', 0);
+VALUES ('佣金提现审核', 'trade:brokerage-withdraw:audit', 3, 2, @parentId, '', '', '', 0);

+ 4 - 0
yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java

@@ -74,4 +74,8 @@ public interface ErrorCodeConstants {
     // ==========  物流 PICK_UP 模块 1011006000 ==========
     ErrorCode PICK_UP_STORE_NOT_EXISTS = new ErrorCode(1011006000, "自提门店不存在");
 
+
+    // ==========  分销 分销用户 模块 1011007000 ==========
+    ErrorCode BROKERAGE_USER_NOT_EXISTS = new ErrorCode(1011007000, "分销用户不存在");
+
 }

+ 71 - 0
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/TradeBrokerageUserController.java

@@ -0,0 +1,71 @@
+package cn.iocoder.yudao.module.trade.controller.admin.brokerage.user;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo.*;
+import cn.iocoder.yudao.module.trade.convert.brokerage.user.TradeBrokerageUserConvert;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.user.TradeBrokerageUserDO;
+import cn.iocoder.yudao.module.trade.service.brokerage.user.TradeBrokerageUserService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 分销用户")
+@RestController
+@RequestMapping("/trade/brokerage-user")
+@Validated
+public class TradeBrokerageUserController {
+
+    @Resource
+    private TradeBrokerageUserService brokerageUserService;
+
+    @PutMapping("/update-brokerage-user")
+    @Operation(summary = "修改推广员")
+    @PreAuthorize("@ss.hasPermission('trade:brokerage-user:update-brokerage-user')")
+    public CommonResult<Boolean> updateBrokerageUser(@Valid @RequestBody TradeBrokerageUserUpdateBrokerageUserReqVO updateReqVO) {
+        brokerageUserService.updateBrokerageUserId(updateReqVO.getId(), updateReqVO.getBrokerageUserId());
+        return success(true);
+    }
+
+    @PutMapping("/clear-brokerage-user")
+    @Operation(summary = "清除推广员")
+    @PreAuthorize("@ss.hasPermission('trade:brokerage-user:clear-brokerage-user')")
+    public CommonResult<Boolean> clearBrokerageUser(@Valid @RequestBody TradeBrokerageUserClearBrokerageUserReqVO updateReqVO) {
+        brokerageUserService.updateBrokerageUserId(updateReqVO.getId(), null);
+        return success(true);
+    }
+
+    @PutMapping("/update-brokerage-enable")
+    @Operation(summary = "修改推广资格")
+    @PreAuthorize("@ss.hasPermission('trade:brokerage-user:update-brokerage-enable')")
+    public CommonResult<Boolean> updateBrokerageEnabled(@Valid @RequestBody TradeBrokerageUserUpdateBrokerageEnabledReqVO updateReqVO) {
+        brokerageUserService.updateBrokerageEnabled(updateReqVO.getId(), updateReqVO.getBrokerageEnabled());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得分销用户")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('trade:brokerage-user:query')")
+    public CommonResult<TradeBrokerageUserRespVO> getBrokerageUser(@RequestParam("id") Long id) {
+        TradeBrokerageUserDO brokerageUser = brokerageUserService.getBrokerageUser(id);
+        return success(TradeBrokerageUserConvert.INSTANCE.convert(brokerageUser));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得分销用户分页")
+    @PreAuthorize("@ss.hasPermission('trade:brokerage-user:query')")
+    public CommonResult<PageResult<TradeBrokerageUserRespVO>> getBrokerageUserPage(@Valid TradeBrokerageUserPageReqVO pageVO) {
+        PageResult<TradeBrokerageUserDO> pageResult = brokerageUserService.getBrokerageUserPage(pageVO);
+        return success(TradeBrokerageUserConvert.INSTANCE.convertPage(pageResult));
+    }
+
+}

+ 43 - 0
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/TradeBrokerageUserBaseVO.java

@@ -0,0 +1,43 @@
+package cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+/**
+ * 分销用户 Base VO,提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
+ */
+@Data
+public class TradeBrokerageUserBaseVO {
+
+    @Schema(description = "推广员编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "4587")
+    @NotNull(message = "推广员编号不能为空")
+    private Long brokerageUserId;
+
+    @Schema(description = "推广员绑定时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime brokerageBindTime;
+
+    @Schema(description = "推广资格", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "推广资格不能为空")
+    private Boolean brokerageEnabled;
+
+    @Schema(description = "成为分销员时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime brokerageTime;
+
+    @Schema(description = "可用佣金", requiredMode = Schema.RequiredMode.REQUIRED, example = "11089")
+    @NotNull(message = "可用佣金不能为空")
+    private Integer brokeragePrice;
+
+    @Schema(description = "冻结佣金", requiredMode = Schema.RequiredMode.REQUIRED, example = "30916")
+    @NotNull(message = "冻结佣金不能为空")
+    private Integer frozenBrokeragePrice;
+
+}

+ 18 - 0
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/TradeBrokerageUserClearBrokerageUserReqVO.java

@@ -0,0 +1,18 @@
+package cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 分销用户 - 清除推广员 Request VO")
+@Data
+@ToString(callSuper = true)
+public class TradeBrokerageUserClearBrokerageUserReqVO {
+
+    @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20019")
+    @NotNull(message = "用户编号不能为空")
+    private Long id;
+
+}

+ 30 - 0
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/TradeBrokerageUserPageReqVO.java

@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 分销用户分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class TradeBrokerageUserPageReqVO extends PageParam {
+
+    @Schema(description = "推广员编号", example = "4587")
+    private Long brokerageUserId;
+
+    @Schema(description = "推广资格")
+    private Boolean brokerageEnabled;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

+ 22 - 0
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/TradeBrokerageUserRespVO.java

@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 分销用户 Response VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class TradeBrokerageUserRespVO extends TradeBrokerageUserBaseVO {
+
+    @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20019")
+    private Long id;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime createTime;
+
+}

+ 22 - 0
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/TradeBrokerageUserUpdateBrokerageEnabledReqVO.java

@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 分销用户 - 修改推广员 Request VO")
+@Data
+@ToString(callSuper = true)
+public class TradeBrokerageUserUpdateBrokerageEnabledReqVO {
+
+    @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20019")
+    @NotNull(message = "用户编号不能为空")
+    private Long id;
+
+    @Schema(description = "推广资格", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "推广资格不能为空")
+    private Boolean brokerageEnabled;
+
+}

+ 22 - 0
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/user/vo/TradeBrokerageUserUpdateBrokerageUserReqVO.java

@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 分销用户 - 修改推广员 Request VO")
+@Data
+@ToString(callSuper = true)
+public class TradeBrokerageUserUpdateBrokerageUserReqVO {
+
+    @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20019")
+    @NotNull(message = "用户编号不能为空")
+    private Long id;
+
+    @Schema(description = "推广员编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "4587")
+    @NotNull(message = "推广员编号不能为空")
+    private Long brokerageUserId;
+
+}

+ 27 - 0
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/user/TradeBrokerageUserConvert.java

@@ -0,0 +1,27 @@
+package cn.iocoder.yudao.module.trade.convert.brokerage.user;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo.TradeBrokerageUserRespVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.user.TradeBrokerageUserDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+/**
+ * 分销用户 Convert
+ *
+ * @author owen
+ */
+@Mapper
+public interface TradeBrokerageUserConvert {
+
+    TradeBrokerageUserConvert INSTANCE = Mappers.getMapper(TradeBrokerageUserConvert.class);
+
+    TradeBrokerageUserRespVO convert(TradeBrokerageUserDO bean);
+
+    List<TradeBrokerageUserRespVO> convertList(List<TradeBrokerageUserDO> list);
+
+    PageResult<TradeBrokerageUserRespVO> convertPage(PageResult<TradeBrokerageUserDO> page);
+
+}

+ 56 - 0
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/user/TradeBrokerageUserDO.java

@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.user;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+/**
+ * 分销用户 DO
+ *
+ * @author owen
+ */
+@TableName("trade_brokerage_user")
+@KeySequence("trade_brokerage_user_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TradeBrokerageUserDO extends BaseDO {
+
+    /**
+     * 用户编号
+     */
+    @TableId
+    private Long id;
+    /**
+     * 推广员编号
+     */
+    private Long brokerageUserId;
+    /**
+     * 推广员绑定时间
+     */
+    private LocalDateTime brokerageBindTime;
+    /**
+     * 推广资格
+     */
+    private Boolean brokerageEnabled;
+    /**
+     * 成为分销员时间
+     */
+    private LocalDateTime brokerageTime;
+    /**
+     * 可用佣金
+     */
+    private Integer brokeragePrice;
+    /**
+     * 冻结佣金
+     */
+    private Integer frozenBrokeragePrice;
+
+}

+ 26 - 0
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/user/TradeBrokerageUserMapper.java

@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.trade.dal.mysql.brokerage.user;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo.TradeBrokerageUserPageReqVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.user.TradeBrokerageUserDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 分销用户 Mapper
+ *
+ * @author owen
+ */
+@Mapper
+public interface TradeBrokerageUserMapper extends BaseMapperX<TradeBrokerageUserDO> {
+
+    default PageResult<TradeBrokerageUserDO> selectPage(TradeBrokerageUserPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<TradeBrokerageUserDO>()
+                .eqIfPresent(TradeBrokerageUserDO::getBrokerageUserId, reqVO.getBrokerageUserId())
+                .eqIfPresent(TradeBrokerageUserDO::getBrokerageEnabled, reqVO.getBrokerageEnabled())
+                .betweenIfPresent(TradeBrokerageUserDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(TradeBrokerageUserDO::getId));
+    }
+
+}

+ 56 - 0
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/TradeBrokerageUserService.java

@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.trade.service.brokerage.user;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo.TradeBrokerageUserPageReqVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.user.TradeBrokerageUserDO;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 分销用户 Service 接口
+ *
+ * @author owen
+ */
+public interface TradeBrokerageUserService {
+
+    /**
+     * 获得分销用户
+     *
+     * @param id 编号
+     * @return 分销用户
+     */
+    TradeBrokerageUserDO getBrokerageUser(Long id);
+
+    /**
+     * 获得分销用户列表
+     *
+     * @param ids 编号
+     * @return 分销用户列表
+     */
+    List<TradeBrokerageUserDO> getBrokerageUserList(Collection<Long> ids);
+
+    /**
+     * 获得分销用户分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 分销用户分页
+     */
+    PageResult<TradeBrokerageUserDO> getBrokerageUserPage(TradeBrokerageUserPageReqVO pageReqVO);
+
+    /**
+     * 修改推广员编号
+     *
+     * @param id              用户编号
+     * @param brokerageUserId 推广员编号
+     */
+    void updateBrokerageUserId(Long id, Long brokerageUserId);
+
+    /**
+     * 修改推广资格
+     *
+     * @param id               用户编号
+     * @param brokerageEnabled 推广资格
+     */
+    void updateBrokerageEnabled(Long id, Boolean brokerageEnabled);
+}

+ 63 - 0
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/TradeBrokerageUserServiceImpl.java

@@ -0,0 +1,63 @@
+package cn.iocoder.yudao.module.trade.service.brokerage.user;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo.TradeBrokerageUserPageReqVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.user.TradeBrokerageUserDO;
+import cn.iocoder.yudao.module.trade.dal.mysql.brokerage.user.TradeBrokerageUserMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.BROKERAGE_USER_NOT_EXISTS;
+
+/**
+ * 分销用户 Service 实现类
+ *
+ * @author owen
+ */
+@Service
+@Validated
+public class TradeBrokerageUserServiceImpl implements TradeBrokerageUserService {
+
+    @Resource
+    private TradeBrokerageUserMapper brokerageUserMapper;
+
+    private void validateBrokerageUserExists(Long id) {
+        if (brokerageUserMapper.selectById(id) == null) {
+            throw exception(BROKERAGE_USER_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public TradeBrokerageUserDO getBrokerageUser(Long id) {
+        return brokerageUserMapper.selectById(id);
+    }
+
+    @Override
+    public List<TradeBrokerageUserDO> getBrokerageUserList(Collection<Long> ids) {
+        return brokerageUserMapper.selectBatchIds(ids);
+    }
+
+    @Override
+    public PageResult<TradeBrokerageUserDO> getBrokerageUserPage(TradeBrokerageUserPageReqVO pageReqVO) {
+        return brokerageUserMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public void updateBrokerageUserId(Long id, Long brokerageUserId) {
+        // 校验存在
+        validateBrokerageUserExists(id);
+
+    }
+
+    @Override
+    public void updateBrokerageEnabled(Long id, Boolean brokerageEnabled) {
+        // 校验存在
+        validateBrokerageUserExists(id);
+    }
+
+}

+ 64 - 0
yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/user/TradeBrokerageUserServiceImplTest.java

@@ -0,0 +1,64 @@
+package cn.iocoder.yudao.module.trade.service.brokerage.user;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo.TradeBrokerageUserPageReqVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.user.TradeBrokerageUserDO;
+import cn.iocoder.yudao.module.trade.dal.mysql.brokerage.user.TradeBrokerageUserMapper;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.springframework.context.annotation.Import;
+
+import javax.annotation.Resource;
+
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * {@link TradeBrokerageUserServiceImpl} 的单元测试类
+ *
+ * @author owen
+ */
+@Import(TradeBrokerageUserServiceImpl.class)
+public class TradeBrokerageUserServiceImplTest extends BaseDbUnitTest {
+
+    @Resource
+    private TradeBrokerageUserServiceImpl brokerageUserService;
+
+    @Resource
+    private TradeBrokerageUserMapper brokerageUserMapper;
+
+    @Test
+    @Disabled  // TODO 请修改 null 为需要的值,然后删除 @Disabled 注解
+    public void testGetBrokerageUserPage() {
+        // mock 数据
+        TradeBrokerageUserDO dbBrokerageUser = randomPojo(TradeBrokerageUserDO.class, o -> { // 等会查询到
+            o.setBrokerageUserId(null);
+            o.setBrokerageEnabled(null);
+            o.setCreateTime(null);
+        });
+        brokerageUserMapper.insert(dbBrokerageUser);
+        // 测试 brokerageUserId 不匹配
+        brokerageUserMapper.insert(cloneIgnoreId(dbBrokerageUser, o -> o.setBrokerageUserId(null)));
+        // 测试 brokerageEnabled 不匹配
+        brokerageUserMapper.insert(cloneIgnoreId(dbBrokerageUser, o -> o.setBrokerageEnabled(null)));
+        // 测试 createTime 不匹配
+        brokerageUserMapper.insert(cloneIgnoreId(dbBrokerageUser, o -> o.setCreateTime(null)));
+        // 准备参数
+        TradeBrokerageUserPageReqVO reqVO = new TradeBrokerageUserPageReqVO();
+        reqVO.setBrokerageUserId(null);
+        reqVO.setBrokerageEnabled(null);
+        reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+
+        // 调用
+        PageResult<TradeBrokerageUserDO> pageResult = brokerageUserService.getBrokerageUserPage(reqVO);
+        // 断言
+        assertEquals(1, pageResult.getTotal());
+        assertEquals(1, pageResult.getList().size());
+        assertPojoEquals(dbBrokerageUser, pageResult.getList().get(0));
+    }
+
+}

+ 1 - 0
yudao-module-mall/yudao-module-trade-biz/src/test/resources/sql/clean.sql

@@ -2,3 +2,4 @@ DELETE FROM trade_order;
 DELETE FROM trade_order_item;
 DELETE FROM trade_after_sale;
 DELETE FROM trade_after_sale_log;
+DELETE FROM "trade_brokerage_user";

+ 18 - 0
yudao-module-mall/yudao-module-trade-biz/src/test/resources/sql/create_tables.sql

@@ -125,3 +125,21 @@ CREATE TABLE IF NOT EXISTS "trade_after_sale_log" (
     "deleted" bit NOT NULL DEFAULT FALSE,
     PRIMARY KEY ("id")
 ) COMMENT '交易售后日志';
+
+CREATE TABLE IF NOT EXISTS "trade_brokerage_user"
+(
+    "id"                     bigint   NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+    "brokerage_user_id"      bigint   NOT NULL,
+    "brokerage_bind_time"    varchar,
+    "brokerage_enabled"      bit      NOT NULL,
+    "brokerage_time"         varchar,
+    "brokerage_price"        int      NOT NULL,
+    "frozen_brokerage_price" int      NOT NULL,
+    "creator"                varchar           DEFAULT '',
+    "create_time"            datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updater"                varchar           DEFAULT '',
+    "update_time"            datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    "deleted"                bit      NOT NULL DEFAULT FALSE,
+    "tenant_id"              bigint   NOT NULL DEFAULT '0',
+    PRIMARY KEY ("id")
+) COMMENT '分销用户';