From 90ae4f1fdad2be2720945e0f1474c971a0fdf1a6 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 17 Dec 2025 10:00:09 +0800
Subject: [PATCH] fix(okxWs): 调整账户与持仓状态设置逻辑
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/AccountWs.java | 87 ++++++++++++++++++++++++-------------------
1 files changed, 48 insertions(+), 39 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..7816c1d 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<>();
/**
* 账户频道名称常量
*/
@@ -47,10 +49,16 @@
String connId = MallUtils.getOrderNum(ACCOUNTWS_CHANNEL);
JSONObject jsonObject = WsParamBuild.buildJsonObject(connId, option, argsArray);
webSocketClient.send(jsonObject.toJSONString());
- log.info("发送账户频道:{}", option);
+// log.info("发送账户频道:{}", option);
} catch (Exception e) {
log.error("订阅账户频道构建失败", e);
}
+ }
+
+ public static void initEvent(JSONObject response) {
+// log.info("订阅成功: {}", response.getJSONObject("arg"));
+ JSONObject arg = response.getJSONObject("arg");
+ initParam(arg);
}
/**
@@ -61,7 +69,7 @@
public static void handleEvent(JSONObject response) {
- log.info("开始执行AccountWs......{}",ACCOUNTWS_CHANNEL);
+// log.info("开始执行AccountWs......{}",ACCOUNTWS_CHANNEL);
try {
JSONArray dataArray = response.getJSONArray("data");
if (dataArray == null || dataArray.isEmpty()) {
@@ -80,43 +88,9 @@
for (int j = 0; j < detailsArray.size(); j++) {
JSONObject detail = detailsArray.getJSONObject(j);
- //需要获取的参数
- String ccyKey = "ccy";
- String availBalKey = "availBal";
- String cashBalKey = "cashBal";
- String eqKey = "eq";
- String ordFrozKey = "ordFroz";
+ initParam(detail);
- BigDecimal ccy = WsMapBuild.parseBigDecimalSafe(detail.getString(ccyKey));
- WsMapBuild.saveBigDecimalToMap(ACCOUNTWSMAP, ccyKey, ccy);
-
- BigDecimal availBal = WsMapBuild.parseBigDecimalSafe(detail.getString(availBalKey));
- WsMapBuild.saveBigDecimalToMap(ACCOUNTWSMAP, availBalKey, availBal);
-
- BigDecimal cashBal = WsMapBuild.parseBigDecimalSafe(detail.getString(cashBalKey));
- WsMapBuild.saveBigDecimalToMap(ACCOUNTWSMAP, cashBalKey, cashBal);
-
- BigDecimal eq = WsMapBuild.parseBigDecimalSafe(detail.getString(eqKey));
- WsMapBuild.saveBigDecimalToMap(ACCOUNTWSMAP, eqKey, eq);
-
- BigDecimal ordFroz = WsMapBuild.parseBigDecimalSafe(detail.getString(ordFrozKey));
- WsMapBuild.saveBigDecimalToMap(ACCOUNTWSMAP, ordFrozKey, ordFroz);
-
- if (cashBal.compareTo(BigDecimal.ZERO) == 0) {
- log.warn("账户频道无效的账户余额数据，跳过处理");
- continue;
- }
-
- // 根据可用余额计算下单总保证金
- 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);
-
- log.info(
- "账户详情-币种: {}, 可用余额: {}, 现金余额: {}, 余额: {}, 占用保证金: {}, 下单总保证金: {}",
- ccy, availBal, cashBal, eq, ordFroz, totalOrderUsdt
- );
+ WsMapBuild.saveStringToMap(ACCOUNTWSMAP, CoinEnums.READY_STATE.name(), CoinEnums.READY_STATE_YES.getCode());
}
} catch (Exception innerEx) {
log.warn("处理账户频道数据失败", innerEx);
@@ -127,5 +101,40 @@
}
}
+
+ public static final String ccyKey = "ccy";
+ public static final String availBalKey = "availBal";
+ public static final String cashBalKey = "cashBal";
+ public static final String eqKey = "eq";
+ public static final String uplKey = "upl";
+ private static void initParam(JSONObject detail) {
+
+ String ccy = WsMapBuild.parseStringSafe( detail.getString(ccyKey));
+ WsMapBuild.saveStringToMap(ACCOUNTWSMAP, ccyKey, ccy);
+
+ String availBal = WsMapBuild.parseStringSafe(detail.getString(availBalKey));
+ WsMapBuild.saveStringToMap(ACCOUNTWSMAP, availBalKey, availBal);
+
+ String cashBal = WsMapBuild.parseStringSafe(detail.getString(cashBalKey));
+ WsMapBuild.saveStringToMap(ACCOUNTWSMAP, cashBalKey, cashBal);
+
+ String eq = WsMapBuild.parseStringSafe(detail.getString(eqKey));
+ WsMapBuild.saveStringToMap(ACCOUNTWSMAP, eqKey, eq);
+
+ String upl = WsMapBuild.parseStringSafe(detail.getString(uplKey));
+ WsMapBuild.saveStringToMap(ACCOUNTWSMAP, uplKey, upl);
+
+ BigDecimal cashBalDecimal = WsMapBuild.parseBigDecimalSafe(cashBal);
+ // 根据可用余额计算下单总保证金
+ 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.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, upl, totalOrderUsdt
+ );
+ }
}
--
Gitblit v1.9.1