From 61ef9ea0bd0979caa60d2e2bc0ff3e514549bc51 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 08 Jun 2026 13:07:42 +0800
Subject: [PATCH] fix(gateApi): 修复网格交易中止盈检查逻辑

---
 src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 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 09c4731..b1c496b 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -793,7 +793,7 @@
                 shortEntryQty = 1;
                 extendShortStopLoss(filledQty);
                 log.info("[Gate] 空单成交 gridId:{}, qty:{}, 追挂止损", shortGridElement.getId(), filledQty);
-                checkMaxPositionAndPlaceTakeProfit(false, shortGridElement.getId());
+//                checkMaxPositionAndPlaceTakeProfit(false, shortGridElement.getId());
             }
         }
         GridElement longGridElement = GridElement.findByLongOrderId(orderId);
@@ -804,7 +804,7 @@
                 longEntryQty = 1;
                 extendLongStopLoss(filledQty);
                 log.info("[Gate] 多单成交 gridId:{}, qty:{}, 追挂止损", longGridElement.getId(), filledQty);
-                checkMaxPositionAndPlaceTakeProfit(true, longGridElement.getId());
+//                checkMaxPositionAndPlaceTakeProfit(true, longGridElement.getId());
             }
         }
     }
@@ -928,7 +928,8 @@
             baseGridElement.setShortOrderId(baseShortTraderParam.getEntryOrderId());
             baseGridElement.setHasShortOrder(true);
 
-            for (int id = 2; id <= 11; id++) {
+            int shortTime = Integer.parseInt(config.getBaseQuantity()) + 1;
+            for (int id = 2; id <= shortTime; id++) {
                 GridElement elem = GridElement.findById(id);
                 if (elem == null) {
                     continue;
@@ -948,7 +949,9 @@
                 );
             }
 
-            for (int id = -2; id >= -11; id--) {
+
+            int longTime = Integer.parseInt(config.getBaseQuantity()) + 1;
+            for (int id = -2; id >= -longTime; id--) {
                 GridElement elem = GridElement.findById(id);
                 if (elem == null) {
                     continue;
@@ -968,7 +971,7 @@
                 );
             }
 
-            log.info("[Gate] 止损单已全部挂完, 空仓止损: 2~11, 多仓止损: -2~-11");
+            log.info("[Gate] 止损单已全部挂完, 空仓止损: 2~{}, 多仓止损: -2~-{}", shortTime, longTime);
             state = StrategyState.ACTIVE;
         }
     }

--
Gitblit v1.9.1