From befbf57e4112d07003bff18102f556a1e5a154de Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 22 Apr 2026 10:53:37 +0800
Subject: [PATCH] 1
---
trading-order-bean/src/main/java/com/yami/trading/bean/trader/domain/Trader.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/trading-order-bean/src/main/java/com/yami/trading/bean/trader/domain/Trader.java b/trading-order-bean/src/main/java/com/yami/trading/bean/trader/domain/Trader.java
index 9d6e154..18a8143 100644
--- a/trading-order-bean/src/main/java/com/yami/trading/bean/trader/domain/Trader.java
+++ b/trading-order-bean/src/main/java/com/yami/trading/bean/trader/domain/Trader.java
@@ -2,9 +2,13 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.yami.trading.bean.trader.FollowCommissionType;
import com.yami.trading.common.domain.BaseEntity;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.type.JdbcType;
+
+import java.math.BigDecimal;
/**
* 交易员
@@ -36,10 +40,25 @@
private String symbols;
/**
- * 利润分成比例
+ * 利润分成比例（LEGACY：单笔盈利平仓时按此比例抽成）
*/
@TableField("PROFIT_SHARE_RATIO")
private double profitShareRatio;
+
+ /**
+ * 跟单佣金类型：LEGACY / MONTHLY_FIXED / DAILY_PROFIT_PCT
+ */
+ @TableField("FOLLOW_COMMISSION_TYPE")
+ private String followCommissionType = FollowCommissionType.LEGACY;
+
+ @TableField("FOLLOW_COMMISSION_MONTHLY_AMOUNT")
+ private BigDecimal followCommissionMonthlyAmount = BigDecimal.ZERO;
+
+ /**
+ * 按日总盈利提成比例，0~1（与 PROFIT_SHARE_RATIO 存法一致）
+ */
+ @TableField("FOLLOW_COMMISSION_DAILY_PCT")
+ private double followCommissionDailyPct;
/**
* 状态（是否开启跟单）---STATE,0为未开启，1为开启
@@ -205,10 +224,10 @@
@TableField("DEVIATION_FOLLOWER_NOW")
private int deviationFollowerNow;
/**
- * 跟单最小下单数
+ * 跟单最小下单数（币数量，支持小数；与库表 DECIMAL 对齐，避免 ORM/JDBC 整型转换异常）
*/
- @TableField("FOLLOW_VOLUMN_MIN")
- private int followVolumnMin;
+ @TableField(value = "FOLLOW_VOLUMN_MIN", jdbcType = JdbcType.DECIMAL)
+ private BigDecimal followVolumnMin;
/**
* 审核: 0-待审核,1-审核通过,-1审核不通过
--
Gitblit v1.9.3