From 1cbbbb86a6ed0036540ff40f9d0051d400d692b4 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 11 May 2026 17:01:35 +0800
Subject: [PATCH] refactor(gateApi): 优化网格交易逻辑和止盈策略
---
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java | 88 ++++++++++++++++++++++++-------------------
1 files changed, 49 insertions(+), 39 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 ee9b68d..feb3fa0 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -354,7 +354,7 @@
* <li><b>有仓位 (size ≠ 0)</b>：
* <ul>
* <li>首次开仓（基底）：标记 baseOpened=true，记录基底入场价，双基底都成交后生成网格队列</li>
- * <li>仓位净增加（size > 之前记录值）：说明网格触发了新开仓 → 设止盈条件单</li>
+ * <li>仓位净增加（size > 之前记录值）：说明网格触发了新开仓 → 取对应方向队列首元素为止盈价，设止盈条件单</li>
* <li>仓位减少或不变（止盈平仓后）：仅更新 positionSize，不重复设止盈</li>
* </ul>
* </li>
@@ -386,10 +386,14 @@
tryGenerateQueues();
} else if (size.compareTo(longPositionSize) > 0) {
longPositionSize = size;
- BigDecimal tpPrice = entryPrice.multiply(BigDecimal.ONE.add(config.getGridRate())).setScale(1, RoundingMode.HALF_UP);
- executor.placeTakeProfit(tpPrice,
- FuturesPriceTrigger.RuleEnum.NUMBER_1, ORDER_TYPE_CLOSE_LONG, negate(config.getQuantity()));
- log.info("[Gate] 多单止盈已设, entry:{}, tp:{}, size:{}", entryPrice, tpPrice, negate(config.getQuantity()));
+ if (longPriceQueue.isEmpty()) {
+ log.warn("[Gate] 多仓队列为空，无法设止盈");
+ } else {
+ BigDecimal tpPrice = longPriceQueue.get(0);
+ executor.placeTakeProfit(tpPrice,
+ FuturesPriceTrigger.RuleEnum.NUMBER_1, ORDER_TYPE_CLOSE_LONG, negate(config.getQuantity()));
+ log.info("[Gate] 多单止盈已设, entry:{}, tp:{}, size:{}", entryPrice, tpPrice, negate(config.getQuantity()));
+ }
} else {
longPositionSize = size;
}
@@ -409,10 +413,14 @@
tryGenerateQueues();
} else if (size.abs().compareTo(shortPositionSize) > 0) {
shortPositionSize = size.abs();
- BigDecimal tpPrice = entryPrice.multiply(BigDecimal.ONE.subtract(config.getGridRate())).setScale(1, RoundingMode.HALF_UP);
- executor.placeTakeProfit(tpPrice,
- FuturesPriceTrigger.RuleEnum.NUMBER_2, ORDER_TYPE_CLOSE_SHORT, config.getQuantity());
- log.info("[Gate] 空单止盈已设, entry:{}, tp:{}, size:{}", entryPrice, tpPrice, config.getQuantity());
+ if (shortPriceQueue.isEmpty()) {
+ log.warn("[Gate] 空仓队列为空，无法设止盈");
+ } else {
+ BigDecimal tpPrice = shortPriceQueue.get(0);
+ executor.placeTakeProfit(tpPrice,
+ FuturesPriceTrigger.RuleEnum.NUMBER_2, ORDER_TYPE_CLOSE_SHORT, config.getQuantity());
+ log.info("[Gate] 空单止盈已设, entry:{}, tp:{}, size:{}", entryPrice, tpPrice, config.getQuantity());
+ }
} else {
shortPositionSize = size.abs();
}
@@ -512,10 +520,10 @@
* <h3>执行流程</h3>
* <ol>
* <li>匹配队列元素 → 为空则直接返回</li>
- * <li>保证金检查 → 安全则开空一次</li>
- * <li>额外反向开多：若多仓均价 > 空仓均价 且 当前价夹在中间且远离多仓均价</li>
* <li>空仓队列：移除 matched 元素，尾部补充新元素（尾价 × (1 − gridRate) 循环递减）</li>
* <li>多仓队列：以多仓队列首元素（最小价）为种子，生成 matched.size() 个递减元素加入</li>
+ * <li>保证金检查 → 安全则开空一次</li>
+ * <li>额外反向开多：若多仓均价 > 空仓均价 且 当前价夹在中间且远离多仓均价</li>
* </ol>
*
* <h3>多仓队列转移过滤</h3>
@@ -538,19 +546,6 @@
return;
}
log.info("[Gate] 空仓队列触发, 匹配{}个元素, 当前价:{}", matched.size(), currentPrice);
- if (!isMarginSafe()) {
- log.warn("[Gate] 保证金超限，跳过空单开仓");
- } else {
- executor.openShort(negate(config.getQuantity()), null, null);
- if (shortEntryPrice.compareTo(BigDecimal.ZERO) > 0
- && longEntryPrice.compareTo(BigDecimal.ZERO) > 0
- && longEntryPrice.compareTo(shortEntryPrice) > 0
- && currentPrice.compareTo(shortEntryPrice) > 0
- && currentPrice.compareTo(longEntryPrice.multiply(BigDecimal.ONE.subtract(config.getGridRate()))) < 0) {
- executor.openLong(config.getQuantity(), null, null);
- log.info("[Gate] 触发价在多/空持仓价之间且多>空且远离多仓均价, 额外开多一次, 当前价:{}", currentPrice);
- }
- }
synchronized (shortPriceQueue) {
shortPriceQueue.removeAll(matched);
@@ -586,6 +581,20 @@
}
log.info("[Gate] 现多队列:{}", longPriceQueue);
}
+
+ if (!isMarginSafe()) {
+ log.warn("[Gate] 保证金超限，跳过空单开仓");
+ } else {
+ executor.openShort(negate(config.getQuantity()), null, null);
+ if (shortEntryPrice.compareTo(BigDecimal.ZERO) > 0
+ && longEntryPrice.compareTo(BigDecimal.ZERO) > 0
+ && longEntryPrice.compareTo(shortEntryPrice) > 0
+ && currentPrice.compareTo(shortEntryPrice) > 0
+ && currentPrice.compareTo(longEntryPrice.multiply(BigDecimal.ONE.subtract(config.getGridRate()))) < 0) {
+ executor.openLong(config.getQuantity(), null, null);
+ log.info("[Gate] 触发价在多/空持仓价之间且多>空且远离多仓均价, 额外开多一次, 当前价:{}", currentPrice);
+ }
+ }
}
/**
@@ -598,10 +607,10 @@
* <h3>执行流程</h3>
* <ol>
* <li>匹配队列元素 → 为空则直接返回</li>
- * <li>保证金检查 → 安全则开多一次</li>
- * <li>额外反向开空：若多仓均价 > 空仓均价 且 当前价夹在中间且远离空仓均价</li>
* <li>多仓队列：移除 matched 元素，尾部补充新元素（尾价 × (1 + gridRate) 循环递增）</li>
* <li>空仓队列：以空仓队列首元素（最高价）为种子，生成 matched.size() 个递增元素加入</li>
+ * <li>保证金检查 → 安全则开多一次</li>
+ * <li>额外反向开空：若多仓均价 > 空仓均价 且 当前价夹在中间且远离空仓均价</li>
* </ol>
*
* <h3>空仓队列转移过滤</h3>
@@ -625,19 +634,6 @@
}
log.info("[Gate] 多仓队列触发, 匹配{}个元素, 当前价:{}", matched.size(), currentPrice);
- if (!isMarginSafe()) {
- log.warn("[Gate] 保证金超限，跳过多单开仓");
- } else {
- executor.openLong(config.getQuantity(), null, null);
- if (shortEntryPrice.compareTo(BigDecimal.ZERO) > 0
- && longEntryPrice.compareTo(BigDecimal.ZERO) > 0
- && longEntryPrice.compareTo(shortEntryPrice) > 0
- && currentPrice.compareTo(shortEntryPrice.multiply(BigDecimal.ONE.add(config.getGridRate()))) > 0
- && currentPrice.compareTo(longEntryPrice) < 0) {
- executor.openShort(negate(config.getQuantity()), null, null);
- log.info("[Gate] 触发价在多/空持仓价之间且多>空且远离空仓均价, 额外开空一次, 当前价:{}", currentPrice);
- }
- }
synchronized (longPriceQueue) {
longPriceQueue.removeAll(matched);
@@ -673,6 +669,20 @@
}
log.info("[Gate] 现空队列:{}", shortPriceQueue);
}
+
+ if (!isMarginSafe()) {
+ log.warn("[Gate] 保证金超限，跳过多单开仓");
+ } else {
+ executor.openLong(config.getQuantity(), null, null);
+ if (shortEntryPrice.compareTo(BigDecimal.ZERO) > 0
+ && longEntryPrice.compareTo(BigDecimal.ZERO) > 0
+ && longEntryPrice.compareTo(shortEntryPrice) > 0
+ && currentPrice.compareTo(shortEntryPrice.multiply(BigDecimal.ONE.add(config.getGridRate()))) > 0
+ && currentPrice.compareTo(longEntryPrice) < 0) {
+ executor.openShort(negate(config.getQuantity()), null, null);
+ log.info("[Gate] 触发价在多/空持仓价之间且多>空且远离空仓均价, 额外开空一次, 当前价:{}", currentPrice);
+ }
+ }
}
// ---- 保证金安全阀 ----
--
Gitblit v1.9.1