page);
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/config/TradeConfigConvert.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/config/TradeConfigConvert.java
new file mode 100644
index 000000000..031f1198a
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/config/TradeConfigConvert.java
@@ -0,0 +1,23 @@
+package cn.iocoder.yudao.module.trade.convert.config;
+
+import cn.iocoder.yudao.module.trade.controller.admin.config.vo.TradeConfigRespVO;
+import cn.iocoder.yudao.module.trade.controller.admin.config.vo.TradeConfigSaveReqVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.config.TradeConfigDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * 交易中心配置 Convert
+ *
+ * @author owen
+ */
+@Mapper
+public interface TradeConfigConvert {
+
+ TradeConfigConvert INSTANCE = Mappers.getMapper(TradeConfigConvert.class);
+
+ TradeConfigDO convert(TradeConfigSaveReqVO bean);
+
+ TradeConfigRespVO convert(TradeConfigDO bean);
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
index e46ce66b6..f42af2d73 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
@@ -7,7 +7,7 @@ import cn.iocoder.yudao.framework.common.util.string.StrUtils;
import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils;
import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils;
import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO;
-import cn.iocoder.yudao.module.member.api.brokerage.dto.BrokerageAddReqDTO;
+import cn.iocoder.yudao.module.trade.service.brokerage.record.bo.BrokerageAddReqBO;
import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
import cn.iocoder.yudao.module.pay.api.order.dto.PayOrderCreateReqDTO;
import cn.iocoder.yudao.module.pay.enums.DictTypeConstants;
@@ -275,8 +275,8 @@ public interface TradeOrderConvert {
TradeOrderDO convert(TradeOrderRemarkReqVO reqVO);
- default BrokerageAddReqDTO convert(TradeOrderItemDO item, ProductSkuRespDTO sku) {
- return new BrokerageAddReqDTO().setBizId(String.valueOf(item.getId()))
+ default BrokerageAddReqBO convert(TradeOrderItemDO item, ProductSkuRespDTO sku) {
+ return new BrokerageAddReqBO().setBizId(String.valueOf(item.getId()))
.setPayPrice(item.getPayPrice()).setCount(item.getCount())
.setSkuFirstBrokeragePrice(sku.getSubCommissionFirstPrice())
.setSkuSecondBrokeragePrice(sku.getSubCommissionSecondPrice());
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/brokerage/record/MemberBrokerageRecordDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/record/TradeBrokerageRecordDO.java
similarity index 72%
rename from yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/brokerage/record/MemberBrokerageRecordDO.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/record/TradeBrokerageRecordDO.java
index 88e6ba7d9..0bf7c0cf2 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/brokerage/record/MemberBrokerageRecordDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/record/TradeBrokerageRecordDO.java
@@ -1,8 +1,8 @@
-package cn.iocoder.yudao.module.member.dal.dataobject.brokerage.record;
+package cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.record;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.module.member.enums.brokerage.BrokerageRecordBizTypeEnum;
-import cn.iocoder.yudao.module.member.enums.brokerage.BrokerageRecordStatusEnum;
+import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageRecordBizTypeEnum;
+import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageRecordStatusEnum;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -15,15 +15,15 @@ import java.time.LocalDateTime;
*
* @author owen
*/
-@TableName("member_brokerage_record")
-@KeySequence("member_brokerage_record_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@TableName("trade_brokerage_record")
+@KeySequence("trade_brokerage_record_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
-public class MemberBrokerageRecordDO extends BaseDO {
+public class TradeBrokerageRecordDO extends BaseDO {
/**
* 编号
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/user/TradeBrokerageUserDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/user/TradeBrokerageUserDO.java
new file mode 100644
index 000000000..0bc552dca
--- /dev/null
+++ b/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;
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/config/TradeConfigDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/config/TradeConfigDO.java
new file mode 100644
index 000000000..a0c6d3858
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/config/TradeConfigDO.java
@@ -0,0 +1,90 @@
+package cn.iocoder.yudao.module.trade.dal.dataobject.config;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.framework.mybatis.core.type.IntegerListTypeHandler;
+import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageBindModeEnum;
+import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageEnabledConditionEnum;
+import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageWithdrawTypeEnum;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import lombok.*;
+
+import java.util.List;
+
+/**
+ * 交易中心配置 DO
+ *
+ * @author owen
+ */
+@TableName(value = "trade_config", autoResultMap = true)
+@KeySequence("trade_config_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TradeConfigDO extends BaseDO {
+
+ /**
+ * 自增主键
+ */
+ @TableId
+ private Long id;
+
+ // ========== 分销相关 ==========
+
+ /**
+ * 是否启用分佣
+ */
+ private Boolean brokerageEnabled;
+ /**
+ * 分佣模式
+ *
+ * 枚举 {@link BrokerageEnabledConditionEnum 对应的类}
+ */
+ private Integer brokerageEnabledCondition;
+ /**
+ * 分销关系绑定模式
+ *
+ * 枚举 {@link BrokerageBindModeEnum 对应的类}
+ */
+ private Integer brokerageBindMode;
+ /**
+ * 分销海报图地址数组
+ */
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private List brokeragePostUrls;
+ /**
+ * 一级返佣比例
+ */
+ private Integer brokerageFirstPercent;
+ /**
+ * 二级返佣比例
+ */
+ private Integer brokerageSecondPercent;
+ /**
+ * 用户提现最低金额
+ */
+ private Integer brokerageWithdrawMinPrice;
+ /**
+ * 提现银行
+ */
+ @TableField(typeHandler = IntegerListTypeHandler.class)
+ private List brokerageBankNames;
+ /**
+ * 佣金冻结时间(天)
+ */
+ private Integer brokerageFrozenDays;
+ /**
+ * 提现方式
+ *
+ * 枚举 {@link BrokerageWithdrawTypeEnum 对应的类}
+ */
+ @TableField(typeHandler = IntegerListTypeHandler.class)
+ private List brokerageWithdrawType;
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/record/TradeBrokerageRecordMapper.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/record/TradeBrokerageRecordMapper.java
new file mode 100644
index 000000000..78efbc53a
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/record/TradeBrokerageRecordMapper.java
@@ -0,0 +1,47 @@
+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 com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 佣金记录 Mapper
+ *
+ * @author owen
+ */
+@Mapper
+public interface TradeBrokerageRecordMapper extends BaseMapperX {
+
+ default PageResult selectPage(TradeBrokerageRecordPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX()
+ .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 selectListByStatusAndUnfreezeTimeLt(Integer status, LocalDateTime unfreezeTime) {
+ return selectList(new LambdaQueryWrapper()
+ .eq(TradeBrokerageRecordDO::getStatus, status)
+ .lt(TradeBrokerageRecordDO::getUnfreezeTime, unfreezeTime));
+ }
+
+ default int updateByIdAndStatus(Integer id, Integer status, TradeBrokerageRecordDO updateObj) {
+ return update(updateObj, new LambdaQueryWrapper()
+ .eq(TradeBrokerageRecordDO::getId, id)
+ .eq(TradeBrokerageRecordDO::getStatus, status));
+ }
+
+ default TradeBrokerageRecordDO selectByUserIdAndBizTypeAndBizId(Integer bizType, String bizId) {
+ return selectOne(TradeBrokerageRecordDO::getBizType, bizType,
+ TradeBrokerageRecordDO::getBizId, bizId);
+ }
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/user/TradeBrokerageUserMapper.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/user/TradeBrokerageUserMapper.java
new file mode 100644
index 000000000..f0c221311
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/user/TradeBrokerageUserMapper.java
@@ -0,0 +1,103 @@
+package cn.iocoder.yudao.module.trade.dal.mysql.brokerage.user;
+
+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 com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 分销用户 Mapper
+ *
+ * @author owen
+ */
+@Mapper
+public interface TradeBrokerageUserMapper extends BaseMapperX {
+
+ default PageResult selectPage(TradeBrokerageUserPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX()
+ .eqIfPresent(TradeBrokerageUserDO::getBrokerageUserId, reqVO.getBrokerageUserId())
+ .eqIfPresent(TradeBrokerageUserDO::getBrokerageEnabled, reqVO.getBrokerageEnabled())
+ .betweenIfPresent(TradeBrokerageUserDO::getCreateTime, reqVO.getCreateTime())
+ .orderByDesc(TradeBrokerageUserDO::getId));
+ }
+
+ /**
+ * 更新用户可用佣金（增加）
+ *
+ * @param id 用户编号
+ * @param incrCount 增加佣金（正数）
+ */
+ default void updateBrokeragePriceIncr(Long id, int incrCount) {
+ Assert.isTrue(incrCount > 0);
+ LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper()
+ .setSql(" brokerage_price = brokerage_price + " + incrCount)
+ .eq(TradeBrokerageUserDO::getId, id);
+ update(null, lambdaUpdateWrapper);
+ }
+
+ /**
+ * 更新用户可用佣金（减少）
+ * 注意：理论上佣金可能已经提现，这时会扣出负数，确保平台不会造成损失
+ *
+ * @param id 用户编号
+ * @param incrCount 增加佣金（负数）
+ */
+ default void updateBrokeragePriceDecr(Long id, int incrCount) {
+ Assert.isTrue(incrCount < 0);
+ LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper()
+ .setSql(" brokerage_price = brokerage_price + " + incrCount) // 负数，所以使用 + 号
+ .eq(TradeBrokerageUserDO::getId, id);
+ update(null, lambdaUpdateWrapper);
+ }
+
+ /**
+ * 更新用户冻结佣金（增加）
+ *
+ * @param id 用户编号
+ * @param incrCount 增加冻结佣金（正数）
+ */
+ default void updateFrozenBrokeragePriceIncr(Long id, int incrCount) {
+ Assert.isTrue(incrCount > 0);
+ LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper()
+ .setSql(" frozen_brokerage_price = frozen_brokerage_price + " + incrCount)
+ .eq(TradeBrokerageUserDO::getId, id);
+ update(null, lambdaUpdateWrapper);
+ }
+
+ /**
+ * 更新用户冻结佣金（减少）
+ * 注意：理论上冻结佣金可能已经解冻，这时会扣出负数，确保平台不会造成损失
+ *
+ * @param id 用户编号
+ * @param incrCount 减少冻结佣金（负数）
+ */
+ default void updateFrozenBrokeragePriceDecr(Long id, int incrCount) {
+ Assert.isTrue(incrCount < 0);
+ LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper()
+ .setSql(" frozen_brokerage_price = frozen_brokerage_price + " + incrCount) // 负数，所以使用 + 号
+ .eq(TradeBrokerageUserDO::getId, id);
+ update(null, lambdaUpdateWrapper);
+ }
+
+ /**
+ * 更新用户冻结佣金（减少）, 更新用户佣金（增加）
+ *
+ * @param id 用户编号
+ * @param incrCount 减少冻结佣金（负数）
+ * @return 更新条数
+ */
+ default int updateFrozenBrokeragePriceDecrAndBrokeragePriceIncr(Long id, int incrCount) {
+ Assert.isTrue(incrCount < 0);
+ LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper()
+ .setSql(" frozen_brokerage_price = frozen_brokerage_price + " + incrCount + // 负数，所以使用 + 号
+ ", brokerage_price = brokerage_price + " + -incrCount) // 负数，所以使用 - 号
+ .eq(TradeBrokerageUserDO::getId, id)
+ .ge(TradeBrokerageUserDO::getFrozenBrokeragePrice, -incrCount); // cas 逻辑
+ return update(null, lambdaUpdateWrapper);
+ }
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/config/TradeConfigMapper.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/config/TradeConfigMapper.java
new file mode 100644
index 000000000..18a3f4df7
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/config/TradeConfigMapper.java
@@ -0,0 +1,15 @@
+package cn.iocoder.yudao.module.trade.dal.mysql.config;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.trade.dal.dataobject.config.TradeConfigDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 交易中心配置 Mapper
+ *
+ * @author owen
+ */
+@Mapper
+public interface TradeConfigMapper extends BaseMapperX {
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/job/brokerage/TradeBrokerageRecordUnfreezeJob.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/job/brokerage/TradeBrokerageRecordUnfreezeJob.java
new file mode 100644
index 000000000..94218d47e
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/job/brokerage/TradeBrokerageRecordUnfreezeJob.java
@@ -0,0 +1,29 @@
+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 org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * 佣金解冻 Job
+ *
+ * @author owen
+ */
+@Component
+@TenantJob
+public class TradeBrokerageRecordUnfreezeJob implements JobHandler {
+
+ @Resource
+ private TradeBrokerageRecordService tradeBrokerageRecordService;
+
+ @Override
+ public String execute(String param) {
+ int count = tradeBrokerageRecordService.unfreezeRecord();
+ return StrUtil.format("解冻佣金 {} 个", count);
+ }
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/TradeBrokerageRecordService.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/TradeBrokerageRecordService.java
new file mode 100644
index 000000000..6b83bdbc0
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/TradeBrokerageRecordService.java
@@ -0,0 +1,54 @@
+package cn.iocoder.yudao.module.trade.service.brokerage.record;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.record.TradeBrokerageRecordDO;
+import cn.iocoder.yudao.module.trade.service.brokerage.record.bo.BrokerageAddReqBO;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.record.vo.TradeBrokerageRecordPageReqVO;
+
+import java.util.List;
+
+/**
+ * 佣金记录 Service 接口
+ *
+ * @author owen
+ */
+public interface TradeBrokerageRecordService {
+
+ /**
+ * 获得佣金记录
+ *
+ * @param id 编号
+ * @return 佣金记录
+ */
+ TradeBrokerageRecordDO getBrokerageRecord(Integer id);
+
+ /**
+ * 获得佣金记录分页
+ *
+ * @param pageReqVO 分页查询
+ * @return 佣金记录分页
+ */
+ PageResult getBrokerageRecordPage(TradeBrokerageRecordPageReqVO pageReqVO);
+
+ /**
+ * 增加佣金
+ *
+ * @param userId 会员编号
+ * @param list 请求参数列表
+ */
+ void addBrokerage(Long userId, List list);
+
+ /**
+ * 取消佣金：将佣金记录，状态修改为已失效
+ * @param userId 会员编号
+ * @param bizId 业务编号
+ */
+ void cancelBrokerage(Long userId, String bizId);
+
+ /**
+ * 解冻佣金：将待结算的佣金记录，状态修改为已结算
+ *
+ * @return 解冻佣金的数量
+ */
+ int unfreezeRecord();
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/TradeBrokerageRecordServiceImpl.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/TradeBrokerageRecordServiceImpl.java
new file mode 100644
index 000000000..5502bcbf7
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/TradeBrokerageRecordServiceImpl.java
@@ -0,0 +1,232 @@
+package cn.iocoder.yudao.module.trade.service.brokerage.record;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.BooleanUtil;
+import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.extra.spring.SpringUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+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.bo.BrokerageAddReqBO;
+import cn.iocoder.yudao.module.trade.controller.admin.brokerage.record.vo.TradeBrokerageRecordPageReqVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.user.TradeBrokerageUserDO;
+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.enums.brokerage.BrokerageRecordBizTypeEnum;
+import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageRecordStatusEnum;
+import cn.iocoder.yudao.module.trade.service.brokerage.user.TradeBrokerageUserService;
+import cn.iocoder.yudao.module.trade.service.config.TradeConfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+import java.math.RoundingMode;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Function;
+
+/**
+ * 佣金记录 Service 实现类
+ *
+ * @author owen
+ */
+@Slf4j
+@Service
+@Validated
+public class TradeBrokerageRecordServiceImpl implements TradeBrokerageRecordService {
+
+ @Resource
+ private TradeBrokerageRecordMapper tradeBrokerageRecordMapper;
+ @Resource
+ private TradeConfigService tradeConfigService;
+ @Resource
+ private TradeBrokerageUserService tradeBrokerageUserService;
+
+ @Override
+ public TradeBrokerageRecordDO getBrokerageRecord(Integer id) {
+ return tradeBrokerageRecordMapper.selectById(id);
+ }
+
+ @Override
+ public PageResult getBrokerageRecordPage(TradeBrokerageRecordPageReqVO pageReqVO) {
+ return tradeBrokerageRecordMapper.selectPage(pageReqVO);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void addBrokerage(Long buyerId, List list) {
+ TradeConfigDO memberConfig = tradeConfigService.getTradeConfig();
+ // 0 未启用分销功能
+ if (memberConfig == null || !BooleanUtil.isTrue(memberConfig.getBrokerageEnabled())) {
+ log.warn("[addBrokerage][增加佣金失败：brokerageEnabled 未配置，buyerId({})", buyerId);
+ return;
+ }
+
+ // 1.1 获得一级推广人
+ TradeBrokerageUserDO firstUser = tradeBrokerageUserService.getInviteBrokerageUser(buyerId);
+ if (firstUser == null || !BooleanUtil.isTrue(firstUser.getBrokerageEnabled())) {
+ return;
+ }
+
+ // 1.2 计算一级分佣
+ addBrokerage(firstUser, list, memberConfig.getBrokerageFrozenDays(), memberConfig.getBrokerageFirstPercent(), BrokerageAddReqBO::getSkuFirstBrokeragePrice);
+
+
+ // 2.1 获得二级推广员
+ TradeBrokerageUserDO secondUser = tradeBrokerageUserService.getBrokerageUser(firstUser.getBrokerageUserId());
+ if (secondUser == null || !BooleanUtil.isTrue(secondUser.getBrokerageEnabled())) {
+ return;
+ }
+
+ // 2.2 计算二级分佣
+ addBrokerage(secondUser, list, memberConfig.getBrokerageFrozenDays(), memberConfig.getBrokerageSecondPercent(), BrokerageAddReqBO::getSkuSecondBrokeragePrice);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void cancelBrokerage(Long userId, String bizId) {
+ TradeBrokerageRecordDO record = tradeBrokerageRecordMapper.selectByUserIdAndBizTypeAndBizId(BrokerageRecordBizTypeEnum.ORDER.getType(), bizId);
+ if (record == null || ObjectUtil.notEqual(record.getUserId(), userId)) {
+ log.error("[cancelBrokerage][userId({})][bizId({}) 更新为已失效失败：记录不存在]", userId, bizId);
+ return;
+ }
+
+ TradeBrokerageRecordDO updateObj = new TradeBrokerageRecordDO().setStatus(BrokerageRecordStatusEnum.CANCEL.getStatus());
+ int updateRows = tradeBrokerageRecordMapper.updateByIdAndStatus(record.getId(), record.getStatus(), updateObj);
+ if (updateRows == 0) {
+ log.error("[cancelBrokerage][record({}) 更新为已失效失败]", record.getId());
+ return;
+ }
+
+ if (BrokerageRecordStatusEnum.WAIT_SETTLEMENT.getStatus().equals(record.getStatus())) {
+ tradeBrokerageUserService.updateUserFrozenBrokeragePrice(userId, -record.getPrice());
+ } else if (BrokerageRecordStatusEnum.SETTLEMENT.getStatus().equals(record.getStatus())) {
+ tradeBrokerageUserService.updateUserBrokeragePrice(userId, -record.getPrice());
+ }
+ }
+
+ /**
+ * 计算佣金
+ *
+ * @param payPrice 订单支付金额
+ * @param percent 商品 SKU 设置的佣金
+ * @param skuBrokeragePrice 商品的佣金
+ * @return 佣金
+ */
+ int calculateBrokerage(Integer payPrice, Integer percent, Integer skuBrokeragePrice) {
+ // 1. 优先使用商品 SKU 设置的佣金
+ if (skuBrokeragePrice != null && skuBrokeragePrice > 0) {
+ return ObjectUtil.defaultIfNull(skuBrokeragePrice, 0);
+ }
+
+ // 2. 根据订单支付金额计算佣金
+ if (payPrice != null && payPrice > 0 && percent != null && percent > 0) {
+ return NumberUtil.div(NumberUtil.mul(payPrice, percent), 100, 0, RoundingMode.DOWN).intValue();
+ }
+
+ return 0;
+ }
+
+ /**
+ * 增加用户佣金
+ *
+ * @param user 用户
+ * @param list 佣金增加参数列表
+ * @param brokerageFrozenDays 冻结天数
+ * @param brokeragePercent 佣金比例
+ * @param skuBrokeragePriceFun 商品 SKU 设置的佣金
+ */
+ private void addBrokerage(TradeBrokerageUserDO user, List list, Integer brokerageFrozenDays,
+ Integer brokeragePercent, Function skuBrokeragePriceFun) {
+ // 处理冻结时间
+ brokerageFrozenDays = ObjectUtil.defaultIfNull(brokerageFrozenDays, 0);
+ LocalDateTime unfreezeTime = null;
+ if (brokerageFrozenDays > 0) {
+ unfreezeTime = LocalDateTime.now().plusDays(brokerageFrozenDays);
+ }
+
+ // 计算分佣
+ int totalBrokerage = 0;
+ List records = new ArrayList<>();
+ for (BrokerageAddReqBO dto : list) {
+ int brokeragePerItem = calculateBrokerage(dto.getPayPrice(), brokeragePercent, skuBrokeragePriceFun.apply(dto));
+ if (brokeragePerItem > 0) {
+ int brokerage = brokeragePerItem * dto.getCount();
+ records.add(TradeBrokerageRecordConvert.INSTANCE.convert(user, dto.getBizId(), brokerageFrozenDays, brokerage, unfreezeTime));
+ totalBrokerage += brokerage;
+ }
+ }
+
+ if (records.isEmpty()) {
+ return;
+ }
+
+ // 保存佣金记录
+ tradeBrokerageRecordMapper.insertBatch(records);
+
+ if (brokerageFrozenDays > 0) {
+ // 更新用户冻结佣金
+ tradeBrokerageUserService.updateUserFrozenBrokeragePrice(user.getId(), totalBrokerage);
+ } else {
+ // 更新用户可用佣金
+ tradeBrokerageUserService.updateUserBrokeragePrice(user.getId(), totalBrokerage);
+ }
+ }
+
+ @Override
+ public int unfreezeRecord() {
+ // 1. 查询待结算的佣金记录
+ List records = tradeBrokerageRecordMapper.selectListByStatusAndUnfreezeTimeLt(
+ BrokerageRecordStatusEnum.WAIT_SETTLEMENT.getStatus(), LocalDateTime.now());
+ if (CollUtil.isEmpty(records)) {
+ return 0;
+ }
+
+ // 2. 遍历执行
+ int count = 0;
+ for (TradeBrokerageRecordDO record : records) {
+ try {
+ boolean successful = getSelf().unfreezeRecord(record);
+ if (successful) {
+ count++;
+ }
+ } catch (Exception e) {
+ log.error("[unfreezeRecord][record({}) 更新为已结算失败]", record.getId(), e);
+ }
+ }
+ return count;
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public boolean unfreezeRecord(TradeBrokerageRecordDO record) {
+ // 更新记录状态
+ TradeBrokerageRecordDO updateObj = new TradeBrokerageRecordDO()
+ .setStatus(BrokerageRecordStatusEnum.SETTLEMENT.getStatus())
+ .setUnfreezeTime(LocalDateTime.now());
+ int updateRows = tradeBrokerageRecordMapper.updateByIdAndStatus(record.getId(), record.getStatus(), updateObj);
+ if (updateRows == 0) {
+ log.error("[unfreezeRecord][record({}) 更新为已结算失败]", record.getId());
+ return false;
+ }
+
+ // 更新用户冻结佣金
+ tradeBrokerageUserService.updateFrozenBrokeragePriceDecrAndBrokeragePriceIncr(record.getUserId(), -record.getPrice());
+
+ log.info("[unfreezeRecord][record({}) 更新为已结算成功]", record.getId());
+ return true;
+ }
+
+ /**
+ * 获得自身的代理对象，解决 AOP 生效问题
+ *
+ * @return 自己
+ */
+ private TradeBrokerageRecordServiceImpl getSelf() {
+ return SpringUtil.getBean(getClass());
+ }
+
+}
diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/brokerage/dto/BrokerageAddReqDTO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/bo/BrokerageAddReqBO.java
similarity index 80%
rename from yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/brokerage/dto/BrokerageAddReqDTO.java
rename to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/bo/BrokerageAddReqBO.java
index c46645201..a968d14ea 100644
--- a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/brokerage/dto/BrokerageAddReqDTO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/bo/BrokerageAddReqBO.java
@@ -1,17 +1,17 @@
-package cn.iocoder.yudao.module.member.api.brokerage.dto;
+package cn.iocoder.yudao.module.trade.service.brokerage.record.bo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
- * 佣金 增加 Request DTO
+ * 佣金 增加 Request BO
* @author owen
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
-public class BrokerageAddReqDTO {
+public class BrokerageAddReqBO {
/**
* 业务ID
*/
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/TradeBrokerageUserService.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/TradeBrokerageUserService.java
new file mode 100644
index 000000000..773342e55
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/TradeBrokerageUserService.java
@@ -0,0 +1,88 @@
+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 getBrokerageUserList(Collection ids);
+
+ /**
+ * 获得分销用户分页
+ *
+ * @param pageReqVO 分页查询
+ * @return 分销用户分页
+ */
+ PageResult getBrokerageUserPage(TradeBrokerageUserPageReqVO pageReqVO);
+
+ /**
+ * 修改推广员编号
+ *
+ * @param id 用户编号
+ * @param brokerageUserId 推广员编号
+ */
+ void updateBrokerageUserId(Long id, Long brokerageUserId);
+
+ /**
+ * 修改推广资格
+ *
+ * @param id 用户编号
+ * @param brokerageEnabled 推广资格
+ */
+ void updateBrokerageEnabled(Long id, Boolean brokerageEnabled);
+
+ /**
+ * 获得用户的推广人
+ *
+ * @param id 用户编号
+ * @return 用户的推广人
+ */
+ TradeBrokerageUserDO getInviteBrokerageUser(Long id);
+
+ /**
+ * 更新用户佣金
+ *
+ * @param id 用户编号
+ * @param brokeragePrice 用户可用佣金
+ */
+ void updateUserBrokeragePrice(Long id, int brokeragePrice);
+
+ /**
+ * 更新用户冻结佣金
+ *
+ * @param id 用户编号
+ * @param frozenBrokeragePrice 用户冻结佣金
+ */
+ void updateUserFrozenBrokeragePrice(Long id, int frozenBrokeragePrice);
+
+ /**
+ * 更新用户冻结佣金（减少）, 更新用户佣金（增加）
+ *
+ * @param id 用户编号
+ * @param frozenBrokeragePrice 减少冻结佣金（负数）
+ */
+ void updateFrozenBrokeragePriceDecrAndBrokeragePriceIncr(Long id, int frozenBrokeragePrice);
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/TradeBrokerageUserServiceImpl.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/TradeBrokerageUserServiceImpl.java
new file mode 100644
index 000000000..9691a8154
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/TradeBrokerageUserServiceImpl.java
@@ -0,0 +1,106 @@
+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 org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.MEMBER_FROZEN_BROKERAGE_PRICE_NOT_ENOUGH;
+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 getBrokerageUserList(Collection ids) {
+ return brokerageUserMapper.selectBatchIds(ids);
+ }
+
+ @Override
+ public PageResult 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);
+ }
+
+ @Override
+ public TradeBrokerageUserDO getInviteBrokerageUser(Long id) {
+ return Optional.ofNullable(id)
+ .map(this::getBrokerageUser)
+ .map(TradeBrokerageUserDO::getBrokerageUserId)
+ .map(this::getBrokerageUser)
+ .orElse(null);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateUserBrokeragePrice(Long id, int brokeragePrice) {
+ if (brokeragePrice > 0) {
+ brokerageUserMapper.updateBrokeragePriceIncr(id, brokeragePrice);
+ } else if (brokeragePrice < 0) {
+ brokerageUserMapper.updateBrokeragePriceDecr(id, brokeragePrice);
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateUserFrozenBrokeragePrice(Long id, int frozenBrokeragePrice) {
+ if (frozenBrokeragePrice > 0) {
+ brokerageUserMapper.updateFrozenBrokeragePriceIncr(id, frozenBrokeragePrice);
+ } else if (frozenBrokeragePrice < 0) {
+ brokerageUserMapper.updateFrozenBrokeragePriceDecr(id, frozenBrokeragePrice);
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateFrozenBrokeragePriceDecrAndBrokeragePriceIncr(Long id, int frozenBrokeragePrice) {
+ Assert.isTrue(frozenBrokeragePrice < 0);
+ int updateRows = brokerageUserMapper.updateFrozenBrokeragePriceDecrAndBrokeragePriceIncr(id, frozenBrokeragePrice);
+ if (updateRows == 0) {
+ throw exception(MEMBER_FROZEN_BROKERAGE_PRICE_NOT_ENOUGH);
+ }
+ }
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/config/TradeConfigService.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/config/TradeConfigService.java
new file mode 100644
index 000000000..c00825f2e
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/config/TradeConfigService.java
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.trade.service.config;
+
+import cn.iocoder.yudao.module.trade.controller.admin.config.vo.TradeConfigSaveReqVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.config.TradeConfigDO;
+
+import javax.validation.Valid;
+
+/**
+ * 交易中心配置 Service 接口
+ *
+ * @author owen
+ */
+public interface TradeConfigService {
+
+
+ /**
+ * 更新交易中心配置
+ *
+ * @param updateReqVO 更新信息
+ */
+ void saveTradeConfig(@Valid TradeConfigSaveReqVO updateReqVO);
+
+ /**
+ * 获得交易中心配置
+ *
+ * @return 交易中心配置
+ */
+ TradeConfigDO getTradeConfig();
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/config/TradeConfigServiceImpl.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/config/TradeConfigServiceImpl.java
new file mode 100644
index 000000000..c859cdee6
--- /dev/null
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/config/TradeConfigServiceImpl.java
@@ -0,0 +1,44 @@
+package cn.iocoder.yudao.module.trade.service.config;
+
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
+import cn.iocoder.yudao.module.trade.controller.admin.config.vo.TradeConfigSaveReqVO;
+import cn.iocoder.yudao.module.trade.convert.config.TradeConfigConvert;
+import cn.iocoder.yudao.module.trade.dal.dataobject.config.TradeConfigDO;
+import cn.iocoder.yudao.module.trade.dal.mysql.config.TradeConfigMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 交易中心配置 Service 实现类
+ *
+ * @author owen
+ */
+@Service
+@Validated
+public class TradeConfigServiceImpl implements TradeConfigService {
+
+ @Resource
+ private TradeConfigMapper tradeConfigMapper;
+
+ @Override
+ public void saveTradeConfig(TradeConfigSaveReqVO saveReqVO) {
+ // 存在，则进行更新
+ TradeConfigDO dbConfig = getTradeConfig();
+ if (dbConfig != null) {
+ tradeConfigMapper.updateById(TradeConfigConvert.INSTANCE.convert(saveReqVO).setId(dbConfig.getId()));
+ return;
+ }
+ // 不存在，则进行插入
+ tradeConfigMapper.insert(TradeConfigConvert.INSTANCE.convert(saveReqVO));
+ }
+
+ @Override
+ public TradeConfigDO getTradeConfig() {
+ List list = tradeConfigMapper.selectList();
+ return CollectionUtils.getFirst(list);
+ }
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
index afb125e08..b75b7ac7c 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
@@ -12,8 +12,8 @@ import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
import cn.iocoder.yudao.module.member.api.address.AddressApi;
import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO;
-import cn.iocoder.yudao.module.member.api.brokerage.BrokerageApi;
-import cn.iocoder.yudao.module.member.api.brokerage.dto.BrokerageAddReqDTO;
+import cn.iocoder.yudao.module.trade.service.brokerage.record.TradeBrokerageRecordService;
+import cn.iocoder.yudao.module.trade.service.brokerage.record.bo.BrokerageAddReqBO;
import cn.iocoder.yudao.module.member.api.level.MemberLevelApi;
import cn.iocoder.yudao.module.member.api.point.MemberPointApi;
import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
@@ -120,7 +120,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
@Resource
private MemberPointApi memberPointApi;
@Resource
- private BrokerageApi brokerageApi;
+ private TradeBrokerageRecordService tradeBrokerageRecordService;
@Resource
private ProductCommentApi productCommentApi;
@@ -635,12 +635,12 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
.setRefundStatus(TradeOrderRefundStatusEnum.PART.getStatus()).setRefundPrice(orderRefundPrice));
}
- // TODO 芋艿：未来如果有分佣，需要更新相关分佣订单为已失效
-
// 扣减用户积分
getSelf().reduceUserPointAsync(order.getUserId(), orderRefundPrice, afterSaleId);
// 扣减用户经验
getSelf().reduceUserExperienceAsync(order.getUserId(), orderRefundPrice, afterSaleId);
+ // 更新分佣记录为已失效
+ getSelf().cancelBrokerageAsync(order.getUserId(), id);
}
@Override
@@ -752,9 +752,14 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
@Async
protected void addBrokerageAsync(Long userId, Long orderId) {
List orderItems = tradeOrderItemMapper.selectListByOrderId(orderId);
- List list = convertList(orderItems,
+ List list = convertList(orderItems,
item -> TradeOrderConvert.INSTANCE.convert(item, productSkuApi.getSku(item.getSkuId())));
- brokerageApi.addBrokerage(userId, list);
+ tradeBrokerageRecordService.addBrokerage(userId, list);
+ }
+
+ @Async
+ protected void cancelBrokerageAsync(Long userId, Long orderItemId) {
+ tradeBrokerageRecordService.cancelBrokerage(userId, String.valueOf(orderItemId));
}
/**
diff --git a/yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/brokerage/record/MemberBrokerageRecordServiceImplTest.java b/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/record/TradeBrokerageRecordServiceImplTest.java
similarity index 56%
rename from yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/brokerage/record/MemberBrokerageRecordServiceImplTest.java
rename to yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/record/TradeBrokerageRecordServiceImplTest.java
index d5991b4e8..a6d8dffb1 100644
--- a/yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/brokerage/record/MemberBrokerageRecordServiceImplTest.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/record/TradeBrokerageRecordServiceImplTest.java
@@ -1,13 +1,13 @@
-package cn.iocoder.yudao.module.member.service.brokerage.record;
+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.member.controller.admin.brokerage.record.vo.MemberBrokerageRecordPageReqVO;
-import cn.iocoder.yudao.module.member.dal.dataobject.brokerage.record.MemberBrokerageRecordDO;
-import cn.iocoder.yudao.module.member.dal.mysql.brokerage.record.MemberBrokerageRecordMapper;
-import cn.iocoder.yudao.module.member.service.point.MemberPointConfigService;
-import cn.iocoder.yudao.module.member.service.user.MemberUserService;
+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.service.config.TradeConfigService;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.mock.mockito.MockBean;
@@ -26,55 +26,55 @@ import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
import static org.junit.jupiter.api.Assertions.assertEquals;
/**
- * {@link MemberBrokerageRecordServiceImpl} 的单元测试类
+ * {@link TradeBrokerageRecordServiceImpl} 的单元测试类
*
* @author owen
*/
-@Import(MemberBrokerageRecordServiceImpl.class)
-public class MemberBrokerageRecordServiceImplTest extends BaseDbUnitTest {
+@Import(TradeBrokerageRecordServiceImpl.class)
+public class TradeBrokerageRecordServiceImplTest extends BaseDbUnitTest {
@Resource
- private MemberBrokerageRecordServiceImpl memberBrokerageRecordService;
+ private TradeBrokerageRecordServiceImpl tradeBrokerageRecordService;
@Resource
- private MemberBrokerageRecordMapper memberBrokerageRecordMapper;
+ private TradeBrokerageRecordMapper tradeBrokerageRecordMapper;
@MockBean
- private MemberPointConfigService memberPointConfigService;
+ private TradeConfigService tradeConfigService;
@MockBean
- private MemberUserService memberUserService;
+ private TradeBrokerageUserService tradeBrokerageUserService;
@Test
@Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
- public void testGetMemberBrokerageRecordPage() {
+ public void testGetBrokerageRecordPage() {
// mock 数据
- MemberBrokerageRecordDO dbMemberBrokerageRecord = randomPojo(MemberBrokerageRecordDO.class, o -> { // 等会查询到
+ TradeBrokerageRecordDO dbBrokerageRecord = randomPojo(TradeBrokerageRecordDO.class, o -> { // 等会查询到
o.setUserId(null);
o.setBizType(null);
o.setStatus(null);
o.setCreateTime(null);
});
- memberBrokerageRecordMapper.insert(dbMemberBrokerageRecord);
+ tradeBrokerageRecordMapper.insert(dbBrokerageRecord);
// 测试 userId 不匹配
- memberBrokerageRecordMapper.insert(cloneIgnoreId(dbMemberBrokerageRecord, o -> o.setUserId(null)));
+ tradeBrokerageRecordMapper.insert(cloneIgnoreId(dbBrokerageRecord, o -> o.setUserId(null)));
// 测试 bizType 不匹配
- memberBrokerageRecordMapper.insert(cloneIgnoreId(dbMemberBrokerageRecord, o -> o.setBizType(null)));
+ tradeBrokerageRecordMapper.insert(cloneIgnoreId(dbBrokerageRecord, o -> o.setBizType(null)));
// 测试 status 不匹配
- memberBrokerageRecordMapper.insert(cloneIgnoreId(dbMemberBrokerageRecord, o -> o.setStatus(null)));
+ tradeBrokerageRecordMapper.insert(cloneIgnoreId(dbBrokerageRecord, o -> o.setStatus(null)));
// 测试 createTime 不匹配
- memberBrokerageRecordMapper.insert(cloneIgnoreId(dbMemberBrokerageRecord, o -> o.setCreateTime(null)));
+ tradeBrokerageRecordMapper.insert(cloneIgnoreId(dbBrokerageRecord, o -> o.setCreateTime(null)));
// 准备参数
- MemberBrokerageRecordPageReqVO reqVO = new MemberBrokerageRecordPageReqVO();
+ TradeBrokerageRecordPageReqVO reqVO = new TradeBrokerageRecordPageReqVO();
reqVO.setUserId(null);
reqVO.setBizType(null);
reqVO.setStatus(null);
reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
// 调用
- PageResult pageResult = memberBrokerageRecordService.getMemberBrokerageRecordPage(reqVO);
+ PageResult pageResult = tradeBrokerageRecordService.getBrokerageRecordPage(reqVO);
// 断言
assertEquals(1, pageResult.getTotal());
assertEquals(1, pageResult.getList().size());
- assertPojoEquals(dbMemberBrokerageRecord, pageResult.getList().get(0));
+ assertPojoEquals(dbBrokerageRecord, pageResult.getList().get(0));
}
@Test
@@ -84,7 +84,7 @@ public class MemberBrokerageRecordServiceImplTest extends BaseDbUnitTest {
Integer percent = randomInt(1, 101);
Integer skuBrokeragePrice = randomInt();
// 调用
- int brokerage = memberBrokerageRecordService.calculateBrokerage(payPrice, percent, skuBrokeragePrice);
+ int brokerage = tradeBrokerageRecordService.calculateBrokerage(payPrice, percent, skuBrokeragePrice);
// 断言
assertEquals(brokerage, skuBrokeragePrice);
}
@@ -97,7 +97,7 @@ public class MemberBrokerageRecordServiceImplTest extends BaseDbUnitTest {
Integer skuBrokeragePrice = randomEle(new Integer[]{0, null});
System.out.println("skuBrokeragePrice=" + skuBrokeragePrice);
// 调用
- int brokerage = memberBrokerageRecordService.calculateBrokerage(payPrice, percent, skuBrokeragePrice);
+ int brokerage = tradeBrokerageRecordService.calculateBrokerage(payPrice, percent, skuBrokeragePrice);
// 断言
assertEquals(brokerage, NumberUtil.div(NumberUtil.mul(payPrice, percent), 100, 0, RoundingMode.DOWN).intValue());
}
@@ -109,7 +109,7 @@ public class MemberBrokerageRecordServiceImplTest extends BaseDbUnitTest {
Integer percent = null;
Integer skuBrokeragePrice = null;
// 调用
- int brokerage = memberBrokerageRecordService.calculateBrokerage(payPrice, percent, skuBrokeragePrice);
+ int brokerage = tradeBrokerageRecordService.calculateBrokerage(payPrice, percent, skuBrokeragePrice);
// 断言
assertEquals(brokerage, 0);
}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/user/TradeBrokerageUserServiceImplTest.java b/yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/user/TradeBrokerageUserServiceImplTest.java
new file mode 100644
index 000000000..49e8aa351
--- /dev/null
+++ b/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 pageResult = brokerageUserService.getBrokerageUserPage(reqVO);
+ // 断言
+ assertEquals(1, pageResult.getTotal());
+ assertEquals(1, pageResult.getList().size());
+ assertPojoEquals(dbBrokerageUser, pageResult.getList().get(0));
+ }
+
+}
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/test/resources/sql/clean.sql b/yudao-module-mall/yudao-module-trade-biz/src/test/resources/sql/clean.sql
index dfa4a5b42..f02fdcaf1 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/test/resources/sql/clean.sql
+++ b/yudao-module-mall/yudao-module-trade-biz/src/test/resources/sql/clean.sql
@@ -2,3 +2,5 @@ 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;
+DELETE FROM trade_brokerage_record;
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/test/resources/sql/create_tables.sql b/yudao-module-mall/yudao-module-trade-biz/src/test/resources/sql/create_tables.sql
index e30b0d225..02045d2c2 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/test/resources/sql/create_tables.sql
+++ b/yudao-module-mall/yudao-module-trade-biz/src/test/resources/sql/create_tables.sql
@@ -125,3 +125,42 @@ 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 '分销用户';
+CREATE TABLE IF NOT EXISTS "trade_brokerage_record"
+(
+ "id" int NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+ "user_id" bigint NOT NULL,
+ "biz_id" varchar NOT NULL,
+ "biz_type" varchar NOT NULL,
+ "title" varchar NOT NULL,
+ "price" int NOT NULL,
+ "total_price" int NOT NULL,
+ "description" varchar NOT NULL,
+ "status" varchar NOT NULL,
+ "frozen_days" int NOT NULL,
+ "unfreeze_time" varchar,
+ "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 '佣金记录';
\ No newline at end of file
diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/brokerage/BrokerageApi.java b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/brokerage/BrokerageApi.java
deleted file mode 100644
index d01ce5845..000000000
--- a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/brokerage/BrokerageApi.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package cn.iocoder.yudao.module.member.api.brokerage;
-
-import cn.iocoder.yudao.module.member.api.brokerage.dto.BrokerageAddReqDTO;
-
-import java.util.List;
-
-/**
- * 佣金 API 接口
- *
- * @author owen
- */
-public interface BrokerageApi {
-
- /**
- * 增加佣金
- *
- * @param userId 会员ID
- * @param list 请求参数列表
- */
- void addBrokerage(Long userId, List list);
-
- /**
- * 取消佣金
- *
- * @param userId 会员ID
- * @param bizId 业务编号
- */
- void cancelBrokerage(Long userId, String bizId);
-
-}
diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
index ba283ab0c..dc6439e74 100644
--- a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
+++ b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
@@ -13,6 +13,7 @@ public interface ErrorCodeConstants {
ErrorCode USER_NOT_EXISTS = new ErrorCode(1004001000, "用户不存在");
ErrorCode USER_MOBILE_NOT_EXISTS = new ErrorCode(1004001001, "手机号未注册用户");
ErrorCode USER_MOBILE_USED = new ErrorCode(1004001002, "修改手机失败，该手机号({})已经被使用");
+ ErrorCode MEMBER_FROZEN_BROKERAGE_PRICE_NOT_ENOUGH = new ErrorCode(1004001003, "用户冻结佣金({})数量不足");
// ========== AUTH 模块 1004003000 ==========
ErrorCode AUTH_LOGIN_BAD_CREDENTIALS = new ErrorCode(1004003000, "登录失败，账号密码不正确");
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/brokerage/BrokerageApiImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/brokerage/BrokerageApiImpl.java
deleted file mode 100644
index 2891bdcc1..000000000
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/brokerage/BrokerageApiImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package cn.iocoder.yudao.module.member.api.brokerage;
-
-import cn.iocoder.yudao.module.member.api.brokerage.dto.BrokerageAddReqDTO;
-import cn.iocoder.yudao.module.member.service.brokerage.record.MemberBrokerageRecordService;
-import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 佣金 API 实现类
- *
- * @author owen
- */
-@Service
-@Validated
-public class BrokerageApiImpl implements BrokerageApi {
-
- @Resource
- private MemberBrokerageRecordService memberBrokerageRecordService;
-
- @Override
- public void addBrokerage(Long userId, List list) {
- memberBrokerageRecordService.addBrokerage(userId, list);
- }
-
- @Override
- public void cancelBrokerage(Long userId, String bizId) {
-
- }
-}
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/brokerage/record/MemberBrokerageRecordController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/brokerage/record/MemberBrokerageRecordController.java
deleted file mode 100644
index 92cb0ae1a..000000000
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/brokerage/record/MemberBrokerageRecordController.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package cn.iocoder.yudao.module.member.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.member.controller.admin.brokerage.record.vo.MemberBrokerageRecordPageReqVO;
-import cn.iocoder.yudao.module.member.controller.admin.brokerage.record.vo.MemberBrokerageRecordRespVO;
-import cn.iocoder.yudao.module.member.convert.brokerage.record.MemberBrokerageRecordConvert;
-import cn.iocoder.yudao.module.member.dal.dataobject.brokerage.record.MemberBrokerageRecordDO;
-import cn.iocoder.yudao.module.member.service.brokerage.record.MemberBrokerageRecordService;
-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.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 佣金记录")
-@RestController
-@RequestMapping("/member/member-brokerage-record")
-@Validated
-public class MemberBrokerageRecordController {
-
- @Resource
- private MemberBrokerageRecordService memberBrokerageRecordService;
-
- @GetMapping("/get")
- @Operation(summary = "获得佣金记录")
- @Parameter(name = "id", description = "编号", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('member:member-brokerage-record:query')")
- public CommonResult getMemberBrokerageRecord(@RequestParam("id") Integer id) {
- MemberBrokerageRecordDO memberBrokerageRecord = memberBrokerageRecordService.getMemberBrokerageRecord(id);
- return success(MemberBrokerageRecordConvert.INSTANCE.convert(memberBrokerageRecord));
- }
-
- @GetMapping("/page")
- @Operation(summary = "获得佣金记录分页")
- @PreAuthorize("@ss.hasPermission('member:member-brokerage-record:query')")
- public CommonResult> getMemberBrokerageRecordPage(@Valid MemberBrokerageRecordPageReqVO pageVO) {
- PageResult pageResult = memberBrokerageRecordService.getMemberBrokerageRecordPage(pageVO);
- return success(MemberBrokerageRecordConvert.INSTANCE.convertPage(pageResult));
- }
-
-}
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/vo/config/MemberPointConfigBaseVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/vo/config/MemberPointConfigBaseVO.java
index acdadb6bc..f946e4a27 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/vo/config/MemberPointConfigBaseVO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/vo/config/MemberPointConfigBaseVO.java
@@ -1,17 +1,9 @@
package cn.iocoder.yudao.module.member.controller.admin.point.vo.config;
-import cn.iocoder.yudao.framework.common.validation.InEnum;
-import cn.iocoder.yudao.module.member.enums.brokerage.BrokerageBindModeEnum;
-import cn.iocoder.yudao.module.member.enums.brokerage.BrokerageEnabledConditionEnum;
-import cn.iocoder.yudao.module.member.enums.brokerage.BrokerageWithdrawTypeEnum;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
-import org.hibernate.validator.constraints.Range;
-import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
-import javax.validation.constraints.PositiveOrZero;
-import java.util.List;
/**
* 会员积分配置 Base VO，提供给添加、修改、详细的子 VO 使用
@@ -36,53 +28,4 @@ public class MemberPointConfigBaseVO {
@NotNull(message = "1 元赠送积分不能为空")
private Integer tradeGivePoint;
- // ========== 分销相关 ==========
-
- @Schema(description = "是否启用分佣", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "是否启用分佣不能为空")
- private Boolean brokerageEnabled;
-
- @Schema(description = "分佣模式", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
- @NotNull(message = "分佣模式不能为空")
- @InEnum(value = BrokerageEnabledConditionEnum.class, message = "分佣模式必须是 {value}")
- private Integer brokerageEnabledCondition;
-
- @Schema(description = "分销关系绑定模式", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
- @NotNull(message = "分销关系绑定模式不能为空")
- @InEnum(value = BrokerageBindModeEnum.class, message = "分销关系绑定模式必须是 {value}")
- private Integer brokerageBindMode;
-
- @Schema(description = "分销海报图地址数组", requiredMode = Schema.RequiredMode.REQUIRED, example = "[https://www.iocoder.cn/yudao.jpg]")
- private List brokeragePostUrls;
-
- @Schema(description = "一级返佣比例", requiredMode = Schema.RequiredMode.REQUIRED, example = "5")
- @NotNull(message = "一级返佣比例不能为空")
- @Range(min = 0, max = 100, message = "一级返佣比例必须在 0 - 100 之间")
- private Integer brokerageFirstPercent;
-
- @Schema(description = "二级返佣比例", requiredMode = Schema.RequiredMode.REQUIRED, example = "5")
- @NotNull(message = "二级返佣比例不能为空")
- @Range(min = 0, max = 100, message = "二级返佣比例必须在 0 - 100 之间")
- private Integer brokerageSecondPercent;
-
- @Schema(description = "用户提现最低金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
- @NotNull(message = "用户提现最低金额不能为空")
- @PositiveOrZero(message = "用户提现最低金额不能是负数")
- private Integer brokerageWithdrawMinPrice;
-
- @Schema(description = "提现银行", requiredMode = Schema.RequiredMode.REQUIRED, example = "[0, 1]")
- @NotEmpty(message = "提现银行不能为空")
- private List brokerageBankNames;
-
- @Schema(description = "佣金冻结时间(天)", requiredMode = Schema.RequiredMode.REQUIRED, example = "7")
- @NotNull(message = "佣金冻结时间(天)不能为空")
- @PositiveOrZero(message = "佣金冻结时间不能是负数")
- private Integer brokerageFrozenDays;
-
- @Schema(description = "提现方式", requiredMode = Schema.RequiredMode.REQUIRED, example = "[0, 1]")
- @NotNull(message = "提现方式不能为空")
- @InEnum(value = BrokerageWithdrawTypeEnum.class, message = "提现方式必须是 {value}")
- private List brokerageWithdrawType;
-
-
}
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/point/MemberPointConfigDO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/point/MemberPointConfigDO.java
index 8f44bd948..4a6354b03 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/point/MemberPointConfigDO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/point/MemberPointConfigDO.java
@@ -1,19 +1,11 @@
package cn.iocoder.yudao.module.member.dal.dataobject.point;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.framework.mybatis.core.type.IntegerListTypeHandler;
-import cn.iocoder.yudao.module.member.enums.brokerage.BrokerageBindModeEnum;
-import cn.iocoder.yudao.module.member.enums.brokerage.BrokerageEnabledConditionEnum;
-import cn.iocoder.yudao.module.member.enums.brokerage.BrokerageWithdrawTypeEnum;
import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import lombok.*;
-import java.util.List;
-
/**
* 会员积分配置 DO
*
@@ -53,56 +45,4 @@ public class MemberPointConfigDO extends BaseDO {
*/
private Integer tradeGivePoint;
- // ========== 分销相关 ==========
-
- /**
- * 是否启用分佣
- */
- private Boolean brokerageEnabled;
- /**
- * 分佣模式
- *
- * 枚举 {@link BrokerageEnabledConditionEnum 对应的类}
- */
- private Integer brokerageEnabledCondition;
- /**
- * 分销关系绑定模式
- *
- * 枚举 {@link BrokerageBindModeEnum 对应的类}
- */
- private Integer brokerageBindMode;
- /**
- * 分销海报图地址数组
- */
- @TableField(typeHandler = JacksonTypeHandler.class)
- private List brokeragePostUrls;
- /**
- * 一级返佣比例
- */
- private Integer brokerageFirstPercent;
- /**
- * 二级返佣比例
- */
- private Integer brokerageSecondPercent;
- /**
- * 用户提现最低金额
- */
- private Integer brokerageWithdrawMinPrice;
- /**
- * 提现银行
- */
- @TableField(typeHandler = IntegerListTypeHandler.class)
- private List brokerageBankNames;
- /**
- * 佣金冻结时间(天)
- */
- private Integer brokerageFrozenDays;
- /**
- * 提现方式
- *
- * 枚举 {@link BrokerageWithdrawTypeEnum 对应的类}
- */
- @TableField(typeHandler = IntegerListTypeHandler.class)
- private List brokerageWithdrawType;
-
}
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/brokerage/record/MemberBrokerageRecordMapper.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/brokerage/record/MemberBrokerageRecordMapper.java
deleted file mode 100644
index 52f85c1a1..000000000
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/brokerage/record/MemberBrokerageRecordMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package cn.iocoder.yudao.module.member.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.member.controller.admin.brokerage.record.vo.MemberBrokerageRecordPageReqVO;
-import cn.iocoder.yudao.module.member.dal.dataobject.brokerage.record.MemberBrokerageRecordDO;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 佣金记录 Mapper
- *
- * @author owen
- */
-@Mapper
-public interface MemberBrokerageRecordMapper extends BaseMapperX {
-
- default PageResult selectPage(MemberBrokerageRecordPageReqVO reqVO) {
- return selectPage(reqVO, new LambdaQueryWrapperX()
- .eqIfPresent(MemberBrokerageRecordDO::getUserId, reqVO.getUserId())
- .eqIfPresent(MemberBrokerageRecordDO::getBizType, reqVO.getBizType())
- .eqIfPresent(MemberBrokerageRecordDO::getStatus, reqVO.getStatus())
- .betweenIfPresent(MemberBrokerageRecordDO::getCreateTime, reqVO.getCreateTime())
- .orderByDesc(MemberBrokerageRecordDO::getId));
- }
-
-}
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java
index 39a7307c1..7e35cdf2a 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java
@@ -1,14 +1,12 @@
package cn.iocoder.yudao.module.member.dal.mysql.user;
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.StrUtil;
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.member.controller.admin.user.vo.MemberUserPageReqVO;
import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@@ -63,33 +61,4 @@ public interface MemberUserMapper extends BaseMapperX {
return selectCount(new LambdaQueryWrapperX()
.apply("FIND_IN_SET({0}, tag_ids)", tagId));
}
-
- /**
- * 更新用户可用佣金（增加）
- *
- * @param id 用户编号
- * @param incrCount 增加佣金（正数）
- */
- default void updateBrokeragePriceIncr(Long id, int incrCount) {
- Assert.isTrue(incrCount > 0);
- LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper()
- .setSql(" brokerage_price = brokerage_price + " + incrCount)
- .eq(MemberUserDO::getId, id);
- update(null, lambdaUpdateWrapper);
- }
-
- /**
- * 更新用户冻结佣金（增加）
- *
- * @param id 用户编号
- * @param incrCount 增加冻结佣金（正数）
- */
- default void updateFrozenBrokeragePriceIncr(Long id, int incrCount) {
- Assert.isTrue(incrCount > 0);
- LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper()
- .setSql(" frozen_brokerage_price = frozen_brokerage_price + " + incrCount)
- .eq(MemberUserDO::getId, id);
- update(null, lambdaUpdateWrapper);
- }
-
}
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/brokerage/record/MemberBrokerageRecordService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/brokerage/record/MemberBrokerageRecordService.java
deleted file mode 100644
index 16b82f78f..000000000
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/brokerage/record/MemberBrokerageRecordService.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package cn.iocoder.yudao.module.member.service.brokerage.record;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.member.api.brokerage.dto.BrokerageAddReqDTO;
-import cn.iocoder.yudao.module.member.controller.admin.brokerage.record.vo.MemberBrokerageRecordPageReqVO;
-import cn.iocoder.yudao.module.member.dal.dataobject.brokerage.record.MemberBrokerageRecordDO;
-
-import java.util.List;
-
-/**
- * 佣金记录 Service 接口
- *
- * @author owen
- */
-public interface MemberBrokerageRecordService {
-
- /**
- * 获得佣金记录
- *
- * @param id 编号
- * @return 佣金记录
- */
- MemberBrokerageRecordDO getMemberBrokerageRecord(Integer id);
-
- /**
- * 获得佣金记录分页
- *
- * @param pageReqVO 分页查询
- * @return 佣金记录分页
- */
- PageResult getMemberBrokerageRecordPage(MemberBrokerageRecordPageReqVO pageReqVO);
-
- /**
- * 增加佣金
- *
- * @param userId 会员ID
- * @param list 请求参数列表
- */
- void addBrokerage(Long userId, List list);
-}
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/brokerage/record/MemberBrokerageRecordServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/brokerage/record/MemberBrokerageRecordServiceImpl.java
deleted file mode 100644
index 80c753fb5..000000000
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/brokerage/record/MemberBrokerageRecordServiceImpl.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package cn.iocoder.yudao.module.member.service.brokerage.record;
-
-import cn.hutool.core.util.BooleanUtil;
-import cn.hutool.core.util.NumberUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.member.api.brokerage.dto.BrokerageAddReqDTO;
-import cn.iocoder.yudao.module.member.controller.admin.brokerage.record.vo.MemberBrokerageRecordPageReqVO;
-import cn.iocoder.yudao.module.member.convert.brokerage.record.MemberBrokerageRecordConvert;
-import cn.iocoder.yudao.module.member.dal.dataobject.brokerage.record.MemberBrokerageRecordDO;
-import cn.iocoder.yudao.module.member.dal.dataobject.point.MemberPointConfigDO;
-import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
-import cn.iocoder.yudao.module.member.dal.mysql.brokerage.record.MemberBrokerageRecordMapper;
-import cn.iocoder.yudao.module.member.service.point.MemberPointConfigService;
-import cn.iocoder.yudao.module.member.service.user.MemberUserService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-
-import javax.annotation.Resource;
-import java.math.RoundingMode;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Function;
-
-/**
- * 佣金记录 Service 实现类
- *
- * @author owen
- */
-@Slf4j
-@Service
-@Validated
-public class MemberBrokerageRecordServiceImpl implements MemberBrokerageRecordService {
-
- @Resource
- private MemberBrokerageRecordMapper memberBrokerageRecordMapper;
- @Resource
- private MemberPointConfigService memberConfigService;
- @Resource
- private MemberUserService memberUserService;
-
- @Override
- public MemberBrokerageRecordDO getMemberBrokerageRecord(Integer id) {
- return memberBrokerageRecordMapper.selectById(id);
- }
-
- @Override
- public PageResult getMemberBrokerageRecordPage(MemberBrokerageRecordPageReqVO pageReqVO) {
- return memberBrokerageRecordMapper.selectPage(pageReqVO);
- }
-
- @Override
- public void addBrokerage(Long buyerId, List list) {
- MemberPointConfigDO memberConfig = memberConfigService.getPointConfig();
- // 0 未启用分销功能
- if (memberConfig == null || !BooleanUtil.isTrue(memberConfig.getBrokerageEnabled())) {
- log.warn("[addBrokerage][增加佣金失败：brokerageEnabled 未配置，buyerId({})", buyerId);
- return;
- }
-
- // 1.1 获得一级推广人
- MemberUserDO firstUser = memberUserService.getBrokerageUser(buyerId);
- if (firstUser == null || !BooleanUtil.isTrue(firstUser.getBrokerageEnabled())) {
- return;
- }
-
- // 1.2 计算一级分佣
- addBrokerage(firstUser, list, memberConfig.getBrokerageFrozenDays(), memberConfig.getBrokerageFirstPercent(), BrokerageAddReqDTO::getSkuFirstBrokeragePrice);
-
-
- // 2.1 获得二级推广员
- MemberUserDO secondUser = memberUserService.getUser(firstUser.getBrokerageUserId());
- if (secondUser == null || !BooleanUtil.isTrue(secondUser.getBrokerageEnabled())) {
- return;
- }
-
- // 2.2 计算二级分佣
- addBrokerage(secondUser, list, memberConfig.getBrokerageFrozenDays(), memberConfig.getBrokerageSecondPercent(), BrokerageAddReqDTO::getSkuSecondBrokeragePrice);
- }
-
- /**
- * 计算佣金
- *
- * @param payPrice 订单支付金额
- * @param percent 商品 SKU 设置的佣金
- * @param skuBrokeragePrice 商品的佣金
- * @return 佣金
- */
- int calculateBrokerage(Integer payPrice, Integer percent, Integer skuBrokeragePrice) {
- // 1. 优先使用商品 SKU 设置的佣金
- if (skuBrokeragePrice != null && skuBrokeragePrice > 0) {
- return ObjectUtil.defaultIfNull(skuBrokeragePrice, 0);
- }
-
- // 2. 根据订单支付金额计算佣金
- if (payPrice != null && payPrice > 0 && percent != null && percent > 0) {
- return NumberUtil.div(NumberUtil.mul(payPrice, percent), 100, 0, RoundingMode.DOWN).intValue();
- }
-
- return 0;
- }
-
- /**
- * 增加用户佣金
- *
- * @param user 用户
- * @param list 佣金增加参数列表
- * @param brokerageFrozenDays 冻结天数
- * @param brokeragePercent 佣金比例
- * @param skuBrokeragePriceFun 商品 SKU 设置的佣金
- */
- private void addBrokerage(MemberUserDO user, List list, Integer brokerageFrozenDays,
- Integer brokeragePercent, Function skuBrokeragePriceFun) {
- // 处理冻结时间
- brokerageFrozenDays = ObjectUtil.defaultIfNull(brokerageFrozenDays, 0);
- LocalDateTime unfreezeTime = null;
- if (brokerageFrozenDays > 0) {
- unfreezeTime = LocalDateTime.now().plusDays(brokerageFrozenDays);
- }
-
- // 计算分佣
- int totalBrokerage = 0;
- List records = new ArrayList<>();
- for (BrokerageAddReqDTO dto : list) {
- int brokeragePerItem = calculateBrokerage(dto.getPayPrice(), brokeragePercent, skuBrokeragePriceFun.apply(dto));
- if (brokeragePerItem > 0) {
- int brokerage = brokeragePerItem * dto.getCount();
- records.add(MemberBrokerageRecordConvert.INSTANCE.convert(user, dto.getBizId(), brokerageFrozenDays, brokerage, unfreezeTime));
- totalBrokerage += brokerage;
- }
- }
-
- if (records.isEmpty()) {
- return;
- }
-
- // 保存佣金记录
- memberBrokerageRecordMapper.insertBatch(records);
-
- if (brokerageFrozenDays > 0) {
- // 更新用户冻结佣金
- memberUserService.updateUserFrozenBrokeragePrice(user.getId(), totalBrokerage);
- } else {
- // 更新用户可用佣金
- memberUserService.updateUserBrokeragePrice(user.getId(), totalBrokerage);
- }
- }
-
-}
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java
index 206f9f1c7..f1a0a7265 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java
@@ -166,28 +166,4 @@ public interface MemberUserService {
* @param point 积分数量
*/
void updateUserPoint(Long userId, Integer point);
-
- /**
- * 获得用户的推广人
- *
- * @param id 用户编号
- * @return 用户的推广人
- */
- MemberUserDO getBrokerageUser(Long id);
-
- /**
- * 增加用户佣金
- *
- * @param id 用户编号
- * @param brokeragePrice 用户可用佣金
- */
- void updateUserBrokeragePrice(Long id, int brokeragePrice);
-
- /**
- * 增加用户佣金
- *
- * @param id 用户编号
- * @param frozenBrokeragePrice 用户冻结佣金
- */
- void updateUserFrozenBrokeragePrice(Long id, int frozenBrokeragePrice);
}
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
index db80661c6..c5b674cc8 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
@@ -30,7 +30,6 @@ import javax.validation.Valid;
import java.time.LocalDateTime;
import java.util.Collection;
import java.util.List;
-import java.util.Optional;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.servlet.ServletUtils.getClientIP;
@@ -260,25 +259,4 @@ public class MemberUserServiceImpl implements MemberUserService {
memberUserMapper.updateById(new MemberUserDO().setId(userId).setPoint(point));
}
- @Override
- public MemberUserDO getBrokerageUser(Long id) {
- return Optional.ofNullable(id)
- .map(this::getUser)
- .map(MemberUserDO::getBrokerageUserId)
- .map(this::getUser)
- .orElse(null);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void updateUserBrokeragePrice(Long id, int brokeragePrice) {
- memberUserMapper.updateBrokeragePriceIncr(id, brokeragePrice);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void updateUserFrozenBrokeragePrice(Long id, int frozenBrokeragePrice) {
- memberUserMapper.updateFrozenBrokeragePriceIncr(id, frozenBrokeragePrice);
- }
-
}
diff --git a/yudao-module-member/yudao-module-member-biz/src/test/resources/sql/clean.sql b/yudao-module-member/yudao-module-member-biz/src/test/resources/sql/clean.sql
index 6981982c4..f972e048d 100644
--- a/yudao-module-member/yudao-module-member-biz/src/test/resources/sql/clean.sql
+++ b/yudao-module-member/yudao-module-member-biz/src/test/resources/sql/clean.sql
@@ -2,5 +2,4 @@ DELETE FROM "member_user";
DELETE FROM "member_address";
DELETE FROM "member_tag";
DELETE FROM "member_level";
-DELETE FROM "member_group";
-DELETE FROM "member_brokerage_record";
\ No newline at end of file
+DELETE FROM "member_group";
\ No newline at end of file
diff --git a/yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql b/yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
index ccefc4bf1..5fdc526b0 100644
--- a/yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
+++ b/yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
@@ -89,25 +89,4 @@ CREATE TABLE IF NOT EXISTS "member_group"
"deleted" bit NOT NULL DEFAULT FALSE,
"tenant_id" bigint not null default '0',
PRIMARY KEY ("id")
-) COMMENT '用户分组';
-CREATE TABLE IF NOT EXISTS "member_brokerage_record"
-(
- "id" int NOT NULL GENERATED BY DEFAULT AS IDENTITY,
- "user_id" bigint NOT NULL,
- "biz_id" varchar NOT NULL,
- "biz_type" varchar NOT NULL,
- "title" varchar NOT NULL,
- "price" int NOT NULL,
- "total_price" int NOT NULL,
- "description" varchar NOT NULL,
- "status" varchar NOT NULL,
- "frozen_days" int NOT NULL,
- "unfreeze_time" varchar,
- "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 '佣金记录';
\ No newline at end of file
+) COMMENT '用户分组';
\ No newline at end of file