From 6933ef2edc3911311976cfc0f077c395be510f34 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 10 Dec 2025 13:37:18 +0800
Subject: [PATCH] feat(okx): 优化账户与持仓数据处理逻辑

---
 src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/AccountWs.java |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/AccountWs.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/AccountWs.java
index 22e46bc..95021c4 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/AccountWs.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/AccountWs.java
@@ -83,6 +83,7 @@
                     JSONObject accountData = dataArray.getJSONObject(i);
                     JSONArray detailsArray = accountData.getJSONArray(DETAILS_KEY);
                     if (detailsArray == null || detailsArray.isEmpty()) {
+                        log.warn("账户频道{}数据为空",CoinEnums.USDT.getCode());
                         continue;
                     }
 
@@ -95,7 +96,7 @@
                         String eq = detail.getString(EQ_KEY);
 
                         if (StrUtil.isBlank(ccy) || StrUtil.isBlank(availBalStr) || StrUtil.isBlank(cashBalStr)) {
-                            log.warn("账户详情缺失必要字段,跳过处理");
+                            log.warn("账户频道缺失必要字段,跳过处理");
                             continue;
                         }
 
@@ -103,7 +104,7 @@
                         BigDecimal cashBal = parseBigDecimalSafe(cashBalStr);
 
                         if (availBal == null || cashBal == null || cashBal.compareTo(BigDecimal.ZERO) == 0) {
-                            log.warn("无效的账户余额数据,跳过处理");
+                            log.warn("账户频道无效的账户余额数据,跳过处理");
                             continue;
                         }
 
@@ -111,16 +112,21 @@
                         BigDecimal divide = availBal.divide(cashBal, 4, RoundingMode.DOWN);
 
                         String state = (String) redisUtils.get(InstrumentsWs.INSTRUMENTSWS_CHANNEL + ":" + CoinEnums.HE_YUE.getCode() + ":state");
-                        if (!OrderParamEnums.STATE_3.getValue().equals(state)){
-                            if (divide.compareTo(KANG_CANG_THRESHOLD) > 0) {
-                                log.info(OrderParamEnums.STATE_1.getName());
-                                state = OrderParamEnums.STATE_1.getValue();
-                            } else if (divide.compareTo(ZHI_SUN_THRESHOLD) > 0) {
-                                log.warn(OrderParamEnums.STATE_2.getName());
-                                state = OrderParamEnums.STATE_2.getValue();
-                            } else {
-                                log.error(OrderParamEnums.STATE_3.getName());
-                                state = OrderParamEnums.STATE_3.getValue();
+                        if (OrderParamEnums.STATE_4.getValue().equals(state)){
+                            log.info(OrderParamEnums.STATE_4.getName());
+                            state = OrderParamEnums.STATE_4.getValue();
+                        }else {
+                            if (!OrderParamEnums.STATE_3.getValue().equals(state)){
+                                if (divide.compareTo(KANG_CANG_THRESHOLD) > 0) {
+                                    log.info(OrderParamEnums.STATE_1.getName());
+                                    state = OrderParamEnums.STATE_1.getValue();
+                                } else if (divide.compareTo(ZHI_SUN_THRESHOLD) > 0) {
+                                    log.warn(OrderParamEnums.STATE_2.getName());
+                                    state = OrderParamEnums.STATE_2.getValue();
+                                } else {
+                                    log.error(OrderParamEnums.STATE_3.getName());
+                                    state = OrderParamEnums.STATE_3.getValue();
+                                }
                             }
                         }
 

--
Gitblit v1.9.1