From 4dbaa914142b578be0756608d3cd23c328c3e4cd Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 05 Jan 2026 10:14:24 +0800
Subject: [PATCH] fix(okxWs): 修复订单信息WebSocket中账户名称初始化参数错误
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/AccountWs.java | 52 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 36 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 401ad3b..3d5fe77 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
@@ -26,7 +26,13 @@
@Slf4j
public class AccountWs {
- public static final Map<String,String> ACCOUNTWSMAP = new ConcurrentHashMap<>();
+ // 使用双层Map，第一层key为账号名称，第二层key为数据key
+ private static final Map<String, Map<String, String>> ACCOUNTWSMAP = new ConcurrentHashMap<>();
+
+ // 获取指定账号的Map，如果不存在则创建
+ public static Map<String, String> getAccountMap(String accountName) {
+ return ACCOUNTWSMAP.computeIfAbsent(accountName, k -> new ConcurrentHashMap<>());
+ }
/**
* 账户频道名称常量
*/
@@ -55,18 +61,19 @@
}
}
- public static void initEvent(JSONObject response) {
+ public static void initEvent(JSONObject response, String accountName) {
// log.info("订阅成功: {}", response.getJSONObject("arg"));
JSONObject arg = response.getJSONObject("arg");
- initParam(arg);
+ initParam(arg, accountName);
}
/**
* 处理账户频道推送的数据
*
* @param response 推送的 JSON 数据对象
+ * @param accountName 账号名称
*/
- public static void handleEvent(JSONObject response) {
+ public static void handleEvent(JSONObject response, String accountName) {
// log.info("开始执行AccountWs......{}",ACCOUNTWS_CHANNEL);
@@ -88,7 +95,10 @@
for (int j = 0; j < detailsArray.size(); j++) {
JSONObject detail = detailsArray.getJSONObject(j);
- initParam(detail);
+ initParam(detail, accountName);
+
+ Map<String, String> accountMap = getAccountMap(accountName);
+ WsMapBuild.saveStringToMap(accountMap, CoinEnums.READY_STATE.name(), CoinEnums.READY_STATE_YES.getCode());
}
} catch (Exception innerEx) {
log.warn("处理账户频道数据失败", innerEx);
@@ -105,35 +115,45 @@
public static final String cashBalKey = "cashBal";
public static final String eqKey = "eq";
public static final String uplKey = "upl";
- private static void initParam(JSONObject detail) {
+ public static final String imrKey = "imr";
+ private static void initParam(JSONObject detail, String accountName) {
+ Map<String, String> accountMap = getAccountMap(accountName);
String ccy = WsMapBuild.parseStringSafe( detail.getString(ccyKey));
- WsMapBuild.saveStringToMap(ACCOUNTWSMAP, ccyKey, ccy);
+ WsMapBuild.saveStringToMap(accountMap, ccyKey, ccy);
String availBal = WsMapBuild.parseStringSafe(detail.getString(availBalKey));
- WsMapBuild.saveStringToMap(ACCOUNTWSMAP, availBalKey, availBal);
+ WsMapBuild.saveStringToMap(accountMap, availBalKey, availBal);
String cashBal = WsMapBuild.parseStringSafe(detail.getString(cashBalKey));
- WsMapBuild.saveStringToMap(ACCOUNTWSMAP, cashBalKey, cashBal);
+ WsMapBuild.saveStringToMap(accountMap, cashBalKey, cashBal);
String eq = WsMapBuild.parseStringSafe(detail.getString(eqKey));
- WsMapBuild.saveStringToMap(ACCOUNTWSMAP, eqKey, eq);
+ WsMapBuild.saveStringToMap(accountMap, eqKey, eq);
String upl = WsMapBuild.parseStringSafe(detail.getString(uplKey));
- WsMapBuild.saveStringToMap(ACCOUNTWSMAP, uplKey, upl);
+ WsMapBuild.saveStringToMap(accountMap, uplKey, upl);
+ String imr = WsMapBuild.parseStringSafe(detail.getString(imrKey));
+ WsMapBuild.saveStringToMap(accountMap, imrKey, imr);
BigDecimal cashBalDecimal = WsMapBuild.parseBigDecimalSafe(cashBal);
// 根据可用余额计算下单总保证金
- String total_order_usdtpecent = InstrumentsWs.INSTRUMENTSWSMAP.get(CoinEnums.TOTAL_ORDER_USDTPECENT.name());
+ String total_order_usdtpecent = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.TOTAL_ORDER_USDTPECENT.name());
BigDecimal total_order_usdt_factor = WsMapBuild.parseBigDecimalSafe(total_order_usdtpecent);
BigDecimal totalOrderUsdt = cashBalDecimal.multiply(total_order_usdt_factor).setScale(2, RoundingMode.DOWN);
- WsMapBuild.saveStringToMap(ACCOUNTWSMAP, CoinEnums.TOTAL_ORDER_USDT.name(), String.valueOf(totalOrderUsdt));
+ WsMapBuild.saveStringToMap(accountMap, CoinEnums.TOTAL_ORDER_USDT.name(), String.valueOf(totalOrderUsdt));
- WsMapBuild.saveStringToMap(ACCOUNTWSMAP, CoinEnums.READY_STATE.name(), CoinEnums.READY_STATE_YES.getCode());
+ /**
+ * 当前账户未满仓，并且账户余额不为0，才更新为已就绪
+ */
+ BigDecimal imrDecimal = WsMapBuild.parseBigDecimalSafe(imr);
+ if (BigDecimal.ZERO.compareTo(cashBalDecimal) < 0 && imrDecimal.compareTo(totalOrderUsdt) < 0){
+ WsMapBuild.saveStringToMap(accountMap, CoinEnums.READY_STATE.name(), CoinEnums.READY_STATE_YES.getCode());
+ }
log.info(
- "账户详情-币种: {}, 可用余额: {}, 现金余额: {}, 余额: {}, 全仓未实现盈亏: {}, 下单总保证金: {}",
- ccy, availBal, cashBal, eq, upl, totalOrderUsdt
+ "{}: 账户详情-币种: {}, 可用余额: {}, 现金余额: {}, 余额: {}, 全仓未实现盈亏: {}, 下单总保证金: {},已使用保证金：{}",
+ accountName, ccy, availBal, cashBal, eq, upl, totalOrderUsdt,imr
);
}
}
--
Gitblit v1.9.1