trade: 分销业务相关类型移除Trade前缀

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/record/TradeBrokerageRecordController.java

@@ -2,11 +2,11 @@ package cn.iocoder.yudao.module.trade.controller.admin.brokerage.record;
 
 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.record.vo.TradeBrokerageRecordPageReqVO;
-import cn.iocoder.yudao.module.trade.controller.admin.brokerage.record.vo.TradeBrokerageRecordRespVO;
-import cn.iocoder.yudao.module.trade.convert.brokerage.record.TradeBrokerageRecordConvert;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.record.TradeBrokerageRecordDO;
-import cn.iocoder.yudao.module.trade.service.brokerage.record.TradeBrokerageRecordService;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.record.vo.BrokerageRecordPageReqVO;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.record.vo.BrokerageRecordRespVO;
+import cn.iocoder.yudao.module.trade.convert.brokerage.record.BrokerageRecordConvert;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.record.BrokerageRecordDO;
+import cn.iocoder.yudao.module.trade.service.brokerage.record.BrokerageRecordService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -26,26 +26,26 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 @RestController
 @RequestMapping("/trade/brokerage-record")
 @Validated
-public class TradeBrokerageRecordController {
+public class BrokerageRecordController {
 
     @Resource
-    private TradeBrokerageRecordService tradeBrokerageRecordService;
+    private BrokerageRecordService brokerageRecordService;
 
     @GetMapping("/get")
     @Operation(summary = "获得佣金记录")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('trade:brokerage-record:query')")
-    public CommonResult<TradeBrokerageRecordRespVO> getBrokerageRecord(@RequestParam("id") Integer id) {
-        TradeBrokerageRecordDO tradeBrokerageRecord = tradeBrokerageRecordService.getBrokerageRecord(id);
-        return success(TradeBrokerageRecordConvert.INSTANCE.convert(tradeBrokerageRecord));
+    public CommonResult<BrokerageRecordRespVO> getBrokerageRecord(@RequestParam("id") Integer id) {
+        BrokerageRecordDO brokerageRecord = brokerageRecordService.getBrokerageRecord(id);
+        return success(BrokerageRecordConvert.INSTANCE.convert(brokerageRecord));
     }
 
     @GetMapping("/page")
     @Operation(summary = "获得佣金记录分页")
     @PreAuthorize("@ss.hasPermission('trade:brokerage-record:query')")
-    public CommonResult<PageResult<TradeBrokerageRecordRespVO>> getBrokerageRecordPage(@Valid TradeBrokerageRecordPageReqVO pageVO) {
-        PageResult<TradeBrokerageRecordDO> pageResult = tradeBrokerageRecordService.getBrokerageRecordPage(pageVO);
-        return success(TradeBrokerageRecordConvert.INSTANCE.convertPage(pageResult));
+    public CommonResult<PageResult<BrokerageRecordRespVO>> getBrokerageRecordPage(@Valid BrokerageRecordPageReqVO pageVO) {
+        PageResult<BrokerageRecordDO> pageResult = brokerageRecordService.getBrokerageRecordPage(pageVO);
+        return success(BrokerageRecordConvert.INSTANCE.convertPage(pageResult));
     }
 
 }

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/record/vo/TradeBrokerageRecordBaseVO.java

@@ -15,7 +15,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
  * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
  */
 @Data
-public class TradeBrokerageRecordBaseVO {
+public class BrokerageRecordBaseVO {
 
     @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "25973")
     @NotNull(message = "用户编号不能为空")

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/record/vo/TradeBrokerageRecordPageReqVO.java

@@ -15,7 +15,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class TradeBrokerageRecordPageReqVO extends PageParam {
+public class BrokerageRecordPageReqVO extends PageParam {
 
     @Schema(description = "用户编号", example = "25973")
     private Long userId;

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/record/vo/TradeBrokerageRecordRespVO.java

@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class TradeBrokerageRecordRespVO extends TradeBrokerageRecordBaseVO {
+public class BrokerageRecordRespVO extends BrokerageRecordBaseVO {
 
     @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "28896")
     private Integer id;

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

@@ -5,13 +5,13 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
 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.convert.brokerage.user.BrokerageUserConvert;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.user.BrokerageUserDO;
 import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageRecordBizTypeEnum;
 import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageRecordStatusEnum;
-import cn.iocoder.yudao.module.trade.service.brokerage.record.TradeBrokerageRecordService;
+import cn.iocoder.yudao.module.trade.service.brokerage.record.BrokerageRecordService;
 import cn.iocoder.yudao.module.trade.service.brokerage.bo.UserBrokerageSummaryBO;
-import cn.iocoder.yudao.module.trade.service.brokerage.user.TradeBrokerageUserService;
+import cn.iocoder.yudao.module.trade.service.brokerage.user.BrokerageUserService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -32,12 +32,12 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.
 @RestController
 @RequestMapping("/trade/brokerage-user")
 @Validated
-public class TradeBrokerageUserController {
+public class BrokerageUserController {
 
     @Resource
-    private TradeBrokerageUserService brokerageUserService;
+    private BrokerageUserService brokerageUserService;
     @Resource
-    private TradeBrokerageRecordService brokerageRecordService;
+    private BrokerageRecordService brokerageRecordService;
 
     @Resource
     private MemberUserApi memberUserApi;
@@ -45,7 +45,7 @@ public class TradeBrokerageUserController {
     @PutMapping("/update-brokerage-user")
     @Operation(summary = "修改推广员")
     @PreAuthorize("@ss.hasPermission('trade:brokerage-user:update-brokerage-user')")
-    public CommonResult<Boolean> updateBrokerageUser(@Valid @RequestBody TradeBrokerageUserUpdateBrokerageUserReqVO updateReqVO) {
+    public CommonResult<Boolean> updateBrokerageUser(@Valid @RequestBody BrokerageUserUpdateBrokerageUserReqVO updateReqVO) {
         brokerageUserService.updateBrokerageUserId(updateReqVO.getId(), updateReqVO.getBrokerageUserId());
         return success(true);
     }
@@ -53,7 +53,7 @@ public class TradeBrokerageUserController {
     @PutMapping("/clear-brokerage-user")
     @Operation(summary = "清除推广员")
     @PreAuthorize("@ss.hasPermission('trade:brokerage-user:clear-brokerage-user')")
-    public CommonResult<Boolean> clearBrokerageUser(@Valid @RequestBody TradeBrokerageUserClearBrokerageUserReqVO updateReqVO) {
+    public CommonResult<Boolean> clearBrokerageUser(@Valid @RequestBody BrokerageUserClearBrokerageUserReqVO updateReqVO) {
         brokerageUserService.updateBrokerageUserId(updateReqVO.getId(), null);
         return success(true);
     }
@@ -61,7 +61,7 @@ public class TradeBrokerageUserController {
     @PutMapping("/update-brokerage-enable")
     @Operation(summary = "修改推广资格")
     @PreAuthorize("@ss.hasPermission('trade:brokerage-user:update-brokerage-enable')")
-    public CommonResult<Boolean> updateBrokerageEnabled(@Valid @RequestBody TradeBrokerageUserUpdateBrokerageEnabledReqVO updateReqVO) {
+    public CommonResult<Boolean> updateBrokerageEnabled(@Valid @RequestBody BrokerageUserUpdateBrokerageEnabledReqVO updateReqVO) {
         brokerageUserService.updateBrokerageEnabled(updateReqVO.getId(), updateReqVO.getBrokerageEnabled());
         return success(true);
     }
@@ -70,20 +70,20 @@ public class TradeBrokerageUserController {
     @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));
+    public CommonResult<BrokerageUserRespVO> getBrokerageUser(@RequestParam("id") Long id) {
+        BrokerageUserDO brokerageUser = brokerageUserService.getBrokerageUser(id);
+        return success(BrokerageUserConvert.INSTANCE.convert(brokerageUser));
     }
 
     @GetMapping("/page")
     @Operation(summary = "获得分销用户分页")
     @PreAuthorize("@ss.hasPermission('trade:brokerage-user:query')")
-    public CommonResult<PageResult<TradeBrokerageUserRespVO>> getBrokerageUserPage(@Valid TradeBrokerageUserPageReqVO pageVO) {
+    public CommonResult<PageResult<BrokerageUserRespVO>> getBrokerageUserPage(@Valid BrokerageUserPageReqVO pageVO) {
         // 分页查询
-        PageResult<TradeBrokerageUserDO> pageResult = brokerageUserService.getBrokerageUserPage(pageVO);
+        PageResult<BrokerageUserDO> pageResult = brokerageUserService.getBrokerageUserPage(pageVO);
 
         // 涉及到的用户
-        Set<Long> userIds = convertSet(pageResult.getList(), TradeBrokerageUserDO::getId);
+        Set<Long> userIds = convertSet(pageResult.getList(), BrokerageUserDO::getId);
         // 查询用户信息
         Map<Long, MemberUserRespDTO> userMap = memberUserApi.getUserMap(userIds);
         // 合计分佣订单
@@ -98,7 +98,7 @@ public class TradeBrokerageUserController {
 
         // todo 合计提现
 
-        return success(TradeBrokerageUserConvert.INSTANCE.convertPage(pageResult, userMap, brokerageUserCountMap, userOrderSummaryMap));
+        return success(BrokerageUserConvert.INSTANCE.convertPage(pageResult, userMap, brokerageUserCountMap, userOrderSummaryMap));
     }
 
 }

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

@@ -14,7 +14,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
  * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
  */
 @Data
-public class TradeBrokerageUserBaseVO {
+public class BrokerageUserBaseVO {
 
     @Schema(description = "推广员编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "4587")
     @NotNull(message = "推广员编号不能为空")

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

@@ -9,7 +9,7 @@ import javax.validation.constraints.NotNull;
 @Schema(description = "管理后台 - 分销用户 - 清除推广员 Request VO")
 @Data
 @ToString(callSuper = true)
-public class TradeBrokerageUserClearBrokerageUserReqVO {
+public class BrokerageUserClearBrokerageUserReqVO {
 
     @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20019")
     @NotNull(message = "用户编号不能为空")

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

@@ -15,7 +15,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class TradeBrokerageUserPageReqVO extends PageParam {
+public class BrokerageUserPageReqVO extends PageParam {
 
     @Schema(description = "推广员编号", example = "4587")
     private Long brokerageUserId;

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

@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class TradeBrokerageUserRespVO extends TradeBrokerageUserBaseVO {
+public class BrokerageUserRespVO extends BrokerageUserBaseVO {
 
     @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20019")
     private Long id;

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

@@ -9,7 +9,7 @@ import javax.validation.constraints.NotNull;
 @Schema(description = "管理后台 - 分销用户 - 修改推广员 Request VO")
 @Data
 @ToString(callSuper = true)
-public class TradeBrokerageUserUpdateBrokerageEnabledReqVO {
+public class BrokerageUserUpdateBrokerageEnabledReqVO {
 
     @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20019")
     @NotNull(message = "用户编号不能为空")

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

@@ -9,7 +9,7 @@ import javax.validation.constraints.NotNull;
 @Schema(description = "管理后台 - 分销用户 - 修改推广员 Request VO")
 @Data
 @ToString(callSuper = true)
-public class TradeBrokerageUserUpdateBrokerageUserReqVO {
+public class BrokerageUserUpdateBrokerageUserReqVO {
 
     @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20019")
     @NotNull(message = "用户编号不能为空")

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/record/TradeBrokerageRecordConvert.java

@@ -3,9 +3,9 @@ package cn.iocoder.yudao.module.trade.convert.brokerage.record;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.trade.controller.admin.brokerage.record.vo.TradeBrokerageRecordRespVO;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.record.TradeBrokerageRecordDO;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.user.TradeBrokerageUserDO;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.record.vo.BrokerageRecordRespVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.record.BrokerageRecordDO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.user.BrokerageUserDO;
 import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageRecordBizTypeEnum;
 import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageRecordStatusEnum;
 import org.mapstruct.Mapper;
@@ -20,25 +20,25 @@ import java.util.List;
  * @author owen
  */
 @Mapper
-public interface TradeBrokerageRecordConvert {
+public interface BrokerageRecordConvert {
 
-    TradeBrokerageRecordConvert INSTANCE = Mappers.getMapper(TradeBrokerageRecordConvert.class);
+    BrokerageRecordConvert INSTANCE = Mappers.getMapper(BrokerageRecordConvert.class);
 
-    TradeBrokerageRecordRespVO convert(TradeBrokerageRecordDO bean);
+    BrokerageRecordRespVO convert(BrokerageRecordDO bean);
 
-    List<TradeBrokerageRecordRespVO> convertList(List<TradeBrokerageRecordDO> list);
+    List<BrokerageRecordRespVO> convertList(List<BrokerageRecordDO> list);
 
-    PageResult<TradeBrokerageRecordRespVO> convertPage(PageResult<TradeBrokerageRecordDO> page);
+    PageResult<BrokerageRecordRespVO> convertPage(PageResult<BrokerageRecordDO> page);
 
-    default TradeBrokerageRecordDO convert(TradeBrokerageUserDO user, BrokerageRecordBizTypeEnum bizType, String bizId,
-                                           Integer brokerageFrozenDays, int brokerage, LocalDateTime unfreezeTime,
-                                           String title) {
+    default BrokerageRecordDO convert(BrokerageUserDO user, BrokerageRecordBizTypeEnum bizType, String bizId,
+                                      Integer brokerageFrozenDays, int brokerage, LocalDateTime unfreezeTime,
+                                      String title) {
         brokerageFrozenDays = ObjectUtil.defaultIfNull(brokerageFrozenDays, 0);
         // 不冻结时，佣金直接就是结算状态
         Integer status = brokerageFrozenDays > 0
                 ? BrokerageRecordStatusEnum.WAIT_SETTLEMENT.getStatus()
                 : BrokerageRecordStatusEnum.SETTLEMENT.getStatus();
-        return new TradeBrokerageRecordDO()
+        return new BrokerageRecordDO()
                 .setUserId(user.getId())
                 .setBizType(bizType.getType())
                 .setBizId(bizId)

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

@@ -3,8 +3,8 @@ package cn.iocoder.yudao.module.trade.convert.brokerage.user;
 import cn.hutool.core.map.MapUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
-import cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo.TradeBrokerageUserRespVO;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.user.TradeBrokerageUserDO;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo.BrokerageUserRespVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.user.BrokerageUserDO;
 import cn.iocoder.yudao.module.trade.service.brokerage.bo.UserBrokerageSummaryBO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
@@ -19,22 +19,22 @@ import java.util.Optional;
  * @author owen
  */
 @Mapper
-public interface TradeBrokerageUserConvert {
+public interface BrokerageUserConvert {
 
-    TradeBrokerageUserConvert INSTANCE = Mappers.getMapper(TradeBrokerageUserConvert.class);
+    BrokerageUserConvert INSTANCE = Mappers.getMapper(BrokerageUserConvert.class);
 
-    TradeBrokerageUserRespVO convert(TradeBrokerageUserDO bean);
+    BrokerageUserRespVO convert(BrokerageUserDO bean);
 
-    List<TradeBrokerageUserRespVO> convertList(List<TradeBrokerageUserDO> list);
+    List<BrokerageUserRespVO> convertList(List<BrokerageUserDO> list);
 
-    PageResult<TradeBrokerageUserRespVO> convertPage(PageResult<TradeBrokerageUserDO> page);
+    PageResult<BrokerageUserRespVO> convertPage(PageResult<BrokerageUserDO> page);
 
-    default PageResult<TradeBrokerageUserRespVO> convertPage(PageResult<TradeBrokerageUserDO> pageResult,
-                                                             Map<Long, MemberUserRespDTO> userMap,
-                                                             Map<Long, Long> brokerageUserCountMap,
-                                                             Map<Long, UserBrokerageSummaryBO> userOrderSummaryMap) {
-        PageResult<TradeBrokerageUserRespVO> result = convertPage(pageResult);
-        for (TradeBrokerageUserRespVO vo : result.getList()) {
+    default PageResult<BrokerageUserRespVO> convertPage(PageResult<BrokerageUserDO> pageResult,
+                                                        Map<Long, MemberUserRespDTO> userMap,
+                                                        Map<Long, Long> brokerageUserCountMap,
+                                                        Map<Long, UserBrokerageSummaryBO> userOrderSummaryMap) {
+        PageResult<BrokerageUserRespVO> result = convertPage(pageResult);
+        for (BrokerageUserRespVO vo : result.getList()) {
             // 用户信息
             Optional.ofNullable(userMap.get(vo.getId()))
                     .ifPresent(user -> {

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/record/TradeBrokerageRecordDO.java

@@ -23,7 +23,7 @@ import java.time.LocalDateTime;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class TradeBrokerageRecordDO extends BaseDO {
+public class BrokerageRecordDO extends BaseDO {
 
     /**
      * 编号

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

@@ -22,7 +22,7 @@ import java.time.LocalDateTime;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class TradeBrokerageUserDO extends BaseDO {
+public class BrokerageUserDO extends BaseDO {
 
     /**
      * 用户编号

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/record/BrokerageRecordMapper.java

@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.trade.dal.mysql.brokerage.record;
+
+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.record.vo.BrokerageRecordPageReqVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.record.BrokerageRecordDO;
+import cn.iocoder.yudao.module.trade.service.brokerage.bo.UserBrokerageSummaryBO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 佣金记录 Mapper
+ *
+ * @author owen
+ */
+@Mapper
+public interface BrokerageRecordMapper extends BaseMapperX<BrokerageRecordDO> {
+
+    default PageResult<BrokerageRecordDO> selectPage(BrokerageRecordPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<BrokerageRecordDO>()
+                .eqIfPresent(BrokerageRecordDO::getUserId, reqVO.getUserId())
+                .eqIfPresent(BrokerageRecordDO::getBizType, reqVO.getBizType())
+                .eqIfPresent(BrokerageRecordDO::getStatus, reqVO.getStatus())
+                .betweenIfPresent(BrokerageRecordDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(BrokerageRecordDO::getId));
+    }
+
+    default List<BrokerageRecordDO> selectListByStatusAndUnfreezeTimeLt(Integer status, LocalDateTime unfreezeTime) {
+        return selectList(new LambdaQueryWrapper<BrokerageRecordDO>()
+                .eq(BrokerageRecordDO::getStatus, status)
+                .lt(BrokerageRecordDO::getUnfreezeTime, unfreezeTime));
+    }
+
+    default int updateByIdAndStatus(Integer id, Integer status, BrokerageRecordDO updateObj) {
+        return update(updateObj, new LambdaQueryWrapper<BrokerageRecordDO>()
+                .eq(BrokerageRecordDO::getId, id)
+                .eq(BrokerageRecordDO::getStatus, status));
+    }
+
+    default BrokerageRecordDO selectByBizTypeAndBizId(Integer bizType, String bizId) {
+        return selectOne(BrokerageRecordDO::getBizType, bizType,
+                BrokerageRecordDO::getBizId, bizId);
+    }
+
+    @Select("select count(1), sum(price) from trade_brokerage_record where user_id = #{userId} and biz_type = #{bizType} and status = #{status}")
+    UserBrokerageSummaryBO selectCountAndSumPriceByUserIdAndBizTypeAndStatus(@Param("userId") Long userId,
+                                                                             @Param("bizType") Integer bizType,
+                                                                             @Param("status") Integer status);
+}

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/record/TradeBrokerageRecordMapper.java

@@ -1,55 +0,0 @@
-package cn.iocoder.yudao.module.trade.dal.mysql.brokerage.record;
-
-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.record.vo.TradeBrokerageRecordPageReqVO;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.record.TradeBrokerageRecordDO;
-import cn.iocoder.yudao.module.trade.service.brokerage.bo.UserBrokerageSummaryBO;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * 佣金记录 Mapper
- *
- * @author owen
- */
-@Mapper
-public interface TradeBrokerageRecordMapper extends BaseMapperX<TradeBrokerageRecordDO> {
-
-    default PageResult<TradeBrokerageRecordDO> selectPage(TradeBrokerageRecordPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<TradeBrokerageRecordDO>()
-                .eqIfPresent(TradeBrokerageRecordDO::getUserId, reqVO.getUserId())
-                .eqIfPresent(TradeBrokerageRecordDO::getBizType, reqVO.getBizType())
-                .eqIfPresent(TradeBrokerageRecordDO::getStatus, reqVO.getStatus())
-                .betweenIfPresent(TradeBrokerageRecordDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(TradeBrokerageRecordDO::getId));
-    }
-
-    default List<TradeBrokerageRecordDO> selectListByStatusAndUnfreezeTimeLt(Integer status, LocalDateTime unfreezeTime) {
-        return selectList(new LambdaQueryWrapper<TradeBrokerageRecordDO>()
-                .eq(TradeBrokerageRecordDO::getStatus, status)
-                .lt(TradeBrokerageRecordDO::getUnfreezeTime, unfreezeTime));
-    }
-
-    default int updateByIdAndStatus(Integer id, Integer status, TradeBrokerageRecordDO updateObj) {
-        return update(updateObj, new LambdaQueryWrapper<TradeBrokerageRecordDO>()
-                .eq(TradeBrokerageRecordDO::getId, id)
-                .eq(TradeBrokerageRecordDO::getStatus, status));
-    }
-
-    default TradeBrokerageRecordDO selectByBizTypeAndBizId(Integer bizType, String bizId) {
-        return selectOne(TradeBrokerageRecordDO::getBizType, bizType,
-                TradeBrokerageRecordDO::getBizId, bizId);
-    }
-
-    @Select("select count(1), sum(price) from trade_brokerage_record where user_id = #{userId} and biz_type = #{bizType} and status = #{status}")
-    UserBrokerageSummaryBO selectCountAndSumPriceByUserIdAndBizTypeAndStatus(@Param("userId") Long userId,
-                                                                             @Param("bizType") Integer bizType,
-                                                                             @Param("status") Integer status);
-}

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

@@ -4,8 +4,8 @@ import cn.hutool.core.lang.Assert;
 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 cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo.BrokerageUserPageReqVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.user.BrokerageUserDO;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -15,14 +15,14 @@ import org.apache.ibatis.annotations.Mapper;
  * @author owen
  */
 @Mapper
-public interface TradeBrokerageUserMapper extends BaseMapperX<TradeBrokerageUserDO> {
+public interface BrokerageUserMapper extends BaseMapperX<BrokerageUserDO> {
 
-    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));
+    default PageResult<BrokerageUserDO> selectPage(BrokerageUserPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<BrokerageUserDO>()
+                .eqIfPresent(BrokerageUserDO::getBrokerageUserId, reqVO.getBrokerageUserId())
+                .eqIfPresent(BrokerageUserDO::getBrokerageEnabled, reqVO.getBrokerageEnabled())
+                .betweenIfPresent(BrokerageUserDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(BrokerageUserDO::getId));
     }
 
     /**
@@ -33,9 +33,9 @@ public interface TradeBrokerageUserMapper extends BaseMapperX<TradeBrokerageUser
      */
     default void updateBrokeragePriceIncr(Long id, Integer incrCount) {
         Assert.isTrue(incrCount > 0);
-        LambdaUpdateWrapper<TradeBrokerageUserDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<TradeBrokerageUserDO>()
+        LambdaUpdateWrapper<BrokerageUserDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<BrokerageUserDO>()
                 .setSql(" brokerage_price = brokerage_price + " + incrCount)
-                .eq(TradeBrokerageUserDO::getId, id);
+                .eq(BrokerageUserDO::getId, id);
         update(null, lambdaUpdateWrapper);
     }
 
@@ -48,9 +48,9 @@ public interface TradeBrokerageUserMapper extends BaseMapperX<TradeBrokerageUser
      */
     default void updateBrokeragePriceDecr(Long id, Integer incrCount) {
         Assert.isTrue(incrCount < 0);
-        LambdaUpdateWrapper<TradeBrokerageUserDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<TradeBrokerageUserDO>()
+        LambdaUpdateWrapper<BrokerageUserDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<BrokerageUserDO>()
                 .setSql(" brokerage_price = brokerage_price + " + incrCount) // 负数，所以使用 + 号
-                .eq(TradeBrokerageUserDO::getId, id);
+                .eq(BrokerageUserDO::getId, id);
         update(null, lambdaUpdateWrapper);
     }
 
@@ -62,9 +62,9 @@ public interface TradeBrokerageUserMapper extends BaseMapperX<TradeBrokerageUser
      */
     default void updateFrozenBrokeragePriceIncr(Long id, Integer incrCount) {
         Assert.isTrue(incrCount > 0);
-        LambdaUpdateWrapper<TradeBrokerageUserDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<TradeBrokerageUserDO>()
+        LambdaUpdateWrapper<BrokerageUserDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<BrokerageUserDO>()
                 .setSql(" frozen_brokerage_price = frozen_brokerage_price + " + incrCount)
-                .eq(TradeBrokerageUserDO::getId, id);
+                .eq(BrokerageUserDO::getId, id);
         update(null, lambdaUpdateWrapper);
     }
 
@@ -77,9 +77,9 @@ public interface TradeBrokerageUserMapper extends BaseMapperX<TradeBrokerageUser
      */
     default void updateFrozenBrokeragePriceDecr(Long id, Integer incrCount) {
         Assert.isTrue(incrCount < 0);
-        LambdaUpdateWrapper<TradeBrokerageUserDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<TradeBrokerageUserDO>()
+        LambdaUpdateWrapper<BrokerageUserDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<BrokerageUserDO>()
                 .setSql(" frozen_brokerage_price = frozen_brokerage_price + " + incrCount) // 负数，所以使用 + 号
-                .eq(TradeBrokerageUserDO::getId, id);
+                .eq(BrokerageUserDO::getId, id);
         update(null, lambdaUpdateWrapper);
     }
 
@@ -92,11 +92,11 @@ public interface TradeBrokerageUserMapper extends BaseMapperX<TradeBrokerageUser
      */
     default int updateFrozenBrokeragePriceDecrAndBrokeragePriceIncr(Long id, Integer incrCount) {
         Assert.isTrue(incrCount < 0);
-        LambdaUpdateWrapper<TradeBrokerageUserDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<TradeBrokerageUserDO>()
+        LambdaUpdateWrapper<BrokerageUserDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<BrokerageUserDO>()
                 .setSql(" frozen_brokerage_price = frozen_brokerage_price + " + incrCount + // 负数，所以使用 + 号
                         ", brokerage_price = brokerage_price + " + -incrCount) // 负数，所以使用 - 号
-                .eq(TradeBrokerageUserDO::getId, id)
-                .ge(TradeBrokerageUserDO::getFrozenBrokeragePrice, -incrCount); // cas 逻辑
+                .eq(BrokerageUserDO::getId, id)
+                .ge(BrokerageUserDO::getFrozenBrokeragePrice, -incrCount); // cas 逻辑
         return update(null, lambdaUpdateWrapper);
     }
 

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/job/brokerage/TradeBrokerageRecordUnfreezeJob.java

@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.trade.job.brokerage;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
 import cn.iocoder.yudao.framework.tenant.core.job.TenantJob;
-import cn.iocoder.yudao.module.trade.service.brokerage.record.TradeBrokerageRecordService;
+import cn.iocoder.yudao.module.trade.service.brokerage.record.BrokerageRecordService;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -15,14 +15,14 @@ import javax.annotation.Resource;
  */
 @Component
 @TenantJob
-public class TradeBrokerageRecordUnfreezeJob implements JobHandler {
+public class BrokerageRecordUnfreezeJob implements JobHandler {
 
     @Resource
-    private TradeBrokerageRecordService tradeBrokerageRecordService;
+    private BrokerageRecordService brokerageRecordService;
 
     @Override
     public String execute(String param) {
-        int count = tradeBrokerageRecordService.unfreezeRecord();
+        int count = brokerageRecordService.unfreezeRecord();
         return StrUtil.format("解冻佣金 {} 个", count);
     }
 

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/TradeBrokerageRecordService.java

@@ -1,8 +1,8 @@
 package cn.iocoder.yudao.module.trade.service.brokerage.record;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.trade.controller.admin.brokerage.record.vo.TradeBrokerageRecordPageReqVO;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.record.TradeBrokerageRecordDO;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.record.vo.BrokerageRecordPageReqVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.record.BrokerageRecordDO;
 import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageRecordBizTypeEnum;
 import cn.iocoder.yudao.module.trade.service.brokerage.bo.BrokerageAddReqBO;
 import cn.iocoder.yudao.module.trade.service.brokerage.bo.UserBrokerageSummaryBO;
@@ -14,7 +14,7 @@ import java.util.List;
  *
  * @author owen
  */
-public interface TradeBrokerageRecordService {
+public interface BrokerageRecordService {
 
     /**
      * 获得佣金记录
@@ -22,7 +22,7 @@ public interface TradeBrokerageRecordService {
      * @param id 编号
      * @return 佣金记录
      */
-    TradeBrokerageRecordDO getBrokerageRecord(Integer id);
+    BrokerageRecordDO getBrokerageRecord(Integer id);
 
     /**
      * 获得佣金记录分页
@@ -30,7 +30,7 @@ public interface TradeBrokerageRecordService {
      * @param pageReqVO 分页查询
      * @return 佣金记录分页
      */
-    PageResult<TradeBrokerageRecordDO> getBrokerageRecordPage(TradeBrokerageRecordPageReqVO pageReqVO);
+    PageResult<BrokerageRecordDO> getBrokerageRecordPage(BrokerageRecordPageReqVO pageReqVO);
 
     /**
      * 增加佣金

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/TradeBrokerageRecordServiceImpl.java

@@ -6,17 +6,17 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
-import cn.iocoder.yudao.module.trade.controller.admin.brokerage.record.vo.TradeBrokerageRecordPageReqVO;
-import cn.iocoder.yudao.module.trade.convert.brokerage.record.TradeBrokerageRecordConvert;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.record.TradeBrokerageRecordDO;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.user.TradeBrokerageUserDO;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.record.vo.BrokerageRecordPageReqVO;
+import cn.iocoder.yudao.module.trade.convert.brokerage.record.BrokerageRecordConvert;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.record.BrokerageRecordDO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.user.BrokerageUserDO;
 import cn.iocoder.yudao.module.trade.dal.dataobject.config.TradeConfigDO;
-import cn.iocoder.yudao.module.trade.dal.mysql.brokerage.record.TradeBrokerageRecordMapper;
+import cn.iocoder.yudao.module.trade.dal.mysql.brokerage.record.BrokerageRecordMapper;
 import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageRecordBizTypeEnum;
 import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageRecordStatusEnum;
 import cn.iocoder.yudao.module.trade.service.brokerage.bo.BrokerageAddReqBO;
 import cn.iocoder.yudao.module.trade.service.brokerage.bo.UserBrokerageSummaryBO;
-import cn.iocoder.yudao.module.trade.service.brokerage.user.TradeBrokerageUserService;
+import cn.iocoder.yudao.module.trade.service.brokerage.user.BrokerageUserService;
 import cn.iocoder.yudao.module.trade.service.config.TradeConfigService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -37,23 +37,23 @@ import java.util.function.Function;
 @Slf4j
 @Service
 @Validated
-public class TradeBrokerageRecordServiceImpl implements TradeBrokerageRecordService {
+public class BrokerageRecordServiceImpl implements BrokerageRecordService {
 
     @Resource
-    private TradeBrokerageRecordMapper tradeBrokerageRecordMapper;
+    private BrokerageRecordMapper brokerageRecordMapper;
     @Resource
     private TradeConfigService tradeConfigService;
     @Resource
-    private TradeBrokerageUserService tradeBrokerageUserService;
+    private BrokerageUserService brokerageUserService;
 
     @Override
-    public TradeBrokerageRecordDO getBrokerageRecord(Integer id) {
-        return tradeBrokerageRecordMapper.selectById(id);
+    public BrokerageRecordDO getBrokerageRecord(Integer id) {
+        return brokerageRecordMapper.selectById(id);
     }
 
     @Override
-    public PageResult<TradeBrokerageRecordDO> getBrokerageRecordPage(TradeBrokerageRecordPageReqVO pageReqVO) {
-        return tradeBrokerageRecordMapper.selectPage(pageReqVO);
+    public PageResult<BrokerageRecordDO> getBrokerageRecordPage(BrokerageRecordPageReqVO pageReqVO) {
+        return brokerageRecordMapper.selectPage(pageReqVO);
     }
 
     @Override
@@ -67,7 +67,7 @@ public class TradeBrokerageRecordServiceImpl implements TradeBrokerageRecordServ
         }
 
         // 1.1 获得一级推广人
-        TradeBrokerageUserDO firstUser = tradeBrokerageUserService.getBindBrokerageUser(userId);
+        BrokerageUserDO firstUser = brokerageUserService.getBindBrokerageUser(userId);
         if (firstUser == null || !BooleanUtil.isTrue(firstUser.getBrokerageEnabled())) {
             return;
         }
@@ -78,7 +78,7 @@ public class TradeBrokerageRecordServiceImpl implements TradeBrokerageRecordServ
         if (firstUser.getBrokerageUserId() == null) {
             return;
         }
-        TradeBrokerageUserDO secondUser = tradeBrokerageUserService.getBrokerageUser(firstUser.getBrokerageUserId());
+        BrokerageUserDO secondUser = brokerageUserService.getBrokerageUser(firstUser.getBrokerageUserId());
         if (secondUser == null || !BooleanUtil.isTrue(secondUser.getBrokerageEnabled())) {
             return;
         }
@@ -89,15 +89,15 @@ public class TradeBrokerageRecordServiceImpl implements TradeBrokerageRecordServ
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void cancelBrokerage(Long userId, BrokerageRecordBizTypeEnum bizType, String bizId) {
-        TradeBrokerageRecordDO record = tradeBrokerageRecordMapper.selectByBizTypeAndBizId(bizType.getType(), bizId);
+        BrokerageRecordDO record = brokerageRecordMapper.selectByBizTypeAndBizId(bizType.getType(), bizId);
         if (record == null || ObjectUtil.notEqual(record.getUserId(), userId)) {
             log.error("[cancelBrokerage][userId({})][bizId({}) 更新为已失效失败：记录不存在]", userId, bizId);
             return;
         }
 
         // 1. 更新佣金记录为已失效
-        TradeBrokerageRecordDO updateObj = new TradeBrokerageRecordDO().setStatus(BrokerageRecordStatusEnum.CANCEL.getStatus());
-        int updateRows = tradeBrokerageRecordMapper.updateByIdAndStatus(record.getId(), record.getStatus(), updateObj);
+        BrokerageRecordDO updateObj = new BrokerageRecordDO().setStatus(BrokerageRecordStatusEnum.CANCEL.getStatus());
+        int updateRows = brokerageRecordMapper.updateByIdAndStatus(record.getId(), record.getStatus(), updateObj);
         if (updateRows == 0) {
             log.error("[cancelBrokerage][record({}) 更新为已失效失败]", record.getId());
             return;
@@ -105,9 +105,9 @@ public class TradeBrokerageRecordServiceImpl implements TradeBrokerageRecordServ
 
         // 2. 更新用户的佣金
         if (BrokerageRecordStatusEnum.WAIT_SETTLEMENT.getStatus().equals(record.getStatus())) {
-            tradeBrokerageUserService.updateUserFrozenBrokeragePrice(userId, -record.getPrice());
+            brokerageUserService.updateUserFrozenBrokeragePrice(userId, -record.getPrice());
         } else if (BrokerageRecordStatusEnum.SETTLEMENT.getStatus().equals(record.getStatus())) {
-            tradeBrokerageUserService.updateUserBrokeragePrice(userId, -record.getPrice());
+            brokerageUserService.updateUserBrokeragePrice(userId, -record.getPrice());
         }
     }
 
@@ -141,7 +141,7 @@ public class TradeBrokerageRecordServiceImpl implements TradeBrokerageRecordServ
      * @param FixedBrokeragePriceFun 固定佣金
      * @param bizType                业务类型
      */
-    private void addBrokerage(TradeBrokerageUserDO user, List<BrokerageAddReqBO> list, Integer brokerageFrozenDays,
+    private void addBrokerage(BrokerageUserDO user, List<BrokerageAddReqBO> list, Integer brokerageFrozenDays,
                               Integer brokeragePercent, Function<BrokerageAddReqBO, Integer> FixedBrokeragePriceFun,
                               BrokerageRecordBizTypeEnum bizType) {
         // 1.1 处理冻结时间
@@ -151,13 +151,13 @@ public class TradeBrokerageRecordServiceImpl implements TradeBrokerageRecordServ
         }
         // 1.2 计算分佣
         int totalBrokerage = 0;
-        List<TradeBrokerageRecordDO> records = new ArrayList<>();
+        List<BrokerageRecordDO> records = new ArrayList<>();
         for (BrokerageAddReqBO item : list) {
             int brokeragePerItem = calculateBrokeragePrice(item.getBasePrice(), brokeragePercent, FixedBrokeragePriceFun.apply(item));
             if (brokeragePerItem <= 0) {
                 continue;
             }
-            records.add(TradeBrokerageRecordConvert.INSTANCE.convert(user, bizType, item.getBizId(),
+            records.add(BrokerageRecordConvert.INSTANCE.convert(user, bizType, item.getBizId(),
                     brokerageFrozenDays, brokeragePerItem, unfreezeTime, bizType.getTitle()));
             totalBrokerage += brokeragePerItem;
         }
@@ -165,20 +165,20 @@ public class TradeBrokerageRecordServiceImpl implements TradeBrokerageRecordServ
             return;
         }
         // 1.3 保存佣金记录
-        tradeBrokerageRecordMapper.insertBatch(records);
+        brokerageRecordMapper.insertBatch(records);
 
         // 2. 更新用户佣金
         if (brokerageFrozenDays != null && brokerageFrozenDays > 0) { // 更新用户冻结佣金
-            tradeBrokerageUserService.updateUserFrozenBrokeragePrice(user.getId(), totalBrokerage);
+            brokerageUserService.updateUserFrozenBrokeragePrice(user.getId(), totalBrokerage);
         } else { // 更新用户可用佣金
-            tradeBrokerageUserService.updateUserBrokeragePrice(user.getId(), totalBrokerage);
+            brokerageUserService.updateUserBrokeragePrice(user.getId(), totalBrokerage);
         }
     }
 
     @Override
     public int unfreezeRecord() {
         // 1. 查询待结算的佣金记录
-        List<TradeBrokerageRecordDO> records = tradeBrokerageRecordMapper.selectListByStatusAndUnfreezeTimeLt(
+        List<BrokerageRecordDO> records = brokerageRecordMapper.selectListByStatusAndUnfreezeTimeLt(
                 BrokerageRecordStatusEnum.WAIT_SETTLEMENT.getStatus(), LocalDateTime.now());
         if (CollUtil.isEmpty(records)) {
             return 0;
@@ -186,7 +186,7 @@ public class TradeBrokerageRecordServiceImpl implements TradeBrokerageRecordServ
 
         // 2. 遍历执行
         int count = 0;
-        for (TradeBrokerageRecordDO record : records) {
+        for (BrokerageRecordDO record : records) {
             try {
                 boolean success = getSelf().unfreezeRecord(record);
                 if (success) {
@@ -201,24 +201,24 @@ public class TradeBrokerageRecordServiceImpl implements TradeBrokerageRecordServ
 
     @Override
     public UserBrokerageSummaryBO summaryByUserIdAndBizTypeAndStatus(Long userId, Integer bizType, Integer status) {
-        UserBrokerageSummaryBO summaryBO = tradeBrokerageRecordMapper.selectCountAndSumPriceByUserIdAndBizTypeAndStatus(userId, bizType, status);
+        UserBrokerageSummaryBO summaryBO = brokerageRecordMapper.selectCountAndSumPriceByUserIdAndBizTypeAndStatus(userId, bizType, status);
         return summaryBO == null ? new UserBrokerageSummaryBO(0, 0) : summaryBO;
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public boolean unfreezeRecord(TradeBrokerageRecordDO record) {
+    public boolean unfreezeRecord(BrokerageRecordDO record) {
         // 更新记录状态
-        TradeBrokerageRecordDO updateObj = new TradeBrokerageRecordDO()
+        BrokerageRecordDO updateObj = new BrokerageRecordDO()
                 .setStatus(BrokerageRecordStatusEnum.SETTLEMENT.getStatus())
                 .setUnfreezeTime(LocalDateTime.now());
-        int updateRows = tradeBrokerageRecordMapper.updateByIdAndStatus(record.getId(), record.getStatus(), updateObj);
+        int updateRows = brokerageRecordMapper.updateByIdAndStatus(record.getId(), record.getStatus(), updateObj);
         if (updateRows == 0) {
             log.error("[unfreezeRecord][record({}) 更新为已结算失败]", record.getId());
             return false;
         }
 
         // 更新用户冻结佣金
-        tradeBrokerageUserService.updateFrozenBrokeragePriceDecrAndBrokeragePriceIncr(record.getUserId(), -record.getPrice());
+        brokerageUserService.updateFrozenBrokeragePriceDecrAndBrokeragePriceIncr(record.getUserId(), -record.getPrice());
         log.info("[unfreezeRecord][record({}) 更新为已结算成功]", record.getId());
         return true;
     }
@@ -228,7 +228,7 @@ public class TradeBrokerageRecordServiceImpl implements TradeBrokerageRecordServ
      *
      * @return 自己
      */
-    private TradeBrokerageRecordServiceImpl getSelf() {
+    private BrokerageRecordServiceImpl getSelf() {
         return SpringUtil.getBean(getClass());
     }
 

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

@@ -1,19 +1,18 @@
 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.controller.admin.brokerage.user.vo.BrokerageUserPageReqVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.user.BrokerageUserDO;
 
 import java.util.Collection;
 import java.util.List;
 
-// TODO @疯狂：要不去掉 Trade 前缀哈；交易这块，我准备除了 tradeorder 保持下，类似 aftersale，都要取消前缀了；tradeorder 保持的原因，是避免 payorder 和它重复
 /**
  * 分销用户 Service 接口
  *
  * @author owen
  */
-public interface TradeBrokerageUserService {
+public interface BrokerageUserService {
 
     /**
      * 获得分销用户
@@ -21,7 +20,7 @@ public interface TradeBrokerageUserService {
      * @param id 编号
      * @return 分销用户
      */
-    TradeBrokerageUserDO getBrokerageUser(Long id);
+    BrokerageUserDO getBrokerageUser(Long id);
 
     /**
      * 获得分销用户列表
@@ -29,7 +28,7 @@ public interface TradeBrokerageUserService {
      * @param ids 编号
      * @return 分销用户列表
      */
-    List<TradeBrokerageUserDO> getBrokerageUserList(Collection<Long> ids);
+    List<BrokerageUserDO> getBrokerageUserList(Collection<Long> ids);
 
     /**
      * 获得分销用户分页
@@ -37,7 +36,7 @@ public interface TradeBrokerageUserService {
      * @param pageReqVO 分页查询
      * @return 分销用户分页
      */
-    PageResult<TradeBrokerageUserDO> getBrokerageUserPage(TradeBrokerageUserPageReqVO pageReqVO);
+    PageResult<BrokerageUserDO> getBrokerageUserPage(BrokerageUserPageReqVO pageReqVO);
 
     /**
      * 修改推广员编号
@@ -61,7 +60,7 @@ public interface TradeBrokerageUserService {
      * @param id 用户编号
      * @return 用户的推广人
      */
-    TradeBrokerageUserDO getBindBrokerageUser(Long id);
+    BrokerageUserDO getBindBrokerageUser(Long id);
 
     /**
      * 更新用户佣金

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

@@ -2,9 +2,9 @@ package cn.iocoder.yudao.module.trade.service.brokerage.user;
 
 import cn.hutool.core.lang.Assert;
 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 cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo.BrokerageUserPageReqVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.user.BrokerageUserDO;
+import cn.iocoder.yudao.module.trade.dal.mysql.brokerage.user.BrokerageUserMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -24,23 +24,23 @@ import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.USER_FROZEN
  */
 @Service
 @Validated
-public class TradeBrokerageUserServiceImpl implements TradeBrokerageUserService {
+public class BrokerageUserServiceImpl implements BrokerageUserService {
 
     @Resource
-    private TradeBrokerageUserMapper brokerageUserMapper;
+    private BrokerageUserMapper brokerageUserMapper;
 
     @Override
-    public TradeBrokerageUserDO getBrokerageUser(Long id) {
+    public BrokerageUserDO getBrokerageUser(Long id) {
         return brokerageUserMapper.selectById(id);
     }
 
     @Override
-    public List<TradeBrokerageUserDO> getBrokerageUserList(Collection<Long> ids) {
+    public List<BrokerageUserDO> getBrokerageUserList(Collection<Long> ids) {
         return brokerageUserMapper.selectBatchIds(ids);
     }
 
     @Override
-    public PageResult<TradeBrokerageUserDO> getBrokerageUserPage(TradeBrokerageUserPageReqVO pageReqVO) {
+    public PageResult<BrokerageUserDO> getBrokerageUserPage(BrokerageUserPageReqVO pageReqVO) {
         return brokerageUserMapper.selectPage(pageReqVO);
     }
 
@@ -65,10 +65,10 @@ public class TradeBrokerageUserServiceImpl implements TradeBrokerageUserService
     }
 
     @Override
-    public TradeBrokerageUserDO getBindBrokerageUser(Long id) {
+    public BrokerageUserDO getBindBrokerageUser(Long id) {
         return Optional.ofNullable(id)
                 .map(this::getBrokerageUser)
-                .map(TradeBrokerageUserDO::getBrokerageUserId)
+                .map(BrokerageUserDO::getBrokerageUserId)
                 .map(this::getBrokerageUser)
                 .orElse(null);
     }
@@ -102,7 +102,7 @@ public class TradeBrokerageUserServiceImpl implements TradeBrokerageUserService
 
     @Override
     public Long getCountByBrokerageUserId(Long brokerageUserId) {
-        return brokerageUserMapper.selectCount(TradeBrokerageUserDO::getBrokerageUserId, brokerageUserId);
+        return brokerageUserMapper.selectCount(BrokerageUserDO::getBrokerageUserId, brokerageUserId);
     }
 
 }

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java

@@ -51,7 +51,7 @@ import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageRecordBizTypeEnum;
 import cn.iocoder.yudao.module.trade.enums.delivery.DeliveryTypeEnum;
 import cn.iocoder.yudao.module.trade.enums.order.*;
 import cn.iocoder.yudao.module.trade.framework.order.config.TradeOrderProperties;
-import cn.iocoder.yudao.module.trade.service.brokerage.record.TradeBrokerageRecordService;
+import cn.iocoder.yudao.module.trade.service.brokerage.record.BrokerageRecordService;
 import cn.iocoder.yudao.module.trade.service.brokerage.bo.BrokerageAddReqBO;
 import cn.iocoder.yudao.module.trade.service.cart.CartService;
 import cn.iocoder.yudao.module.trade.service.delivery.DeliveryExpressService;
@@ -121,7 +121,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
     @Resource
     private MemberPointApi memberPointApi;
     @Resource
-    private TradeBrokerageRecordService tradeBrokerageRecordService;
+    private BrokerageRecordService brokerageRecordService;
     @Resource
     private ProductCommentApi productCommentApi;
 
@@ -755,12 +755,12 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         List<TradeOrderItemDO> orderItems = tradeOrderItemMapper.selectListByOrderId(orderId);
         List<BrokerageAddReqBO> list = convertList(orderItems,
                 item -> TradeOrderConvert.INSTANCE.convert(item, productSkuApi.getSku(item.getSkuId())));
-        tradeBrokerageRecordService.addBrokerage(userId, bizType, list);
+        brokerageRecordService.addBrokerage(userId, bizType, list);
     }
 
     @Async
     protected void cancelBrokerageAsync(Long userId, BrokerageRecordBizTypeEnum bizType, Long orderItemId) {
-        tradeBrokerageRecordService.cancelBrokerage(userId, bizType, String.valueOf(orderItemId));
+        brokerageRecordService.cancelBrokerage(userId, bizType, String.valueOf(orderItemId));
     }
 
     /**

yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/record/TradeBrokerageRecordServiceImplTest.java

@@ -3,10 +3,10 @@ package cn.iocoder.yudao.module.trade.service.brokerage.record;
 import cn.hutool.core.util.NumberUtil;
 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.record.vo.TradeBrokerageRecordPageReqVO;
-import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.record.TradeBrokerageRecordDO;
-import cn.iocoder.yudao.module.trade.dal.mysql.brokerage.record.TradeBrokerageRecordMapper;
-import cn.iocoder.yudao.module.trade.service.brokerage.user.TradeBrokerageUserService;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.record.vo.BrokerageRecordPageReqVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.record.BrokerageRecordDO;
+import cn.iocoder.yudao.module.trade.dal.mysql.brokerage.record.BrokerageRecordMapper;
+import cn.iocoder.yudao.module.trade.service.brokerage.user.BrokerageUserService;
 import cn.iocoder.yudao.module.trade.service.config.TradeConfigService;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -27,51 +27,51 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 // TODO @芋艿：单测后续看看
 /**
- * {@link TradeBrokerageRecordServiceImpl} 的单元测试类
+ * {@link BrokerageRecordServiceImpl} 的单元测试类
  *
  * @author owen
  */
-@Import(TradeBrokerageRecordServiceImpl.class)
-public class TradeBrokerageRecordServiceImplTest extends BaseDbUnitTest {
+@Import(BrokerageRecordServiceImpl.class)
+public class BrokerageRecordServiceImplTest extends BaseDbUnitTest {
 
     @Resource
-    private TradeBrokerageRecordServiceImpl tradeBrokerageRecordService;
+    private BrokerageRecordServiceImpl brokerageRecordService;
     @Resource
-    private TradeBrokerageRecordMapper tradeBrokerageRecordMapper;
+    private BrokerageRecordMapper brokerageRecordMapper;
 
     @MockBean
     private TradeConfigService tradeConfigService;
     @MockBean
-    private TradeBrokerageUserService tradeBrokerageUserService;
+    private BrokerageUserService brokerageUserService;
 
     @Test
     @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
     public void testGetBrokerageRecordPage() {
         // mock 数据
-        TradeBrokerageRecordDO dbBrokerageRecord = randomPojo(TradeBrokerageRecordDO.class, o -> { // 等会查询到
+        BrokerageRecordDO dbBrokerageRecord = randomPojo(BrokerageRecordDO.class, o -> { // 等会查询到
             o.setUserId(null);
             o.setBizType(null);
             o.setStatus(null);
             o.setCreateTime(null);
         });
-        tradeBrokerageRecordMapper.insert(dbBrokerageRecord);
+        brokerageRecordMapper.insert(dbBrokerageRecord);
         // 测试 userId 不匹配
-        tradeBrokerageRecordMapper.insert(cloneIgnoreId(dbBrokerageRecord, o -> o.setUserId(null)));
+        brokerageRecordMapper.insert(cloneIgnoreId(dbBrokerageRecord, o -> o.setUserId(null)));
         // 测试 bizType 不匹配
-        tradeBrokerageRecordMapper.insert(cloneIgnoreId(dbBrokerageRecord, o -> o.setBizType(null)));
+        brokerageRecordMapper.insert(cloneIgnoreId(dbBrokerageRecord, o -> o.setBizType(null)));
         // 测试 status 不匹配
-        tradeBrokerageRecordMapper.insert(cloneIgnoreId(dbBrokerageRecord, o -> o.setStatus(null)));
+        brokerageRecordMapper.insert(cloneIgnoreId(dbBrokerageRecord, o -> o.setStatus(null)));
         // 测试 createTime 不匹配
-        tradeBrokerageRecordMapper.insert(cloneIgnoreId(dbBrokerageRecord, o -> o.setCreateTime(null)));
+        brokerageRecordMapper.insert(cloneIgnoreId(dbBrokerageRecord, o -> o.setCreateTime(null)));
         // 准备参数
-        TradeBrokerageRecordPageReqVO reqVO = new TradeBrokerageRecordPageReqVO();
+        BrokerageRecordPageReqVO reqVO = new BrokerageRecordPageReqVO();
         reqVO.setUserId(null);
         reqVO.setBizType(null);
         reqVO.setStatus(null);
         reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
 
         // 调用
-        PageResult<TradeBrokerageRecordDO> pageResult = tradeBrokerageRecordService.getBrokerageRecordPage(reqVO);
+        PageResult<BrokerageRecordDO> pageResult = brokerageRecordService.getBrokerageRecordPage(reqVO);
         // 断言
         assertEquals(1, pageResult.getTotal());
         assertEquals(1, pageResult.getList().size());
@@ -85,7 +85,7 @@ public class TradeBrokerageRecordServiceImplTest extends BaseDbUnitTest {
         Integer percent = randomInt(1, 101);
         Integer fixedBrokeragePrice = randomInt();
         // 调用
-        int brokerage = tradeBrokerageRecordService.calculateBrokeragePrice(payPrice, percent, fixedBrokeragePrice);
+        int brokerage = brokerageRecordService.calculateBrokeragePrice(payPrice, percent, fixedBrokeragePrice);
         // 断言
         assertEquals(brokerage, fixedBrokeragePrice);
     }
@@ -98,7 +98,7 @@ public class TradeBrokerageRecordServiceImplTest extends BaseDbUnitTest {
         Integer skuBrokeragePrice = randomEle(new Integer[]{0, null});
         System.out.println("skuBrokeragePrice=" + skuBrokeragePrice);
         // 调用
-        int brokerage = tradeBrokerageRecordService.calculateBrokeragePrice(payPrice, percent, skuBrokeragePrice);
+        int brokerage = brokerageRecordService.calculateBrokeragePrice(payPrice, percent, skuBrokeragePrice);
         // 断言
         assertEquals(brokerage, NumberUtil.div(NumberUtil.mul(payPrice, percent), 100, 0, RoundingMode.DOWN).intValue());
     }
@@ -110,7 +110,7 @@ public class TradeBrokerageRecordServiceImplTest extends BaseDbUnitTest {
         Integer percent = null;
         Integer skuBrokeragePrice = null;
         // 调用
-        int brokerage = tradeBrokerageRecordService.calculateBrokeragePrice(payPrice, percent, skuBrokeragePrice);
+        int brokerage = brokerageRecordService.calculateBrokeragePrice(payPrice, percent, skuBrokeragePrice);
         // 断言
         assertEquals(brokerage, 0);
     }

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

@@ -2,9 +2,9 @@ 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 cn.iocoder.yudao.module.trade.controller.admin.brokerage.user.vo.BrokerageUserPageReqVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.user.BrokerageUserDO;
+import cn.iocoder.yudao.module.trade.dal.mysql.brokerage.user.BrokerageUserMapper;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;
@@ -19,24 +19,24 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 // TODO @芋艿：单测后续看看
 /**
- * {@link TradeBrokerageUserServiceImpl} 的单元测试类
+ * {@link BrokerageUserServiceImpl} 的单元测试类
  *
  * @author owen
  */
-@Import(TradeBrokerageUserServiceImpl.class)
-public class TradeBrokerageUserServiceImplTest extends BaseDbUnitTest {
+@Import(BrokerageUserServiceImpl.class)
+public class BrokerageUserServiceImplTest extends BaseDbUnitTest {
 
     @Resource
-    private TradeBrokerageUserServiceImpl brokerageUserService;
+    private BrokerageUserServiceImpl brokerageUserService;
 
     @Resource
-    private TradeBrokerageUserMapper brokerageUserMapper;
+    private BrokerageUserMapper brokerageUserMapper;
 
     @Test
     @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
     public void testGetBrokerageUserPage() {
         // mock 数据
-        TradeBrokerageUserDO dbBrokerageUser = randomPojo(TradeBrokerageUserDO.class, o -> { // 等会查询到
+        BrokerageUserDO dbBrokerageUser = randomPojo(BrokerageUserDO.class, o -> { // 等会查询到
             o.setBrokerageUserId(null);
             o.setBrokerageEnabled(null);
             o.setCreateTime(null);
@@ -49,13 +49,13 @@ public class TradeBrokerageUserServiceImplTest extends BaseDbUnitTest {
         // 测试 createTime 不匹配
         brokerageUserMapper.insert(cloneIgnoreId(dbBrokerageUser, o -> o.setCreateTime(null)));
         // 准备参数
-        TradeBrokerageUserPageReqVO reqVO = new TradeBrokerageUserPageReqVO();
+        BrokerageUserPageReqVO reqVO = new BrokerageUserPageReqVO();
         reqVO.setBrokerageUserId(null);
         reqVO.setBrokerageEnabled(null);
         reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
 
         // 调用
-        PageResult<TradeBrokerageUserDO> pageResult = brokerageUserService.getBrokerageUserPage(reqVO);
+        PageResult<BrokerageUserDO> pageResult = brokerageUserService.getBrokerageUserPage(reqVO);
         // 断言
         assertEquals(1, pageResult.getTotal());
         assertEquals(1, pageResult.getList().size());