From 2c81b49924c67d150562b6b4c28ffa03489cf857 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 16 Jul 2026 21:45:32 +0800
Subject: [PATCH] fix(gateApi): 修复网格交易中遗留订单取消逻辑
---
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java | 775 +++++++++++++++++++++++++++--------------------------------
1 files changed, 351 insertions(+), 424 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..4402a94 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -134,10 +134,14 @@
/** 多头是否活跃（有仓位） */
private volatile boolean longActive = false;
- /** 多头累计止损张数（加仓订单成交后归零） */
+ /** 多头累计止损次数（始终递增，加仓订单成交后归零） */
private volatile int accumulatedLongLossCount = 0;
- /** 空头累计止损张数（加仓订单成交后归零） */
+ /** 空头累计止损次数（始终递增，加仓订单成交后归零） */
private volatile int accumulatedShortLossCount = 0;
+ /** 最近触发止损的多头网格ID */
+ private volatile int lastLongStopLossGridId = Integer.MAX_VALUE;
+ /** 最近触发止损的空头网格ID */
+ private volatile int lastShortStopLossGridId = Integer.MAX_VALUE;
private volatile BigDecimal lastKlinePrice;
private volatile BigDecimal markPrice = BigDecimal.ZERO;
@@ -307,6 +311,8 @@
shortActive = false;
accumulatedLongLossCount = 0;
accumulatedShortLossCount = 0;
+ lastLongStopLossGridId = Integer.MAX_VALUE;
+ lastShortStopLossGridId = Integer.MAX_VALUE;
shortPriceQueue.clear();
longPriceQueue.clear();
totalShortPriceQueue.clear();
@@ -392,7 +398,8 @@
return;
}
- checkProfitAndReset();
+ // 异步检查盈亏，避免 REST 调用阻塞 WS 心跳导致 Socket closed
+ executor.submitTask(this::checkProfitAndReset);
if (state == StrategyState.ACTIVE &&
longActive == false &&
@@ -591,21 +598,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;
}
@@ -613,21 +619,23 @@
GridElement longStopLossElem = GridElement.findByLongStopLossOrderId(orderId);
// if (longStopLossElem != null && longPositionSize.compareTo(BigDecimal.ZERO) > 0 && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")) {
if (longStopLossElem != null && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")) {
- handleLongStopLossTriggered(longStopLossElem);
+ handleLongStopLossTriggered(longStopLossElem, orderId);
return;
}
GridElement shortStopLossElem = GridElement.findByShortStopLossOrderId(orderId);
// if (shortStopLossElem != null && shortPositionSize.compareTo(BigDecimal.ZERO) > 0 && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")) {
if (shortStopLossElem != null && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")) {
- handleShortStopLossTriggered(shortStopLossElem);
+ handleShortStopLossTriggered(shortStopLossElem, orderId);
return;
}
GridElement shortGridElement = GridElement.findByShortOrderId(orderId);
if (shortGridElement != null) {
- if (shortGridElement.isHasShortOrder() && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0") ){
+ if (StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0") ){
int filledQty = Integer.parseInt(shortGridElement.getShortTraderParam().getQuantity());
- shortEntryTraderIdParam(shortGridElement, null, false);
+ shortEntryTraderIdParam(shortGridElement, orderId, false);
+ accumulatedShortLossCount = 0;
+ lastShortStopLossGridId = Integer.MAX_VALUE;
// [Gate-需求2] 加仓后先撤空仓所有止盈+止损，再查交易所持仓后重挂
cancelAllShortTakeProfitsAndStopLosses();
// REST 查询可能因交易所延迟返回旧值，与 WS 本地缓存取最大值兜底
@@ -659,52 +667,41 @@
// }
// );
- // 空仓持仓超过baseQuantity时，先找多仓第一个止损位置，从该位置向下挂止盈（间隔=1）
- BigDecimal shortBaseQty = new BigDecimal(config.getBaseQuantity());
- BigDecimal shortGridQty = new BigDecimal(config.getQuantity());
- if (BigDecimal.valueOf(posSize).compareTo(shortBaseQty) > 0) {
- BigDecimal shortExcess = BigDecimal.valueOf(posSize).subtract(shortBaseQty);
- int shortExcessCount = shortExcess.divide(shortGridQty, 0, RoundingMode.DOWN).intValue();
+ // 空仓止盈：超额部分挂止盈，从entry网格向下逐个挂
+ int shortBaseQty = Integer.parseInt(config.getBaseQuantity());
+ int shortGridQty = Integer.parseInt(config.getQuantity());
+ int shortTpCount = posSize > shortBaseQty ? (posSize - shortBaseQty) / shortGridQty : 0;
-// // 找多仓第一个（最近的）止损位置
-// int firstLongSlId = 0;
-// for (GridElement e : config.getGridElements()) {
-// if (e.getLongStopLossOrderId() != null) {
-// if (firstLongSlId == 0 || e.getId() > firstLongSlId) {
-// firstLongSlId = e.getId();
-// }
-// }
-// }
-
- for (int i = 0; i < shortExcessCount; i++) {
- int tpGridId = shortGridElement.getId() - 2 * (i + 1);
- GridElement tpElem = GridElement.findById(tpGridId);
- if (tpElem == null || tpElem.getShortTakeProfitOrderId() != null) {
- continue;
- }
- BigDecimal tpPrice = tpElem.getGridPrice();
- int finalTpGridId = tpGridId;
- executor.placeTakeProfit(
- tpPrice,
- FuturesPriceTrigger.RuleEnum.NUMBER_2,
- ORDER_TYPE_CLOSE_SHORT,
- config.getQuantity(),
- profitId -> {
- shortTakeProfitTraderIdParam(tpElem, profitId, true);
- log.info("[Gate] 空仓止盈挂单, gridId:{}, 触发价:{}, takeProfitId:{}",
- finalTpGridId, tpPrice, profitId);
- }
- );
+ for (int i = 0; i < shortTpCount; i++) {
+ int tpGridId = shortGridElement.getId() - 2 * (i + 1);
+ GridElement tpElem = GridElement.findById(tpGridId);
+ if (tpElem == null || tpElem.getShortTakeProfitOrderId() != null) {
+ continue;
}
+ BigDecimal tpPrice = tpElem.getGridPrice();
+ int finalTpGridId = tpGridId;
+ executor.placeTakeProfit(
+ tpPrice,
+ FuturesPriceTrigger.RuleEnum.NUMBER_2,
+ ORDER_TYPE_CLOSE_SHORT,
+ config.getQuantity(),
+ profitId -> {
+ shortTakeProfitTraderIdParam(tpElem, profitId, true);
+ log.info("[Gate] 空仓止盈挂单, gridId:{}, 触发价:{}, takeProfitId:{}",
+ finalTpGridId, tpPrice, profitId);
+ }
+ );
}
}
}
GridElement longGridElement = GridElement.findByLongOrderId(orderId);
if (longGridElement != null) {
- if (longGridElement.isHasLongOrder() && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")){
+ if (StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")){
int filledQty = Integer.parseInt(longGridElement.getLongTraderParam().getQuantity());
- longEntryTraderIdParam(longGridElement, null, false);
+ longEntryTraderIdParam(longGridElement, orderId, false);
+ accumulatedLongLossCount = 0;
+ lastLongStopLossGridId = Integer.MAX_VALUE;
// [Gate-需求2] 加仓后先撤多仓所有止盈+止损，再查交易所持仓后重挂
cancelAllLongTakeProfitsAndStopLosses();
// REST 查询可能因交易所延迟返回旧值，与 WS 本地缓存取最大值兜底
@@ -736,43 +733,30 @@
// }
// );
- // 多仓持仓超过baseQuantity时，先找空仓第一个止损位置，从该位置向上挂止盈（间隔=1）
- BigDecimal longBaseQty = new BigDecimal(config.getBaseQuantity());
- BigDecimal longGridQty = new BigDecimal(config.getQuantity());
- if (BigDecimal.valueOf(posSize).compareTo(longBaseQty) > 0) {
- BigDecimal longExcess = BigDecimal.valueOf(posSize).subtract(longBaseQty);
- int longExcessCount = longExcess.divide(longGridQty, 0, RoundingMode.DOWN).intValue();
+ // 多仓止盈：超额部分挂止盈，从entry网格向上逐个挂
+ int longBaseQty = Integer.parseInt(config.getBaseQuantity());
+ int longGridQty = Integer.parseInt(config.getQuantity());
+ int longTpCount = posSize > longBaseQty ? (posSize - longBaseQty) / longGridQty : 0;
-// // 找空仓第一个（最近的）止损位置
-// int firstShortSlId = 0;
-// for (GridElement e : config.getGridElements()) {
-// if (e.getShortStopLossOrderId() != null) {
-// if (firstShortSlId == 0 || e.getId() < firstShortSlId) {
-// firstShortSlId = e.getId();
-// }
-// }
-// }
-
- for (int i = 0; i < longExcessCount; i++) {
- int tpGridId = longGridElement.getId() + 2 * (i + 1);
- GridElement tpElem = GridElement.findById(tpGridId);
- if (tpElem == null || tpElem.getLongTakeProfitOrderId() != null) {
- continue;
- }
- BigDecimal tpPrice = tpElem.getGridPrice();
- int finalTpGridId = tpGridId;
- executor.placeTakeProfit(
- tpPrice,
- FuturesPriceTrigger.RuleEnum.NUMBER_1,
- ORDER_TYPE_CLOSE_LONG,
- negate(config.getQuantity()),
- profitId -> {
- longTakeProfitTraderIdParam(tpElem, profitId, true);
- log.info("[Gate] 多仓止盈挂单, gridId:{}, 触发价:{}, takeProfitId:{}",
- finalTpGridId, tpPrice, profitId);
- }
- );
+ for (int i = 0; i < longTpCount; i++) {
+ int tpGridId = longGridElement.getId() + 2 * (i + 1);
+ GridElement tpElem = GridElement.findById(tpGridId);
+ if (tpElem == null || tpElem.getLongTakeProfitOrderId() != null) {
+ continue;
}
+ BigDecimal tpPrice = tpElem.getGridPrice();
+ int finalTpGridId = tpGridId;
+ executor.placeTakeProfit(
+ tpPrice,
+ FuturesPriceTrigger.RuleEnum.NUMBER_1,
+ ORDER_TYPE_CLOSE_LONG,
+ negate(config.getQuantity()),
+ profitId -> {
+ longTakeProfitTraderIdParam(tpElem, profitId, true);
+ log.info("[Gate] 多仓止盈挂单, gridId:{}, 触发价:{}, takeProfitId:{}",
+ finalTpGridId, tpPrice, profitId);
+ }
+ );
}
}
}
@@ -902,7 +886,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 +905,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 +927,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 +951,7 @@
ORDER_TYPE_CLOSE_LONG,
negate(size),
profitId -> {
- elem.setLongStopLossOrderId(profitId);
+ elem.addLongStopLossOrderId(profitId);
GridElement.refreshIndices();
log.info("[Gate] 多仓止损已挂, gridId:{}, 触发价:{}, stopLossId:{}", finalId, triggerPrice, profitId);
}
@@ -1008,8 +992,14 @@
TraderParam tp = baseElement.getLongTraderParam();
tp.setEntryOrderId(entryId);
tp.setEntryOrderPlaced(flag);
- baseElement.setHasLongOrder(flag);
- baseElement.setLongOrderId(entryId);
+ if (flag && entryId != null) {
+ baseElement.addLongOrderId(entryId);
+ baseElement.setHasLongOrder(true);
+ } else if (!flag && entryId != null) {
+ baseElement.removeLongOrderId(entryId);
+ // 只有列表全部清空才关闭预置标志，避免还有未成交挂单时被 processGrid 误判
+ baseElement.setHasLongOrder(baseElement.hasLongOrderIds());
+ }
GridElement.refreshIndices();
}
@@ -1019,8 +1009,14 @@
TraderParam tp = baseElement.getShortTraderParam();
tp.setEntryOrderId(entryId);
tp.setEntryOrderPlaced(flag);
- baseElement.setHasShortOrder(flag);
- baseElement.setShortOrderId(entryId);
+ if (flag && entryId != null) {
+ baseElement.addShortOrderId(entryId);
+ baseElement.setHasShortOrder(true);
+ } else if (!flag && entryId != null) {
+ baseElement.removeShortOrderId(entryId);
+ // 只有列表全部清空才关闭预置标志，避免还有未成交挂单时被 processGrid 误判
+ baseElement.setHasShortOrder(baseElement.hasShortOrderIds());
+ }
GridElement.refreshIndices();
}
@@ -1208,16 +1204,20 @@
if (newEntryGrid != null) {
- GridElement cancelGridElement = GridElement.findById(newEntryGrid.getUpId());
- String quantity = cancelGridElement != null
- ? cancelGridElement.getLongTraderParam().getQuantity()
- : config.getBaseQuantity();
- if (cancelGridElement != null && cancelGridElement.isHasLongOrder()) {
- String longOrderId = cancelGridElement.getLongOrderId();
- executor.cancelConditionalOrder(longOrderId, oid -> {
- longEntryTraderIdParam(cancelGridElement, null, false);
- log.info("[Gate] 多仓仓位归零, 取消gridId:{}的多单,{}", cancelGridElement.getId(),longOrderId);
- });
+ String quantity = String.valueOf((accumulatedLongLossCount + 1) * Integer.parseInt(config.getQuantity()));
+ // 向上遍历取消所有遗留多单（跳过基础入场网格0）
+ GridElement cancelCursor = GridElement.findById(newEntryGrid.getUpId());
+ while (cancelCursor != null) {
+ if (cancelCursor.isHasLongOrder()) {
+ for (String longOrderId : new ArrayList<>(cancelCursor.getLongOrderIds())) {
+ GridElement finalCancelCursor = cancelCursor;
+ executor.cancelConditionalOrder(longOrderId, oid -> {
+ longEntryTraderIdParam(finalCancelCursor, longOrderId, false);
+ log.info("[Gate] 多仓仓位归零, 取消gridId:{}的多单,{}", finalCancelCursor.getId(), longOrderId);
+ });
+ }
+ }
+ cancelCursor = GridElement.findById(cancelCursor.getUpId());
}
// log.info("[Gate-2] 多仓仓位归零 空仓队列触发, 匹配：{}，当前价：{}", matched, currentPrice);
if (!newEntryGrid.isHasLongOrder()) {
@@ -1258,20 +1258,20 @@
if (newEntryGrid != null) {
- GridElement cancelGridElement = GridElement.findById(newEntryGrid.getDownId());
-
- String quantity = cancelGridElement != null
- ? cancelGridElement.getShortTraderParam().getQuantity()
- : config.getBaseQuantity();
- /**
- * 看是否有空仓挂单，有就取消
- */
- if (cancelGridElement != null && cancelGridElement.isHasShortOrder()) {
- String shortOrderId = cancelGridElement.getShortOrderId();
- executor.cancelConditionalOrder(shortOrderId, oid -> {
- shortEntryTraderIdParam(cancelGridElement, null, false);
- log.info("[Gate] 空仓仓位归零, 取消gridId:{}的多单{}", cancelGridElement.getId(),shortOrderId);
- });
+ String quantity = String.valueOf((accumulatedShortLossCount + 1) * Integer.parseInt(config.getQuantity()));
+ // 向下遍历取消所有遗留空单（跳过基础入场网格0）
+ GridElement cancelCursor = GridElement.findById(newEntryGrid.getDownId());
+ while (cancelCursor != null) {
+ if (cancelCursor.isHasShortOrder()) {
+ for (String shortOrderId : new ArrayList<>(cancelCursor.getShortOrderIds())) {
+ GridElement finalCancelCursor = cancelCursor;
+ executor.cancelConditionalOrder(shortOrderId, oid -> {
+ shortEntryTraderIdParam(finalCancelCursor, shortOrderId, false);
+ log.info("[Gate] 空仓仓位归零, 取消gridId:{}的多单{}", finalCancelCursor.getId(), shortOrderId);
+ });
+ }
+ }
+ cancelCursor = GridElement.findById(cancelCursor.getDownId());
}
// log.info("[Gate-4] 空仓仓位归零 多仓队列触发, 匹配：{}，当前价：{}", matched, currentPrice);
if (!newEntryGrid.isHasShortOrder()){
@@ -1290,12 +1290,15 @@
}
}
- private void handleLongStopLossTriggered(GridElement gridElement) {
- gridElement.setLongStopLossOrderId(null);
+ private void handleLongStopLossTriggered(GridElement gridElement, String orderId) {
+ gridElement.removeLongStopLossOrderId(orderId);
- accumulatedLongLossCount++;
int gridId = gridElement.getId();
- log.info("[Gate] 多仓止损触发 gridId:{}, 止损次数:{}, 开始追单", gridId, accumulatedLongLossCount);
+ boolean sameGrid = (gridId == lastLongStopLossGridId);
+ accumulatedLongLossCount++;
+ lastLongStopLossGridId = gridId;
+ log.info("[Gate] 多仓止损触发 gridId:{}, 止损次数:{}{}, 开始追单",
+ gridId, accumulatedLongLossCount, sameGrid ? "(同网格)" : "");
int newEntryGridId = gridId + 1;
GridElement newEntryGrid = GridElement.findById(newEntryGridId);
@@ -1305,52 +1308,43 @@
return;
}
- // [Gate-BugFix] 防止与"仓位归零"重复下单：若该网格已有挂单则跳过
- if (!newEntryGrid.isHasLongOrder()) {
- BigDecimal triggerPrice = newEntryGrid.getGridPrice();
-
- // 止损触发后持仓在减少，取REST和WS缓存中较小值更准确
- int posSize = Math.min(queryPositionSize(Position.ModeEnum.DUAL_LONG), longPositionSize.intValue());
- int maxPos = config.getMaxPositionSize();
- // 止损阶梯：止损次数≤阈值时挂单量=单笔数量，超过后恢复默认逻辑(quantity*2)
- int targetAmount;
- if (config.getStopLossCount() > 0 && accumulatedLongLossCount <= config.getStopLossCount()) {
- targetAmount = Integer.parseInt(config.getQuantity());
+ // 止损追单：同一网格可有多笔挂单，不判断 isHasLongOrder，直接挂单
+ BigDecimal triggerPrice = newEntryGrid.getGridPrice();
+ int posSize = Math.min(queryPositionSize(Position.ModeEnum.DUAL_LONG), longPositionSize.intValue());
+ int maxPos = config.getMaxPositionSize();
+ int targetAmount = sameGrid ? Integer.parseInt(config.getQuantity()) : (accumulatedLongLossCount + 1) * Integer.parseInt(config.getQuantity());
+ int addSize;
+ if (maxPos > 0) {
+ int remainingRoom = maxPos - posSize;
+ if (remainingRoom <= 0) {
+ log.warn("[Gate] 多仓止损触发 gridId:{}, 当前持仓{}/{}已达上限，跳过追单",
+ gridId, posSize, maxPos);
+ addSize = 0;
} else {
- targetAmount = Integer.parseInt(config.getQuantity()) * 2; // quantity + 本次止损量
+ addSize = Math.min(remainingRoom, targetAmount);
}
- int addSize;
- if (maxPos > 0) {
- int remainingRoom = maxPos - posSize;
- if (remainingRoom <= 0) {
- log.warn("[Gate] 多仓止损触发 gridId:{}, 当前持仓{}/{}已达上限，跳过追单",
- gridId, posSize, maxPos);
- addSize = 0;
- } else {
- addSize = Math.min(remainingRoom, targetAmount);
- }
- } else {
- addSize = targetAmount;
- }
- if (addSize > 0) {
- String size = String.valueOf(addSize);
- log.info("[Gate] 多仓止损触发 gridId:{}, 止损次数:{}, 在gridId:{}补{}张多单(当前{}/上限{})",
- gridId, accumulatedLongLossCount, newEntryGridId, size, posSize, maxPos > 0 ? maxPos : "无");
- newEntryGrid.getLongTraderParam().setQuantity(size);
- placeEntryOrderWithPreFlag(newEntryGrid, true, triggerPrice,
- FuturesPriceTrigger.RuleEnum.NUMBER_1, size);
- }
- }else{
- log.warn("[Gate] 多仓止损触发 gridId:{}, 目标gridId:{}已有挂单，跳过重复下单", gridId, newEntryGridId);
+ } else {
+ addSize = targetAmount;
+ }
+ if (addSize > 0) {
+ String size = String.valueOf(addSize);
+ log.info("[Gate] 多仓止损触发 gridId:{}, 止损次数:{}, 在gridId:{}补{}张多单(当前{}/上限{})",
+ gridId, accumulatedLongLossCount, newEntryGridId, size, posSize, maxPos > 0 ? maxPos : "无");
+ newEntryGrid.getLongTraderParam().setQuantity(size);
+ placeEntryOrderWithPreFlag(newEntryGrid, true, triggerPrice,
+ FuturesPriceTrigger.RuleEnum.NUMBER_1, size);
}
+ // 取消 gridId+2 位置的所有多单
int cancelGridId = gridId + 2;
GridElement cancelGrid = GridElement.findById(cancelGridId);
if (cancelGrid != null && cancelGrid.isHasLongOrder()) {
- executor.cancelConditionalOrder(cancelGrid.getLongOrderId(), oid -> {
- longEntryTraderIdParam(cancelGrid, null, false);
- log.info("[Gate] 多仓止损触发, 取消gridId:{}的多单", cancelGridId);
- });
+ for (String cancelOrderId : new ArrayList<>(cancelGrid.getLongOrderIds())) {
+ executor.cancelConditionalOrder(cancelOrderId, oid -> {
+ longEntryTraderIdParam(cancelGrid, cancelOrderId, false);
+ log.info("[Gate] 多仓止损触发, 取消gridId:{}的多单,{}", cancelGridId, cancelOrderId);
+ });
+ }
}
// 止损触发时，取消最远的多仓止盈订单
@@ -1372,12 +1366,15 @@
}
}
- private void handleShortStopLossTriggered(GridElement gridElement) {
- gridElement.setShortStopLossOrderId(null);
+ private void handleShortStopLossTriggered(GridElement gridElement, String orderId) {
+ gridElement.removeShortStopLossOrderId(orderId);
- accumulatedShortLossCount++;
int gridId = gridElement.getId();
- log.info("[Gate] 空仓止损触发 gridId:{}, 止损次数:{}, 开始追单", gridId, accumulatedShortLossCount);
+ boolean sameGrid = (gridId == lastShortStopLossGridId);
+ accumulatedShortLossCount++;
+ lastShortStopLossGridId = gridId;
+ log.info("[Gate] 空仓止损触发 gridId:{}, 止损次数:{}{}, 开始追单",
+ gridId, accumulatedShortLossCount, sameGrid ? "(同网格)" : "");
int newEntryGridId = gridId - 1;
GridElement newEntryGrid = GridElement.findById(newEntryGridId);
@@ -1387,55 +1384,43 @@
return;
}
- // [Gate-BugFix] 防止与"仓位归零"重复下单：若该网格已有挂单则跳过
- if (!newEntryGrid.isHasShortOrder()) {
- BigDecimal triggerPrice = newEntryGrid.getGridPrice();
-
- // 止损触发后持仓在减少，取REST和WS缓存中较小值更准确
- int posSize = Math.min(queryPositionSize(Position.ModeEnum.DUAL_SHORT), shortPositionSize.intValue());
- int maxPos = config.getMaxPositionSize();
- // 止损阶梯：止损次数≤阈值时挂单量=单笔数量，超过后恢复默认逻辑(quantity*2)
- int targetAmount;
- if (config.getStopLossCount() > 0 && accumulatedShortLossCount <= config.getStopLossCount()) {
- targetAmount = Integer.parseInt(config.getQuantity());
+ // 止损追单：同一网格可有多笔挂单，不判断 isHasShortOrder，直接挂单
+ BigDecimal triggerPrice = newEntryGrid.getGridPrice();
+ int posSize = Math.min(queryPositionSize(Position.ModeEnum.DUAL_SHORT), shortPositionSize.intValue());
+ int maxPos = config.getMaxPositionSize();
+ int targetAmount = sameGrid ? Integer.parseInt(config.getQuantity()) : (accumulatedShortLossCount + 1) * Integer.parseInt(config.getQuantity());
+ int addSize;
+ if (maxPos > 0) {
+ int remainingRoom = maxPos - posSize;
+ if (remainingRoom <= 0) {
+ log.warn("[Gate] 空仓止损触发 gridId:{}, 当前持仓{}/{}已达上限，跳过追单",
+ gridId, posSize, maxPos);
+ addSize = 0;
} else {
- targetAmount = Integer.parseInt(config.getQuantity()) * 2; // quantity + 本次止损量
+ addSize = Math.min(remainingRoom, targetAmount);
}
- int addSize;
- if (maxPos > 0) {
- int remainingRoom = maxPos - posSize;
- if (remainingRoom <= 0) {
- log.warn("[Gate] 空仓止损触发 gridId:{}, 当前持仓{}/{}已达上限，跳过追单",
- gridId, posSize, maxPos);
- addSize = 0;
- } else {
- addSize = Math.min(remainingRoom, targetAmount);
- }
- } else {
- addSize = targetAmount;
- }
- if (addSize > 0) {
- String size = String.valueOf(addSize);
- log.info("[Gate] 空仓止损触发 gridId:{}, 止损次数:{}, 在gridId:{}补{}张空单(当前{}/上限{})",
- gridId, accumulatedShortLossCount, newEntryGridId, size, posSize, maxPos > 0 ? maxPos : "无");
- newEntryGrid.getShortTraderParam().setQuantity(size);
- placeEntryOrderWithPreFlag(newEntryGrid, false, triggerPrice,
- FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(size));
- }
- }else{
- log.warn("[Gate] 空仓止损触发 gridId:{}, 目标gridId:{}已有挂单，跳过重复下单", gridId, newEntryGridId);
+ } else {
+ addSize = targetAmount;
+ }
+ if (addSize > 0) {
+ String size = String.valueOf(addSize);
+ log.info("[Gate] 空仓止损触发 gridId:{}, 止损次数:{}, 在gridId:{}补{}张空单(当前{}/上限{})",
+ gridId, accumulatedShortLossCount, newEntryGridId, size, posSize, maxPos > 0 ? maxPos : "无");
+ newEntryGrid.getShortTraderParam().setQuantity(size);
+ placeEntryOrderWithPreFlag(newEntryGrid, false, triggerPrice,
+ FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(size));
}
-
-
-
+ // 取消 gridId-2 位置的所有空单
int cancelGridId = gridId - 2;
GridElement cancelGrid = GridElement.findById(cancelGridId);
if (cancelGrid != null && cancelGrid.isHasShortOrder()) {
- executor.cancelConditionalOrder(cancelGrid.getShortOrderId(), oid -> {
- shortEntryTraderIdParam(cancelGrid, null, false);
- log.info("[Gate] 空仓止损触发, 取消gridId:{}的空单", cancelGridId);
- });
+ for (String cancelOrderId : new ArrayList<>(cancelGrid.getShortOrderIds())) {
+ executor.cancelConditionalOrder(cancelOrderId, oid -> {
+ shortEntryTraderIdParam(cancelGrid, cancelOrderId, false);
+ log.info("[Gate] 空仓止损触发, 取消gridId:{}的空单,{}", cancelGridId, cancelOrderId);
+ });
+ }
}
// 止损触发时，取消最远的空仓止盈订单
@@ -1553,48 +1538,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 +1595,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 +1614,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 +1646,145 @@
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();
+ /**
+ * 多仓止损追单 — 网格数量 = baseQuantity/quantity，从近到远分配。
+ * aCount<0跳过, aCount=0→主=2, aCount=1→主=2,辅0=1, aCount>=2→主=aCount,辅依次填1
+ */
+ private void extendLongStopLoss(int filledQty, int gridId) {
+ int qty = Integer.parseInt(config.getQuantity());
+ int baseQty = Integer.parseInt(config.getBaseQuantity());
+ int gridCount = baseQty / qty;
+ if (gridCount <= 0 || filledQty < qty) {
+ return;
+ }
+
+ int totalOrders = filledQty / qty;
+ int[] orders = new int[gridCount];
+
+ if (gridCount == 1) {
+ // 只有1个网格，全量放在上面
+ orders[0] = totalOrders;
+ } else {
+ int aCount = Math.max(0, totalOrders - 2);
+ if (aCount == 0) {
+ orders[0] = 2;
+ } else if (aCount == 1) {
+ orders[0] = 2;
+ orders[1] = 1;
+ } else {
+ orders[0] = aCount;
+ int remainder = totalOrders - aCount;
+ for (int i = 1; i < gridCount && remainder > 0; i++) {
+ orders[i] = 1;
+ remainder--;
+ }
}
}
-// 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);
- }
- );
+ StringBuilder detail = new StringBuilder();
+ for (int i = 0; i < gridCount; i++) {
+ if (orders[i] > 0) {
+ int sgId = gridId - 2 - i;
+ placeStopLossOrders(sgId, orders[i], qty, FuturesPriceTrigger.RuleEnum.NUMBER_2,
+ ORDER_TYPE_CLOSE_LONG, true);
+ if (detail.length() > 0) {
+ detail.append(" ");
+ }
+ detail.append(sgId).append("x").append(orders[i]);
}
}
+ log.info("[Gate] 多仓追挂止损, 成交{}张, gridId:{}, 网格数:{}, 分配:{}",
+ filledQty, gridId, gridCount, detail);
}
+ /**
+ * 空仓止损追单 — 网格数量 = baseQuantity/quantity，从近到远分配。
+ * aCount<0跳过, aCount=0→主=2, aCount=1→主=2,辅0=1, aCount>=2→主=aCount,辅依次填1
+ */
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 baseQty = Integer.parseInt(config.getBaseQuantity());
+ int gridCount = baseQty / qty;
+ if (gridCount <= 0 || filledQty < qty) {
+ return;
+ }
+
+ int totalOrders = filledQty / qty;
+ int[] orders = new int[gridCount];
+
+ if (gridCount == 1) {
+ // 只有1个网格，全量放在上面
+ orders[0] = totalOrders;
+ } else {
+ int aCount = Math.max(0, totalOrders - 2);
+ if (aCount == 0) {
+ orders[0] = 2;
+ } else if (aCount == 1) {
+ orders[0] = 2;
+ orders[1] = 1;
+ } else {
+ orders[0] = aCount;
+ int remainder = totalOrders - aCount;
+ for (int i = 1; i < gridCount && remainder > 0; i++) {
+ orders[i] = 1;
+ remainder--;
+ }
}
}
-// 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);
-// }
-// );
-// }
-
- 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);
- }
- );
- }
- }
- 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);
- }
- );
+ StringBuilder detail = new StringBuilder();
+ for (int i = 0; i < gridCount; i++) {
+ if (orders[i] > 0) {
+ int sgId = gridId + 2 + i;
+ placeStopLossOrders(sgId, orders[i], qty, FuturesPriceTrigger.RuleEnum.NUMBER_1,
+ ORDER_TYPE_CLOSE_SHORT, false);
+ if (detail.length() > 0) {
+ detail.append(" ");
+ }
+ detail.append(sgId).append("x").append(orders[i]);
}
}
+ log.info("[Gate] 空仓追挂止损, 成交{}张, gridId:{}, 网格数:{}, 分配:{}",
+ filledQty, gridId, gridCount, detail);
+ }
+
+ /**
+ * 在指定网格位置挂 count 个独立止损单，每个 size 张。
+ */
+ private void placeStopLossOrders(int gridId, int count, int qty,
+ FuturesPriceTrigger.RuleEnum rule,
+ String orderType, boolean isLong) {
+ if (count <= 0) {
+ return;
+ }
+ 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);
+ }
+ );
+ }
}
// ---- 工具 ----
@@ -1904,15 +1828,18 @@
}
},
() -> {
+ // 仅当列表为空（无其他有效订单）时才清预置标志，避免误伤其他并发挂单
if (isLong) {
- gridElement.setHasLongOrder(false);
- gridElement.setLongOrderId(null);
+ if (!gridElement.hasLongOrderIds()) {
+ gridElement.setHasLongOrder(false);
+ }
} else {
- gridElement.setHasShortOrder(false);
- gridElement.setShortOrderId(null);
+ if (!gridElement.hasShortOrderIds()) {
+ gridElement.setHasShortOrder(false);
+ }
}
GridElement.refreshIndices();
- log.warn("[Gate] 条件单创建失败，回滚标志位 gridId:{}, isLong:{}", gridElement.getId(), isLong);
+ log.warn("[Gate] 条件单创建失败 gridId:{}, isLong:{}", gridElement.getId(), isLong);
}
);
}
--
Gitblit v1.9.1