From b12289898dcc3b61769420df7c43c4eb073c5d57 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 08 Jun 2026 12:01:30 +0800
Subject: [PATCH] refactor(gateApi): 优化网格交易逻辑并修复仓位处理问题

---
 src/main/java/com/xcong/excoin/modules/gateApi/wsHandler/handler/PositionClosesChannelHandler.java |   37 ++++++++++++++++++++++++++++---------
 1 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/gateApi/wsHandler/handler/PositionClosesChannelHandler.java b/src/main/java/com/xcong/excoin/modules/gateApi/wsHandler/handler/PositionClosesChannelHandler.java
index deefcdb..c58ea39 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/wsHandler/handler/PositionClosesChannelHandler.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/wsHandler/handler/PositionClosesChannelHandler.java
@@ -9,8 +9,7 @@
 import java.math.BigDecimal;
 
 /**
- * 平仓频道处理器。
- * 私有频道,需认证。解析平仓推送后回调 {@link GateGridTradeService#onPositionClose}。
+ * 平仓频道处理器(futures.position_closes),接收平仓盈亏推送并回调 {@link GateGridTradeService#onPositionClose}。
  *
  * @author Administrator
  */
@@ -19,16 +18,39 @@
 
     private static final String CHANNEL_NAME = "futures.position_closes";
 
+    /**
+     * @param apiKey           Gate API v4 密钥,用于签名认证
+     * @param apiSecret        Gate API v4 签名密钥
+     * @param contract         合约名称(如 ETH_USDT)
+     * @param gridTradeService 网格交易策略服务实例
+     */
     public PositionClosesChannelHandler(String apiKey, String apiSecret,
                                          String contract,
                                          GateGridTradeService gridTradeService) {
         super(CHANNEL_NAME, apiKey, apiSecret, contract, gridTradeService);
     }
 
+    /**
+     * 处理平仓推送消息。
+     *
+     * <h3>数据提取</h3>
+     * result 数组中每个元素包含:
+     * <ul>
+     *   <li>contract:合约名称</li>
+     *   <li>side:平仓方向("long" / "short")</li>
+     *   <li>pnl:本次平仓的盈亏金额(字符串格式,如 "+0.2" / "-0.1")</li>
+     * </ul>
+     *
+     * <h3>数据处理</h3>
+     * 按合约名称过滤 → 提取 pnl 和 side → 调用 gridTradeService.onPositionClose() 累加盈亏。
+     * pnl 来自服务端,不受本地计算误差影响。
+     *
+     * @param response WebSocket 推送的完整 JSON
+     * @return true 表示已处理(匹配成功)
+     */
     @Override
     public boolean handleMessage(JSONObject response) {
-        String channel = response.getString("channel");
-        if (!CHANNEL_NAME.equals(channel)) {
+        if (!CHANNEL_NAME.equals(response.getString("channel"))) {
             return false;
         }
         try {
@@ -43,15 +65,12 @@
                 }
                 BigDecimal pnl = new BigDecimal(item.getString("pnl"));
                 String side = item.getString("side");
-                log.info("[{}] 推送: contract={}, side={}, pnl={}",
-                        CHANNEL_NAME, getContract(), side, pnl);
+                log.info("[{}] 平仓更新, 方向:{}, 盈亏:{}", CHANNEL_NAME, side, pnl);
                 if (getGridTradeService() != null) {
                     getGridTradeService().onPositionClose(getContract(), side, pnl);
                 }
             }
-        } catch (Exception e) {
-            log.error("[{}] 处理数据失败", CHANNEL_NAME, e);
-        }
+        } catch (Exception e) { log.error("[{}] 处理数据失败", CHANNEL_NAME, e); }
         return true;
     }
 }

--
Gitblit v1.9.1