From a7d61fcdf24ab8e459f53761b632072df00251b6 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Sat, 13 Dec 2025 19:44:42 +0800
Subject: [PATCH] fix(okxNewPrice): 更新订单成交后的持仓计算逻辑
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/AccountWs.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 41ce005..4a58f77 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;
@@ -80,12 +82,13 @@
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";
String ccy = WsMapBuild.parseStringSafe( detail.getString(ccyKey));
WsMapBuild.saveStringToMap(ACCOUNTWSMAP, ccyKey, ccy);
@@ -99,8 +102,8 @@
String eq = WsMapBuild.parseStringSafe(detail.getString(eqKey));
WsMapBuild.saveStringToMap(ACCOUNTWSMAP, eqKey, eq);
- String ordFroz = WsMapBuild.parseStringSafe(detail.getString(ordFrozKey));
- WsMapBuild.saveStringToMap(ACCOUNTWSMAP, ordFrozKey, ordFroz);
+ String upl = WsMapBuild.parseStringSafe(detail.getString(uplKey));
+ WsMapBuild.saveStringToMap(ACCOUNTWSMAP, uplKey, upl);
BigDecimal cashBalDecimal = WsMapBuild.parseBigDecimalSafe(cashBal);
if (cashBalDecimal.compareTo(BigDecimal.ZERO) == 0) {
@@ -111,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 = cashBalDecimal.divide(total_order_usdt_factor, 4, RoundingMode.DOWN);
+ 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