From e038b5c6ad4c19c7a502fb04b88aaaeb3d5ba74e Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 12 Dec 2025 13:45:34 +0800
Subject: [PATCH] fix(okxWs): 修复订单信息与交易订单逻辑错误
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/AccountWs.java | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 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..5ff8c24 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
@@ -1,5 +1,6 @@
package com.xcong.excoin.modules.okxNewPrice.okxWs;
+import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xcong.excoin.modules.okxNewPrice.okxWs.enums.CoinEnums;
@@ -7,6 +8,7 @@
import com.xcong.excoin.modules.okxNewPrice.okxpi.MallUtils;
import com.xcong.excoin.modules.okxNewPrice.utils.WsMapBuild;
import com.xcong.excoin.modules.okxNewPrice.utils.WsParamBuild;
+import io.micrometer.core.instrument.util.JsonUtils;
import lombok.extern.slf4j.Slf4j;
import org.java_websocket.client.WebSocketClient;
@@ -24,7 +26,7 @@
@Slf4j
public class AccountWs {
- public static final Map<String,BigDecimal> ACCOUNTWSMAP = new ConcurrentHashMap<>();
+ public static final Map<String,String> ACCOUNTWSMAP = new ConcurrentHashMap<>();
/**
* 账户频道名称常量
*/
@@ -80,29 +82,31 @@
for (int j = 0; j < detailsArray.size(); j++) {
JSONObject detail = detailsArray.getJSONObject(j);
+ log.info("账户详情: {}", JSONUtil.formatJsonStr(String.valueOf(detail)));
//需要获取的参数
String ccyKey = "ccy";
String availBalKey = "availBal";
String cashBalKey = "cashBal";
String eqKey = "eq";
- String ordFrozKey = "ordFroz";
+ String uplKey = "upl";
- 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 upl = WsMapBuild.parseStringSafe(detail.getString(uplKey));
+ WsMapBuild.saveStringToMap(ACCOUNTWSMAP, uplKey, upl);
- if (cashBal.compareTo(BigDecimal.ZERO) == 0) {
+ BigDecimal cashBalDecimal = WsMapBuild.parseBigDecimalSafe(cashBal);
+ if (cashBalDecimal.compareTo(BigDecimal.ZERO) == 0) {
log.warn("账户频道无效的账户余额数据，跳过处理");
continue;
}
@@ -110,12 +114,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.multiply(total_order_usdt_factor).setScale(2, 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, upl, totalOrderUsdt
);
}
} catch (Exception innerEx) {
--
Gitblit v1.9.1