From 3cd5191a2840d770a166c937da1b3c8493285c47 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 12 Dec 2025 12:48:00 +0800
Subject: [PATCH] fix(okx): 更新账户占用保证金字段为imr并调整相关逻辑
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/AccountWs.java | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 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 5d27096..a18b5cc 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
@@ -24,7 +24,7 @@
@Slf4j
public class AccountWs {
- public static final Map<String,BigDecimal> ACCOUNTWSMAP = new ConcurrentHashMap<>();
+ public static final Map<String,String> ACCOUNTWSMAP = new ConcurrentHashMap<>();
/**
* 账户频道名称常量
*/
@@ -85,24 +85,25 @@
String availBalKey = "availBal";
String cashBalKey = "cashBal";
String eqKey = "eq";
- String ordFrozKey = "ordFroz";
+ String imrKey = "imr";
- BigDecimal ccy = WsMapBuild.parseBigDecimalSafe(detail.getString(ccyKey));
- WsMapBuild.saveBigDecimalToMap(ACCOUNTWSMAP, ccyKey, ccy);
+ String ccy = WsMapBuild.parseStringSafe( detail.getString(ccyKey));
+ WsMapBuild.saveStringToMap(ACCOUNTWSMAP, ccyKey, ccy);
- BigDecimal availBal = WsMapBuild.parseBigDecimalSafe(detail.getString(availBalKey));
- WsMapBuild.saveBigDecimalToMap(ACCOUNTWSMAP, availBalKey, availBal);
+ String availBal = WsMapBuild.parseStringSafe(detail.getString(availBalKey));
+ WsMapBuild.saveStringToMap(ACCOUNTWSMAP, availBalKey, availBal);
- BigDecimal cashBal = WsMapBuild.parseBigDecimalSafe(detail.getString(cashBalKey));
- WsMapBuild.saveBigDecimalToMap(ACCOUNTWSMAP, cashBalKey, cashBal);
+ String cashBal = WsMapBuild.parseStringSafe(detail.getString(cashBalKey));
+ WsMapBuild.saveStringToMap(ACCOUNTWSMAP, cashBalKey, cashBal);
- BigDecimal eq = WsMapBuild.parseBigDecimalSafe(detail.getString(eqKey));
- WsMapBuild.saveBigDecimalToMap(ACCOUNTWSMAP, eqKey, eq);
+ String eq = WsMapBuild.parseStringSafe(detail.getString(eqKey));
+ WsMapBuild.saveStringToMap(ACCOUNTWSMAP, eqKey, eq);
- BigDecimal ordFroz = WsMapBuild.parseBigDecimalSafe(detail.getString(ordFrozKey));
- WsMapBuild.saveBigDecimalToMap(ACCOUNTWSMAP, ordFrozKey, ordFroz);
+ String imr = WsMapBuild.parseStringSafe(detail.getString(imrKey));
+ WsMapBuild.saveStringToMap(ACCOUNTWSMAP, imrKey, imr);
- if (cashBal.compareTo(BigDecimal.ZERO) == 0) {
+ BigDecimal cashBalDecimal = WsMapBuild.parseBigDecimalSafe(cashBal);
+ if (cashBalDecimal.compareTo(BigDecimal.ZERO) == 0) {
log.warn("账户频道无效的账户余额数据，跳过处理");
continue;
}
@@ -110,12 +111,12 @@
// 根据可用余额计算下单总保证金
String total_order_usdtpecent = InstrumentsWs.INSTRUMENTSWSMAP.get(CoinEnums.TOTAL_ORDER_USDTPECENT.name());
BigDecimal total_order_usdt_factor = WsMapBuild.parseBigDecimalSafe(total_order_usdtpecent);
- BigDecimal totalOrderUsdt = availBal.divide(total_order_usdt_factor, 4, RoundingMode.DOWN);
- WsMapBuild.saveBigDecimalToMap(ACCOUNTWSMAP, CoinEnums.TOTAL_ORDER_USDT.name(), totalOrderUsdt);
+ BigDecimal totalOrderUsdt = cashBalDecimal.divide(total_order_usdt_factor, 4, RoundingMode.DOWN);
+ WsMapBuild.saveStringToMap(ACCOUNTWSMAP, CoinEnums.TOTAL_ORDER_USDT.name(), String.valueOf(totalOrderUsdt));
log.info(
"账户详情-币种: {}, 可用余额: {}, 现金余额: {}, 余额: {}, 占用保证金: {}, 下单总保证金: {}",
- ccy, availBal, cashBal, eq, ordFroz, totalOrderUsdt
+ ccy, availBal, cashBal, eq, imr, totalOrderUsdt
);
}
} catch (Exception innerEx) {
--
Gitblit v1.9.1