From b6333c73b559bb606fd1bc63e7c36ad606ab6c2a Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 13 Jul 2026 10:39:32 +0800
Subject: [PATCH] refactor(gateApi): 优化止损订单管理逻辑
---
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java | 352 ++++++++++++++-----------------------------
src/main/java/com/xcong/excoin/modules/gateApi/GridElement.java | 74 +++++---
2 files changed, 161 insertions(+), 265 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 7a47a33..39b1c43 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -1,4 +1,4 @@
-package com.xcong.excoin.modules.gateApi;
+package com.xcong.excoin.modules.gateApi;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
@@ -591,21 +591,20 @@
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();
+ cancelNearestLongStopLoss();
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();
+ cancelNearestShortStopLoss();
// checkLastTakeProfitAndRestart();
return;
}
@@ -669,7 +668,7 @@
// // 找多仓第一个（最近的）止损位置
// int firstLongSlId = 0;
// for (GridElement e : config.getGridElements()) {
-// if (e.getLongStopLossOrderId() != null) {
+// if (e.hasLongStopLossOrders()) {
// if (firstLongSlId == 0 || e.getId() > firstLongSlId) {
// firstLongSlId = e.getId();
// }
@@ -746,7 +745,7 @@
// // 找空仓第一个（最近的）止损位置
// int firstShortSlId = 0;
// for (GridElement e : config.getGridElements()) {
-// if (e.getShortStopLossOrderId() != null) {
+// if (e.hasShortStopLossOrders()) {
// if (firstShortSlId == 0 || e.getId() < firstShortSlId) {
// firstShortSlId = e.getId();
// }
@@ -902,7 +901,7 @@
// ORDER_TYPE_CLOSE_SHORT,
// size,
// profitId -> {
-// elemShort.setShortStopLossOrderId(profitId);
+// elemShort.addShortStopLossOrderId(profitId);
// GridElement.refreshIndices();
// log.info("[Gate] 空仓止损已挂, gridId:{}, 触发价:{}, stopLossId:{}", shortTime, triggerPrice, profitId);
// }
@@ -921,7 +920,7 @@
// ORDER_TYPE_CLOSE_LONG,
// negate(size),
// profitId -> {
-// elemLong.setLongStopLossOrderId(profitId);
+// elemLong.addLongStopLossOrderId(profitId);
// GridElement.refreshIndices();
// log.info("[Gate] 多仓止损已挂, gridId:{}, 触发价:{}, stopLossId:{}", longTime, triggerPrice, profitId);
// }
@@ -943,7 +942,7 @@
ORDER_TYPE_CLOSE_SHORT,
size,
profitId -> {
- elem.setShortStopLossOrderId(profitId);
+ elem.addShortStopLossOrderId(profitId);
GridElement.refreshIndices();
log.info("[Gate] 空仓止损已挂, gridId:{}, 触发价:{}, stopLossId:{}", finalId, triggerPrice, profitId);
}
@@ -967,7 +966,7 @@
ORDER_TYPE_CLOSE_LONG,
negate(size),
profitId -> {
- elem.setLongStopLossOrderId(profitId);
+ elem.addLongStopLossOrderId(profitId);
GridElement.refreshIndices();
log.info("[Gate] 多仓止损已挂, gridId:{}, 触发价:{}, stopLossId:{}", finalId, triggerPrice, profitId);
}
@@ -1291,7 +1290,7 @@
}
private void handleLongStopLossTriggered(GridElement gridElement) {
- gridElement.setLongStopLossOrderId(null);
+ gridElement.clearLongStopLossOrderIds();
accumulatedLongLossCount++;
int gridId = gridElement.getId();
@@ -1373,7 +1372,7 @@
}
private void handleShortStopLossTriggered(GridElement gridElement) {
- gridElement.setShortStopLossOrderId(null);
+ gridElement.clearShortStopLossOrderIds();
accumulatedShortLossCount++;
int gridId = gridElement.getId();
@@ -1553,48 +1552,50 @@
}
/**
- * 取消最远的多仓止损订单。
- * 多仓止损在 gridId 负方向，最远 = id 最小。
+ * 取消最近的多仓止损订单（A 位置，gridId 最大即最接近 0）。
+ * 多仓止损在 gridId 负方向，A = gridId-2，是三个位置中 ID 最大（最接近 0）的那个。
*/
- private void cancelFarthestLongStopLoss() {
- GridElement farthest = null;
+ private void cancelNearestLongStopLoss() {
+ GridElement nearest = null;
for (GridElement e : config.getGridElements()) {
- if (e.getLongStopLossOrderId() != null) {
- if (farthest == null || e.getId() < farthest.getId()) {
- farthest = e;
+ if (e.hasLongStopLossOrders()) {
+ if (nearest == null || e.getId() > nearest.getId()) {
+ nearest = e;
}
}
}
- if (farthest != null) {
- String slId = farthest.getLongStopLossOrderId();
- farthest.setLongStopLossOrderId(null);
+ if (nearest != null && nearest.hasLongStopLossOrders()) {
+ List<String> ids = nearest.getLongStopLossOrderIds();
+ String slId = ids.get(0); // 取第一个（最早加入的 = A 位置第一单）
+ nearest.removeLongStopLossOrderId(slId);
GridElement.refreshIndices();
- GridElement finalFarthest = farthest;
+ GridElement finalNearest = nearest;
executor.cancelConditionalOrder(slId, oid ->
- log.info("[Gate] 止盈触发, 取消最远多仓止损 gridId:{}, orderId:{}", finalFarthest.getId(), slId));
+ log.info("[Gate] 止盈触发, 取消最近多仓止损 gridId:{}, orderId:{}", finalNearest.getId(), slId));
}
}
/**
- * 取消最远的空仓止损订单。
- * 空仓止损在 gridId 正方向，最远 = id 最大。
+ * 取消最近的空仓止损订单（A 位置，gridId 最小即最接近 0）。
+ * 空仓止损在 gridId 正方向，A = gridId+2，是三个位置中 ID 最小（最接近 0）的那个。
*/
- private void cancelFarthestShortStopLoss() {
- GridElement farthest = null;
+ private void cancelNearestShortStopLoss() {
+ GridElement nearest = null;
for (GridElement e : config.getGridElements()) {
- if (e.getShortStopLossOrderId() != null) {
- if (farthest == null || e.getId() > farthest.getId()) {
- farthest = e;
+ if (e.hasShortStopLossOrders()) {
+ if (nearest == null || e.getId() < nearest.getId()) {
+ nearest = e;
}
}
}
- if (farthest != null) {
- String slId = farthest.getShortStopLossOrderId();
- farthest.setShortStopLossOrderId(null);
+ if (nearest != null && nearest.hasShortStopLossOrders()) {
+ List<String> ids = nearest.getShortStopLossOrderIds();
+ String slId = ids.get(0); // 取第一个（最早加入的 = A 位置第一单）
+ nearest.removeShortStopLossOrderId(slId);
GridElement.refreshIndices();
- GridElement finalFarthest = farthest;
+ GridElement finalNearest = nearest;
executor.cancelConditionalOrder(slId, oid ->
- log.info("[Gate] 止盈触发, 取消最远空仓止损 gridId:{}, orderId:{}", finalFarthest.getId(), slId));
+ log.info("[Gate] 止盈触发, 取消最近空仓止损 gridId:{}, orderId:{}", finalNearest.getId(), slId));
}
}
@@ -1608,11 +1609,10 @@
e.setLongTakeProfitOrderId(null);
executor.cancelConditionalOrder(tpId, oid -> {});
}
- String slId = e.getLongStopLossOrderId();
- if (slId != null) {
- e.setLongStopLossOrderId(null);
+ for (String slId : new ArrayList<>(e.getLongStopLossOrderIds())) {
executor.cancelConditionalOrder(slId, oid -> {});
}
+ e.clearLongStopLossOrderIds();
}
GridElement.refreshIndices();
log.info("[Gate] 已提交取消所有多仓止盈+止损");
@@ -1628,11 +1628,10 @@
e.setShortTakeProfitOrderId(null);
executor.cancelConditionalOrder(tpId, oid -> {});
}
- String slId = e.getShortStopLossOrderId();
- if (slId != null) {
- e.setShortStopLossOrderId(null);
+ for (String slId : new ArrayList<>(e.getShortStopLossOrderIds())) {
executor.cancelConditionalOrder(slId, oid -> {});
}
+ e.clearShortStopLossOrderIds();
}
GridElement.refreshIndices();
log.info("[Gate] 已提交取消所有空仓止盈+止损");
@@ -1661,206 +1660,89 @@
log.info("[Gate] 首次成交，取消所有初始化止盈单");
}
- // ========== 止损追单 ==========
+ // ========== 止损追单（新逻辑：3 个固定位置，每个位置挂多个 1 张止损单） ==========
- private void extendLongStopLoss(int filledQty,int gridId) {
- int furthestSlId = 0;
- for (GridElement e : config.getGridElements()) {
- if (e.getLongStopLossOrderId() != null && e.getId() < furthestSlId) {
- furthestSlId = e.getId();
- }
- }
+ /**
+ * 多仓止损追单 — 3 个固定位置，从近到远分配合约。
+ * A(gridId-2): (filledQty/qty - 2) 个独立止损单，每个 qty 张
+ * B(gridId-3): 1 个止损单，qty 张
+ * C(gridId-4): 1 个止损单，qty 张
+ * 注意：多仓止损在 gridId 负方向，触发价 ≤ 网格价。
+ */
+ private void extendLongStopLoss(int filledQty, int gridId) {
+ int qty = Integer.parseInt(config.getQuantity());
+ int aCount = Math.max(0, filledQty / qty - 2);
+ log.info("[Gate] 多仓追挂止损, 成交{}张, gridId:{}, A({})x{} B({})x1 C({})x1",
+ filledQty, gridId, gridId - 2, aCount, gridId - 3, gridId - 4);
-// int interval = 1;
-// if (furthestSlId == 0) {
-// furthestSlId = gridId;
-// interval = 2;
-// }
-// int stopLossCount = filledQty / Integer.parseInt(config.getQuantity());
-// log.info("[Gate] 多仓追挂止损, 当前最远止损gridId:{}, 成交{}张, 追加{}个止损单", furthestSlId, filledQty, stopLossCount);
-// for (int i = 0; i < stopLossCount; i++) {
-// int newSlId = furthestSlId - i - interval;
-// GridElement elem = GridElement.findById(newSlId);
-// if (elem == null) {
-// continue;
-// }
-// BigDecimal triggerPrice = elem.getGridPrice();
-// int finalSlId = newSlId;
-// executor.placeTakeProfit(
-// triggerPrice,
-// FuturesPriceTrigger.RuleEnum.NUMBER_2,
-// ORDER_TYPE_CLOSE_LONG,
-// negate(config.getQuantity()),
-// profitId -> {
-// elem.setLongStopLossOrderId(profitId);
-// GridElement.refreshIndices();
-// log.info("[Gate] 多仓止损追加, gridId:{}, 触发价:{}, stopLossId:{}", finalSlId, triggerPrice, profitId);
-// }
-// );
-// }
-
- int parseInt = Integer.parseInt(config.getQuantity());
- int total = filledQty - parseInt;
- if (total > parseInt) {
- String firstNum = String.valueOf(total);
- log.info("[Gate] 多仓追挂止损, 当前最远止损gridId:{}, 成交{}张, 追加{}个止损单", furthestSlId, filledQty, 2);
- int newSlId = gridId - 2;
- GridElement elem = GridElement.findById(newSlId);
- if (elem != null) {
- BigDecimal triggerPrice = elem.getGridPrice();
- int finalSlId = newSlId;
- executor.placeTakeProfit(
- triggerPrice,
- FuturesPriceTrigger.RuleEnum.NUMBER_2,
- ORDER_TYPE_CLOSE_LONG,
- negate(firstNum),
- profitId -> {
- elem.setLongStopLossOrderId(profitId);
- GridElement.refreshIndices();
- log.info("[Gate] 多仓止损追加, gridId:{}, 触发价:{}, 数量:{}, stopLossId:{}", finalSlId, triggerPrice, firstNum, profitId);
- }
- );
- }
- int newSecendSlId = gridId - 3;
- GridElement elemSecend = GridElement.findById(newSecendSlId);
- if (elemSecend != null) {
- BigDecimal triggerPrice = elemSecend.getGridPrice();
- int finalSlId = newSecendSlId;
- executor.placeTakeProfit(
- triggerPrice,
- FuturesPriceTrigger.RuleEnum.NUMBER_2,
- ORDER_TYPE_CLOSE_LONG,
- negate(config.getQuantity()),
- profitId -> {
- elemSecend.setLongStopLossOrderId(profitId);
- GridElement.refreshIndices();
- log.info("[Gate] 多仓止损追加, gridId:{}, 触发价:{}, 数量:{}, stopLossId:{}", finalSlId, triggerPrice, config.getQuantity(), profitId);
- }
- );
- }
- }
- if (total == parseInt){
- String firstNum = config.getQuantity();
- log.info("[Gate] 多仓追挂止损, 当前最远止损gridId:{}, 成交{}张, 追加{}个止损单", furthestSlId, filledQty, 1);
- int newSlId = gridId - 2;
- GridElement elem = GridElement.findById(newSlId);
- if (elem != null) {
- BigDecimal triggerPrice = elem.getGridPrice();
- int finalSlId = newSlId;
- executor.placeTakeProfit(
- triggerPrice,
- FuturesPriceTrigger.RuleEnum.NUMBER_2,
- ORDER_TYPE_CLOSE_LONG,
- negate(firstNum),
- profitId -> {
- elem.setLongStopLossOrderId(profitId);
- GridElement.refreshIndices();
- log.info("[Gate] 多仓止损追加, gridId:{}, 触发价:{}, 数量:{}, stopLossId:{}", finalSlId, triggerPrice, firstNum, profitId);
- }
- );
- }
- }
-
+ // A 位置：挂 aCount 个独立止损单
+ placeStopLossOrders(gridId - 2, aCount, qty, FuturesPriceTrigger.RuleEnum.NUMBER_2,
+ ORDER_TYPE_CLOSE_LONG, true);
+ // B 位置：挂 1 个
+ placeStopLossOrders(gridId - 3, 1, qty, FuturesPriceTrigger.RuleEnum.NUMBER_2,
+ ORDER_TYPE_CLOSE_LONG, true);
+ // C 位置：挂 1 个
+ placeStopLossOrders(gridId - 4, 1, qty, FuturesPriceTrigger.RuleEnum.NUMBER_2,
+ ORDER_TYPE_CLOSE_LONG, true);
}
+ /**
+ * 空仓止损追单 — 3 个固定位置，从近到远分配合约。
+ * A(gridId+2): (filledQty/qty - 2) 个独立止损单，每个 qty 张
+ * B(gridId+3): 1 个止损单，qty 张
+ * C(gridId+4): 1 个止损单，qty 张
+ * 注意：空仓止损在 gridId 正方向，触发价 ≥ 网格价。
+ */
private void extendShortStopLoss(int filledQty, int gridId) {
- int furthestSlId = 0;
- for (GridElement e : config.getGridElements()) {
- if (e.getShortStopLossOrderId() != null && e.getId() > furthestSlId) {
- furthestSlId = e.getId();
- }
- }
+ int qty = Integer.parseInt(config.getQuantity());
+ int aCount = Math.max(0, filledQty / qty - 2);
+ log.info("[Gate] 空仓追挂止损, 成交{}张, gridId:{}, A({})x{} B({})x1 C({})x1",
+ filledQty, gridId, gridId + 2, aCount, gridId + 3, gridId + 4);
-// int interval = 1;
-// if (furthestSlId == 0) {
-// furthestSlId = gridId;
-// interval = 2;
-// }
-// int stopLossCount = filledQty / Integer.parseInt(config.getQuantity());
-// log.info("[Gate] 空仓追挂止损, 当前最远止损gridId:{}, 成交{}张, 追加{}个止损单", furthestSlId, filledQty, stopLossCount);
-// for (int i = 0; i < stopLossCount; i++) {
-// int newSlId = furthestSlId + i + interval;
-// GridElement elem = GridElement.findById(newSlId);
-// if (elem == null) {
-// continue;
-// }
-// BigDecimal triggerPrice = elem.getGridPrice();
-// int finalSlId = newSlId;
-// executor.placeTakeProfit(
-// triggerPrice,
-// FuturesPriceTrigger.RuleEnum.NUMBER_1,
-// ORDER_TYPE_CLOSE_SHORT,
-// config.getQuantity(),
-// profitId -> {
-// elem.setShortStopLossOrderId(profitId);
-// GridElement.refreshIndices();
-// log.info("[Gate] 空仓止损追加, gridId:{}, 触发价:{}, stopLossId:{}", finalSlId, triggerPrice, profitId);
-// }
-// );
-// }
+ // A 位置：挂 aCount 个独立止损单
+ placeStopLossOrders(gridId + 2, aCount, qty, FuturesPriceTrigger.RuleEnum.NUMBER_1,
+ ORDER_TYPE_CLOSE_SHORT, false);
+ // B 位置：挂 1 个
+ placeStopLossOrders(gridId + 3, 1, qty, FuturesPriceTrigger.RuleEnum.NUMBER_1,
+ ORDER_TYPE_CLOSE_SHORT, false);
+ // C 位置：挂 1 个
+ placeStopLossOrders(gridId + 4, 1, qty, FuturesPriceTrigger.RuleEnum.NUMBER_1,
+ ORDER_TYPE_CLOSE_SHORT, false);
+ }
- int parseInt = Integer.parseInt(config.getQuantity());
- int total = filledQty - parseInt;
- if (total > parseInt) {
- String firstNum = String.valueOf(total);
- log.info("[Gate] 空仓追挂止损, 当前最远止损gridId:{}, 成交{}张, 追加{}个止损单", furthestSlId, filledQty, 2);
- int newSlId = gridId + 2;
- GridElement elem = GridElement.findById(newSlId);
- if (elem != null) {
- BigDecimal triggerPrice = elem.getGridPrice();
- int finalSlId = newSlId;
- executor.placeTakeProfit(
- triggerPrice,
- FuturesPriceTrigger.RuleEnum.NUMBER_1,
- ORDER_TYPE_CLOSE_SHORT,
- firstNum,
- profitId -> {
- elem.setShortStopLossOrderId(profitId);
- GridElement.refreshIndices();
- log.info("[Gate] 空仓止损追加, gridId:{}, 触发价:{}, 数量:{}, stopLossId:{}", finalSlId, triggerPrice, firstNum, profitId);
- }
- );
- }
- int newSecendSlId = gridId + 2;
- GridElement elemSecend = GridElement.findById(newSecendSlId);
- if (elemSecend != null) {
- BigDecimal triggerPrice = elemSecend.getGridPrice();
- int finalSlId = newSecendSlId;
- executor.placeTakeProfit(
- triggerPrice,
- FuturesPriceTrigger.RuleEnum.NUMBER_1,
- ORDER_TYPE_CLOSE_SHORT,
- config.getQuantity(),
- profitId -> {
- elemSecend.setShortStopLossOrderId(profitId);
- GridElement.refreshIndices();
- log.info("[Gate] 空仓止损追加, gridId:{}, 触发价:{}, 数量:{}, stopLossId:{}", finalSlId, triggerPrice, config.getQuantity(), profitId);
- }
- );
- }
+ /**
+ * 在指定网格位置挂 count 个独立止损单，每个 size 张。
+ */
+ private void placeStopLossOrders(int gridId, int count, int qty,
+ FuturesPriceTrigger.RuleEnum rule,
+ String orderType, boolean isLong) {
+ if (count <= 0) {
+ return;
}
- if (total == parseInt) {
- String firstNum = config.getQuantity();
- log.info("[Gate] 空仓追挂止损, 当前最远止损gridId:{}, 成交{}张, 追加{}个止损单", furthestSlId, filledQty, 1);
- int newSlId = gridId + 2;
- GridElement elem = GridElement.findById(newSlId);
- if (elem != null) {
- BigDecimal triggerPrice = elem.getGridPrice();
- int finalSlId = newSlId;
- executor.placeTakeProfit(
- triggerPrice,
- FuturesPriceTrigger.RuleEnum.NUMBER_1,
- ORDER_TYPE_CLOSE_SHORT,
- firstNum,
- profitId -> {
- elem.setShortStopLossOrderId(profitId);
- GridElement.refreshIndices();
- log.info("[Gate] 空仓止损追加, gridId:{}, 触发价:{}, 数量:{}, stopLossId:{}", finalSlId, triggerPrice, firstNum, profitId);
- }
- );
- }
+ GridElement elem = GridElement.findById(gridId);
+ if (elem == null) {
+ log.warn("[Gate] 止损挂单位置不存在, gridId:{}", gridId);
+ return;
}
-
+ BigDecimal triggerPrice = elem.getGridPrice();
+ for (int i = 0; i < count; i++) {
+ String size = isLong ? negate(String.valueOf(qty)) : String.valueOf(qty);
+ int finalGridId = gridId;
+ int finalI = i;
+ executor.placeTakeProfit(
+ triggerPrice, rule, orderType, size,
+ profitId -> {
+ if (isLong) {
+ elem.addLongStopLossOrderId(profitId);
+ } else {
+ elem.addShortStopLossOrderId(profitId);
+ }
+ GridElement.refreshIndices();
+ log.info("[Gate] {}止损追加, gridId:{}, 触发价:{}, 第{}单, stopLossId:{}",
+ isLong ? "多仓" : "空仓", finalGridId, triggerPrice, finalI + 1, profitId);
+ }
+ );
+ }
}
// ---- 工具 ----
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 661cdd2..f77840f 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GridElement.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GridElement.java
@@ -87,10 +87,10 @@
private String longTakeProfitOrderId;
/** 空仓止盈订单 ID */
private String shortTakeProfitOrderId;
- /** 多仓止损订单 ID */
- private String longStopLossOrderId;
- /** 空仓止损订单 ID */
- private String shortStopLossOrderId;
+ /** 多仓止损订单 ID 列表（支持一个网格多个止损单） */
+ private List<String> longStopLossOrderIds = new ArrayList<>();
+ /** 空仓止损订单 ID 列表（支持一个网格多个止损单） */
+ private List<String> shortStopLossOrderIds = new ArrayList<>();
/** 索引重建锁，保证 refreshIndices() 与计数读取之间互斥，避免 clear→rebuild 窗口期读到 0 */
private static final Object INDEX_LOCK = new Object();
@@ -248,7 +248,7 @@
StringBuilder sb = new StringBuilder("\n========== 网格数据 ==========\n");
for (GridElement e : sorted) {
if (e.isHasLongOrder() || e.isHasShortOrder()
- || e.getLongStopLossOrderId() != null || e.getShortStopLossOrderId() != null){
+ || e.hasLongStopLossOrders() || e.hasShortStopLossOrders()){
sb.append(String.format(
" ID=%4d 价格=%s up=%s down=%s 多仓=%s(%s) 空仓=%s(%s) 多止盈=%s 空止盈=%s 多止损=%s 空止损=%s\n",
e.getId(),
@@ -261,8 +261,8 @@
e.getShortOrderId() != null ? e.getShortOrderId() : "-",
e.getLongTakeProfitOrderId() != null ? e.getLongTakeProfitOrderId() : "-",
e.getShortTakeProfitOrderId() != null ? e.getShortTakeProfitOrderId() : "-",
- e.getLongStopLossOrderId() != null ? e.getLongStopLossOrderId() : "-",
- e.getShortStopLossOrderId() != null ? e.getShortStopLossOrderId() : "-"
+ e.hasLongStopLossOrders() ? String.join(",", e.getLongStopLossOrderIds()) : "-",
+ e.hasShortStopLossOrders() ? String.join(",", e.getShortStopLossOrderIds()) : "-"
));
}
}
@@ -332,11 +332,11 @@
if (e.getShortTakeProfitOrderId() != null) {
SHORT_TP_ORDER_ID_INDEX.put(e.getShortTakeProfitOrderId(), e);
}
- if (e.getLongStopLossOrderId() != null) {
- LONG_SL_ORDER_ID_INDEX.put(e.getLongStopLossOrderId(), e);
+ for (String slId : e.getLongStopLossOrderIds()) {
+ LONG_SL_ORDER_ID_INDEX.put(slId, e);
}
- if (e.getShortStopLossOrderId() != null) {
- SHORT_SL_ORDER_ID_INDEX.put(e.getShortStopLossOrderId(), e);
+ for (String slId : e.getShortStopLossOrderIds()) {
+ SHORT_SL_ORDER_ID_INDEX.put(slId, e);
}
}
@@ -367,8 +367,8 @@
this.shortOrderId = builder.shortOrderId;
this.longTakeProfitOrderId = builder.longTakeProfitOrderId;
this.shortTakeProfitOrderId = builder.shortTakeProfitOrderId;
- this.longStopLossOrderId = builder.longStopLossOrderId;
- this.shortStopLossOrderId = builder.shortStopLossOrderId;
+ if (builder.longStopLossOrderIds != null) this.longStopLossOrderIds.addAll(builder.longStopLossOrderIds);
+ if (builder.shortStopLossOrderIds != null) this.shortStopLossOrderIds.addAll(builder.shortStopLossOrderIds);
}
// ==================== 网格层级编号 ====================
@@ -457,17 +457,31 @@
// ==================== 多仓止损订单 ID ====================
- /** @return 多仓止损订单 ID */
- public String getLongStopLossOrderId() { return longStopLossOrderId; }
- /** 设置多仓止损订单 ID */
- public void setLongStopLossOrderId(String longStopLossOrderId) { this.longStopLossOrderId = longStopLossOrderId; }
+ // ==================== 多仓止损订单 ID 列表 ====================
- // ==================== 空仓止损订单 ID ====================
+ /** @return 多仓止损订单 ID 列表 */
+ public List<String> getLongStopLossOrderIds() { return longStopLossOrderIds; }
+ /** 添加一个多仓止损订单 ID */
+ public void addLongStopLossOrderId(String orderId) { longStopLossOrderIds.add(orderId); }
+ /** 移除一个多仓止损订单 ID */
+ public boolean removeLongStopLossOrderId(String orderId) { return longStopLossOrderIds.remove(orderId); }
+ /** 清空所有多仓止损订单 ID */
+ public void clearLongStopLossOrderIds() { longStopLossOrderIds.clear(); }
+ /** @return 是否有止损单 */
+ public boolean hasLongStopLossOrders() { return !longStopLossOrderIds.isEmpty(); }
- /** @return 空仓止损订单 ID */
- public String getShortStopLossOrderId() { return shortStopLossOrderId; }
- /** 设置空仓止损订单 ID */
- public void setShortStopLossOrderId(String shortStopLossOrderId) { this.shortStopLossOrderId = shortStopLossOrderId; }
+ // ==================== 空仓止损订单 ID 列表 ====================
+
+ /** @return 空仓止损订单 ID 列表 */
+ public List<String> getShortStopLossOrderIds() { return shortStopLossOrderIds; }
+ /** 添加一个空仓止损订单 ID */
+ public void addShortStopLossOrderId(String orderId) { shortStopLossOrderIds.add(orderId); }
+ /** 移除一个空仓止损订单 ID */
+ public boolean removeShortStopLossOrderId(String orderId) { return shortStopLossOrderIds.remove(orderId); }
+ /** 清空所有空仓止损订单 ID */
+ public void clearShortStopLossOrderIds() { shortStopLossOrderIds.clear(); }
+ /** @return 是否有止损单 */
+ public boolean hasShortStopLossOrders() { return !shortStopLossOrderIds.isEmpty(); }
public static Builder builder() {
return new Builder();
@@ -507,10 +521,10 @@
private String longTakeProfitOrderId;
/** 空仓止盈订单 ID */
private String shortTakeProfitOrderId;
- /** 多仓止损订单 ID */
- private String longStopLossOrderId;
- /** 空仓止损订单 ID */
- private String shortStopLossOrderId;
+ /** 多仓止损订单 ID 列表 */
+ private List<String> longStopLossOrderIds;
+ /** 空仓止损订单 ID 列表 */
+ private List<String> shortStopLossOrderIds;
/** 设置网格层级编号 */
public Builder id(int id) { this.id = id; return this; }
@@ -536,10 +550,10 @@
public Builder longTakeProfitOrderId(String longTakeProfitOrderId) { this.longTakeProfitOrderId = longTakeProfitOrderId; return this; }
/** 设置空仓止盈订单 ID */
public Builder shortTakeProfitOrderId(String shortTakeProfitOrderId) { this.shortTakeProfitOrderId = shortTakeProfitOrderId; return this; }
- /** 设置多仓止损订单 ID */
- public Builder longStopLossOrderId(String longStopLossOrderId) { this.longStopLossOrderId = longStopLossOrderId; return this; }
- /** 设置空仓止损订单 ID */
- public Builder shortStopLossOrderId(String shortStopLossOrderId) { this.shortStopLossOrderId = shortStopLossOrderId; return this; }
+ /** 设置多仓止损订单 ID 列表 */
+ public Builder longStopLossOrderIds(List<String> longStopLossOrderIds) { this.longStopLossOrderIds = longStopLossOrderIds; return this; }
+ /** 设置空仓止损订单 ID 列表 */
+ public Builder shortStopLossOrderIds(List<String> shortStopLossOrderIds) { this.shortStopLossOrderIds = shortStopLossOrderIds; return this; }
public GridElement build() {
return new GridElement(this);
--
Gitblit v1.9.1