From a48f0ecfefc8553f40fa3ea2bd6694e4f525c909 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 03 Jul 2026 21:31:09 +0800
Subject: [PATCH] refactor(gateApi): 优化网格交易服务的止盈逻辑和条件判断
---
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java | 206 +++++++++++++++++++++++++++++++--------------------
1 files changed, 126 insertions(+), 80 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 8c9fe92..6d59571 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -364,6 +364,7 @@
* @param closePrice K 线收盘价（即当前最新成交价）
*/
public void onKline(BigDecimal closePrice) {
+
lastKlinePrice = closePrice;
//初始化0位置的开仓，并且用空的开仓价格，作为价格基准来划分网格
@@ -391,46 +392,37 @@
return;
}
+ checkProfitAndReset();
-// checkProfitAndReset();
-
-
- if (state == StrategyState.ACTIVE &&
- longActive == false &&
- longPositionSize.compareTo(BigDecimal.ZERO) == 0){
- processShortGrid(closePrice);
- }
-
-
- if (state == StrategyState.ACTIVE &&
- shortActive == false &&
- shortPositionSize.compareTo(BigDecimal.ZERO) == 0){
- processLongGrid(closePrice);
- }
+// if (state == StrategyState.ACTIVE &&
+// longActive == false &&
+// longPositionSize.compareTo(BigDecimal.ZERO) == 0){
+// processShortGrid(closePrice);
+// }
+//
+//
+// if (state == StrategyState.ACTIVE &&
+// shortActive == false &&
+// shortPositionSize.compareTo(BigDecimal.ZERO) == 0){
+// processLongGrid(closePrice);
+// }
}
/** Gate 永续合约 taker 费率 0.05% */
private static final BigDecimal TAKER_FEE_RATE = new BigDecimal("0.0005");
private void checkProfitAndReset() {
+ if (state == StrategyState.STOPPED || state == StrategyState.WAITING_KLINE) {
+ return;
+ }
try {
BigDecimal target = initialPrincipal.add(config.getExpectedProfit());
FuturesAccount account = futuresApi.listFuturesAccounts(SETTLE);
- BigDecimal unrealisedPnl = new BigDecimal(account.getCrossUnrealisedPnl());
- BigDecimal available = new BigDecimal(account.getCrossAvailable());
- BigDecimal totalEquity = unrealisedPnl.add(available);
+ BigDecimal totalEquity = new BigDecimal(account.getTotal()).add(new BigDecimal(account.getUnrealisedPnl()));
- // 估算平仓手续费：(多仓张数+空仓张数) × 合约面值 × 当前价 × taker费率
- BigDecimal totalSize = longPositionSize.abs().add(shortPositionSize.abs());
- BigDecimal closeContractValue =
- totalSize.multiply(config.getContractMultiplier()).multiply(lastKlinePrice != null ? lastKlinePrice : BigDecimal.ZERO);
- BigDecimal estimatedFee = closeContractValue.multiply(TAKER_FEE_RATE);
- BigDecimal netEquity = totalEquity.subtract(estimatedFee);
- log.info("[Gate] 盈亏检查,总张数：{}, upl:{}, avail:{}, 合计:{}, 估手续费:{}, 净权益:{}, 目标:{}",
- totalSize,unrealisedPnl, available, totalEquity, estimatedFee, netEquity, target);
- if (netEquity.compareTo(target) > 0) {
- log.info("[Gate] 盈亏达标(净权益{}>目标{})，重置策略", netEquity, target);
+ if (totalEquity.compareTo(target) > 0) {
+ log.info("[Gate] 盈亏达标(净权益{}>目标{})，重置策略", totalEquity, target);
state = StrategyState.STOPPED;
try {
futuresApi.cancelPriceTriggeredOrderList(SETTLE, config.getContract());
@@ -641,7 +633,6 @@
// REST 查询可能因交易所延迟返回旧值，与 WS 本地缓存取最大值兜底
int posSize = Math.max(queryPositionSize(Position.ModeEnum.DUAL_SHORT), shortPositionSize.intValue());
extendShortStopLoss(posSize, shortGridElement.getId());
- accumulatedShortLossCount = 0; // 加仓订单成交，重置止损累计
log.info("[Gate] 空单成交 gridId:{}, 当前持仓:{}张", filledQty, posSize);
// 空仓持仓超过baseQuantity时，先找多仓第一个止损位置，从该位置向下挂止盈（间隔=1）
@@ -700,7 +691,6 @@
// REST 查询可能因交易所延迟返回旧值，与 WS 本地缓存取最大值兜底
int posSize = Math.max(queryPositionSize(Position.ModeEnum.DUAL_LONG), longPositionSize.intValue());
extendLongStopLoss(posSize, longGridElement.getId());
- accumulatedLongLossCount = 0; // 加仓订单成交，重置止损累计
log.info("[Gate] 多单成交 gridId:{}, 当前持仓:{}张", filledQty, posSize);
// 多仓持仓超过baseQuantity时，先找空仓第一个止损位置，从该位置向上挂止盈（间隔=1）
@@ -1227,8 +1217,9 @@
private void handleLongStopLossTriggered(GridElement gridElement) {
gridElement.setLongStopLossOrderId(null);
+ accumulatedLongLossCount++;
int gridId = gridElement.getId();
- log.info("[Gate] 多仓止损触发 gridId:{}, 开始追单", gridId);
+ log.info("[Gate] 多仓止损触发 gridId:{}, 止损次数:{}, 开始追单", gridId, accumulatedLongLossCount);
int newEntryGridId = gridId + 1;
GridElement newEntryGrid = GridElement.findById(newEntryGridId);
@@ -1245,7 +1236,13 @@
// 止损触发后持仓在减少，取REST和WS缓存中较小值更准确
int posSize = Math.min(queryPositionSize(Position.ModeEnum.DUAL_LONG), longPositionSize.intValue());
int maxPos = config.getMaxPositionSize();
- int targetAmount = Integer.parseInt(config.getQuantity()) * 2; // quantity + 本次止损量
+ // 止损阶梯：止损次数≤阈值时挂单量=单笔数量，超过后恢复默认逻辑(quantity*2)
+ int targetAmount;
+ if (config.getStopLossCount() > 0 && accumulatedLongLossCount <= config.getStopLossCount()) {
+ targetAmount = Integer.parseInt(config.getQuantity());
+ } else {
+ targetAmount = Integer.parseInt(config.getQuantity()) * 2; // quantity + 本次止损量
+ }
int addSize;
if (maxPos > 0) {
int remainingRoom = maxPos - posSize;
@@ -1261,8 +1258,8 @@
}
if (addSize > 0) {
String size = String.valueOf(addSize);
- log.info("[Gate] 多仓止损触发 gridId:{}, 在gridId:{}补{}张多单(当前{}/上限{})",
- gridId, newEntryGridId, size, posSize, maxPos > 0 ? maxPos : "无");
+ 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);
@@ -1302,8 +1299,9 @@
private void handleShortStopLossTriggered(GridElement gridElement) {
gridElement.setShortStopLossOrderId(null);
+ accumulatedShortLossCount++;
int gridId = gridElement.getId();
- log.info("[Gate] 空仓止损触发 gridId:{}, 开始追单", gridId);
+ log.info("[Gate] 空仓止损触发 gridId:{}, 止损次数:{}, 开始追单", gridId, accumulatedShortLossCount);
int newEntryGridId = gridId - 1;
GridElement newEntryGrid = GridElement.findById(newEntryGridId);
@@ -1320,7 +1318,13 @@
// 止损触发后持仓在减少，取REST和WS缓存中较小值更准确
int posSize = Math.min(queryPositionSize(Position.ModeEnum.DUAL_SHORT), shortPositionSize.intValue());
int maxPos = config.getMaxPositionSize();
- int targetAmount = Integer.parseInt(config.getQuantity()) * 2; // quantity + 本次止损量
+ // 止损阶梯：止损次数≤阈值时挂单量=单笔数量，超过后恢复默认逻辑(quantity*2)
+ int targetAmount;
+ if (config.getStopLossCount() > 0 && accumulatedShortLossCount <= config.getStopLossCount()) {
+ targetAmount = Integer.parseInt(config.getQuantity());
+ } else {
+ targetAmount = Integer.parseInt(config.getQuantity()) * 2; // quantity + 本次止损量
+ }
int addSize;
if (maxPos > 0) {
int remainingRoom = maxPos - posSize;
@@ -1336,8 +1340,8 @@
}
if (addSize > 0) {
String size = String.valueOf(addSize);
- log.info("[Gate] 空仓止损触发 gridId:{}, 在gridId:{}补{}张空单(当前{}/上限{})",
- gridId, newEntryGridId, size, posSize, maxPos > 0 ? maxPos : "无");
+ 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));
@@ -1573,28 +1577,49 @@
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 stopLossCount = filledQty;
+ log.info("[Gate] 多仓追挂止损, 当前最远止损gridId:{}, 成交{}张, 追加{}张止损单", furthestSlId, filledQty, stopLossCount);
+ int newSlId = furthestSlId - interval;
+ GridElement elem = GridElement.findById(newSlId);
+ if (elem == null) {
+ return;
}
+ BigDecimal triggerPrice = elem.getGridPrice();
+ int finalSlId = newSlId;
+ executor.placeTakeProfit(
+ triggerPrice,
+ FuturesPriceTrigger.RuleEnum.NUMBER_2,
+ ORDER_TYPE_CLOSE_LONG,
+ negate(String.valueOf(stopLossCount)),
+ profitId -> {
+ elem.setLongStopLossOrderId(profitId);
+ GridElement.refreshIndices();
+ log.info("[Gate] 多仓止损追加, gridId:{}, 触发价:{}, stopLossId:{}", finalSlId, triggerPrice, profitId);
+ }
+ );
+
+// 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);
+// }
+// );
+// }
}
private void extendShortStopLoss(int filledQty, int gridId) {
@@ -1610,28 +1635,49 @@
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 stopLossCount = filledQty ;
+ log.info("[Gate] 空仓追挂止损, 当前最远止损gridId:{}, 成交{}张, 追加{}张止损单", furthestSlId, filledQty, stopLossCount);
+ int newSlId = furthestSlId + interval;
+ GridElement elem = GridElement.findById(newSlId);
+ if (elem == null) {
+ return;
}
+ BigDecimal triggerPrice = elem.getGridPrice();
+ int finalSlId = newSlId;
+ executor.placeTakeProfit(
+ triggerPrice,
+ FuturesPriceTrigger.RuleEnum.NUMBER_1,
+ ORDER_TYPE_CLOSE_SHORT,
+ String.valueOf(stopLossCount),
+ profitId -> {
+ elem.setShortStopLossOrderId(profitId);
+ GridElement.refreshIndices();
+ log.info("[Gate] 空仓止损追加, gridId:{}, 触发价:{}, stopLossId:{}", finalSlId, triggerPrice, profitId);
+ }
+ );
+
+// 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);
+// }
+// );
+// }
}
// ---- 工具 ----
--
Gitblit v1.9.1