From 2562c3a1d550243112d60189e2e97c318404a460 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 22 Jun 2026 13:33:10 +0800
Subject: [PATCH] Merge branch 'gate-zhisun-v2-58b6d8d7b7a6d7b83caed6184026cf63' of http://120.27.238.55:7000/r/exchange into gate-zhisun-v2-58b6d8d7b7a6d7b83caed6184026cf63
---
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 169 insertions(+), 2 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 3bf8290..f787a58 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -599,20 +599,22 @@
return;
}
- // [Gate-需求1] 多仓止盈触发：清空止盈状态 + 取消最远多仓止损
+ // [Gate-需求1] 多仓止盈触发：清空止盈状态 + 取消最远多仓止损 + 检查是否最后一个止盈
GridElement longTpElem = GridElement.findByLongTakeProfitOrderId(orderId);
if (longTpElem != null && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")) {
longTakeProfitTraderIdParam(longTpElem, null, false);
log.info("[Gate] 多仓止盈触发 gridId:{}, orderId:{}", longTpElem.getId(), orderId);
cancelFarthestLongStopLoss();
+ checkLastTakeProfitAndRestart();
return;
}
- // [Gate-需求1] 空仓止盈触发：清空止盈状态 + 取消最远空仓止损
+ // [Gate-需求1] 空仓止盈触发：清空止盈状态 + 取消最远空仓止损 + 检查是否最后一个止盈
GridElement shortTpElem = GridElement.findByShortTakeProfitOrderId(orderId);
if (shortTpElem != null && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")) {
shortTakeProfitTraderIdParam(shortTpElem, null, false);
log.info("[Gate] 空仓止盈触发 gridId:{}, orderId:{}", shortTpElem.getId(), orderId);
cancelFarthestShortStopLoss();
+ checkLastTakeProfitAndRestart();
return;
}
@@ -1283,6 +1285,171 @@
}
}
+ // ========== 止盈/止损取消辅助方法 ==========
+
+ /**
+ * 止盈触发后检查跨度是否达至要求，满足条件则重启策略。
+ *
+ * <h3>跨度定义</h3>
+ * {@code restartGridSpan} 表示多少倍的绝对步长 step（= 短基价 × gridRate）。
+ *
+ * <h3>判断逻辑</h3>
+ * <ol>
+ * <li>多空双边均有持仓：longEntryPrice − shortEntryPrice > span × step</li>
+ * <li>仅持多仓：currentPrice − longEntryPrice > span × step</li>
+ * <li>仅持空仓：shortEntryPrice − currentPrice > span × step</li>
+ * </ol>
+ * restartGridSpan=0 时禁用此功能。重启复用仓位归零模式：取消全部条件单 → 平仓 → 延迟启动。
+ */
+ private void checkLastTakeProfitAndRestart() {
+ int span = config.getRestartGridSpan();
+ if (span <= 0) {
+ return;
+ }
+ BigDecimal step = config.getStep();
+ if (step == null || step.compareTo(BigDecimal.ZERO) == 0) {
+ return;
+ }
+ BigDecimal threshold = step.multiply(new BigDecimal(span));
+
+ BigDecimal currentPrice = lastKlinePrice;
+ if (currentPrice == null || currentPrice.compareTo(BigDecimal.ZERO) == 0) {
+ return;
+ }
+
+ boolean shouldRestart = false;
+ String reason = "";
+
+ if (longActive && shortActive) {
+ // 多空双边持仓：多均价 − 空均价 > span × step
+ BigDecimal gap = longEntryPrice.subtract(shortEntryPrice);
+ if (gap.compareTo(threshold) > 0) {
+ shouldRestart = true;
+ reason = StrUtil.format("双边跨度 多均价:{} − 空均价:{} = {} > {} (span:{}×step:{})",
+ longEntryPrice, shortEntryPrice, gap, threshold, span, step);
+ }
+ } else if (longActive) {
+ // 仅持多仓：当前价 − 多均价 > span × step
+ BigDecimal gap = currentPrice.subtract(longEntryPrice);
+ if (gap.compareTo(threshold) > 0) {
+ shouldRestart = true;
+ reason = StrUtil.format("多仓跨度 当前价:{} − 多均价:{} = {} > {} (span:{}×step:{})",
+ currentPrice, longEntryPrice, gap, threshold, span, step);
+ }
+ } else if (shortActive) {
+ // 仅持空仓：空均价 − 当前价 > span × step
+ BigDecimal gap = shortEntryPrice.subtract(currentPrice);
+ if (gap.compareTo(threshold) > 0) {
+ shouldRestart = true;
+ reason = StrUtil.format("空仓跨度 空均价:{} − 当前价:{} = {} > {} (span:{}×step:{})",
+ shortEntryPrice, currentPrice, gap, threshold, span, step);
+ }
+ }
+
+ if (shouldRestart) {
+ log.info("[Gate] 跨度已达要求 → {}，最后一个止盈触发策略重启", reason);
+ try {
+ futuresApi.cancelPriceTriggeredOrderList(SETTLE, config.getContract());
+ } catch (ApiException ex) {
+ log.warn("[Gate] 重启前清理条件单失败", ex);
+ }
+ closeExistingPositions();
+ state = StrategyState.STOPPED;
+ executor.submitTask(() -> {
+ try { Thread.sleep(3000); } catch (InterruptedException ex) { Thread.currentThread().interrupt(); }
+ startGrid();
+ });
+ }
+ }
+
+ /**
+ * 取消最远的多仓止损订单。
+ * 多仓止损在 gridId 负方向，最远 = id 最小。
+ */
+ private void cancelFarthestLongStopLoss() {
+ GridElement farthest = null;
+ for (GridElement e : config.getGridElements()) {
+ if (e.getLongStopLossOrderId() != null) {
+ if (farthest == null || e.getId() < farthest.getId()) {
+ farthest = e;
+ }
+ }
+ }
+ if (farthest != null) {
+ String slId = farthest.getLongStopLossOrderId();
+ farthest.setLongStopLossOrderId(null);
+ GridElement.refreshIndices();
+ GridElement finalFarthest = farthest;
+ executor.cancelConditionalOrder(slId, oid ->
+ log.info("[Gate] 止盈触发, 取消最远多仓止损 gridId:{}, orderId:{}", finalFarthest.getId(), slId));
+ }
+ }
+
+ /**
+ * 取消最远的空仓止损订单。
+ * 空仓止损在 gridId 正方向，最远 = id 最大。
+ */
+ private void cancelFarthestShortStopLoss() {
+ GridElement farthest = null;
+ for (GridElement e : config.getGridElements()) {
+ if (e.getShortStopLossOrderId() != null) {
+ if (farthest == null || e.getId() > farthest.getId()) {
+ farthest = e;
+ }
+ }
+ }
+ if (farthest != null) {
+ String slId = farthest.getShortStopLossOrderId();
+ farthest.setShortStopLossOrderId(null);
+ GridElement.refreshIndices();
+ GridElement finalFarthest = farthest;
+ executor.cancelConditionalOrder(slId, oid ->
+ log.info("[Gate] 止盈触发, 取消最远空仓止损 gridId:{}, orderId:{}", finalFarthest.getId(), slId));
+ }
+ }
+
+ /**
+ * 取消所有多仓止盈 + 多仓止损订单（加仓后重建前清场）。
+ */
+ private void cancelAllLongTakeProfitsAndStopLosses() {
+ for (GridElement e : config.getGridElements()) {
+ String tpId = e.getLongTakeProfitOrderId();
+ if (tpId != null) {
+ e.setLongTakeProfitOrderId(null);
+ executor.cancelConditionalOrder(tpId, oid -> {});
+ }
+ String slId = e.getLongStopLossOrderId();
+ if (slId != null) {
+ e.setLongStopLossOrderId(null);
+ executor.cancelConditionalOrder(slId, oid -> {});
+ }
+ }
+ GridElement.refreshIndices();
+ log.info("[Gate] 已提交取消所有多仓止盈+止损");
+ }
+
+ /**
+ * 取消所有空仓止盈 + 空仓止损订单（加仓后重建前清场）。
+ */
+ private void cancelAllShortTakeProfitsAndStopLosses() {
+ for (GridElement e : config.getGridElements()) {
+ String tpId = e.getShortTakeProfitOrderId();
+ if (tpId != null) {
+ e.setShortTakeProfitOrderId(null);
+ executor.cancelConditionalOrder(tpId, oid -> {});
+ }
+ String slId = e.getShortStopLossOrderId();
+ if (slId != null) {
+ e.setShortStopLossOrderId(null);
+ executor.cancelConditionalOrder(slId, oid -> {});
+ }
+ }
+ GridElement.refreshIndices();
+ log.info("[Gate] 已提交取消所有空仓止盈+止损");
+ }
+
+ // ========== 止损追单 ==========
+
private void extendLongStopLoss(int filledQty,int gridId) {
int furthestSlId = 0;
for (GridElement e : config.getGridElements()) {
--
Gitblit v1.9.1