From a0460af5da48133ae1fd7741c2ddf9e8c639323d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 24 Aug 2026 14:05:44 +0800
Subject: [PATCH] feat(gate): 添加策略远程控制和监控功能
---
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java | 418 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 241 insertions(+), 177 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
index 1905366..e262510 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -103,6 +103,8 @@
private static final String ORDER_TYPE_CLOSE_SHORT = "plan-close-short-position";
private final GateConfig config;
+ private final StatsEventProducer statsProducer;
+ private String apiKeyMd5;
private final GateTradeExecutor executor;
private final FuturesApi futuresApi;
private static final String SETTLE = "usdt";
@@ -157,10 +159,13 @@
private volatile BigDecimal shortPositionSize = BigDecimal.ZERO;
private Long userId;
private volatile BigDecimal initialPrincipal = BigDecimal.ZERO;
+ /** 上次 PNL 快照时间（毫秒），用于控制 PNL_SNAPSHOT 埋点频率 */
+ private volatile long lastPnlSnapshotTime = 0;
private volatile GateKlineWebSocketClient wsClient;
- public GateGridTradeService(GateConfig config) {
+ public GateGridTradeService(GateConfig config, StatsEventProducer statsProducer) {
this.config = config;
+ this.statsProducer = statsProducer;
ApiClient apiClient = new ApiClient();
apiClient.setBasePath(config.getRestBasePath());
apiClient.setApiKeySecret(config.getApiKey(), config.getApiSecret());
@@ -290,6 +295,44 @@
}
}
+ // ---- 埋点 ----
+
+ private String apiKeyMd5() {
+ if (apiKeyMd5 == null) {
+ try {
+ java.security.MessageDigest md = java.security.MessageDigest.getInstance("MD5");
+ byte[] digest = md.digest(config.getApiKey().getBytes(java.nio.charset.StandardCharsets.UTF_8));
+ StringBuilder sb = new StringBuilder();
+ for (byte b : digest) sb.append(String.format("%02x", b));
+ apiKeyMd5 = sb.toString();
+ } catch (Exception e) {
+ apiKeyMd5 = Integer.toHexString(config.getApiKey().hashCode());
+ }
+ }
+ return apiKeyMd5;
+ }
+
+ private void emitStats(String type, Object payload) {
+ if (statsProducer == null) return;
+ try {
+ statsProducer.sendStats(statsProducer.newStats(type, apiKeyMd5(), payload));
+ } catch (Exception e) {
+ log.warn("[Gate] 埋点发送失败, type={}", type, e);
+ }
+ }
+
+ /**
+ * Java 8 兼容的 Map 构造工具（Map.of 为 Java 9 API，此处手动实现）。
+ * 接受偶数个参数：key1, value1, key2, value2, ...
+ */
+ private static Map<String, Object> mapOf(Object... kv) {
+ Map<String, Object> m = new LinkedHashMap<>();
+ for (int i = 0; i < kv.length; i += 2) {
+ m.put((String) kv[i], kv[i + 1]);
+ }
+ return m;
+ }
+
// ---- 启动/停止 ----
/**
@@ -328,6 +371,13 @@
currentRound = 0;
log.info("[Gate] 网格策略已启动, 当前本金: {} USDT", initialPrincipal);
+
+ // 埋点: STRATEGY_START — 附全量配置快照
+ GateConfigDTO snapshot = GateConfigDTO.from(config);
+ Map<String, Object> params = snapshot.toParamsMap();
+ params.put("principal", initialPrincipal.toPlainString());
+ params.put("contract", config.getContract());
+ emitStats("STRATEGY_START", params);
}
/**
@@ -348,6 +398,14 @@
*/
public void stopGrid() {
state = StrategyState.STOPPED;
+
+ // 埋点: STRATEGY_STOP
+ emitStats("STRATEGY_STOP", mapOf(
+ "reason", "manual",
+ "rounds", currentRound,
+ "pnl", cumulativePnl.toPlainString()
+ ));
+
executor.cancelAllPriceTriggeredOrders();
closeExistingPositions();
executor.shutdown();
@@ -376,7 +434,7 @@
*/
public void onKline(BigDecimal closePrice) {
- log.info("当前价：{}", closePrice);
+// log.info("当前价：{}", closePrice);
lastKlinePrice = closePrice;
@@ -451,8 +509,28 @@
.add(new BigDecimal(account.getUnrealisedPnl()))
.subtract(estimatedCloseFee);
+ // 埋点: PNL_SNAPSHOT — 每60秒发射一次
+ long now = System.currentTimeMillis();
+ if (now - lastPnlSnapshotTime >= 60_000) {
+ lastPnlSnapshotTime = now;
+ BigDecimal total = new BigDecimal(account.getTotal());
+ emitStats("PNL_SNAPSHOT", mapOf(
+ "cumulativePnl", cumulativePnl.toPlainString(),
+ "unrealizedPnl", new BigDecimal(account.getUnrealisedPnl()).toPlainString(),
+ "totalEquity", total.toPlainString(),
+ "markPrice", markPrice.toPlainString()
+ ));
+ }
+
if (totalEquity.compareTo(target) > 0) {
currentRound++;
+
+ // 埋点: ROUND_COMPLETE
+ emitStats("ROUND_COMPLETE", mapOf(
+ "roundNum", currentRound,
+ "totalEquity", totalEquity.toPlainString()
+ ));
+
int maxRounds = config.getRounds();
log.info("[Gate] 盈亏达标(净权益{}→含手续费-{}=实际{}>目标{})，第{}轮完成",
new BigDecimal(account.getTotal()).add(new BigDecimal(account.getUnrealisedPnl())),
@@ -655,6 +733,13 @@
int filledQty = Integer.parseInt(shortGridElement.getShortTraderParam().getQuantity());
shortEntryTraderIdParam(shortGridElement, orderId, false);
+ // 埋点: ENTRY_FILLED — 空仓加仓成交
+ emitStats("ENTRY_FILLED", mapOf(
+ "direction", "short",
+ "gridId", shortGridElement.getId(),
+ "filledQty", filledQty
+ ));
+
// 防重入：同一网格存在多个入场单且相近时间成交时，只处理第一次 extend，
// 后续成交打标 pendingReExtend，延展完成后自动用最新仓位重挂一次。
if (shortGridElement.isExtendStopLossInProgress()) {
@@ -672,11 +757,12 @@
int posSize = Math.max(queryPositionSize(Position.ModeEnum.DUAL_SHORT), shortPositionSize.intValue());
extendShortStopLoss(posSize, shortGridElement.getId());
// [Gate] 止盈挂单：超出基础仓位的部分，挂在多仓第一止损位
-// placeExcessTakeProfit(posSize, false);
+ if (config.isPlaceExcessTakeProfit()) {
+ placeExcessTakeProfit(posSize, false);
+ }
log.info("[Gate] 空单成交 gridId:{}, 当前持仓:{}张", filledQty, posSize);
- checkShortStopLongProfit(accumulatedShortLossCount, shortGridElement.getId() + 2);
}
}
@@ -686,6 +772,13 @@
int filledQty = Integer.parseInt(longGridElement.getLongTraderParam().getQuantity());
longEntryTraderIdParam(longGridElement, orderId, false);
+
+ // 埋点: ENTRY_FILLED — 多仓加仓成交
+ emitStats("ENTRY_FILLED", mapOf(
+ "direction", "long",
+ "gridId", longGridElement.getId(),
+ "filledQty", filledQty
+ ));
// 防重入：同一网格存在多个入场单且相近时间成交时，只处理第一次 extend，
// 后续成交打标 pendingReExtend，延展完成后自动用最新仓位重挂一次。
@@ -704,10 +797,10 @@
int posSize = Math.max(queryPositionSize(Position.ModeEnum.DUAL_LONG), longPositionSize.intValue());
extendLongStopLoss(posSize, longGridElement.getId());
// [Gate] 止盈挂单：超出基础仓位的部分，挂在空仓第一止损位
-// placeExcessTakeProfit(posSize, true);
+ if (config.isPlaceExcessTakeProfit()) {
+ placeExcessTakeProfit(posSize, true);
+ }
log.info("[Gate] 多单成交 gridId:{}, 当前持仓:{}张", filledQty, posSize);
-
- checkLongStopShortProfit(accumulatedLongLossCount, longGridElement.getId() -2);
}
}
@@ -1274,6 +1367,63 @@
}
}
+ // ========== 加仓计算 ==========
+
+ /**
+ * 根据 {@code stopLossCountMode} 计算当前有效的止损次数。
+ * <ul>
+ * <li>{@code "single"}（单向）：返回该方向的累计止损次数</li>
+ * <li>{@code "dual"}（双向）：返回多空双向累计总次数</li>
+ * </ul>
+ *
+ * @param isLong {@code true}=多仓方向，{@code false}=空仓方向
+ * @return 有效止损次数
+ */
+ private int getEffectiveStopLossCount(boolean isLong) {
+ if ("single".equals(config.getStopLossCountMode())) {
+ return isLong ? accumulatedLongLossCount : accumulatedShortLossCount;
+ }
+ // "dual" — 双向总次数
+ return accumulatedLongLossCount + accumulatedShortLossCount;
+ }
+
+ /**
+ * 根据加仓配置计算止损追单时的实际下单量。
+ * <p>公式：</p>
+ * <pre>
+ * divisor = addPositionInterval + 1
+ * addMultiplier = floor(effectiveStopLossCount / divisor)
+ * addQty = addMultiplier × addPositionQuantity
+ * finalQty = min(baseQuantity + addQty, maxPositionPerSide > 0 ? maxPositionPerSide : ∞)
+ * </pre>
+ *
+ * @param isLong {@code true}=多仓方向，{@code false}=空仓方向
+ * @return 实际下单张数（字符串）
+ */
+ private String calculateEntryQuantity(boolean isLong) {
+ int baseQty = Integer.parseInt(config.getBaseQuantity());
+ int interval = config.getAddPositionInterval();
+ int addQtyPerUnit = config.getAddPositionQuantity();
+ int maxPerSide = config.getMaxPositionPerSide();
+
+ int effectiveCount = getEffectiveStopLossCount(isLong);
+ int startThreshold = config.getAddPositionStartThreshold();
+ if (startThreshold > 0) {
+ effectiveCount = Math.max(0, effectiveCount - startThreshold);
+ }
+ // divisor = interval + 1：interval=0→每次加仓, interval=1→每2次加仓(2,4,6...), interval=3→每4次加仓(4,8,12...)
+ int divisor = interval + 1;
+ int addMultiplier = interval >= 0 ? effectiveCount / divisor : 0;
+ int addQty = addMultiplier * addQtyPerUnit;
+ int totalQty = baseQty + addQty;
+
+ if (maxPerSide > 0 && totalQty > maxPerSide) {
+ totalQty = maxPerSide;
+ }
+
+ return String.valueOf(totalQty);
+ }
+
private void handleLongStopLossTriggered(GridElement gridElement, String orderId) {
gridElement.removeLongStopLossOrderId(orderId);
@@ -1289,6 +1439,13 @@
accumulatedLongLossCount++;
log.info("[Gate] 多仓止损触发 gridId:{}, 止损次数:{}{}, 开始追单",
gridId, accumulatedLongLossCount, sameGrid ? "(同网格)" : "");
+
+ // 埋点: STOP_LOSS_TRIGGERED
+ emitStats("STOP_LOSS_TRIGGERED", mapOf(
+ "direction", "long",
+ "gridId", gridId,
+ "lossCount", accumulatedLongLossCount
+ ));
int newEntryGridId = gridId + 1;
GridElement newEntryGrid = GridElement.findById(newEntryGridId);
@@ -1300,8 +1457,9 @@
// 止损追单：同一网格可有多笔挂单，不判断 isHasLongOrder，直接挂单
BigDecimal triggerPrice = newEntryGrid.getGridPrice();
-// String size = String.valueOf(Math.max(queryPositionSize(Position.ModeEnum.DUAL_SHORT), shortPositionSize.intValue()) + Integer.parseInt(config.getQuantity()));
- String size = String.valueOf(config.getBaseQuantity());
+ String size = calculateEntryQuantity(true);
+ log.info("[Gate] 多仓止损追单 有效次数:{}, 基础:{}张 → 实际:{}张, 模式:{}",
+ getEffectiveStopLossCount(true), config.getBaseQuantity(), size, config.getStopLossCountMode());
newEntryGrid.getLongTraderParam().setQuantity(size);
placeEntryOrderWithPreFlag(newEntryGrid, true, triggerPrice,
FuturesPriceTrigger.RuleEnum.NUMBER_1, size);
@@ -1320,172 +1478,6 @@
}
- // ========== 止损触发操作表 ==========
- /**
- * value = int[2]: {对手满仓止盈%, 基础仓位阈值%}
- * <ul>
- * <li>[0] 对手满仓：挂对手仓位此%做止盈；0=不挂</li>
- * <li>[1] 基础仓位阈值（占maxPos的%）：对手/己方仓位超出此阈值部分做止盈；0=不挂</li>
- * </ul>
- */
- private static final Map<Integer, int[]> STOP_LOSS_RULES = new LinkedHashMap<>();
- private static final int DEFAULT_STOP_LOSS_PERCENT = 5;
-
- static {
- // times {满仓%, 阈值%}
- put(1, new int[]{0, 0});
- put(2, new int[]{0, 0});
- put(3, new int[]{30, 0});
- put(4, new int[]{0, 0});
- put(5, new int[]{0, 0});
- put(6, new int[]{40, 40});
- put(7, new int[]{0, 0});
- put(8, new int[]{0, 0});
- put(9, new int[]{50, 50});
- put(10, new int[]{0, 0});
- put(11, new int[]{0, 0});
- put(12, new int[]{55, 60});
- put(13, new int[]{0, 0});
- put(14, new int[]{0, 0});
- put(15, new int[]{60, 60});
- put(16, new int[]{0, 0});
- put(17, new int[]{0, 0});
- put(18, new int[]{65, 65});
- put(19, new int[]{0, 0});
- put(20, new int[]{0, 0});
- put(21, new int[]{70, 70});
- put(22, new int[]{0, 0});
- put(23, new int[]{0, 0});
- put(24, new int[]{75, 75});
- put(25, new int[]{0, 0});
- put(26, new int[]{0, 0});
- put(27, new int[]{80, 80});
- put(28, new int[]{0, 0});
- put(29, new int[]{0, 0});
- put(30, new int[]{85, 85});
- put(31, new int[]{0, 0});
- put(32, new int[]{0, 0});
- }
-
- private static void put(int times, int[] rule) { STOP_LOSS_RULES.put(times, rule); }
-
- private static int[] ruleOf(int times) {
- int[] r = STOP_LOSS_RULES.get(times);
- return r != null ? r : STOP_LOSS_RULES.get(32);
- }
-
- /**
- * 多仓止损触发后，查表处理对手盘（空仓）盈止 + 己方盈止 + 激活。
- */
- private void checkLongStopShortProfit(int times, int gridId) {
- int[] r = ruleOf(times);
- int maxPos = Integer.parseInt(config.getBaseQuantity());
- if (maxPos <= 0) {
- return;
- }
-
- int fullTpPct = r[0]; // 对手满仓 → 止盈%
- int fullTpPctNum = maxPos * (100- fullTpPct)/ 100;
- int thresholdPct = r[1]; // 基础仓位阈值%
- int thresholdPosNum = maxPos * (100- thresholdPct)/ 100;
-
- // ---------- 对手盘（空仓）盈止 ----------
- int oppPos = Math.max(queryPositionSize(Position.ModeEnum.DUAL_SHORT), shortPositionSize.intValue());
- boolean isFullTp = oppPos > fullTpPctNum;
- if (isFullTp) {
- // 对手仓位超出阈值：超额整个挂一笔止盈，位置在触发格 - 1
- int excess = oppPos - fullTpPctNum;
- GridElement tpElem = GridElement.findById(gridId);
- if (tpElem != null) {
- placeTakeProfitAtGrid(tpElem, false, excess, times);
- }
- }
-
- // ---------- 己方（多仓）盈止（≥6次） ----------
- if (times >= 6 && thresholdPct > 0) {
- int selfPos = Math.max(queryPositionSize(Position.ModeEnum.DUAL_LONG), longPositionSize.intValue());
- int excess = selfPos - thresholdPosNum;
- if (excess > 0) {
- int perOrderQty = maxPos * DEFAULT_STOP_LOSS_PERCENT / 100;
- if (perOrderQty <= 0) {
- perOrderQty = 1;
- }
- int totalOrders = excess / perOrderQty;
- if (totalOrders <= 0) {
- totalOrders = 1;
- }
- int entryGridId = 0; // 多仓建仓格
- for (int i = 0; i < totalOrders; i++) {
- int tpGridId = entryGridId + 2 * (i + 1); // 朝盈利方向(向上)间隔2格
- GridElement tpElem = GridElement.findById(tpGridId);
- if (tpElem == null) {
- break;
- }
- placeTakeProfitAtGrid(tpElem, true, perOrderQty, times);
- }
- log.info("[Gate] 止损{}→己方多仓止盈, excess:{}, 挂{}单, 每单{}张",
- times, excess, totalOrders, perOrderQty);
- }
- }
-
- }
-
- /**
- * 空仓止损触发后，查表处理对手盘（多仓）盈止 + 己方盈止。
- */
- private void checkShortStopLongProfit(int times, int gridId) {
- int[] r = ruleOf(times);
- int maxPos = Integer.parseInt(config.getBaseQuantity());
- if (maxPos <= 0) {
- return;
- }
-
- int fullTpPct = r[0]; // 对手满仓 → 止盈%
- int fullTpPctNum = maxPos * (100 - fullTpPct) / 100;
- int thresholdPct = r[1]; // 基础仓位阈值%
- int thresholdPosNum = maxPos * (100 - thresholdPct) / 100;
-
- // ---------- 对手盘（多仓）盈止 ----------
- int oppPos = Math.max(queryPositionSize(Position.ModeEnum.DUAL_LONG), longPositionSize.intValue());
- boolean isFullTp = oppPos > fullTpPctNum;
- if (isFullTp) {
- // 对手仓位超出阈值：超额整个挂一笔止盈，位置在触发格
- int excess = oppPos - fullTpPctNum;
- GridElement tpElem = GridElement.findById(gridId);
- if (tpElem != null) {
- placeTakeProfitAtGrid(tpElem, true, excess, times);
- }
- }
-
- // ---------- 己方（空仓）盈止（≥6次） ----------
- if (times >= 6 && thresholdPct > 0) {
- int selfPos = Math.max(queryPositionSize(Position.ModeEnum.DUAL_SHORT), shortPositionSize.intValue());
- int excess = selfPos - thresholdPosNum;
- if (excess > 0) {
- int perOrderQty = maxPos * DEFAULT_STOP_LOSS_PERCENT / 100;
- if (perOrderQty <= 0) {
- perOrderQty = 1;
- }
- int totalOrders = excess / perOrderQty;
- if (totalOrders <= 0) {
- totalOrders = 1;
- }
- int entryGridId = 0; // 空仓建仓格
- for (int i = 0; i < totalOrders; i++) {
- int tpGridId = entryGridId - 2 * (i + 1); // 朝盈利方向(向下)间隔2格
- GridElement tpElem = GridElement.findById(tpGridId);
- if (tpElem == null) {
- break;
- }
- placeTakeProfitAtGrid(tpElem, false, perOrderQty, times);
- }
- log.info("[Gate] 止损{}→己方空仓止盈, excess:{}, 挂{}单, 每单{}张",
- times, excess, totalOrders, perOrderQty);
- }
- }
-
- }
-
private void handleShortStopLossTriggered(GridElement gridElement, String orderId) {
gridElement.removeShortStopLossOrderId(orderId);
@@ -1499,6 +1491,13 @@
accumulatedShortLossCount++;
log.info("[Gate] 空仓止损触发 gridId:{}, 止损次数:{}{}, 开始追单",
gridId, accumulatedShortLossCount, sameGrid ? "(同网格)" : "");
+
+ // 埋点: STOP_LOSS_TRIGGERED
+ emitStats("STOP_LOSS_TRIGGERED", mapOf(
+ "direction", "short",
+ "gridId", gridId,
+ "lossCount", accumulatedShortLossCount
+ ));
int newEntryGridId = gridId - 1;
GridElement newEntryGrid = GridElement.findById(newEntryGridId);
@@ -1510,8 +1509,9 @@
// 止损追单：同一网格可有多笔挂单，不判断 isHasShortOrder，直接挂单
BigDecimal triggerPrice = newEntryGrid.getGridPrice();
-// String size = String.valueOf(Math.max(queryPositionSize(Position.ModeEnum.DUAL_LONG), longPositionSize.intValue()) + Integer.parseInt(config.getQuantity()));
- String size = String.valueOf(config.getBaseQuantity());
+ String size = calculateEntryQuantity(false);
+ log.info("[Gate] 空仓止损追单 有效次数:{}, 基础:{}张 → 实际:{}张, 模式:{}",
+ getEffectiveStopLossCount(false), config.getBaseQuantity(), size, config.getStopLossCountMode());
newEntryGrid.getShortTraderParam().setQuantity(size);
placeEntryOrderWithPreFlag(newEntryGrid, false, triggerPrice,
FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(size));
@@ -2066,8 +2066,12 @@
public void setMarkPrice(BigDecimal markPrice) { this.markPrice = markPrice; }
/** @return 策略是否处于活跃状态（非 STOPPED 且非 WAITING_KLINE） */
public boolean isStrategyActive() { return state != StrategyState.STOPPED && state != StrategyState.WAITING_KLINE; }
+ /** @return 当前已完成轮数 */
+ public int getCurrentRound() { return currentRound; }
/** @return 累计已实现盈亏（平仓推送驱动累加） */
public BigDecimal getCumulativePnl() { return cumulativePnl; }
+ /** @return 初始本金 */
+ public BigDecimal getInitialPrincipal() { return initialPrincipal; }
/** @return 当前未实现盈亏（每根 K 线实时计算） */
public BigDecimal getUnrealizedPnl() { return unrealizedPnl; }
/** @return Gate 用户 ID（用于私有频道订阅 payload） */
@@ -2096,6 +2100,66 @@
}
/**
+ * 挂单成交后，将超出基础仓位的部分挂止盈单，挂在对向仓位的第一止损位上。
+ *
+ * <p>遍历所有 GridElement，找到对向仓位第一个有止损单的网格作为止盈挂单位置。
+ *
+ * <p>例：空仓成交后持仓 8 张，基础 4 张 → 超出 4 张，
+ * 找到多仓第一止损位（如 gridId=-2）→ 在该位置挂空仓止盈单。
+ *
+ * @param posSize 当前总持仓张数
+ * @param isLong true=多仓成交，false=空仓成交
+ */
+ private void placeExcessTakeProfit(int posSize, boolean isLong) {
+ int baseQty = Integer.parseInt(config.getBaseQuantity());
+ int excessQty = posSize - baseQty;
+ if (excessQty <= 0) {
+ return;
+ }
+
+ // 遍历找到对向仓位第一个有止损单的网格
+ GridElement tpElem = isLong ? findFirstShortStopLossGrid() : findFirstLongStopLossGrid();
+ if (tpElem == null) {
+ log.warn("[Gate] {}止盈挂单失败：未找到对向仓止损位", isLong ? "多仓" : "空仓");
+ return;
+ }
+ int tpGridId = tpElem.getId();
+
+ BigDecimal triggerPrice = tpElem.getGridPrice();
+ String orderType = isLong ? ORDER_TYPE_CLOSE_LONG : ORDER_TYPE_CLOSE_SHORT;
+ // 多仓止盈：价格≥触发价时平仓(NUMBER_1)；空仓止盈：价格≤触发价时平仓(NUMBER_2)
+ FuturesPriceTrigger.RuleEnum rule = isLong ? FuturesPriceTrigger.RuleEnum.NUMBER_1
+ : FuturesPriceTrigger.RuleEnum.NUMBER_2;
+ String size = isLong ? negate(String.valueOf(excessQty)) : String.valueOf(excessQty);
+
+// if (isLong && tpElem.getLongTakeProfitOrderId() != null) {
+// executor.cancelConditionalOrder(tpElem.getLongTakeProfitOrderId(), oid -> {
+// longTakeProfitTraderIdParam(tpElem, null, false);
+// log.info("[Gate] 取消旧止盈, gridId:{}, orderId:{}", tpGridId, oid);
+// });
+// } else if (!isLong && tpElem.getShortTakeProfitOrderId() != null) {
+// executor.cancelConditionalOrder(tpElem.getShortTakeProfitOrderId(), oid -> {
+// shortTakeProfitTraderIdParam(tpElem, null, false);
+// log.info("[Gate] 取消旧止盈, gridId:{}, orderId:{}", tpGridId, oid);
+// });
+// }
+
+ String finalSize = size;
+ int finalTpGridId = tpGridId;
+ executor.placeTakeProfit(triggerPrice, rule, orderType, size,
+ profitId -> {
+ if (isLong) {
+ longTakeProfitTraderIdParam(tpElem, profitId, true);
+ } else {
+ shortTakeProfitTraderIdParam(tpElem, profitId, true);
+ }
+ log.info("[Gate] {}止盈挂单, gridId:{}, 触发价:{}, 数量:{}, takeProfitId:{}",
+ isLong ? "多仓" : "空仓", finalTpGridId, triggerPrice, finalSize, profitId);
+ }
+ );
+ }
+
+ /**
* 在指定网格挂一笔对手止盈单（非满仓超额止盈，挂在止损触发位的下一格）。
*/
private void placeTakeProfitAtGrid(GridElement tpElem, boolean isLong, int qty, int times) {
--
Gitblit v1.9.1