From 70b7763bfe209d6f7e19557cd15da61e1650add0 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Sat, 13 Dec 2025 21:45:46 +0800
Subject: [PATCH] fix(okxNewPrice): 修复仓位通道就绪状态空指针异常

---
 src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java
index 24cde85..099aa32 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java
@@ -12,6 +12,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.java_websocket.client.WebSocketClient;
 
+import java.math.BigDecimal;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -41,6 +42,10 @@
         } catch (Exception e) {
             log.error("订阅订单频道构建失败", e);
         }
+    }
+
+    public static void initEvent(JSONObject response) {
+        log.info("订阅成功: {}", response.getJSONObject("arg"));
     }
 
 
@@ -95,17 +100,13 @@
                                 && state.equals(stateStr)
                 ){
                     //记录成交均价
-                    if (StrUtil.isBlank(ORDERINFOWSMAP.get("orderPrice"))){
+                    if (ORDERINFOWSMAP.get("orderPrice") == null){
                         WsMapBuild.saveStringToMap(ORDERINFOWSMAP, "orderPrice",avgPx);
                     }
                     WsMapBuild.saveStringToMap(TradeOrderWs.TRADEORDERWSMAP, "state", CoinEnums.ORDER_LIVE.getCode());
 
-                    String outStr = InstrumentsWs.INSTRUMENTSWSMAP.get(CoinEnums.OUT.name());
-                    if (OrderParamEnums.OUT_YES.getValue().equals(outStr)){
-                        WsMapBuild.saveStringToMap(InstrumentsWs.INSTRUMENTSWSMAP, CoinEnums.STATE.name(), OrderParamEnums.STATE_3.getValue());
-                    }else{
-                        WsMapBuild.saveStringToMap(InstrumentsWs.INSTRUMENTSWSMAP, CoinEnums.STATE.name(), OrderParamEnums.STATE_1.getValue());
-                    }
+                    WsMapBuild.saveBigDecimalToMap(PositionsWs.POSITIONSWSMAP, CoinEnums.READY_STATE.name(), WsMapBuild.parseBigDecimalSafe(CoinEnums.READY_STATE_NO.getCode()));
+                    WsMapBuild.saveStringToMap(AccountWs.ACCOUNTWSMAP, CoinEnums.READY_STATE.name(), CoinEnums.READY_STATE_NO.getCode());
 
                     log.info("订单详情已完成: {}, 自定义编号: {}", CoinEnums.HE_YUE.getCode(), clOrdId);
                 }

--
Gitblit v1.9.1