From 4802f4b913efa31a97942fde6d07366f2de534ec Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 18 Jun 2026 10:54:29 +0800
Subject: [PATCH] fix(gateApi): 修正网格交易费率配置
---
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java | 240 +++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 180 insertions(+), 60 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 dec4977..aeb9d38 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -134,6 +134,11 @@
/** 多头是否活跃（有仓位） */
private volatile boolean longActive = false;
+ /** 多头累计止损张数（加仓订单成交后归零） */
+ private volatile int accumulatedLongLossCount = 0;
+ /** 空头累计止损张数（加仓订单成交后归零） */
+ private volatile int accumulatedShortLossCount = 0;
+
private volatile BigDecimal lastKlinePrice;
private volatile BigDecimal markPrice = BigDecimal.ZERO;
private volatile BigDecimal cumulativePnl = BigDecimal.ZERO;
@@ -300,6 +305,8 @@
baseShortOpened = false;
longActive = false;
shortActive = false;
+ accumulatedLongLossCount = 0;
+ accumulatedShortLossCount = 0;
shortPriceQueue.clear();
longPriceQueue.clear();
currentLongOrderIds.clear();
@@ -383,7 +390,7 @@
}
- checkProfitAndReset();
+// checkProfitAndReset();
if (state == StrategyState.ACTIVE &&
@@ -608,8 +615,37 @@
if (shortGridElement.isHasShortOrder() && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0") ){
int filledQty = Integer.parseInt(shortGridElement.getShortTraderParam().getQuantity());
shortEntryTraderIdParam(shortGridElement, null, false);
- extendShortStopLoss(filledQty);
+ extendShortStopLoss(filledQty,shortGridElement.getId());
+ accumulatedShortLossCount = 0; // 加仓订单成交，重置止损累计
log.info("[Gate] 空单成交 gridId:{}", filledQty);
+
+ // 空仓持仓超过baseQuantity时，从gridId-2开始向外追挂止盈
+ BigDecimal shortBaseQty = new BigDecimal(config.getBaseQuantity());
+ BigDecimal shortGridQty = new BigDecimal(config.getQuantity());
+ if (shortPositionSize.compareTo(shortBaseQty) > 0) {
+ BigDecimal shortExcess = shortPositionSize.subtract(shortBaseQty);
+ int shortExcessCount = shortExcess.divide(shortGridQty, 0, RoundingMode.DOWN).intValue();
+ for (int i = 0; i < shortExcessCount; i++) {
+ int tpGridId = shortGridElement.getId() - 2 - i;
+ 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);
@@ -618,8 +654,37 @@
int filledQty = Integer.parseInt(longGridElement.getLongTraderParam().getQuantity());
longEntryTraderIdParam(longGridElement, null, false);
- extendLongStopLoss(filledQty);
+ extendLongStopLoss(filledQty,longGridElement.getId());
+ accumulatedLongLossCount = 0; // 加仓订单成交，重置止损累计
log.info("[Gate] 多单成交 gridId:{}", filledQty);
+
+ // 多仓持仓超过baseQuantity时，从gridId+2开始向外追挂止盈
+ BigDecimal longBaseQty = new BigDecimal(config.getBaseQuantity());
+ BigDecimal longGridQty = new BigDecimal(config.getQuantity());
+ if (longPositionSize.compareTo(longBaseQty) > 0) {
+ BigDecimal longExcess = longPositionSize.subtract(longBaseQty);
+ int longExcessCount = longExcess.divide(longGridQty, 0, RoundingMode.DOWN).intValue();
+ for (int i = 0; i < longExcessCount; i++) {
+ int tpGridId = longGridElement.getId() + 2 + i;
+ 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);
+ }
+ );
+ }
+ }
}
}
}
@@ -689,7 +754,7 @@
// );
// }
- int shortTime = Integer.parseInt(config.getBaseQuantity()) + 1;
+ int shortTime = Integer.parseInt(config.getBaseQuantity()) / Integer.parseInt(config.getQuantity()) + 1;
for (int id = 2; id <= shortTime; id++) {
GridElement elem = GridElement.findById(id);
if (elem == null) {
@@ -712,7 +777,7 @@
}
- int longTime = Integer.parseInt(config.getBaseQuantity()) + 1;
+ int longTime = Integer.parseInt(config.getBaseQuantity()) / Integer.parseInt(config.getQuantity()) + 1;
for (int id = -2; id >= -longTime; id--) {
GridElement elem = GridElement.findById(id);
if (elem == null) {
@@ -965,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);
}
}
}
@@ -1013,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();
/**
* 看是否有空仓挂单，有就取消
*/
@@ -1034,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));
}
}
@@ -1056,21 +1127,22 @@
return;
}
- BigDecimal triggerPrice = newEntryGrid.getGridPrice();
+ // [Gate-BugFix] 防止与"仓位归零"重复下单：若该网格已有挂单则跳过
+ if (!newEntryGrid.isHasLongOrder()) {
+ BigDecimal triggerPrice = newEntryGrid.getGridPrice();
- BigDecimal baseQuantity = new BigDecimal(config.getBaseQuantity());
- BigDecimal subtract = baseQuantity.subtract(longPositionSize);
- String size = new BigDecimal(config.getQuantity()).add(new BigDecimal("1")).toString();
- if (subtract.compareTo(BigDecimal.ZERO) >=0){
- size = subtract.add(new BigDecimal("1")).toString();
+ // 累计止损张数 + 当前止损量作为追单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);
+ }else{
+ log.warn("[Gate] 多仓止损触发 gridId:{}, 目标gridId:{}已有挂单，跳过重复下单", gridId, newEntryGridId);
}
- log.info("[Gate] 多仓止损触发 gridId:{}, 在gridId:{}挂{}基础张多单",
- gridId, newEntryGridId, size);
-
- newEntryGrid.getLongTraderParam().setQuantity(size);
- placeEntryOrderWithPreFlag(newEntryGrid, true, triggerPrice,
- FuturesPriceTrigger.RuleEnum.NUMBER_1, size);
-
int cancelGridId = gridId + 2;
GridElement cancelGrid = GridElement.findById(cancelGridId);
@@ -1078,6 +1150,24 @@
executor.cancelConditionalOrder(cancelGrid.getLongOrderId(), oid -> {
longEntryTraderIdParam(cancelGrid, null, false);
log.info("[Gate] 多仓止损触发, 取消gridId:{}的多单", cancelGridId);
+ });
+ }
+
+ // 止损触发时，取消最远的多仓止盈订单
+ GridElement farthestLongTp = null;
+ for (GridElement e : config.getGridElements()) {
+ if (e.getLongTakeProfitOrderId() != null) {
+ if (farthestLongTp == null || e.getGridPrice().compareTo(farthestLongTp.getGridPrice()) > 0) {
+ farthestLongTp = e;
+ }
+ }
+ }
+ if (farthestLongTp != null) {
+ String tpOrderId = farthestLongTp.getLongTakeProfitOrderId();
+ GridElement finalFarthestLongTp = farthestLongTp;
+ executor.cancelConditionalOrder(tpOrderId, oid -> {
+ longTakeProfitTraderIdParam(finalFarthestLongTp, null, false);
+ log.info("[Gate] 多仓止损触发, 取消最远止盈 gridId:{}, orderId:{}", finalFarthestLongTp.getId(), tpOrderId);
});
}
}
@@ -1096,19 +1186,23 @@
return;
}
- BigDecimal triggerPrice = newEntryGrid.getGridPrice();
+ // [Gate-BugFix] 防止与"仓位归零"重复下单：若该网格已有挂单则跳过
+ if (!newEntryGrid.isHasShortOrder()) {
+ BigDecimal triggerPrice = newEntryGrid.getGridPrice();
- BigDecimal baseQuantity = new BigDecimal(config.getBaseQuantity());
- BigDecimal subtract = baseQuantity.subtract(longPositionSize);
- String size = new BigDecimal(config.getQuantity()).add(new BigDecimal("1")).toString();
- if (subtract.compareTo(BigDecimal.ZERO) >=0){
- size = subtract.add(new BigDecimal("1")).toString();
+ // 累计止损张数 + 当前止损量作为追单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);
}
- log.info("[Gate] 空仓止损触发 gridId:{}, 在gridId:{}挂{}基础张空单",
- gridId, newEntryGridId, size);
- newEntryGrid.getShortTraderParam().setQuantity(size);
- placeEntryOrderWithPreFlag(newEntryGrid, false, triggerPrice,
- FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(size));
+
+
int cancelGridId = gridId - 2;
@@ -1119,21 +1213,43 @@
log.info("[Gate] 空仓止损触发, 取消gridId:{}的空单", cancelGridId);
});
}
+
+ // 止损触发时，取消最远的空仓止盈订单
+ GridElement farthestShortTp = null;
+ for (GridElement e : config.getGridElements()) {
+ if (e.getShortTakeProfitOrderId() != null) {
+ if (farthestShortTp == null || e.getGridPrice().compareTo(farthestShortTp.getGridPrice()) < 0) {
+ farthestShortTp = e;
+ }
+ }
+ }
+ if (farthestShortTp != null) {
+ String tpOrderId = farthestShortTp.getShortTakeProfitOrderId();
+ GridElement finalFarthestShortTp = farthestShortTp;
+ executor.cancelConditionalOrder(tpOrderId, oid -> {
+ shortTakeProfitTraderIdParam(finalFarthestShortTp, null, false);
+ log.info("[Gate] 空仓止损触发, 取消最远止盈 gridId:{}, orderId:{}", finalFarthestShortTp.getId(), tpOrderId);
+ });
+ }
}
- private void extendLongStopLoss(int filledQty) {
+ 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();
}
}
+
+ int interval = 1;
if (furthestSlId == 0) {
- furthestSlId = -11;
+ furthestSlId = gridId;
+ interval = 2;
}
- log.info("[Gate] 多仓追挂止损, 当前最远止损gridId:{}, 追加{}张", furthestSlId, filledQty);
- for (int i = 0; i < filledQty; i++) {
- int newSlId = furthestSlId - i - 1;
+ 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;
@@ -1154,19 +1270,23 @@
}
}
- private void extendShortStopLoss(int filledQty) {
+ 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 interval = 1;
if (furthestSlId == 0) {
- furthestSlId = 11;
+ furthestSlId = gridId;
+ interval = 2;
}
- log.info("[Gate] 空仓追挂止损, 当前最远止损gridId:{}, 追加{}张", furthestSlId, filledQty);
- for (int i = 0; i < filledQty; i++) {
- int newSlId = furthestSlId + i + 1;
+ 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;
--
Gitblit v1.9.1