From 06f958dba5969ba4b8f81e46a0cfb75c6aeb3e9b Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 08 Oct 2026 10:38:04 +0800
Subject: [PATCH] fix(gate-api): 修复网格交易重置策略中的竞态条件问题
---
src/main/java/com/xcong/excoin/modules/gateApi/GridElement.java | 93 +++++++++++++++++++++++++++++-----------------
1 files changed, 59 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/gateApi/GridElement.java b/src/main/java/com/xcong/excoin/modules/gateApi/GridElement.java
index c5ef00f..3d80889 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GridElement.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GridElement.java
@@ -30,7 +30,7 @@
* <tr><td>标识</td><td>id, gridPrice, upId, downId</td><td>编号、价格、双向链表指针</td></tr>
* <tr><td>多仓订单</td><td>hasLongOrder, longOrderId, longTraderParam</td><td>是否有挂单、订单ID、完整参数</td></tr>
* <tr><td>空仓订单</td><td>hasShortOrder, shortOrderId, shortTraderParam</td><td>是否有挂单、订单ID、完整参数</td></tr>
- * <tr><td>止盈</td><td>longTakeProfitOrderId, shortTakeProfitOrderId</td><td>止盈条件单ID</td></tr>
+ * <tr><td>止盈</td><td>longTakeProfitOrderIds, shortTakeProfitOrderIds</td><td>止盈条件单ID列表</td></tr>
* </table>
*
* <h3>6 个全局 O(1) 索引</h3>
@@ -83,10 +83,10 @@
private List<String> longOrderIds = new ArrayList<>();
/** 空仓挂单订单 ID 列表（支持同一网格多个挂单，由止损追单产生） */
private List<String> shortOrderIds = new ArrayList<>();
- /** 多仓止盈订单 ID */
- private String longTakeProfitOrderId;
- /** 空仓止盈订单 ID */
- private String shortTakeProfitOrderId;
+ /** 多仓止盈订单 ID 列表（支持一网格多笔止盈单：基础止盈 + 超额止盈并行挂单） */
+ private List<String> longTakeProfitOrderIds = new ArrayList<>();
+ /** 空仓止盈订单 ID 列表（支持一网格多笔止盈单：基础止盈 + 超额止盈并行挂单） */
+ private List<String> shortTakeProfitOrderIds = new ArrayList<>();
/** 多仓止损订单 ID 列表（支持一个网格多个止损单） */
private List<String> longStopLossOrderIds = new ArrayList<>();
/** 空仓止损订单 ID 列表（支持一个网格多个止损单） */
@@ -263,7 +263,8 @@
StringBuilder sb = new StringBuilder("\n========== 网格数据 ==========\n");
for (GridElement e : sorted) {
if (e.isHasLongOrder() || e.isHasShortOrder()
- || e.hasLongStopLossOrders() || e.hasShortStopLossOrders()){
+ || e.hasLongStopLossOrders() || e.hasShortStopLossOrders()
+ || e.hasLongTakeProfitOrders() || e.hasShortTakeProfitOrders()){
sb.append(String.format(
" ID=%4d 价格=%s up=%s down=%s 多仓=%s(%s) 空仓=%s(%s) 多止盈=%s 空止盈=%s 多止损=%s 空止损=%s\n",
e.getId(),
@@ -274,8 +275,8 @@
e.hasLongOrderIds() ? String.join(",", e.getLongOrderIds()) : "-",
e.isHasShortOrder() ? "有" : "无",
e.hasShortOrderIds() ? String.join(",", e.getShortOrderIds()) : "-",
- e.getLongTakeProfitOrderId() != null ? e.getLongTakeProfitOrderId() : "-",
- e.getShortTakeProfitOrderId() != null ? e.getShortTakeProfitOrderId() : "-",
+ e.hasLongTakeProfitOrders() ? String.join(",", e.getLongTakeProfitOrderIds()) : "-",
+ e.hasShortTakeProfitOrders() ? String.join(",", e.getShortTakeProfitOrderIds()) : "-",
e.hasLongStopLossOrders() ? String.join(",", e.getLongStopLossOrderIds()) : "-",
e.hasShortStopLossOrders() ? String.join(",", e.getShortStopLossOrderIds()) : "-"
));
@@ -310,7 +311,7 @@
public static List<GridElement> findAllShortOrders(BigDecimal currentPrice) {
List<GridElement> result = new ArrayList<>();
for (GridElement e : INDEX.values()) {
- if (e.isHasShortOrder() && e.getGridPrice().compareTo(currentPrice) < 0 && e.getShortTakeProfitOrderId() == null) {
+ if (e.isHasShortOrder() && e.getGridPrice().compareTo(currentPrice) < 0 && !e.hasShortTakeProfitOrders()) {
result.add(e);
}
}
@@ -326,7 +327,7 @@
public static List<GridElement> findAllLongOrders(BigDecimal currentPrice) {
List<GridElement> result = new ArrayList<>();
for (GridElement e : INDEX.values()) {
- if (e.isHasLongOrder() && e.getGridPrice().compareTo(currentPrice) > 0 && e.getLongTakeProfitOrderId() == null) {
+ if (e.isHasLongOrder() && e.getGridPrice().compareTo(currentPrice) > 0 && !e.hasLongTakeProfitOrders()) {
result.add(e);
}
}
@@ -341,11 +342,11 @@
for (String oId : e.getShortOrderIds()) {
SHORT_ORDER_ID_INDEX.put(oId, e);
}
- if (e.getLongTakeProfitOrderId() != null) {
- LONG_TP_ORDER_ID_INDEX.put(e.getLongTakeProfitOrderId(), e);
+ for (String tpId : e.getLongTakeProfitOrderIds()) {
+ LONG_TP_ORDER_ID_INDEX.put(tpId, e);
}
- if (e.getShortTakeProfitOrderId() != null) {
- SHORT_TP_ORDER_ID_INDEX.put(e.getShortTakeProfitOrderId(), e);
+ for (String tpId : e.getShortTakeProfitOrderIds()) {
+ SHORT_TP_ORDER_ID_INDEX.put(tpId, e);
}
for (String slId : e.getLongStopLossOrderIds()) {
LONG_SL_ORDER_ID_INDEX.put(slId, e);
@@ -378,8 +379,8 @@
this.shortTraderParam = builder.shortTraderParam;
this.upId = builder.upId;
this.downId = builder.downId;
- this.longTakeProfitOrderId = builder.longTakeProfitOrderId;
- this.shortTakeProfitOrderId = builder.shortTakeProfitOrderId;
+ if (builder.longTakeProfitOrderIds != null) this.longTakeProfitOrderIds.addAll(builder.longTakeProfitOrderIds);
+ if (builder.shortTakeProfitOrderIds != null) this.shortTakeProfitOrderIds.addAll(builder.shortTakeProfitOrderIds);
if (builder.longOrderIds != null) this.longOrderIds.addAll(builder.longOrderIds);
if (builder.shortOrderIds != null) this.shortOrderIds.addAll(builder.shortOrderIds);
if (builder.longStopLossOrderIds != null) this.longStopLossOrderIds.addAll(builder.longStopLossOrderIds);
@@ -480,19 +481,43 @@
@Deprecated
public void setShortOrderId(String orderId) { if (orderId != null) shortOrderIds.add(orderId); }
- // ==================== 多仓止盈订单 ID ====================
+ // ==================== 多仓止盈订单 ID 列表 ====================
- /** @return 多仓止盈订单 ID */
- public String getLongTakeProfitOrderId() { return longTakeProfitOrderId; }
- /** 设置多仓止盈订单 ID */
- public void setLongTakeProfitOrderId(String longTakeProfitOrderId) { this.longTakeProfitOrderId = longTakeProfitOrderId; }
+ /** @return 多仓止盈订单 ID 列表 */
+ public List<String> getLongTakeProfitOrderIds() { return longTakeProfitOrderIds; }
+ /** 添加多仓止盈订单 ID */
+ public void addLongTakeProfitOrderId(String orderId) { if (orderId != null) longTakeProfitOrderIds.add(orderId); }
+ /** 移除多仓止盈订单 ID */
+ public boolean removeLongTakeProfitOrderId(String orderId) { return longTakeProfitOrderIds.remove(orderId); }
+ /** 清空多仓止盈订单 ID */
+ public void clearLongTakeProfitOrderIds() { longTakeProfitOrderIds.clear(); }
+ /** @return 是否有止盈单 */
+ public boolean hasLongTakeProfitOrders() { return !longTakeProfitOrderIds.isEmpty(); }
+ /** @deprecated 返回最后一个止盈订单ID，用于单订单场景的兼容 */
+ @Deprecated
+ public String getLongTakeProfitOrderId() { return longTakeProfitOrderIds.isEmpty() ? null : longTakeProfitOrderIds.get(longTakeProfitOrderIds.size() - 1); }
+ /** @deprecated 添加到列表，用于兼容旧调用 */
+ @Deprecated
+ public void setLongTakeProfitOrderId(String orderId) { if (orderId != null) longTakeProfitOrderIds.add(orderId); }
- // ==================== 空仓止盈订单 ID ====================
+ // ==================== 空仓止盈订单 ID 列表 ====================
- /** @return 空仓止盈订单 ID */
- public String getShortTakeProfitOrderId() { return shortTakeProfitOrderId; }
- /** 设置空仓止盈订单 ID */
- public void setShortTakeProfitOrderId(String shortTakeProfitOrderId) { this.shortTakeProfitOrderId = shortTakeProfitOrderId; }
+ /** @return 空仓止盈订单 ID 列表 */
+ public List<String> getShortTakeProfitOrderIds() { return shortTakeProfitOrderIds; }
+ /** 添加空仓止盈订单 ID */
+ public void addShortTakeProfitOrderId(String orderId) { if (orderId != null) shortTakeProfitOrderIds.add(orderId); }
+ /** 移除空仓止盈订单 ID */
+ public boolean removeShortTakeProfitOrderId(String orderId) { return shortTakeProfitOrderIds.remove(orderId); }
+ /** 清空空仓止盈订单 ID */
+ public void clearShortTakeProfitOrderIds() { shortTakeProfitOrderIds.clear(); }
+ /** @return 是否有止盈单 */
+ public boolean hasShortTakeProfitOrders() { return !shortTakeProfitOrderIds.isEmpty(); }
+ /** @deprecated 返回最后一个止盈订单ID，用于单订单场景的兼容 */
+ @Deprecated
+ public String getShortTakeProfitOrderId() { return shortTakeProfitOrderIds.isEmpty() ? null : shortTakeProfitOrderIds.get(shortTakeProfitOrderIds.size() - 1); }
+ /** @deprecated 添加到列表，用于兼容旧调用 */
+ @Deprecated
+ public void setShortTakeProfitOrderId(String orderId) { if (orderId != null) shortTakeProfitOrderIds.add(orderId); }
// ==================== 多仓止损订单 ID ====================
@@ -567,10 +592,10 @@
private List<String> longOrderIds;
/** 空仓挂单订单 ID 列表 */
private List<String> shortOrderIds;
- /** 多仓止盈订单 ID */
- private String longTakeProfitOrderId;
- /** 空仓止盈订单 ID */
- private String shortTakeProfitOrderId;
+ /** 多仓止盈订单 ID 列表 */
+ private List<String> longTakeProfitOrderIds;
+ /** 空仓止盈订单 ID 列表 */
+ private List<String> shortTakeProfitOrderIds;
/** 多仓止损订单 ID 列表 */
private List<String> longStopLossOrderIds;
/** 空仓止损订单 ID 列表 */
@@ -596,10 +621,10 @@
public Builder longOrderIds(List<String> longOrderIds) { this.longOrderIds = longOrderIds; return this; }
/** 设置空仓挂单订单 ID 列表 */
public Builder shortOrderIds(List<String> shortOrderIds) { this.shortOrderIds = shortOrderIds; return this; }
- /** 设置多仓止盈订单 ID */
- public Builder longTakeProfitOrderId(String longTakeProfitOrderId) { this.longTakeProfitOrderId = longTakeProfitOrderId; return this; }
- /** 设置空仓止盈订单 ID */
- public Builder shortTakeProfitOrderId(String shortTakeProfitOrderId) { this.shortTakeProfitOrderId = shortTakeProfitOrderId; return this; }
+ /** 设置多仓止盈订单 ID 列表 */
+ public Builder longTakeProfitOrderIds(List<String> longTakeProfitOrderIds) { this.longTakeProfitOrderIds = longTakeProfitOrderIds; return this; }
+ /** 设置空仓止盈订单 ID 列表 */
+ public Builder shortTakeProfitOrderIds(List<String> shortTakeProfitOrderIds) { this.shortTakeProfitOrderIds = shortTakeProfitOrderIds; return this; }
/** 设置多仓止损订单 ID 列表 */
public Builder longStopLossOrderIds(List<String> longStopLossOrderIds) { this.longStopLossOrderIds = longStopLossOrderIds; return this; }
/** 设置空仓止损订单 ID 列表 */
--
Gitblit v1.9.1