From 56a48823bd0ebf96919fe27201b73ab96e800c33 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 01 Jun 2026 15:12:53 +0800
Subject: [PATCH] fix(gateApi): 修复网格交易策略状态管理问题
---
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java | 101 ++++++++++++++++++++++++++------------------------
1 files changed, 53 insertions(+), 48 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 a51fb12..7f30933 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -353,6 +353,8 @@
BigDecimal totalPnl = cumulativePnl.add(unrealizedPnl);
log.info("[Gate] 已实现:{}, 未实现:{}, 合计:{}",
cumulativePnl, unrealizedPnl, totalPnl);
+
+ startGrid();
return;
}
@@ -427,8 +429,8 @@
tryGenerateQueues();
}else {
longPositionSize = size;
- checkShortEntryOrderToCancel();
- checkLongEntryOrderToCancel();
+// checkShortEntryOrderToCancel();
+// checkLongEntryOrderToCancel();
}
} else {
if (longActive && state == StrategyState.ACTIVE) {
@@ -450,8 +452,8 @@
tryGenerateQueues();
}else {
shortPositionSize = size.abs();
- checkShortEntryOrderToCancel();
- checkLongEntryOrderToCancel();
+// checkShortEntryOrderToCancel();
+// checkLongEntryOrderToCancel();
}
} else {
if (shortActive && state == StrategyState.ACTIVE) {
@@ -559,19 +561,12 @@
BigDecimal totalPnl = cumulativePnl.add(unrealizedPnl);
log.info("[Gate] 已实现:{}, 未实现:{}, 合计:{}",
cumulativePnl, unrealizedPnl, totalPnl);
-
- if (totalPnl.compareTo(config.getOverallTp()) >= 0) {
- log.info("[Gate] 已达止盈目标(合计{})→已停止, 已实现:{}, 未实现:{}",
- totalPnl, cumulativePnl, unrealizedPnl);
- state = StrategyState.STOPPED;
- } else if (totalPnl.compareTo(config.getMaxLoss().negate()) <= 0) {
+ if(totalPnl.compareTo(config.getMaxLoss().negate()) <= 0) {
String logMessage = StrUtil.format("[Gate] 已达亏损风险值(合计{}), 已实现:{}, 未实现:{}",
totalPnl, cumulativePnl, unrealizedPnl);
log.info(logMessage);
-
DingTalkUtils.getDefault().sendActionCard("风险提醒", logMessage, config.getApiKey(), "");
-// state = StrategyState.STOPPED;
}
}
@@ -734,34 +729,34 @@
return;
}
- GridElement byShortTakeProfitOrderId = GridElement.findByShortTakeProfitOrderId(orderId);
- if (byShortTakeProfitOrderId != null){
- shortTakeProfitTraderIdParam(
- byShortTakeProfitOrderId,
- null,
- false
- );
- shortEntryTraderIdParam(
- byShortTakeProfitOrderId,
- null,
- false
- );
- TPonUserTradeShortEntry(byShortTakeProfitOrderId);
- }
- GridElement byLongTakeProfitOrderId = GridElement.findByLongTakeProfitOrderId(orderId);
- if (byLongTakeProfitOrderId != null){
- longTakeProfitTraderIdParam(
- byLongTakeProfitOrderId,
- null,
- false
- );
- longEntryTraderIdParam(
- byLongTakeProfitOrderId,
- null,
- false
- );
- TPonUserTradeLongEntry(byLongTakeProfitOrderId);
- }
+// GridElement byShortTakeProfitOrderId = GridElement.findByShortTakeProfitOrderId(orderId);
+// if (byShortTakeProfitOrderId != null){
+// shortTakeProfitTraderIdParam(
+// byShortTakeProfitOrderId,
+// null,
+// false
+// );
+// shortEntryTraderIdParam(
+// byShortTakeProfitOrderId,
+// null,
+// false
+// );
+// TPonUserTradeShortEntry(byShortTakeProfitOrderId);
+// }
+// GridElement byLongTakeProfitOrderId = GridElement.findByLongTakeProfitOrderId(orderId);
+// if (byLongTakeProfitOrderId != null){
+// longTakeProfitTraderIdParam(
+// byLongTakeProfitOrderId,
+// null,
+// false
+// );
+// longEntryTraderIdParam(
+// byLongTakeProfitOrderId,
+// null,
+// false
+// );
+// TPonUserTradeLongEntry(byLongTakeProfitOrderId);
+// }
GridElement shortGridElement = GridElement.findByShortOrderId(orderId);
if (shortGridElement != null) {
@@ -1357,7 +1352,6 @@
log.info("[Gate] 多仓止损触发 gridId:{}, 开始追单", gridId);
int newEntryGridId = -(N - 1);
- int entryQty = N - 1;
GridElement newEntryGrid = GridElement.findById(newEntryGridId);
if (newEntryGrid == null) {
@@ -1377,12 +1371,16 @@
}
}
- String size = String.valueOf(entryQty);
BigDecimal triggerPrice = newEntryGrid.getGridPrice();
- log.info("[Gate] 多仓止损触发 gridId:{}, 在gridId:{}挂{}张多单", gridId, newEntryGridId, entryQty);
+ BigDecimal priceDiff = longEntryPrice.subtract(triggerPrice).abs();
+ int entryQty = priceDiff.divide(config.getStep(), 0, RoundingMode.DOWN).intValue();
+ entryQty = Math.max(1, entryQty);
+ String size = String.valueOf(entryQty);
+ log.info("[Gate] 多仓止损触发 gridId:{}, 在gridId:{}挂{}张多单, 均价:{}, 价差:{}, 步长:{}",
+ gridId, newEntryGridId, entryQty, longEntryPrice, priceDiff, config.getStep());
newEntryGrid.getLongTraderParam().setQuantity(size);
placeEntryOrderWithPreFlag(newEntryGrid, true, triggerPrice,
- FuturesPriceTrigger.RuleEnum.NUMBER_2, size);
+ FuturesPriceTrigger.RuleEnum.NUMBER_1, size);
}
private void handleShortStopLossTriggered(GridElement gridElement) {
@@ -1392,7 +1390,6 @@
log.info("[Gate] 空仓止损触发 gridId:{}, 开始追单", gridId);
int newEntryGridId = N - 1;
- int entryQty = N - 1;
GridElement newEntryGrid = GridElement.findById(newEntryGridId);
if (newEntryGrid == null) {
@@ -1412,12 +1409,18 @@
}
}
- String size = String.valueOf(entryQty);
+
+
BigDecimal triggerPrice = newEntryGrid.getGridPrice();
- log.info("[Gate] 空仓止损触发 gridId:{}, 在gridId:{}挂{}张空单", gridId, newEntryGridId, entryQty);
+ BigDecimal priceDiff = shortEntryPrice.subtract(triggerPrice).abs();
+ int entryQty = priceDiff.divide(config.getStep(), 0, RoundingMode.DOWN).intValue();
+ entryQty = Math.max(1, entryQty);
+ String size = String.valueOf(entryQty);
+ log.info("[Gate] 空仓止损触发 gridId:{}, 在gridId:{}挂{}张空单, 均价:{}, 价差:{}, 步长:{}",
+ gridId, newEntryGridId, entryQty, shortEntryPrice, priceDiff, config.getStep());
newEntryGrid.getShortTraderParam().setQuantity(size);
placeEntryOrderWithPreFlag(newEntryGrid, false, triggerPrice,
- FuturesPriceTrigger.RuleEnum.NUMBER_1, negate(size));
+ FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(size));
}
private void extendLongStopLoss(int filledQty) {
@@ -1497,6 +1500,7 @@
unrealisedPnl, available, totalEquity, target);
if (totalEquity.compareTo(target) > 0) {
log.info("[Gate] 盈亏达标({}>{})，重置策略", totalEquity, target);
+ state = StrategyState.STOPPED;
closeExistingPositions();
futuresApi.cancelPriceTriggeredOrderList(SETTLE, config.getContract());
startGrid();
@@ -1507,6 +1511,7 @@
}
private void handlePositionZeroAndReset(String direction) {
+ state = StrategyState.STOPPED;
try {
futuresApi.cancelPriceTriggeredOrderList(SETTLE, config.getContract());
} catch (Exception e) {
--
Gitblit v1.9.1