From 6c84c2f5c575ec0f4d48f64dd200aca1b3a1b473 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 24 Jun 2026 15:57:52 +0800
Subject: [PATCH] fix(okx): 修复网格交易状态同步和队列生成问题

---
 src/main/java/com/xcong/excoin/modules/okxApi/OkxGridTradeService.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/okxApi/OkxGridTradeService.java b/src/main/java/com/xcong/excoin/modules/okxApi/OkxGridTradeService.java
index 99fdd44..f9e7ddd 100644
--- a/src/main/java/com/xcong/excoin/modules/okxApi/OkxGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/okxApi/OkxGridTradeService.java
@@ -298,6 +298,12 @@
             return;
         }
 
+        // OPENING 状态下若 WS 仓位已确认但 REST 回调尚未完成,等标记价格推送时重试队列生成
+        if (state == StrategyState.OPENING &&
+                baseLongOpened && baseShortOpened) {
+            tryGenerateQueues();
+        }
+
         if (state == StrategyState.ACTIVE &&
                 !longActive &&
                 longPositionSize.compareTo(BigDecimal.ZERO) == 0) {
@@ -590,6 +596,12 @@
 
     private void tryGenerateQueues() {
         if (baseLongOpened && baseShortOpened) {
+            // 确保 openLong/openShort 的 REST 回调已完成(WS 推送可能比回调更快到达)
+            if (config.getBaseLongTraderParam() == null || config.getBaseShortTraderParam() == null) {
+                log.warn("[OKX] 基底REST回调尚未完成, 延后队列生成");
+                return;
+            }
+
             generateShortQueue();
             generateLongQueue();
             updateGridElements();

--
Gitblit v1.9.1