From e2a9507de7c912e622bec7e26df207237b4b0529 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 02 Jun 2026 10:02:22 +0800
Subject: [PATCH] refactor(okxNewPrice): 更新配置并优化网格交易初始化逻辑

---
 src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java |   29 ++++++++++++++++++++---------
 1 files changed, 20 insertions(+), 9 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 aafeba4..1581a23 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -305,7 +305,23 @@
         longPriceQueue.clear();
         currentLongOrderIds.clear();
         currentShortOrderIds.clear();
-        log.info("[Gate] 网格策略已启动");
+
+        // 每次重启重新获取当前本金
+        refreshInitialPrincipal();
+
+        log.info("[Gate] 网格策略已启动, 当前本金: {} USDT", initialPrincipal);
+    }
+
+    /**
+     * 重新获取当前账户权益作为初始本金。
+     */
+    private void refreshInitialPrincipal() {
+        try {
+            FuturesAccount account = futuresApi.listFuturesAccounts(SETTLE);
+            this.initialPrincipal = new BigDecimal(account.getTotal());
+        } catch (Exception e) {
+            log.warn("[Gate] 获取初始化本金失败,使用旧值: {}", initialPrincipal);
+        }
     }
 
     /**
@@ -353,6 +369,8 @@
             BigDecimal totalPnl = cumulativePnl.add(unrealizedPnl);
             log.info("[Gate] 已实现:{}, 未实现:{}, 合计:{}",
                     cumulativePnl, unrealizedPnl, totalPnl);
+
+            startGrid();
             return;
         }
 
@@ -559,19 +577,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;
         }
     }
 

--
Gitblit v1.9.1