From 86a73a6274f9c5938c39c03198f11df9b1735320 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 18 Dec 2025 17:35:01 +0800
Subject: [PATCH] feat(okx): 实现新的交易策略与账户保证金逻辑

---
 src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 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 b03b897..73953c5 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
@@ -41,7 +41,7 @@
             String connId = MallUtils.getOrderNum(POSITIONSWS_CHANNEL);
             JSONObject jsonObject = WsParamBuild.buildJsonObject(connId, option, argsArray);
             webSocketClient.send(jsonObject.toJSONString());
-//            log.info("发送持仓频道频道:{}", option);
+            log.info("发送持仓频道频道:{}", option);
         } catch (Exception e) {
             log.error("订阅持仓频道频道构建失败", e);
         }
@@ -52,7 +52,7 @@
     }
 
     public static void initEvent(JSONObject response, String accountName) {
-//        log.info("订阅成功,数据初始化: {}", response.getJSONObject("arg"));
+        log.info("订阅成功,数据初始化: {}", response.getJSONObject("arg"));
         JSONObject arg = response.getJSONObject("arg");
         initParam(arg, accountName,CoinEnums.POSSIDE_LONG.getCode());
         initParam(arg, accountName,CoinEnums.POSSIDE_SHORT.getCode());
@@ -61,14 +61,11 @@
     public static void handleEvent(JSONObject response, String accountName) {
 
 
-//        log.info("开始执行PositionsWs......");
+        log.info("开始执行PositionsWs......");
         try {
             JSONArray dataArray = response.getJSONArray("data");
             if (dataArray == null || dataArray.isEmpty()) {
-//                log.info("账户持仓频道数据为空,已当前价买入,并且初始化网格");
-                JSONObject posData = new JSONObject();
-                initParam(posData, accountName,CoinEnums.POSSIDE_LONG.getCode());
-                initParam(posData, accountName,CoinEnums.POSSIDE_SHORT.getCode());
+                log.info("账户持仓频道数据为空,等待更新");
                 return;
             }
 
@@ -76,7 +73,7 @@
                 JSONObject posData = dataArray.getJSONObject(i);
                 String instId = posData.getString("instId");
                 if (CoinEnums.HE_YUE.getCode().equals(instId)) {
-//                    log.info("查询到账户{}持仓数据",CoinEnums.HE_YUE.getCode());
+                    log.info("查询到账户{}持仓数据",CoinEnums.HE_YUE.getCode());
                     String mgnMode = posData.getString("mgnMode");
                     String posSide = posData.getString("posSide");
                     String pos = posData.getString("pos");
@@ -104,7 +101,7 @@
                                     + "维持保证金率: {}, 维持保证金: {}, 以美金价值为单位的持仓数量: {}, 占用保证金的币种: {}, "
                                     + "最新成交价: {}, 最新指数价格: {}, 盈亏平衡价: {}, 已实现收益: {}, 累计已结算收益: {}"
                                     + "最新标记价格: {},累计手续费: {},累计持仓费: {},",
-                            accountName, instId, mgnMode, posSide, pos, avgPx,
+                            initAccountName(accountName, posSide), instId, mgnMode, posSide, pos, avgPx,
                             upl, uplRatio, lever, liqPx, imr,
                             mgnRatio, mmr, notionalUsd, ccy,
                             last, idxPx, bePx, realizedPnl, settledPnl,

--
Gitblit v1.9.1