From 53196fafc8500c7fa2dafd9b3a58b5cd79972c50 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 10 Dec 2025 17:20:21 +0800
Subject: [PATCH] fix(okxWs): 修正账户和持仓WebSocket参数配置
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/AccountWs.java | 31 +++++++++++++++++++------------
1 files changed, 19 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 478dd01..f3de1bb 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
@@ -94,6 +94,11 @@
JSONObject detail = detailsArray.getJSONObject(j);
String ccy = detail.getString(CCY_KEY);
+ if (!CoinEnums.USDT.getCode().equals(ccy)) {
+ log.warn("账户频道币种不匹配，跳过处理");
+ continue;
+ }
+
String availBalStr = detail.getString(AVAIL_BAL_KEY);
String cashBalStr = detail.getString(CASH_BAL_KEY);
String eq = detail.getString(EQ_KEY);
@@ -115,21 +120,23 @@
BigDecimal divide = availBal.divide(cashBal, 4, RoundingMode.DOWN);
String state = (String) redisUtils.get(InstrumentsWs.INSTRUMENTSWS_CHANNEL + ":" + CoinEnums.HE_YUE.getCode() + ":state");
+ String out = (String) redisUtils.get(InstrumentsWs.INSTRUMENTSWS_CHANNEL + ":" + CoinEnums.HE_YUE.getCode() + ":out");
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();
- }
+ }else if(OrderParamEnums.STATE_3.getValue().equals(state) && OrderParamEnums.OUT_YES.getValue().equals(out)){
+ log.info(OrderParamEnums.STATE_3.getName());
+ state = OrderParamEnums.STATE_3.getValue();
+ }else{
+ 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_0.getName());
+ state = OrderParamEnums.STATE_0.getValue();
}
}
--
Gitblit v1.9.1