From d8bff1cf946b36f6eeb00c8ecafb47e55b96cedb Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 07 Jul 2026 10:21:10 +0800
Subject: [PATCH] refactor(gateApi): 止盈单挂单流程，统一使用固定的gridId为0进行操作
---
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java | 216 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 132 insertions(+), 84 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 137d05e..ccacbc0 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -635,49 +635,73 @@
extendShortStopLoss(posSize, shortGridElement.getId());
log.info("[Gate] 空单成交 gridId:{}, 当前持仓:{}张", filledQty, posSize);
- // 空仓持仓超过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();
-
- // 找多仓第一个（最近的）止损位置
- 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;
- if (firstLongSlId != 0) {
- tpGridId = firstLongSlId - i; // 从多仓第一个止损位置开始，向下挂，间隔=1
- } else {
- 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);
- }
- );
- }
+ int tpGridId = 0;
+ GridElement tpElem = GridElement.findById(tpGridId);
+ // 已有止盈单先取消再重挂
+ String existingShortTpId = tpElem.getShortTakeProfitOrderId();
+ if (existingShortTpId != null) {
+ executor.cancelConditionalOrder(existingShortTpId, oid -> {
+ shortTakeProfitTraderIdParam(tpElem, null, false);
+ log.info("[Gate] 空仓止盈取消(gridId:{})，准备重挂", tpGridId);
+ });
}
+ 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);
+ }
+ );
+
+// // 空仓持仓超过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();
+//
+// // 找多仓第一个（最近的）止损位置
+// 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;
+// if (firstLongSlId != 0) {
+// tpGridId = firstLongSlId - i; // 从多仓第一个止损位置开始，向下挂，间隔=1
+// } else {
+// 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);
@@ -693,49 +717,73 @@
extendLongStopLoss(posSize, longGridElement.getId());
log.info("[Gate] 多单成交 gridId:{}, 当前持仓:{}张", filledQty, posSize);
- // 多仓持仓超过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();
-
- // 找空仓第一个（最近的）止损位置
- 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;
- if (firstShortSlId != 0) {
- tpGridId = firstShortSlId + i; // 从空仓第一个止损位置开始，向上挂，间隔=1
- } else {
- 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);
- }
- );
- }
+ int tpGridId = 0;
+ GridElement tpElem = GridElement.findById(tpGridId);
+ // 已有止盈单先取消再重挂
+ String existingLongTpId = tpElem.getLongTakeProfitOrderId();
+ if (existingLongTpId != null) {
+ executor.cancelConditionalOrder(existingLongTpId, oid -> {
+ longTakeProfitTraderIdParam(tpElem, null, false);
+ log.info("[Gate] 多仓止盈取消(gridId:{})，准备重挂", tpGridId);
+ });
}
+ 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);
+ }
+ );
+
+// // 多仓持仓超过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();
+//
+// // 找空仓第一个（最近的）止损位置
+// 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;
+// if (firstShortSlId != 0) {
+// tpGridId = firstShortSlId + i; // 从空仓第一个止损位置开始，向上挂，间隔=1
+// } else {
+// 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);
+// }
+// );
+// }
+// }
}
}
}
--
Gitblit v1.9.1