From 4cb8c93cf1784a8e33458000156e6db22271b500 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 14 May 2026 15:40:21 +0800
Subject: [PATCH] refactor(gateApi): 重构网格交易策略核心逻辑

---
 src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java |  591 +++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 495 insertions(+), 96 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
index 32c8dd0..409f59c 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -5,25 +5,88 @@
 import io.gate.gateapi.GateApiException;
 import io.gate.gateapi.api.AccountApi;
 import io.gate.gateapi.api.FuturesApi;
-import io.gate.gateapi.models.AccountDetail;
-import io.gate.gateapi.models.FuturesAccount;
-import io.gate.gateapi.models.FuturesOrder;
-import io.gate.gateapi.models.FuturesPriceTrigger;
-import io.gate.gateapi.models.Position;
+import io.gate.gateapi.models.*;
 import lombok.extern.slf4j.Slf4j;
 
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
+
+import com.xcong.excoin.modules.gateApi.wsHandler.handler.CandlestickChannelHandler;
+import com.xcong.excoin.modules.gateApi.wsHandler.handler.PositionClosesChannelHandler;
+import com.xcong.excoin.modules.gateApi.wsHandler.handler.PositionsChannelHandler;
 
 /**
  * Gate 网格交易服务 — 策略核心。
  *
- * <h3>策略</h3>
- * 多空双开基底 → 生成价格网格队列 → K线触达网格线 → 开仓+设止盈 → 队列动态转移。
- * 每根 K 线更新 {@code unrealizedPnl}(浮动盈亏),平仓后累加到 {@code cumulativePnl}(已实现盈亏)。
+ * <h3>策略概述</h3>
+ * 多空双开基底 → 生成价格网格队列 → 条件单监控 → 触发成交后队列动态转移。
+ * 每根 K 线更新未实现盈亏(unrealizedPnl),平仓后累加已实现盈亏(cumulativePnl)。
+ *
+ * <h3>核心机制</h3>
+ * <ul>
+ *   <li><b>条件开仓单</b>:使用 Gate API {@code FuturesPriceTriggeredOrder},服务器监控价格,
+ *       达到触发价后以市价 IOC 开仓。相比限价单,条件单仅在触发价到达时才执行,避免提前成交。</li>
+ *   <li><b>条件单 ID 映射</b>(currentLongOrderIds / currentShortOrderIds):
+ *       用同步 Map 管理所有活跃的条件单(订单ID → 止盈价格)。挂条件单时通过回调存入,
+ *       订单成交后通过 {@code futures.orders} 推送匹配止盈价并挂止盈单。</li>
+ *   <li><b>订单订阅(futures.orders)</b>:订单成交(status=finished, finish_as=filled)时,
+ *       通过 {@link #onOrderUpdate(String, String, String)} 从 Map 中取出止盈价,
+ *       调用 {@code executor.placeTakeProfit} 创建止盈条件单。</li>
+ *   <li><b>反向条件单</b>:当新网格首元素价格夹在多/空持仓均价之间,
+ *       且反向持仓张数不超过 3 张时,额外挂一张反向市价单,通过订单订阅自动挂止盈。</li>
+ * </ul>
+ *
+ * <h3>状态机</h3>
+ * <pre>
+ *   WAITING_KLINE → (首K线) → 异步双开基底
+ *
+ *   仓位推送(dual_long/dual_short) → 基底成交 → 记录入场价
+ *     → 双基底都成交 → 生成队列 + 初始条件单 + 止盈队列 → ACTIVE
+ *
+ *   ACTIVE:
+ *     ├─ 每根K线 → 更新 unrealizedPnl → 方向判断
+ *     │    ├─ closePrice > longPriceQueue[0] → processLongGrid
+ *     │    └─ closePrice < shortPriceQueue[0] → processShortGrid
+ *     ├─ processShortGrid: 匹配空仓队列 → 本队补充 → 挂空仓+多仓条件单(止盈价存入Map)
+ *     ├─ processLongGrid: 匹配多仓队列 → 本队补充 → 挂多仓+空仓条件单(止盈价存入Map)
+ *     ├─ 订单推送(futures.orders) → onOrderUpdate → Map 匹配止盈价 → 挂止盈条件单
+ *     ├─ 仓位推送 → 更新均价/持仓量、仓位减少时处理反向单
+ *     ├─ 平仓推送 → 累加 cumulativePnl
+ *     ├─ 保证金安全阀 → 超限跳过挂单,队列照常更新
+ *     └─ cumulativePnl ≥ overallTp 或 ≤ -maxLoss → STOPPED
+ * </pre>
+ *
+ * <h3>队列转移规则</h3>
+ * <ul>
+ *   <li><b>空仓队列触发</b>(processShortGrid):matched 元素从空仓队列移除,
+ *       尾部递减 step 补充新元素;多仓队列以首元素(最小价)递减 step 生成新元素加入。</li>
+ *   <li><b>多仓队列触发</b>(processLongGrid):matched 元素从多仓队列移除,
+ *       尾部递增 step 补充新元素;空仓队列以首元素(最高价)递增 step 生成新元素加入。</li>
+ *   <li>队列容量超限时截断尾部,保持固定容量。</li>
+ * </ul>
+ *
+ * <h3>止盈机制</h3>
+ * <ul>
+ *   <li>网格触发时,挂条件单的回调中将订单 ID 和止盈价存入 currentLongOrderIds / currentShortOrderIds Map。</li>
+ *   <li>条件单成交后,{@code futures.orders} 推送触发 {@link #onOrderUpdate},
+ *       通过订单 ID 取出止盈价,创建止盈条件单(plan-close-*-position)。</li>
+ *   <li>止盈条件单:以触发价监控(price_type=最新价,strategy_type=价格触发),
+ *       到达后以市价 IOC 平仓(reduce_only=true,price="0")。</li>
+ * </ul>
+ *
+ * <h3>反向条件单条件</h3>
+ * <pre>
+ *   newFirstPrice > shortEntryPrice AND newFirstPrice < longEntryPrice
+ *   AND 反向持仓张数 < 3
+ * </pre>
+ * 满足条件时以 newFirstPrice ± step 为止盈价直接挂市价单,通过订单订阅自动挂止盈。
  *
  * <h3>未实现盈亏公式(正向合约)</h3>
  * <pre>
@@ -34,21 +97,6 @@
  * {@link GateConfig.PnLPriceMode#MARK_PRICE 标记价格}(通过 {@link #setMarkPrice(BigDecimal)} 注入)。
  * 入场价和持仓量由 {@link #onPositionUpdate(String, Position.ModeEnum, BigDecimal, BigDecimal)} 实时更新。
  *
- * <h3>状态机</h3>
- * <pre>
- *   WAITING_KLINE → (首K线) → 异步双开基底
- *
- *   仓位推送(dual_long/dual_short) → 基底成交 → 记录入场价 → 双基底都成交 → 生成队列 → ACTIVE
- *
- *   ACTIVE:
- *     ├─ 每根K线 → 更新 unrealizedPnl + processShortGrid + processLongGrid
- *     │    ├─ 当前价 &lt; 空仓队列元素 → 匹配 → 开空 + 队列元素转移到多仓队列
- *     │    └─ 当前价 &gt; 多仓队列元素 → 匹配 → 开多 + 队列元素转移到空仓队列
- *     ├─ 仓位推送(非基底) → 设止盈条件单 entry × (1±gridRate)
- *     ├─ 保证金≥初始本金 marginRatioLimit → 跳过开仓,队列照常更新
- *     └─ cumulativePnl ≥ overallTp 或 ≤ -maxLoss → STOPPED
- * </pre>
- *
  * @author Administrator
  */
 @Slf4j
@@ -58,8 +106,18 @@
         WAITING_KLINE, OPENING, ACTIVE, STOPPED
     }
 
-    private static final String ORDER_TYPE_CLOSE_LONG = "close-long-position";
-    private static final String ORDER_TYPE_CLOSE_SHORT = "close-short-position";
+    /**
+     * 止盈条件单 order_type:仓位计划止盈止损 — 平多仓(支持部分平仓,size&lt;0)。
+     * 注意:不能用 close-long-position(仅支持全平且双仓需 auto_size),
+     * 必须用 plan-close-long-position 以支持指定张数部分平仓。
+     */
+    private static final String ORDER_TYPE_CLOSE_LONG = "plan-close-long-position";
+    /**
+     * 止盈条件单 order_type:仓位计划止盈止损 — 平空仓(支持部分平仓,size&gt;0)。
+     * 注意:不能用 close-short-position(仅支持全平且双仓需 auto_size),
+     * 必须用 plan-close-short-position 以支持指定张数部分平仓。
+     */
+    private static final String ORDER_TYPE_CLOSE_SHORT = "plan-close-short-position";
 
     private final GateConfig config;
     private final GateTradeExecutor executor;
@@ -73,9 +131,14 @@
     /** 多仓价格队列,升序排列(小→大),容量 gridQueueSize */
     private final List<BigDecimal> longPriceQueue = Collections.synchronizedList(new ArrayList<>());
 
+    /** 当前多仓条件单映射:订单ID → 止盈价格,订单成交后通过订单订阅推送匹配止盈 */
+    private final Map<String, BigDecimal> currentLongOrderIds = Collections.synchronizedMap(new LinkedHashMap<>());
+    /** 当前空仓条件单映射:订单ID → 止盈价格,订单成交后通过订单订阅推送匹配止盈 */
+    private final Map<String, BigDecimal> currentShortOrderIds = Collections.synchronizedMap(new LinkedHashMap<>());
+
     /** 基底空头入场价 */
     private BigDecimal shortBaseEntryPrice;
-    /** 基底多头入场价 */
+    /** 基底多头入场价(仅记录,当前未被业务逻辑消费,保留以备后续使用) */
     private BigDecimal longBaseEntryPrice;
     /** 基底多头是否已开 */
     private volatile boolean baseLongOpened = false;
@@ -109,6 +172,20 @@
 
     // ---- 初始化 ----
 
+    /**
+     * 初始化策略环境。
+     *
+     * <h3>执行顺序</h3>
+     * <ol>
+     *   <li>获取用户 ID(用于私有频道订阅 payload)</li>
+     *   <li>获取账户信息 → 记录初始本金</li>
+     *   <li>如需要,切换为双向持仓模式</li>
+     *   <li>如需要,调整持仓模式(single/dual)</li>
+     *   <li>清除旧的止盈止损条件单</li>
+     *   <li>平掉所有已有仓位</li>
+     *   <li>设置杠杆倍数</li>
+     * </ol>
+     */
     public void init() {
         try {
             ApiClient detailClient = new ApiClient();
@@ -122,25 +199,40 @@
             this.initialPrincipal = new BigDecimal(account.getTotal());
             log.info("[Gate] 初始本金: {} USDT", initialPrincipal);
 
+            futuresApi.cancelPriceTriggeredOrderList(SETTLE, config.getContract());
+            log.info("[Gate] 旧条件单已清除");
+            closeExistingPositions();
+
             //设置持仓模式为双向持仓
             Boolean inDualMode = account.getInDualMode();
             if (!inDualMode) {
-                futuresApi.setDualModeCall(SETTLE,true,null);
+                try {
+                    futuresApi.setDualModeCall(SETTLE,true,null).execute();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
             }
 
-            if (!config.getPositionMode().equals(account.getPositionMode())) {
-                futuresApi.setPositionMode(SETTLE, config.getPositionMode());
+            try {
+                futuresApi.updateDualModePositionLeverageCall(
+                        SETTLE, config.getContract(), config.getLeverage(),
+                        null, null).execute();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+            if (!config.getMarginMode().equals(account.getMarginMode())) {
+
+                UpdateDualCompPositionCrossModeRequest updateDualCompPositionCrossModeRequest = new UpdateDualCompPositionCrossModeRequest();
+                updateDualCompPositionCrossModeRequest.setMode(config.getMarginMode());
+                updateDualCompPositionCrossModeRequest.setContract(config.getContract());
+                try {
+                    futuresApi.updateDualCompPositionCrossModeCall(SETTLE, updateDualCompPositionCrossModeRequest, null).execute();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
             }
             log.info("[Gate] 持仓模式: {} 余额: {}", config.getPositionMode(), account.getAvailable());
-
-            futuresApi.cancelPriceTriggeredOrderList(SETTLE, config.getContract());
-            log.info("[Gate] 旧条件单已清除");
-
-            closeExistingPositions();
-
-            futuresApi.updateDualModePositionLeverageCall(
-                    SETTLE, config.getContract(), config.getLeverage(),
-                    config.getMarginMode(), null);
             log.info("[Gate] 杠杆: {}x {}", config.getLeverage(), config.getMarginMode());
         } catch (GateApiException e) {
             log.error("[Gate] 初始化失败, label:{}, msg:{}", e.getErrorLabel(), e.getMessage());
@@ -149,6 +241,19 @@
         }
     }
 
+    /**
+     * 平掉当前合约的所有已有仓位。
+     *
+     * <h3>平仓策略</h3>
+     * <ul>
+     *   <li>单向持仓:size=相反数,reduceOnly=true,市价 IOC 平仓</li>
+     *   <li>双向持仓:size=0,close=false,autoSize=LONG/SHORT,reduceOnly=true,市价 IOC 全平</li>
+     * </ul>
+     *
+     * <h3>注意事项</h3>
+     * 双向持仓模式下必须使用 autoSize 参数,不能直接传负数 size,
+     * 否则 Gate API 会拒绝(双向模式下空头 size 为负是正常的持仓方向)。
+     */
     private void closeExistingPositions() {
         try {
             List<Position> positions = futuresApi.listPositions(SETTLE).execute();
@@ -189,6 +294,10 @@
 
     // ---- 启动/停止 ----
 
+    /**
+     * 启动网格策略。重置所有状态变量和队列,进入 WAITING_KLINE 等待首根 K 线。
+     * 仅当当前状态为 WAITING_KLINE 或 STOPPED 时才允许启动。
+     */
     public void startGrid() {
         if (state != StrategyState.WAITING_KLINE && state != StrategyState.STOPPED) {
             log.warn("[Gate] 策略已在运行中, state:{}", state);
@@ -208,9 +317,15 @@
         shortActive = false;
         shortPriceQueue.clear();
         longPriceQueue.clear();
+        currentLongOrderIds.clear();
+        currentShortOrderIds.clear();
         log.info("[Gate] 网格策略已启动");
     }
 
+    /**
+     * 停止网格策略。取消所有条件单 → 关闭交易线程池。
+     * 状态设为 STOPPED,K 线回调将直接返回不再处理。
+     */
     public void stopGrid() {
         state = StrategyState.STOPPED;
         executor.cancelAllPriceTriggeredOrders();
@@ -220,6 +335,24 @@
 
     // ---- K线回调 ----
 
+    /**
+     * K 线回调入口。由 {@link CandlestickChannelHandler} 在收到 WebSocket K 线推送时调用。
+     *
+     * <h3>处理流程</h3>
+     * <ol>
+     *   <li>更新 lastKlinePrice → 计算 unrealizedPnl(浮动盈亏)</li>
+     *   <li>STOPPED → 直接返回(仅保留盈亏更新)</li>
+     *   <li>WAITING_KLINE → 切换为 OPENING → 异步提交基底双开(开多+开空)</li>
+     *   <li>OPENING → 等待仓位推送回调生成队列,此处返回</li>
+     *   <li>ACTIVE → 执行 processShortGrid + processLongGrid</li>
+     * </ol>
+     *
+     * <h3>注意</h3>
+     * 基底双开下单提交到 GateTradeExecutor 的独立线程池中异步执行,
+     * 成交状态由 onPositionUpdate 回调驱动,不阻塞 WS 回调线程。
+     *
+     * @param closePrice K 线收盘价(即当前最新成交价)
+     */
     public void onKline(BigDecimal closePrice) {
         lastKlinePrice = closePrice;
         updateUnrealizedPnl();
@@ -230,11 +363,11 @@
         if (state == StrategyState.WAITING_KLINE) {
             state = StrategyState.OPENING;
             log.info("[Gate] 首根K线到达,开基底仓位...");
-            executor.openLong(config.getQuantity(), () -> {
-                log.info("[Gate] 基底多单已提交");
+            executor.openLong(config.getQuantity(), (orderId) -> {
+                log.info("[Gate] 基底多单已提交{}", orderId);
             }, null);
-            executor.openShort(negate(config.getQuantity()), () -> {
-                log.info("[Gate] 基底空单已提交");
+            executor.openShort(negate(config.getQuantity()), (orderId) -> {
+                log.info("[Gate] 基底空单已提交{}",orderId);
             }, null);
             return;
         }
@@ -242,12 +375,35 @@
         if (state != StrategyState.ACTIVE) {
             return;
         }
-        processShortGrid(closePrice);
         processLongGrid(closePrice);
+        processShortGrid(closePrice);
     }
 
     // ---- 仓位推送回调 ----
 
+    /**
+     * 仓位推送回调。由 {@link PositionsChannelHandler} 在收到 WebSocket 仓位更新时调用。
+     *
+     * <h3>处理逻辑</h3>
+     * <ul>
+     *   <li><b>有仓位 (size ≠ 0)</b>:
+     *     <ul>
+     *       <li>首次开仓(基底):标记 baseOpened=true,记录基底入场价,双基底都成交后生成网格队列</li>
+     *       <li>仓位净减少(size.abs() < 之前记录值):止盈平仓后 → 检查反向条件单条件 →
+     *           满足时以 entryPrice ± step 为止盈价挂反向市价单(订单ID + 止盈价存入 Map)</li>
+     *       <li>仓位净增加或不变:仅更新 positionSize,止盈由 {@link #onOrderUpdate} 通过订单订阅匹配处理</li>
+     *     </ul>
+     *   </li>
+     *   <li><b>无仓位 (size = 0)</b>:清空活跃标记和持仓量</li>
+     *   <li><b>Map 截断</b>:currentLongOrderIds / currentShortOrderIds 超过 5 个时,
+     *       从 LinkedHashMap 头部删除最旧条目,保留最新 5 个</li>
+     * </ul>
+     *
+     * @param contract   合约名称
+     * @param mode       持仓模式(DUAL_LONG / DUAL_SHORT)
+     * @param size       持仓张数(多头为正、空头为负)
+     * @param entryPrice 当前持仓加权均价(交易所计算)
+     */
     public void onPositionUpdate(String contract, Position.ModeEnum mode, BigDecimal size,
                                   BigDecimal entryPrice) {
         if (state == StrategyState.STOPPED || state == StrategyState.WAITING_KLINE) {
@@ -260,47 +416,92 @@
             if (hasPosition) {
                 longActive = true;
                 longEntryPrice = entryPrice;
-                longPositionSize = size;
                 if (!baseLongOpened) {
+                    longPositionSize = size;
                     longBaseEntryPrice = entryPrice;
                     baseLongOpened = true;
                     log.info("[Gate] 基底多成交价: {}", longBaseEntryPrice);
                     tryGenerateQueues();
+                } else if(size.compareTo(longPositionSize) < 0){
+                    if (entryPrice.compareTo(shortEntryPrice) > 0
+                            && entryPrice.compareTo(longEntryPrice) < 0
+                            && shortPositionSize.compareTo(new BigDecimal("3")) < 0) {
+
+                        BigDecimal reverseShortTp = entryPrice.subtract(config.getStep()).setScale(1, RoundingMode.HALF_UP);
+                        executor.openShort(negate(config.getQuantity()),
+                                orderId -> { currentShortOrderIds.put(orderId, reverseShortTp);},
+                               null);
+                        log.info("[Gate] 反向条件空单已挂, trigger:{}, size:{}, 止盈:{}", entryPrice, negate(config.getQuantity()), reverseShortTp);
+                    }
                 } else {
-                    BigDecimal tpPrice = entryPrice.multiply(BigDecimal.ONE.add(config.getGridRate())).setScale(1, RoundingMode.HALF_UP);
-                    executor.placeTakeProfit(tpPrice,
-                            FuturesPriceTrigger.RuleEnum.NUMBER_1, ORDER_TYPE_CLOSE_LONG, negate(config.getQuantity()));
-                    log.info("[Gate] 多单止盈已设, entry:{}, tp:{}, size:{}", entryPrice, tpPrice, negate(config.getQuantity()));
+                    longPositionSize = size;
                 }
             } else {
                 longActive = false;
                 longPositionSize = BigDecimal.ZERO;
             }
+            synchronized (currentLongOrderIds) {
+                if (currentLongOrderIds.size() > 5) {
+                    Iterator<String> it = currentLongOrderIds.keySet().iterator();
+                    for (int i = 0, remove = currentLongOrderIds.size() - 5; i < remove; i++) {
+                        it.next();
+                        it.remove();
+                    }
+                }
+            }
         } else if (Position.ModeEnum.DUAL_SHORT == mode) {
             if (hasPosition) {
                 shortActive = true;
                 shortEntryPrice = entryPrice;
-                shortPositionSize = size.abs();
                 if (!baseShortOpened) {
+                    shortPositionSize = size.abs();
                     shortBaseEntryPrice = entryPrice;
                     baseShortOpened = true;
                     log.info("[Gate] 基底空成交价: {}", shortBaseEntryPrice);
                     tryGenerateQueues();
+                } else if(size.abs().compareTo(shortPositionSize) < 0){
+                    if (entryPrice.compareTo(shortEntryPrice) > 0
+                            && entryPrice.compareTo(longEntryPrice) < 0
+                            && longPositionSize.compareTo(new BigDecimal("3")) < 0) {
+
+                        BigDecimal reverseLongTp = entryPrice.add(config.getStep()).setScale(1, RoundingMode.HALF_UP);
+                        executor.openLong(config.getQuantity(),
+                                orderId -> { currentLongOrderIds.put(orderId, reverseLongTp);},
+                                null);
+                        log.info("[Gate] 反向条件多单已挂, trigger:{}, size:{}, 止盈:{}", entryPrice, negate(config.getQuantity()), reverseLongTp);
+                    }
                 } else {
-                    BigDecimal tpPrice = entryPrice.multiply(BigDecimal.ONE.subtract(config.getGridRate())).setScale(1, RoundingMode.HALF_UP);
-                    executor.placeTakeProfit(tpPrice,
-                            FuturesPriceTrigger.RuleEnum.NUMBER_2, ORDER_TYPE_CLOSE_SHORT, config.getQuantity());
-                    log.info("[Gate] 空单止盈已设, entry:{}, tp:{}, size:{}", entryPrice, tpPrice, config.getQuantity());
+                    shortPositionSize = size.abs();
                 }
             } else {
                 shortActive = false;
                 shortPositionSize = BigDecimal.ZERO;
+            }
+            synchronized (currentShortOrderIds) {
+                if (currentShortOrderIds.size() > 5) {
+                    Iterator<String> it = currentShortOrderIds.keySet().iterator();
+                    for (int i = 0, remove = currentShortOrderIds.size() - 5; i < remove; i++) {
+                        it.next();
+                        it.remove();
+                    }
+                }
             }
         }
     }
 
     // ---- 平仓推送回调 ----
 
+    /**
+     * 平仓推送回调。由 {@link PositionClosesChannelHandler} 在收到平仓推送时调用。
+     *
+     * <h3>累加规则</h3>
+     * cumulativePnl += pnl。止盈平仓时 pnl > 0,止损平仓时 pnl < 0。
+     * 累加后检查停止条件:≥ overallTp 或 ≤ -maxLoss。
+     *
+     * @param contract 合约名称
+     * @param side     平仓方向("long" / "short")
+     * @param pnl      本次平仓的盈亏金额
+     */
     public void onPositionClose(String contract, String side, BigDecimal pnl) {
         if (state == StrategyState.STOPPED) {
             return;
@@ -317,40 +518,144 @@
         }
     }
 
+    // ---- 订单推送回调 ----
+
+    /**
+     * 订单推送回调。由 OrdersChannelHandler 在收到订单更新推送时调用。
+     *
+     * <h3>处理逻辑</h3>
+     * 当订单状态为 finished 且 finish_as 为 filled 时,
+     * 从 {@link #currentLongOrderIds} / {@link #currentShortOrderIds} 中匹配订单ID,
+     * 取出止盈价格并挂止盈单。匹配成功后从 Map 中移除该条目,防止重复挂单。
+     *
+     * @param orderId  订单 ID
+     * @param status   订单状态(open / finished)
+     * @param finishAs 订单结束方式(filled / cancelled / ioc 等)
+     */
+    public void onOrderUpdate(String orderId, String status, String finishAs) {
+        if (!"finished".equals(status) || !"filled".equals(finishAs)) {
+            return;
+        }
+        BigDecimal longTp = currentLongOrderIds.remove(orderId);
+        if (longTp != null) {
+            executor.placeTakeProfit(longTp,
+                    FuturesPriceTrigger.RuleEnum.NUMBER_1, ORDER_TYPE_CLOSE_LONG, negate(config.getQuantity()));
+            log.info("[Gate] 多单成交匹配止盈, orderId:{}, 止盈价:{}, size:{}", orderId, longTp, negate(config.getQuantity()));
+            return;
+        }
+        BigDecimal shortTp = currentShortOrderIds.remove(orderId);
+        if (shortTp != null) {
+            executor.placeTakeProfit(shortTp,
+                    FuturesPriceTrigger.RuleEnum.NUMBER_2, ORDER_TYPE_CLOSE_SHORT, config.getQuantity());
+            log.info("[Gate] 空单成交匹配止盈, orderId:{}, 止盈价:{}, size:{}", orderId, shortTp, config.getQuantity());
+        }
+    }
+
     // ---- 网格队列处理 ----
 
+    /**
+     * 尝试生成网格队列。双基底(多+空)都成交后才触发:
+     * <ol>
+     *   <li>生成空仓价格队列(降序)和多仓价格队列(升序)</li>
+     *   <li>挂初始多仓条件单(触发价 = 多仓队列首元素,rule=NUMBER_1 ≥触发价时开多),
+     *       止盈价 = 触发价 + step,通过 onSuccess 回调将 orderId → 止盈价存入 currentLongOrderIds</li>
+     *   <li>挂初始空仓条件单(触发价 = 空仓队列首元素,rule=NUMBER_2 ≤触发价时开空),
+     *       止盈价 = 触发价 − step,通过 onSuccess 回调将 orderId → 止盈价存入 currentShortOrderIds</li>
+     *   <li>状态切换为 ACTIVE</li>
+     * </ol>
+     * 条件单成交后由 {@link #onOrderUpdate} 匹配止盈价并挂止盈条件单。
+     */
     private void tryGenerateQueues() {
         if (baseLongOpened && baseShortOpened) {
             generateShortQueue();
             generateLongQueue();
+
+            BigDecimal step = config.getStep();
+
+            BigDecimal longPriceQueueOne = longPriceQueue.get(0);
+            BigDecimal longTp = longPriceQueueOne.add(step).setScale(1, RoundingMode.HALF_UP);
+            executor.placeConditionalEntryOrder(longPriceQueueOne,
+                    FuturesPriceTrigger.RuleEnum.NUMBER_1, config.getQuantity(),
+                    orderId -> { currentLongOrderIds.put(orderId, longTp); log.info("[Gate] 初始条件多单已挂, id:{}, trigger:{}, 止盈:{}", orderId, longPriceQueue.get(0), longTp); },
+                    null);
+
+
+            BigDecimal shortPriceQueueOne = shortPriceQueue.get(0);
+            BigDecimal shortTp = shortPriceQueueOne.subtract(step).setScale(1, RoundingMode.HALF_UP);
+            executor.placeConditionalEntryOrder(shortPriceQueueOne,
+                    FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(config.getQuantity()),
+                    orderId -> { currentShortOrderIds.put(orderId, shortTp); log.info("[Gate] 初始条件空单已挂, id:{}, trigger:{}, 止盈:{}", orderId, shortPriceQueue.get(0), shortTp); },
+                    null);
+
+
+            log.info("[Gate] 网格队列已生成, 空队首:{} → 尾:{}, 多队首:{} → 尾:{}, step:{}, 已激活",
+                    shortPriceQueueOne, shortPriceQueue.get(shortPriceQueue.size() - 1),
+                    longPriceQueueOne, longPriceQueue.get(longPriceQueue.size() - 1),
+                    step);
             state = StrategyState.ACTIVE;
-            log.info("[Gate] 网格队列已生成, 空队首:{} → 尾:{}, 多队首:{} → 尾:{}, 已激活",
-                    shortPriceQueue.get(0), shortPriceQueue.get(shortPriceQueue.size() - 1),
-                    longPriceQueue.get(0), longPriceQueue.get(longPriceQueue.size() - 1));
         }
     }
 
+    /**
+     * 生成空仓价格队列。
+     * 以 shortBaseEntryPrice × gridRate 作为绝对步长 step,存到 config。
+     * 第1个元素 = shortBaseEntryPrice − step,后续依次递减 step,共 gridQueueSize 个。
+     * 队列降序排列(大→小),方便 processShortGrid 中从头遍历。
+     */
     private void generateShortQueue() {
         shortPriceQueue.clear();
-        BigDecimal step = config.getGridRate();
-        for (int i = 1; i <= config.getGridQueueSize(); i++) {
-            shortPriceQueue.add(shortBaseEntryPrice.multiply(BigDecimal.ONE.subtract(step.multiply(BigDecimal.valueOf(i)))).setScale(1, RoundingMode.HALF_UP));
+        BigDecimal step = shortBaseEntryPrice.multiply(config.getGridRate()).setScale(1, RoundingMode.HALF_UP);
+        config.setStep(step);
+        BigDecimal elem = shortBaseEntryPrice.subtract(step).setScale(1, RoundingMode.HALF_UP);
+        for (int i = 0; i < config.getGridQueueSize(); i++) {
+            shortPriceQueue.add(elem);
+            elem = elem.subtract(step).setScale(1, RoundingMode.HALF_UP);
         }
         shortPriceQueue.sort((a, b) -> b.compareTo(a));
-        //输出队列:shortPriceQueue;
         log.info("[Gate] 空队列:{}", shortPriceQueue);
     }
 
+    /**
+     * 生成多仓价格队列。
+     * 以 shortBaseEntryPrice + step 为首元素,后续依次递增 step,共 gridQueueSize 个。
+     * 队列升序排列(小→大),方便 processLongGrid 中从头遍历。
+     */
     private void generateLongQueue() {
         longPriceQueue.clear();
-        BigDecimal step = config.getGridRate();
-        for (int i = 1; i <= config.getGridQueueSize(); i++) {
-            longPriceQueue.add(longBaseEntryPrice.multiply(BigDecimal.ONE.add(step.multiply(BigDecimal.valueOf(i)))).setScale(1, RoundingMode.HALF_UP));
+        BigDecimal step = config.getStep();
+        BigDecimal elem = shortBaseEntryPrice.add(step).setScale(1, RoundingMode.HALF_UP);
+        for (int i = 0; i < config.getGridQueueSize(); i++) {
+            longPriceQueue.add(elem);
+            elem = elem.add(step).setScale(1, RoundingMode.HALF_UP);
         }
         longPriceQueue.sort(BigDecimal::compareTo);
         log.info("[Gate] 多队列:{}", longPriceQueue);
     }
 
+    /**
+     * 空仓网格处理(当前价跌破空仓队列元素)。
+     *
+     * <h3>匹配规则</h3>
+     * 遍历空仓队列(降序排列,大→小),收集所有大于当前价的元素为 matched。
+     * 降序排列保证一旦遇到 price ≤ currentPrice 即可停止遍历。
+     *
+     * <h3>执行流程</h3>
+     * <ol>
+     *   <li>匹配队列元素 → 为空则直接返回,不触发</li>
+     *   <li>空仓队列:移除 matched 元素,从尾部递减 step 补充等量新元素,重新降序排序</li>
+     *   <li>多仓队列:<b>不再更新</b>(队列转移逻辑已移除)</li>
+     *   <li>保证金检查 → 不安全则跳过挂单(队列照常更新),安全则继续</li>
+     *   <li>挂新空仓条件单(触发价 = newShortFirst,rule=NUMBER_2,止盈 = newShortFirst − step,
+     *       orderId → 止盈价存入 currentShortOrderIds)</li>
+     *   <li>多仓条件单守卫:newLongFirst = newShortFirst + step × 2,
+     *       若 newLongFirst < longEntryPrice → 挂多仓条件单(止盈 = newLongFirst + step,
+     *       orderId → 止盈价存入 currentLongOrderIds)</li>
+     * </ol>
+     * 条件单成交后由 {@link #onOrderUpdate} 匹配止盈价并挂止盈条件单。
+     * 反向条件单不再在此处理,改为在 {@link #onPositionUpdate} 仓位净减少时触发。
+     *
+     * @param currentPrice 当前 K 线收盘价(最新成交价)
+     */
     private void processShortGrid(BigDecimal currentPrice) {
         List<BigDecimal> matched = new ArrayList<>();
         synchronized (shortPriceQueue) {
@@ -362,40 +667,85 @@
                 }
             }
         }
-        log.info("[Gate] 原空队列:{}", shortPriceQueue);
         if (matched.isEmpty()) {
-            log.info("[Gate] 空仓队列未触发, 当前价:{}", currentPrice);
             return;
         }
         log.info("[Gate] 空仓队列触发, 匹配{}个元素, 当前价:{}", matched.size(), currentPrice);
-        if (!isMarginSafe()) {
-            log.warn("[Gate] 保证金超限,跳过空单开仓");
-        } else {
-            executor.openShort(negate(config.getQuantity()), null, null);
-        }
 
         synchronized (shortPriceQueue) {
             shortPriceQueue.removeAll(matched);
             BigDecimal min = shortPriceQueue.isEmpty() ? matched.get(matched.size() - 1) : shortPriceQueue.get(shortPriceQueue.size() - 1);
-            BigDecimal step = config.getGridRate();
+            BigDecimal gridStep = config.getStep();
             for (int i = 0; i < matched.size(); i++) {
-                min = min.multiply(BigDecimal.ONE.subtract(step)).setScale(1, RoundingMode.HALF_UP);
+                min = min.subtract(gridStep).setScale(1, RoundingMode.HALF_UP);
                 shortPriceQueue.add(min);
             }
-            shortPriceQueue.sort(BigDecimal::compareTo);
-
-            log.info("[Gate] 现空队列:{}", shortPriceQueue);
+            shortPriceQueue.sort((a, b) -> b.compareTo(a));
         }
 
-        synchronized (longPriceQueue) {
-            longPriceQueue.addAll(matched);
-            longPriceQueue.sort(BigDecimal::compareTo);
-            while (longPriceQueue.size() > config.getGridQueueSize()) {
-                longPriceQueue.remove(longPriceQueue.size() - 1);
+//        synchronized (longPriceQueue) {
+//            BigDecimal first = longPriceQueue.isEmpty() ? matched.get(matched.size() - 1) : longPriceQueue.get(0);
+//            BigDecimal gridStep = config.getStep();
+//            for (int i = 1; i <= matched.size(); i++) {
+//                BigDecimal elem = first.subtract(gridStep.multiply(BigDecimal.valueOf(i))).setScale(1, RoundingMode.HALF_UP);
+//                longPriceQueue.add(elem);
+//            }
+//            longPriceQueue.sort(BigDecimal::compareTo);
+//            while (longPriceQueue.size() > config.getGridQueueSize()) {
+//                longPriceQueue.remove(longPriceQueue.size() - 1);
+//            }
+//        }
+
+        if (!isMarginSafe()) {
+            log.warn("[Gate] 保证金超限,跳过挂条件单");
+        } else {
+
+            BigDecimal newShortFirst = shortPriceQueue.get(0);
+            BigDecimal step = config.getStep();
+            BigDecimal stpElem = newShortFirst.subtract(step).setScale(1, RoundingMode.HALF_UP);
+            executor.placeConditionalEntryOrder(newShortFirst,
+                    FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(config.getQuantity()),
+                    orderId -> { currentShortOrderIds.put(orderId, stpElem); log.info("[Gate] 新条件空单, id:{}, trigger:{}, 止盈:{}", orderId, newShortFirst, stpElem); },
+                    null);
+
+            BigDecimal newLongFirst = newShortFirst.add( step.multiply(new BigDecimal("2")));
+            if (newLongFirst.compareTo(longEntryPrice) < 0) {
+
+                BigDecimal ltpElem = newLongFirst.add(step).setScale(1, RoundingMode.HALF_UP);
+                executor.placeConditionalEntryOrder(newLongFirst,
+                        FuturesPriceTrigger.RuleEnum.NUMBER_1, config.getQuantity(),
+                        orderId -> { currentLongOrderIds.put(orderId, ltpElem); log.info("[Gate] 新条件多单, id:{}, trigger:{}, 止盈:{}", orderId, newLongFirst, ltpElem); },
+                        null);
             }
+
         }
+
     }
 
+    /**
+     * 多仓网格处理(当前价涨破多仓队列元素)。
+     *
+     * <h3>匹配规则</h3>
+     * 遍历多仓队列(升序排列,小→大),收集所有小于当前价的元素为 matched。
+     * 升序排列保证一旦遇到 price ≥ currentPrice 即可停止遍历。
+     *
+     * <h3>执行流程</h3>
+     * <ol>
+     *   <li>匹配队列元素 → 为空则直接返回,不触发</li>
+     *   <li>多仓队列:移除 matched 元素,从尾部递增 step 补充等量新元素,重新升序排序</li>
+     *   <li>空仓队列:<b>不再更新</b>(队列转移逻辑已移除)</li>
+     *   <li>保证金检查 → 不安全则跳过挂单(队列照常更新),安全则继续</li>
+     *   <li>挂新多仓条件单(触发价 = newLongFirst,rule=NUMBER_1,止盈 = newLongFirst + step,
+     *       orderId → 止盈价存入 currentLongOrderIds)</li>
+     *   <li>空仓条件单守卫:newShortFirst = newLongFirst − step × 2,
+     *       若 newShortFirst > shortEntryPrice → 挂空仓条件单(止盈 = newShortFirst − step,
+     *       orderId → 止盈价存入 currentShortOrderIds)</li>
+     * </ol>
+     * 条件单成交后由 {@link #onOrderUpdate} 匹配止盈价并挂止盈条件单。
+     * 反向条件单不再在此处理,改为在 {@link #onPositionUpdate} 仓位净减少时触发。
+     *
+     * @param currentPrice 当前 K 线收盘价(最新成交价)
+     */
     private void processLongGrid(BigDecimal currentPrice) {
         List<BigDecimal> matched = new ArrayList<>();
         synchronized (longPriceQueue) {
@@ -407,43 +757,78 @@
                 }
             }
         }
-        log.info("[Gate] 原多队列:{}", longPriceQueue);
         if (matched.isEmpty()) {
-            log.info("[Gate] 多仓队列未触发,  当前价:{}", currentPrice);
             return;
         }
 
         log.info("[Gate] 多仓队列触发, 匹配{}个元素, 当前价:{}", matched.size(), currentPrice);
-        if (!isMarginSafe()) {
-            log.warn("[Gate] 保证金超限,跳过多单开仓");
-        } else {
-            executor.openLong(config.getQuantity(), null, null);
-        }
 
         synchronized (longPriceQueue) {
             longPriceQueue.removeAll(matched);
             BigDecimal max = longPriceQueue.isEmpty() ? matched.get(matched.size() - 1) : longPriceQueue.get(longPriceQueue.size() - 1);
-            BigDecimal step = config.getGridRate();
+            BigDecimal gridStep = config.getStep();
             for (int i = 0; i < matched.size(); i++) {
-                max = max.multiply(BigDecimal.ONE.add(step)).setScale(1, RoundingMode.HALF_UP);
+                max = max.add(gridStep).setScale(1, RoundingMode.HALF_UP);
                 longPriceQueue.add(max);
             }
             longPriceQueue.sort(BigDecimal::compareTo);
-
-            log.info("[Gate] 现多队列:{}", longPriceQueue);
         }
 
-        synchronized (shortPriceQueue) {
-            shortPriceQueue.addAll(matched);
-            shortPriceQueue.sort((a, b) -> b.compareTo(a));
-            while (shortPriceQueue.size() > config.getGridQueueSize()) {
-                shortPriceQueue.remove(shortPriceQueue.size() - 1);
+//        synchronized (shortPriceQueue) {
+//            BigDecimal first = shortPriceQueue.isEmpty() ? matched.get(0) : shortPriceQueue.get(0);
+//            BigDecimal gridStep = config.getStep();
+//            for (int i = 1; i <= matched.size(); i++) {
+//                BigDecimal elem = first.add(gridStep.multiply(BigDecimal.valueOf(i))).setScale(1, RoundingMode.HALF_UP);
+//                shortPriceQueue.add(elem);
+//            }
+//            shortPriceQueue.sort((a, b) -> b.compareTo(a));
+//            while (shortPriceQueue.size() > config.getGridQueueSize()) {
+//                shortPriceQueue.remove(shortPriceQueue.size() - 1);
+//            }
+//        }
+
+
+
+        if (!isMarginSafe()) {
+            log.warn("[Gate] 保证金超限,跳过挂条件单");
+        } else {
+
+            BigDecimal step = config.getStep();
+
+            BigDecimal newLongFirst = longPriceQueue.get(0);
+            BigDecimal ltpElem = newLongFirst.add(step).setScale(1, RoundingMode.HALF_UP);
+            executor.placeConditionalEntryOrder(newLongFirst,
+                    FuturesPriceTrigger.RuleEnum.NUMBER_1, config.getQuantity(),
+                    orderId -> { currentLongOrderIds.put(orderId, ltpElem); log.info("[Gate] 新条件多单, id:{}, trigger:{}, 止盈:{}", orderId, newLongFirst, ltpElem); },
+                    null);
+
+
+            BigDecimal newShortFirst = newLongFirst.subtract( step.multiply(new BigDecimal("2")));
+            if (newShortFirst.compareTo(shortEntryPrice) > 0){
+
+                BigDecimal stpElem = newShortFirst.subtract(step).setScale(1, RoundingMode.HALF_UP);
+                executor.placeConditionalEntryOrder(newShortFirst,
+                        FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(config.getQuantity()),
+                        orderId -> { currentShortOrderIds.put(orderId, stpElem); log.info("[Gate] 新条件空单, id:{}, trigger:{}, 止盈:{}", orderId, newShortFirst, stpElem); },
+                        null);
             }
+
         }
+
     }
 
     // ---- 保证金安全阀 ----
 
+    /**
+     * 保证金安全阀检查。
+     *
+     * <p>实时查询当前保证金占用额(positionInitialMargin),计算其占初始本金的比例。
+     * 比例 ≥ marginRatioLimit(默认 20%)时拒绝开仓,但仍照常更新队列。
+     *
+     * <p>查询失败时默认放行(返回 true),避免因 REST API 异常导致策略完全停滞。
+     *
+     * @return true=安全可开仓 / false=保证金超限跳过开仓
+     */
     private boolean isMarginSafe() {
         try {
             FuturesAccount account = futuresApi.listFuturesAccounts(SETTLE);
@@ -459,6 +844,10 @@
 
     // ---- 工具 ----
 
+    /**
+     * 取反字符串数字。如 "1" → "-1","-2" → "2"。
+     * 用于开空单时将正数张数转为负数。
+     */
     private String negate(String qty) {
         return qty.startsWith("-") ? qty.substring(1) : "-" + qty;
     }
@@ -494,6 +883,9 @@
 
     /**
      * 根据配置的 PnLPriceMode 返回计价价格。
+     * MARK_PRICE 模式优先使用标记价格(外部注入),未注入时回退到最新成交价。
+     *
+     * @return 计价价格,可能为 null
      */
     private BigDecimal resolvePnlPrice() {
         if (config.getUnrealizedPnlPriceMode() == GateConfig.PnLPriceMode.MARK_PRICE
@@ -503,11 +895,18 @@
         return lastKlinePrice;
     }
 
+    /** @return 最新 K 线价格(每次 onKline 更新) */
     public BigDecimal getLastKlinePrice() { return lastKlinePrice; }
+    /** 设置标记价格(外部注入,MARK_PRICE 模式时用于盈亏计算) */
     public void setMarkPrice(BigDecimal markPrice) { this.markPrice = markPrice; }
+    /** @return 策略是否处于活跃状态(非 STOPPED 且非 WAITING_KLINE) */
     public boolean isStrategyActive() { return state != StrategyState.STOPPED && state != StrategyState.WAITING_KLINE; }
+    /** @return 累计已实现盈亏(平仓推送驱动累加) */
     public BigDecimal getCumulativePnl() { return cumulativePnl; }
+    /** @return 当前未实现盈亏(每根 K 线实时计算) */
     public BigDecimal getUnrealizedPnl() { return unrealizedPnl; }
+    /** @return Gate 用户 ID(用于私有频道订阅 payload) */
     public Long getUserId() { return userId; }
+    /** @return 当前策略状态 */
     public StrategyState getState() { return state; }
 }

--
Gitblit v1.9.1