From 9787ba2e4ea3d6299faaceb486df74d24be1fe7d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 17 Jul 2026 16:31:13 +0800
Subject: [PATCH] feat(gate): 添加止盈网格跨度配置功能
---
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 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 4402a94..592992a 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -672,12 +672,15 @@
int shortGridQty = Integer.parseInt(config.getQuantity());
int shortTpCount = posSize > shortBaseQty ? (posSize - shortBaseQty) / shortGridQty : 0;
+ int tpSpan = config.getTakeProfitGridSpan();
for (int i = 0; i < shortTpCount; i++) {
- int tpGridId = shortGridElement.getId() - 2 * (i + 1);
+ int tpGridId = shortGridElement.getId() - tpSpan * (i + 1);
GridElement tpElem = GridElement.findById(tpGridId);
- if (tpElem == null || tpElem.getShortTakeProfitOrderId() != null) {
+ // 用 takeProfitPlaced 做同步标记，避免异步回调未执行时重复挂单
+ if (tpElem == null || tpElem.getShortTraderParam().isTakeProfitPlaced()) {
continue;
}
+ tpElem.getShortTraderParam().setTakeProfitPlaced(true);
BigDecimal tpPrice = tpElem.getGridPrice();
int finalTpGridId = tpGridId;
executor.placeTakeProfit(
@@ -738,12 +741,15 @@
int longGridQty = Integer.parseInt(config.getQuantity());
int longTpCount = posSize > longBaseQty ? (posSize - longBaseQty) / longGridQty : 0;
+ int tpSpan = config.getTakeProfitGridSpan();
for (int i = 0; i < longTpCount; i++) {
- int tpGridId = longGridElement.getId() + 2 * (i + 1);
+ int tpGridId = longGridElement.getId() + tpSpan * (i + 1);
GridElement tpElem = GridElement.findById(tpGridId);
- if (tpElem == null || tpElem.getLongTakeProfitOrderId() != null) {
+ // 用 takeProfitPlaced 做同步标记，避免异步回调未执行时重复挂单
+ if (tpElem == null || tpElem.getLongTraderParam().isTakeProfitPlaced()) {
continue;
}
+ tpElem.getLongTraderParam().setTakeProfitPlaced(true);
BigDecimal tpPrice = tpElem.getGridPrice();
int finalTpGridId = tpGridId;
executor.placeTakeProfit(
@@ -1217,7 +1223,8 @@
});
}
}
- cancelCursor = GridElement.findById(cancelCursor.getUpId());
+ Integer nextUpId = cancelCursor.getUpId();
+ cancelCursor = nextUpId != null ? GridElement.findById(nextUpId) : null;
}
// log.info("[Gate-2] 多仓仓位归零 空仓队列触发, 匹配：{}，当前价：{}", matched, currentPrice);
if (!newEntryGrid.isHasLongOrder()) {
@@ -1271,7 +1278,8 @@
});
}
}
- cancelCursor = GridElement.findById(cancelCursor.getDownId());
+ Integer nextDownId = cancelCursor.getDownId();
+ cancelCursor = nextDownId != null ? GridElement.findById(nextDownId) : null;
}
// log.info("[Gate-4] 空仓仓位归零 多仓队列触发, 匹配：{}，当前价：{}", matched, currentPrice);
if (!newEntryGrid.isHasShortOrder()){
@@ -1592,6 +1600,7 @@
for (GridElement e : config.getGridElements()) {
String tpId = e.getLongTakeProfitOrderId();
if (tpId != null) {
+ e.getLongTraderParam().setTakeProfitPlaced(false);
e.setLongTakeProfitOrderId(null);
executor.cancelConditionalOrder(tpId, oid -> {});
}
@@ -1611,6 +1620,7 @@
for (GridElement e : config.getGridElements()) {
String tpId = e.getShortTakeProfitOrderId();
if (tpId != null) {
+ e.getShortTraderParam().setTakeProfitPlaced(false);
e.setShortTakeProfitOrderId(null);
executor.cancelConditionalOrder(tpId, oid -> {});
}
--
Gitblit v1.9.1