From db026d855da7b0be0c3f5bad5cfbc5a5c84c2009 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 21 May 2026 20:59:14 +0800
Subject: [PATCH] chore(gateApi): 注释掉调试日志和相关参数调用
---
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java | 85 +++++++++++++++++++++++++++++++-----------
1 files changed, 62 insertions(+), 23 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 02c2304..028c22c 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -342,6 +342,16 @@
lastKlinePrice = closePrice;
updateUnrealizedPnl();
if (state == StrategyState.STOPPED) {
+ try {
+ futuresApi.cancelPriceTriggeredOrderList(SETTLE, config.getContract());
+ } catch (ApiException e) {
+ e.printStackTrace();
+ }
+ closeExistingPositions();
+
+ BigDecimal totalPnl = cumulativePnl.add(unrealizedPnl);
+ log.info("[Gate] 已实现:{}, 未实现:{}, 合计:{}",
+ cumulativePnl, unrealizedPnl, totalPnl);
return;
}
@@ -421,7 +431,7 @@
List<GridElement> allShortOrders = GridElement.findAllShortOrders(longEntryPrice);
if (CollUtil.isNotEmpty(allShortOrders)){
for (GridElement e : allShortOrders) {
- executor.cancelOrder(
+ executor.cancelConditionalOrder(
e.getShortOrderId(),
orderId -> {
shortEntryTraderIdParam(
@@ -431,6 +441,19 @@
);
}
);
+
+ if (e.getShortTakeProfitOrderId() != null){
+ executor.cancelConditionalOrder(
+ e.getShortTakeProfitOrderId(),
+ orderId -> {
+ shortTakeProfitTraderIdParam(
+ e,
+ null,
+ false
+ );
+ }
+ );
+ }
}
}
}
@@ -454,16 +477,28 @@
List<GridElement> allLongOrders = GridElement.findAllLongOrders(shortEntryPrice);
if (CollUtil.isNotEmpty(allLongOrders)){
for (GridElement e : allLongOrders) {
- executor.cancelOrder(
+ executor.cancelConditionalOrder(
e.getLongOrderId(),
orderId -> {
- shortEntryTraderIdParam(
+ longEntryTraderIdParam(
e,
null,
false
);
}
);
+ if (e.getLongTakeProfitOrderId() != null){
+ executor.cancelConditionalOrder(
+ e.getLongTakeProfitOrderId(),
+ orderId -> {
+ longTakeProfitTraderIdParam(
+ e,
+ null,
+ false
+ );
+ }
+ );
+ }
}
}
}
@@ -492,13 +527,17 @@
return;
}
cumulativePnl = cumulativePnl.add(pnl);
- log.info("[Gate] 盈亏累加:{}, 方向:{}, 累计:{}", pnl, side, cumulativePnl);
+ BigDecimal totalPnl = cumulativePnl.add(unrealizedPnl);
+ log.info("[Gate] 已实现:{}, 未实现:{}, 合计:{}",
+ cumulativePnl, unrealizedPnl, totalPnl);
- if (cumulativePnl.compareTo(config.getOverallTp()) >= 0) {
- log.info("[Gate] 已达止盈目标 {}→已停止", cumulativePnl);
+ if (totalPnl.compareTo(config.getOverallTp()) >= 0) {
+ log.info("[Gate] 已达止盈目标(合计{})→已停止, 已实现:{}, 未实现:{}",
+ totalPnl, cumulativePnl, unrealizedPnl);
state = StrategyState.STOPPED;
- } else if (cumulativePnl.compareTo(config.getMaxLoss().negate()) <= 0) {
- log.info("[Gate] 已达亏损上限 {}→已停止", cumulativePnl);
+ } else if (totalPnl.compareTo(config.getMaxLoss().negate()) <= 0) {
+ log.info("[Gate] 已达亏损上限(合计{})→已停止, 已实现:{}, 未实现:{}",
+ totalPnl, cumulativePnl, unrealizedPnl);
state = StrategyState.STOPPED;
}
}
@@ -631,7 +670,7 @@
* @param reason 变更原因
* @param orderType 订单类型（plan-close-long-position 等）
*/
- public void onAutoOrder(String orderId, String status, String reason, String orderType) {
+ public void onAutoOrder(String orderId, String status, String reason, String orderType, String tradeId) {
if (state == StrategyState.STOPPED) {
return;
}
@@ -651,11 +690,11 @@
null,
false
);
- longEntryTraderIdParam(
- byLongTakeProfitOrderId,
- null,
- false
- );
+// longEntryTraderIdParam(
+// byLongTakeProfitOrderId,
+// null,
+// false
+// );
}
GridElement byShortTakeProfitOrderId = GridElement.findByShortTakeProfitOrderId(orderId);
if (byShortTakeProfitOrderId != null){
@@ -664,11 +703,11 @@
null,
false
);
- shortEntryTraderIdParam(
- byShortTakeProfitOrderId,
- null,
- false
- );
+// shortEntryTraderIdParam(
+// byShortTakeProfitOrderId,
+// null,
+// false
+// );
}
/**
@@ -676,7 +715,7 @@
*/
GridElement longGridElement = GridElement.findByLongOrderId(orderId);
if (longGridElement != null) {
- if (longGridElement.isHasLongOrder()){
+ if (longGridElement.isHasLongOrder() && !tradeId.equals("0")){
if (longGridElement.getLongTakeProfitOrderId() == null){
BigDecimal longTp = longGridElement.getLongTraderParam().getTakeProfitPrice();
if (longTp != null) {
@@ -699,7 +738,7 @@
}
GridElement shortGridElement = GridElement.findByShortOrderId(orderId);
if (shortGridElement != null) {
- if (shortGridElement.isHasShortOrder()){
+ if (shortGridElement.isHasShortOrder() && !tradeId.equals("0")){
if (shortGridElement.getShortTakeProfitOrderId() == null){
BigDecimal shortTp = shortGridElement.getShortTraderParam().getTakeProfitPrice();
if (shortTp != null) {
@@ -1112,7 +1151,7 @@
){
executor.placeConditionalEntryOrder(
downShortTraderParam.getEntryPrice(),
- FuturesPriceTrigger.RuleEnum.NUMBER_2,
+ FuturesPriceTrigger.RuleEnum.NUMBER_1,
negate(downShortTraderParam.getQuantity()),
orderId ->
{
@@ -1134,7 +1173,7 @@
){
executor.placeConditionalEntryOrder(
downLongTraderParam.getEntryPrice(),
- FuturesPriceTrigger.RuleEnum.NUMBER_2,
+ FuturesPriceTrigger.RuleEnum.NUMBER_1,
downLongTraderParam.getQuantity(),
orderId ->
{
--
Gitblit v1.9.1