From 605ad02775830168f4cf989b705c02d78709155d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 17 Jun 2026 16:55:02 +0800
Subject: [PATCH] fix(gateApi): 解决网格交易止损重复下单问题
---
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java | 107 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 65 insertions(+), 42 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 cbd6694..dc78d98 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -1030,25 +1030,27 @@
GridElement newEntryGrid = GridElement.findById(upId);
if (newEntryGrid != null) {
-// log.info("[Gate-2] 多仓仓位归零 空仓队列触发, 匹配：{}，当前价：{}", matched, currentPrice);
- if (!newEntryGrid.isHasLongOrder()) {
- BigDecimal triggerPrice = newEntryGrid.getGridPrice();
- String size = config.getBaseQuantity();
- log.info("[Gate] 多仓仓位归零 gridId:{}, 挂{}基础张多单",
- newEntryGrid.getId(), size);
- newEntryGrid.getLongTraderParam().setQuantity(size);
- placeEntryOrderWithPreFlag(newEntryGrid, true, triggerPrice,
- FuturesPriceTrigger.RuleEnum.NUMBER_1, size);
- }
-
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);
});
+ }
+// log.info("[Gate-2] 多仓仓位归零 空仓队列触发, 匹配：{}，当前价：{}", matched, currentPrice);
+ if (!newEntryGrid.isHasLongOrder()) {
+ BigDecimal triggerPrice = newEntryGrid.getGridPrice();
+ String size = quantity;
+ log.info("[Gate] 多仓仓位归零 gridId:{}, 挂{}基础张多单",
+ newEntryGrid.getId(), size);
+ newEntryGrid.getLongTraderParam().setQuantity(size);
+ placeEntryOrderWithPreFlag(newEntryGrid, true, triggerPrice,
+ FuturesPriceTrigger.RuleEnum.NUMBER_1, size);
}
}
}
@@ -1078,18 +1080,12 @@
GridElement newEntryGrid = GridElement.findById(downId);
if (newEntryGrid != null) {
-// log.info("[Gate-4] 空仓仓位归零 多仓队列触发, 匹配：{}，当前价：{}", matched, currentPrice);
- if (!newEntryGrid.isHasShortOrder()){
- BigDecimal triggerPrice = newEntryGrid.getGridPrice();
- String size = config.getBaseQuantity();
- log.info("[Gate] 空仓仓位归零 gridId:{}, 挂{}基础张多单",
- newEntryGrid.getId(), size);
- newEntryGrid.getShortTraderParam().setQuantity(size);
- placeEntryOrderWithPreFlag(newEntryGrid, false, triggerPrice,
- FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(size));
- }
GridElement cancelGridElement = GridElement.findById(newEntryGrid.getDownId());
+
+ String quantity = cancelGridElement != null
+ ? cancelGridElement.getShortTraderParam().getQuantity()
+ : config.getBaseQuantity();
/**
* 看是否有空仓挂单，有就取消
*/
@@ -1099,6 +1095,16 @@
shortEntryTraderIdParam(cancelGridElement, null, false);
log.info("[Gate] 空仓仓位归零, 取消gridId:{}的多单{}", cancelGridElement.getId(),shortOrderId);
});
+ }
+// log.info("[Gate-4] 空仓仓位归零 多仓队列触发, 匹配：{}，当前价：{}", matched, currentPrice);
+ if (!newEntryGrid.isHasShortOrder()){
+ BigDecimal triggerPrice = newEntryGrid.getGridPrice();
+ String size = quantity;
+ log.info("[Gate] 空仓仓位归零 gridId:{}, 挂{}基础张多单",
+ newEntryGrid.getId(), size);
+ newEntryGrid.getShortTraderParam().setQuantity(size);
+ placeEntryOrderWithPreFlag(newEntryGrid, false, triggerPrice,
+ FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(size));
}
}
@@ -1121,18 +1127,22 @@
return;
}
- BigDecimal triggerPrice = newEntryGrid.getGridPrice();
+ // [Gate-BugFix] 防止与"仓位归零"重复下单：若该网格已有挂单则跳过
+ if (!newEntryGrid.isHasLongOrder()) {
+ BigDecimal triggerPrice = newEntryGrid.getGridPrice();
- // 累计止损张数 + 当前止损量作为追单size，不再依赖positionSize（避免WS竞态）
- accumulatedLongLossCount += Integer.parseInt(config.getQuantity());
- String size = String.valueOf(accumulatedLongLossCount + Integer.parseInt(config.getQuantity()));
- log.info("[Gate] 多仓止损触发 gridId:{}, 在gridId:{}挂{}基础张多单",
- gridId, newEntryGridId, size);
+ // 累计止损张数 + 当前止损量作为追单size，不再依赖positionSize（避免WS竞态）
+ accumulatedLongLossCount += Integer.parseInt(config.getQuantity());
+ String size = String.valueOf(accumulatedLongLossCount + Integer.parseInt(config.getQuantity()));
+ log.info("[Gate] 多仓止损触发 gridId:{}, 在gridId:{}挂{}基础张多单",
+ gridId, newEntryGridId, size);
- newEntryGrid.getLongTraderParam().setQuantity(size);
- placeEntryOrderWithPreFlag(newEntryGrid, true, triggerPrice,
- FuturesPriceTrigger.RuleEnum.NUMBER_1, size);
-
+ newEntryGrid.getLongTraderParam().setQuantity(size);
+ placeEntryOrderWithPreFlag(newEntryGrid, true, triggerPrice,
+ FuturesPriceTrigger.RuleEnum.NUMBER_1, size);
+ }else{
+ log.warn("[Gate] 多仓止损触发 gridId:{}, 目标gridId:{}已有挂单，跳过重复下单", gridId, newEntryGridId);
+ }
int cancelGridId = gridId + 2;
GridElement cancelGrid = GridElement.findById(cancelGridId);
@@ -1176,16 +1186,23 @@
return;
}
- BigDecimal triggerPrice = newEntryGrid.getGridPrice();
+ // [Gate-BugFix] 防止与"仓位归零"重复下单：若该网格已有挂单则跳过
+ if (!newEntryGrid.isHasShortOrder()) {
+ BigDecimal triggerPrice = newEntryGrid.getGridPrice();
- // 累计止损张数 + 当前止损量作为追单size，不再依赖positionSize（避免WS竞态）
- accumulatedShortLossCount += Integer.parseInt(config.getQuantity());
- String size = String.valueOf(accumulatedShortLossCount + Integer.parseInt(config.getQuantity()));
- log.info("[Gate] 空仓止损触发 gridId:{}, 在gridId:{}挂{}基础张空单",
- gridId, newEntryGridId, size);
- newEntryGrid.getShortTraderParam().setQuantity(size);
- placeEntryOrderWithPreFlag(newEntryGrid, false, triggerPrice,
- FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(size));
+ // 累计止损张数 + 当前止损量作为追单size，不再依赖positionSize（避免WS竞态）
+ accumulatedShortLossCount += Integer.parseInt(config.getQuantity());
+ String size = String.valueOf(accumulatedShortLossCount + Integer.parseInt(config.getQuantity()));
+ log.info("[Gate] 空仓止损触发 gridId:{}, 在gridId:{}挂{}基础张空单",
+ gridId, newEntryGridId, size);
+ newEntryGrid.getShortTraderParam().setQuantity(size);
+ placeEntryOrderWithPreFlag(newEntryGrid, false, triggerPrice,
+ FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(size));
+ }else{
+ log.warn("[Gate] 空仓止损触发 gridId:{}, 目标gridId:{}已有挂单，跳过重复下单", gridId, newEntryGridId);
+ }
+
+
int cancelGridId = gridId - 2;
@@ -1223,12 +1240,15 @@
furthestSlId = e.getId();
}
}
+
+ int interval = 1;
if (furthestSlId == 0) {
furthestSlId = gridId;
+ interval = 2;
}
log.info("[Gate] 多仓追挂止损, 当前最远止损gridId:{}, 追加{}张", furthestSlId, filledQty);
for (int i = 0; i < filledQty; i++) {
- int newSlId = furthestSlId - i - 1;
+ int newSlId = furthestSlId - i - interval;
GridElement elem = GridElement.findById(newSlId);
if (elem == null) {
continue;
@@ -1256,12 +1276,15 @@
furthestSlId = e.getId();
}
}
+
+ int interval = 1;
if (furthestSlId == 0) {
furthestSlId = gridId;
+ interval = 2;
}
log.info("[Gate] 空仓追挂止损, 当前最远止损gridId:{}, 追加{}张", furthestSlId, filledQty);
for (int i = 0; i < filledQty; i++) {
- int newSlId = furthestSlId + i + 1;
+ int newSlId = furthestSlId + i + interval;
GridElement elem = GridElement.findById(newSlId);
if (elem == null) {
continue;
--
Gitblit v1.9.1