From e61cce89f151c9fc660497135ccbd779c82fe969 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 15 Dec 2025 10:07:13 +0800
Subject: [PATCH] chore(logging): 调整账户与策略服务的日志输出

---
 src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java
index dc48c1e..8d5a1f7 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java
@@ -28,7 +28,18 @@
 
     public static void orderEvent(WebSocketClient webSocketClient, String side) {
 
-        log.info("开始执行TradeOrderWs......");
+//        log.info("开始执行TradeOrderWs......");
+        String accountReadyState = AccountWs.ACCOUNTWSMAP.get(CoinEnums.READY_STATE.name());
+        if (!CoinEnums.READY_STATE_YES.getCode().equals(accountReadyState)) {
+            log.info("账户通道未就绪,取消发送");
+            return;
+        }
+        BigDecimal positionsReadyState = PositionsWs.POSITIONSWSMAP.get(CoinEnums.READY_STATE.name()) == null
+                ? BigDecimal.ZERO : PositionsWs.POSITIONSWSMAP.get(CoinEnums.READY_STATE.name());
+        if (WsMapBuild.parseBigDecimalSafe(CoinEnums.READY_STATE_YES.getCode()).compareTo(positionsReadyState) != 0) {
+            log.info("仓位通道未就绪,取消发送");
+            return;
+        }
         // 校验必要参数
         if (StrUtil.isBlank(side)) {
             log.warn("下单参数 side 为空,取消发送");
@@ -86,8 +97,8 @@
             WsMapBuild.saveStringToMap(TRADEORDERWSMAP, "clOrdId", clOrdId);
             WsMapBuild.saveStringToMap(TRADEORDERWSMAP, "state", CoinEnums.ORDER_FILLED.getCode());
 
-
-
+            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());
 
         } catch (Exception e) {
             log.error("下单构建失败", e);

--
Gitblit v1.9.1