From a8ac553af7ed67e69f1466f8e97f4bfda00ab349 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 15 Dec 2025 10:21:48 +0800
Subject: [PATCH] feat(okxWs): 启用并完善账户持仓数据解析

---
 src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java |   64 ++++++++++++++++---------------
 1 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java
index 0af1d7d..75e230a 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java
@@ -65,37 +65,39 @@
                 String instId = posData.getString("instId");
                 if (CoinEnums.HE_YUE.getCode().equals(instId)) {
 //                    log.info("查询到账户{}持仓数据",CoinEnums.HE_YUE.getCode());
-//                    String mgnMode = posData.getString("mgnMode");
-//                    String posSide = posData.getString("posSide");
-//                    String pos = posData.getString("pos");
-//                    String avgPx = posData.getString("avgPx");
-//                    String upl = posData.getString("upl");
-//                    String uplRatio = posData.getString("uplRatio");
-//                    String lever = posData.getString("lever");
-//                    String liqPx = posData.getString("liqPx");
-//                    String markPx = posData.getString("markPx");
-//                    String imr = posData.getString("imr");
-//                    String mgnRatio = posData.getString("mgnRatio");
-//                    String mmr = posData.getString("mmr");
-//                    String notionalUsd = posData.getString("notionalUsd");
-//                    String ccy = posData.getString("ccy");
-//                    String last = posData.getString("last");
-//                    String idxPx = posData.getString("idxPx");
-//                    String bePx = posData.getString("bePx");
-//                    String realizedPnl = posData.getString("realizedPnl");
-//                    String settledPnl = posData.getString("settledPnl");
-//                    log.info(
-//                            "账户持仓频道-产品类型: {}, 保证金模式: {}, 持仓方向: {}, 持仓数量: {}, 开仓平均价: {}, "
-//                                    + "未实现收益: {}, 未实现收益率: {}, 杠杆倍数: {}, 预估强平价: {}, 初始保证金: {}, "
-//                                    + "维持保证金率: {}, 维持保证金: {}, 以美金价值为单位的持仓数量: {}, 占用保证金的币种: {}, "
-//                                    + "最新成交价: {}, 最新指数价格: {}, 盈亏平衡价: {}, 已实现收益: {}, 累计已结算收益: {}"
-//                                    + "最新标记价格: {}",
-//                            instId, mgnMode, posSide, pos, avgPx,
-//                            upl, uplRatio, lever, liqPx, imr,
-//                            mgnRatio, mmr, notionalUsd, ccy,
-//                            last, idxPx, bePx, realizedPnl, settledPnl,
-//                            markPx
-//                    );
+                    String mgnMode = posData.getString("mgnMode");
+                    String posSide = posData.getString("posSide");
+                    String pos = posData.getString("pos");
+                    String avgPx = posData.getString("avgPx");
+                    String upl = posData.getString("upl");
+                    String uplRatio = posData.getString("uplRatio");
+                    String lever = posData.getString("lever");
+                    String liqPx = posData.getString("liqPx");
+                    String markPx = posData.getString("markPx");
+                    String imr = posData.getString("imr");
+                    String mgnRatio = posData.getString("mgnRatio");
+                    String mmr = posData.getString("mmr");
+                    String notionalUsd = posData.getString("notionalUsd");
+                    String ccy = posData.getString("ccy");
+                    String last = posData.getString("last");
+                    String idxPx = posData.getString("idxPx");
+                    String bePx = posData.getString("bePx");
+                    String realizedPnl = posData.getString("realizedPnl");
+                    String settledPnl = posData.getString("settledPnl");
+                    String fee = posData.getString("fee");
+                    String fundingFee = posData.getString("fundingFee");
+                    log.info(
+                            "账户持仓频道-产品类型: {}, 保证金模式: {}, 持仓方向: {}, 持仓数量: {}, 开仓平均价: {}, "
+                                    + "未实现收益: {}, 未实现收益率: {}, 杠杆倍数: {}, 预估强平价: {}, 初始保证金: {}, "
+                                    + "维持保证金率: {}, 维持保证金: {}, 以美金价值为单位的持仓数量: {}, 占用保证金的币种: {}, "
+                                    + "最新成交价: {}, 最新指数价格: {}, 盈亏平衡价: {}, 已实现收益: {}, 累计已结算收益: {}"
+                                    + "最新标记价格: {},累计手续费: {},累计持仓费: {},",
+                            instId, mgnMode, posSide, pos, avgPx,
+                            upl, uplRatio, lever, liqPx, imr,
+                            mgnRatio, mmr, notionalUsd, ccy,
+                            last, idxPx, bePx, realizedPnl, settledPnl,
+                            markPx,fee,fundingFee
+                    );
 
                     initParam(posData);
                 }

--
Gitblit v1.9.1