From 3bcc6918c362a7837f792ef91018a1fe043096ef Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 12 May 2026 17:27:21 +0800
Subject: [PATCH] refactor(gateApi): 将条件单ID管理从单值改为集合支持批量操作

---
 src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java |  492 ++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 435 insertions(+), 57 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 5f83aea..a2ec807 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -5,18 +5,19 @@
 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.List;
+
+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 网格交易服务 — 策略核心。
@@ -42,12 +43,35 @@
  *
  *   ACTIVE:
  *     ├─ 每根K线 → 更新 unrealizedPnl + processShortGrid + processLongGrid
- *     │    ├─ 当前价 &lt; 空仓队列元素 → 匹配 → 开空 + 队列元素转移到多仓队列
- *     │    └─ 当前价 &gt; 多仓队列元素 → 匹配 → 开多 + 队列元素转移到空仓队列
- *     ├─ 仓位推送(非基底) → 设止盈条件单 entry × (1±gridRate)
+ *     │    ├─ 当前价 &lt; 空仓队列元素 → 匹配 → 开空 + 以多仓队列首元素为种子生成新元素加入多仓队列
+ *     │    └─ 当前价 &gt; 多仓队列元素 → 匹配 → 开多 + 以空仓队列首元素为种子生成新元素加入空仓队列
+ *     ├─ 仓位推送(非基底) → 设止盈条件单 entry × (1±gridRate),使用 plan-close-*-position
  *     ├─ 保证金≥初始本金 marginRatioLimit → 跳过开仓,队列照常更新
+ *     ├─ 额外反向开仓:触发价夹在多/空持仓均价之间且多持仓均价&gt;空持仓均价时,额外反向开仓一次
  *     └─ cumulativePnl ≥ overallTp 或 ≤ -maxLoss → STOPPED
  * </pre>
+ *
+ * <h3>队列转移规则</h3>
+ * 触发后不再简单复制 matched 元素到对方队列,而是以对方队列首元素为种子,生成新元素:
+ * <ul>
+ *   <li>空仓队列触发 → 多仓队列新增:以多仓队列首元素(最小价)为基准,生成递减元素</li>
+ *   <li>多仓队列触发 → 空仓队列新增:以空仓队列首元素(最高价)为基准,生成递增元素</li>
+ * </ul>
+ *
+ * <h3>贴近持仓均价过滤</h3>
+ * 转移生成新元素时,若新元素与对应方向持仓均价的差距小于 gridRate,则跳过该元素,
+ * 避免在持仓成本附近生成无效网格线。
+ *
+ * <h3>额外反向开仓条件</h3>
+ * 当触发价在空仓均价和回撤后的多仓均价之间(即多&gt;空且价格夹在中间),额外反向开仓一次:
+ * <ul>
+ *   <li>空仓队列触发 → 额外开多:需满足 shortEntryPrice &lt; currentPrice &lt; longEntryPrice × (1 − gridRate)</li>
+ *   <li>多仓队列触发 → 额外开空:需满足 shortEntryPrice × (1 + gridRate) &lt; currentPrice &lt; longEntryPrice</li>
+ * </ul>
+ *
+ * <h3>止盈条件单</h3>
+ * 使用 Gate API 的 plan-close-long-position / plan-close-short-position(仓位计划止盈止损),
+ * 支持指定张数部分平仓。每次网格触发开仓 quantity 张,只为该批张数创建独立条件单,互不覆盖。
  *
  * @author Administrator
  */
@@ -58,8 +82,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;
@@ -72,6 +106,16 @@
     private final List<BigDecimal> shortPriceQueue = Collections.synchronizedList(new ArrayList<>());
     /** 多仓价格队列,升序排列(小→大),容量 gridQueueSize */
     private final List<BigDecimal> longPriceQueue = Collections.synchronizedList(new ArrayList<>());
+
+    /** 多仓止盈队列,升序排列(小→大),仓位推送时消费 */
+    private final List<BigDecimal> longTakeProfitQueue = Collections.synchronizedList(new ArrayList<>());
+    /** 空仓止盈队列,降序排列(大→小),仓位推送时消费 */
+    private final List<BigDecimal> shortTakeProfitQueue = Collections.synchronizedList(new ArrayList<>());
+
+    /** 当前多仓条件单 ID 集合,用于取消旧单 */
+    private final List<String> currentLongOrderIds = Collections.synchronizedList(new ArrayList<>());
+    /** 当前空仓条件单 ID 集合,用于取消旧单 */
+    private final List<String> currentShortOrderIds = Collections.synchronizedList(new ArrayList<>());
 
     /** 基底空头入场价 */
     private BigDecimal shortBaseEntryPrice;
@@ -109,6 +153,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,19 +180,40 @@
             this.initialPrincipal = new BigDecimal(account.getTotal());
             log.info("[Gate] 初始本金: {} USDT", initialPrincipal);
 
-            if (!config.getPositionMode().equals(account.getPositionMode())) {
-                futuresApi.setPositionMode(SETTLE, config.getPositionMode());
-            }
-            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);
+            //设置持仓模式为双向持仓
+            Boolean inDualMode = account.getInDualMode();
+            if (!inDualMode) {
+                try {
+                    futuresApi.setDualModeCall(SETTLE,true,null).execute();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+
+            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());
             log.info("[Gate] 杠杆: {}x {}", config.getLeverage(), config.getMarginMode());
         } catch (GateApiException e) {
             log.error("[Gate] 初始化失败, label:{}, msg:{}", e.getErrorLabel(), e.getMessage());
@@ -143,6 +222,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();
@@ -183,6 +275,10 @@
 
     // ---- 启动/停止 ----
 
+    /**
+     * 启动网格策略。重置所有状态变量和队列,进入 WAITING_KLINE 等待首根 K 线。
+     * 仅当当前状态为 WAITING_KLINE 或 STOPPED 时才允许启动。
+     */
     public void startGrid() {
         if (state != StrategyState.WAITING_KLINE && state != StrategyState.STOPPED) {
             log.warn("[Gate] 策略已在运行中, state:{}", state);
@@ -202,9 +298,17 @@
         shortActive = false;
         shortPriceQueue.clear();
         longPriceQueue.clear();
+        longTakeProfitQueue.clear();
+        shortTakeProfitQueue.clear();
+        currentLongOrderIds.clear();
+        currentShortOrderIds.clear();
         log.info("[Gate] 网格策略已启动");
     }
 
+    /**
+     * 停止网格策略。取消所有条件单 → 关闭交易线程池。
+     * 状态设为 STOPPED,K 线回调将直接返回不再处理。
+     */
     public void stopGrid() {
         state = StrategyState.STOPPED;
         executor.cancelAllPriceTriggeredOrders();
@@ -214,6 +318,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();
@@ -236,12 +358,35 @@
         if (state != StrategyState.ACTIVE) {
             return;
         }
-        processShortGrid(closePrice);
-        processLongGrid(closePrice);
+        if (!longPriceQueue.isEmpty() && closePrice.compareTo(longPriceQueue.get(0)) > 0) {
+            processLongGrid(closePrice);
+        } else if (!shortPriceQueue.isEmpty() && closePrice.compareTo(shortPriceQueue.get(0)) < 0) {
+            processShortGrid(closePrice);
+        }
     }
 
     // ---- 仓位推送回调 ----
 
+    /**
+     * 仓位推送回调。由 {@link PositionsChannelHandler} 在收到 WebSocket 仓位更新时调用。
+     *
+     * <h3>处理逻辑</h3>
+     * <ul>
+     *   <li><b>有仓位 (size ≠ 0)</b>:
+     *     <ul>
+     *       <li>首次开仓(基底):标记 baseOpened=true,记录基底入场价,双基底都成交后生成网格队列</li>
+     *       <li>仓位净增加(size > 之前记录值):说明网格触发了新开仓 → 取对应方向队列首元素为止盈价,设止盈条件单</li>
+     *       <li>仓位减少或不变(止盈平仓后):仅更新 positionSize,不重复设止盈</li>
+     *     </ul>
+     *   </li>
+     *   <li><b>无仓位 (size = 0)</b>:清空活跃标记和持仓量</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) {
@@ -254,17 +399,32 @@
             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) {
+                    BigDecimal unitQty = new BigDecimal(config.getQuantity());
+                    long prevUnits = longPositionSize.divide(unitQty, 0, RoundingMode.DOWN).longValue();
+                    longPositionSize = size;
+                    long nowUnits = size.divide(unitQty, 0, RoundingMode.DOWN).longValue();
+                    long newUnits = nowUnits - prevUnits;
+                    for (int i = 0; i < newUnits; i++) {
+                        BigDecimal tpPrice;
+                        if (!longTakeProfitQueue.isEmpty()) {
+                            tpPrice = longTakeProfitQueue.remove(0);
+                        } else {
+                            tpPrice = longEntryPrice.add(config.getStep()).setScale(1, RoundingMode.HALF_UP);
+                            log.warn("[Gate] 多止盈队列为空, 兜底止盈价:{}", tpPrice);
+                        }
+                        executor.placeTakeProfit(tpPrice,
+                                FuturesPriceTrigger.RuleEnum.NUMBER_1, ORDER_TYPE_CLOSE_LONG, negate(config.getQuantity()));
+                        log.info("[Gate] 多单止盈已设, tp:{}, size:{}", tpPrice, negate(config.getQuantity()));
+                    }
                 } 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;
@@ -274,17 +434,33 @@
             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) {
+                    BigDecimal unitQty = new BigDecimal(config.getQuantity());
+                    long prevUnits = shortPositionSize.divide(unitQty, 0, RoundingMode.DOWN).longValue();
+                    BigDecimal nowAbsSize = size.abs();
+                    shortPositionSize = nowAbsSize;
+                    long nowUnits = nowAbsSize.divide(unitQty, 0, RoundingMode.DOWN).longValue();
+                    long newUnits = nowUnits - prevUnits;
+                    for (int i = 0; i < newUnits; i++) {
+                        BigDecimal tpPrice;
+                        if (!shortTakeProfitQueue.isEmpty()) {
+                            tpPrice = shortTakeProfitQueue.remove(0);
+                        } else {
+                            tpPrice = shortEntryPrice.subtract(config.getStep()).setScale(1, RoundingMode.HALF_UP);
+                            log.warn("[Gate] 空止盈队列为空, 兜底止盈价:{}", tpPrice);
+                        }
+                        executor.placeTakeProfit(tpPrice,
+                                FuturesPriceTrigger.RuleEnum.NUMBER_2, ORDER_TYPE_CLOSE_SHORT, config.getQuantity());
+                        log.info("[Gate] 空单止盈已设, tp:{}, size:{}", tpPrice, config.getQuantity());
+                    }
                 } 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;
@@ -295,6 +471,17 @@
 
     // ---- 平仓推送回调 ----
 
+    /**
+     * 平仓推送回调。由 {@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;
@@ -313,38 +500,95 @@
 
     // ---- 网格队列处理 ----
 
+    /**
+     * 尝试生成网格队列。双基底(多+空)都成交后才触发:
+     * 生成空仓队列 + 多仓队列 → 状态切换为 ACTIVE。
+     */
     private void tryGenerateQueues() {
         if (baseLongOpened && baseShortOpened) {
             generateShortQueue();
             generateLongQueue();
+
+            BigDecimal step = config.getStep();
+            BigDecimal longTp = longPriceQueue.get(0).add(step).setScale(1, RoundingMode.HALF_UP);
+            BigDecimal shortTp = shortPriceQueue.get(0).subtract(step).setScale(1, RoundingMode.HALF_UP);
+            longTakeProfitQueue.add(longTp);
+            shortTakeProfitQueue.add(shortTp);
+            log.info("[Gate] 多止盈队列:{}", longTakeProfitQueue);
+            log.info("[Gate] 空止盈队列:{}", shortTakeProfitQueue);
+
+            executor.placeConditionalEntryOrder(longPriceQueue.get(0),
+                    FuturesPriceTrigger.RuleEnum.NUMBER_1, config.getQuantity(),
+                    orderId -> { currentLongOrderIds.add(orderId); log.info("[Gate] 初始条件多单已挂, id:{}, trigger:{}", orderId, longPriceQueue.get(0)); },
+                    null);
+            executor.placeConditionalEntryOrder(shortPriceQueue.get(0),
+                    FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(config.getQuantity()),
+                    orderId -> { currentShortOrderIds.add(orderId); log.info("[Gate] 初始条件空单已挂, id:{}, trigger:{}", orderId, shortPriceQueue.get(0)); },
+                    null);
+
             state = StrategyState.ACTIVE;
-            log.info("[Gate] 网格队列已生成, 空队首:{} → 尾:{}, 多队首:{} → 尾:{}, 已激活",
+            log.info("[Gate] 网格队列已生成, 空队首:{} → 尾:{}, 多队首:{} → 尾:{}, step:{}, 已激活",
                     shortPriceQueue.get(0), shortPriceQueue.get(shortPriceQueue.size() - 1),
-                    longPriceQueue.get(0), longPriceQueue.get(longPriceQueue.size() - 1));
+                    longPriceQueue.get(0), longPriceQueue.get(longPriceQueue.size() - 1),
+                    step);
         }
     }
 
+    /**
+     * 生成空仓价格队列。
+     * 以 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>多仓队列:以多仓队列首元素(最小价)为种子,递减 step 生成 matched.size() 个元素加入</li>
+     *   <li>保证金检查 → 安全则开空一次</li>
+     *   <li>额外反向开多:若多仓均价 > 空仓均价 且 当前价夹在中间且远离多仓均价</li>
+     * </ol>
+     *
+     * <h3>多仓队列转移过滤</h3>
+     * 新增元素若与多仓持仓均价差距小于 gridRate,则跳过该元素(避免在持仓成本附近生成无效网格线)。
+     */
     private void processShortGrid(BigDecimal currentPrice) {
         List<BigDecimal> matched = new ArrayList<>();
         synchronized (shortPriceQueue) {
@@ -356,37 +600,101 @@
                 }
             }
         }
+        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);
+                log.info("[Gate] 空队列增加:{}", min);
             }
             shortPriceQueue.sort((a, b) -> b.compareTo(a));
+            log.info("[Gate] 现空队列:{}", shortPriceQueue);
         }
 
         synchronized (longPriceQueue) {
-            longPriceQueue.addAll(matched);
+            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);
+                log.info("[Gate] 多队列增加:{}", elem);
+            }
             longPriceQueue.sort(BigDecimal::compareTo);
             while (longPriceQueue.size() > config.getGridQueueSize()) {
                 longPriceQueue.remove(longPriceQueue.size() - 1);
             }
+            log.info("[Gate] 现多队列:{}", longPriceQueue);
         }
+
+        BigDecimal newShortFirst = shortPriceQueue.get(0);
+        BigDecimal newLongFirst = longPriceQueue.get(0);
+        BigDecimal step = config.getStep();
+        BigDecimal stpElem = newShortFirst.subtract(step).setScale(1, RoundingMode.HALF_UP);
+        shortTakeProfitQueue.add(stpElem);
+        shortTakeProfitQueue.sort((a, b) -> b.compareTo(a));
+        log.info("[Gate] 空止盈队列增加:{}, 现止盈队列:{}", stpElem, shortTakeProfitQueue);
+
+        if (!isMarginSafe()) {
+            log.warn("[Gate] 保证金超限,跳过挂条件单");
+        } else {
+            synchronized (currentLongOrderIds) {
+                for (String id : currentLongOrderIds) {
+                    executor.cancelConditionalOrder(id);
+                }
+                currentLongOrderIds.clear();
+            }
+            executor.placeConditionalEntryOrder(newShortFirst,
+                    FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(config.getQuantity()),
+                    orderId -> { currentShortOrderIds.add(orderId); log.info("[Gate] 新条件空单, id:{}, trigger:{}", orderId, newShortFirst); },
+                    null);
+            executor.placeConditionalEntryOrder(newLongFirst,
+                    FuturesPriceTrigger.RuleEnum.NUMBER_1, config.getQuantity(),
+                    orderId -> { currentLongOrderIds.add(orderId); log.info("[Gate] 新条件多单, id:{}, trigger:{}", orderId, newLongFirst); },
+                    null);
+
+            if (newShortFirst.compareTo(shortEntryPrice) > 0
+                    && newShortFirst.compareTo(longEntryPrice) < 0) {
+                BigDecimal reverseLongTp = newShortFirst.add(step).setScale(1, RoundingMode.HALF_UP);
+                longTakeProfitQueue.add(reverseLongTp);
+                longTakeProfitQueue.sort(BigDecimal::compareTo);
+                executor.placeConditionalEntryOrder(newShortFirst,
+                        FuturesPriceTrigger.RuleEnum.NUMBER_1, config.getQuantity(),
+                        orderId -> { currentLongOrderIds.add(orderId); },
+                        null);
+                log.info("[Gate] 反向条件多单已挂, trigger:{}, size:{}, 止盈:{}", newShortFirst, config.getQuantity(), reverseLongTp);
+            }
+        }
+
     }
 
+    /**
+     * 多仓网格处理(价格涨破多仓队列中的低价)。
+     *
+     * <h3>匹配规则</h3>
+     * 遍历多仓队列(升序),收集所有小于当前价的元素为 matched。
+     * 队列为升序排列,一旦遇 price ≥ currentPrice 即停止遍历。
+     *
+     * <h3>执行流程</h3>
+     * <ol>
+     *   <li>匹配队列元素 → 为空则直接返回</li>
+     *   <li>多仓队列:移除 matched 元素,尾部补充新元素(尾价 + step 循环递增)</li>
+     *   <li>空仓队列:以空仓队列首元素(最高价)为种子,递增 step 生成 matched.size() 个元素加入</li>
+     *   <li>保证金检查 → 安全则开多一次</li>
+     *   <li>额外反向开空:若多仓均价 > 空仓均价 且 当前价夹在中间且远离空仓均价</li>
+     * </ol>
+     *
+     * <h3>空仓队列转移过滤</h3>
+     * 新增元素若与空仓持仓均价差距小于 gridRate,则跳过该元素(避免在持仓成本附近生成无效网格线)。
+     */
     private void processLongGrid(BigDecimal currentPrice) {
         List<BigDecimal> matched = new ArrayList<>();
         synchronized (longPriceQueue) {
@@ -398,39 +706,95 @@
                 }
             }
         }
+        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);
+                log.info("[Gate] 多队列增加:{}", max);
             }
             longPriceQueue.sort(BigDecimal::compareTo);
+            log.info("[Gate] 现多队列:{}", longPriceQueue);
         }
 
         synchronized (shortPriceQueue) {
-            shortPriceQueue.addAll(matched);
+            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);
+                log.info("[Gate] 空队列增加:{}", elem);
+            }
             shortPriceQueue.sort((a, b) -> b.compareTo(a));
             while (shortPriceQueue.size() > config.getGridQueueSize()) {
                 shortPriceQueue.remove(shortPriceQueue.size() - 1);
             }
+            log.info("[Gate] 现空队列:{}", shortPriceQueue);
         }
+
+        BigDecimal newLongFirst = longPriceQueue.get(0);
+        BigDecimal newShortFirst = shortPriceQueue.get(0);
+        BigDecimal step = config.getStep();
+        BigDecimal ltpElem = newLongFirst.add(step).setScale(1, RoundingMode.HALF_UP);
+        longTakeProfitQueue.add(ltpElem);
+        longTakeProfitQueue.sort(BigDecimal::compareTo);
+        log.info("[Gate] 多止盈队列增加:{}, 现止盈队列:{}", ltpElem, longTakeProfitQueue);
+
+        if (!isMarginSafe()) {
+            log.warn("[Gate] 保证金超限,跳过挂条件单");
+        } else {
+            synchronized (currentShortOrderIds) {
+                for (String id : currentShortOrderIds) {
+                    executor.cancelConditionalOrder(id);
+                }
+                currentShortOrderIds.clear();
+            }
+            executor.placeConditionalEntryOrder(newLongFirst,
+                    FuturesPriceTrigger.RuleEnum.NUMBER_1, config.getQuantity(),
+                    orderId -> { currentLongOrderIds.add(orderId); log.info("[Gate] 新条件多单, id:{}, trigger:{}", orderId, newLongFirst); },
+                    null);
+            executor.placeConditionalEntryOrder(newShortFirst,
+                    FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(config.getQuantity()),
+                    orderId -> { currentShortOrderIds.add(orderId); log.info("[Gate] 新条件空单, id:{}, trigger:{}", orderId, newShortFirst); },
+                    null);
+
+            if (newLongFirst.compareTo(shortEntryPrice) > 0
+                    && newLongFirst.compareTo(longEntryPrice) < 0) {
+                BigDecimal reverseShortTp = newLongFirst.subtract(step).setScale(1, RoundingMode.HALF_UP);
+                shortTakeProfitQueue.add(reverseShortTp);
+                shortTakeProfitQueue.sort((a, b) -> b.compareTo(a));
+                executor.placeConditionalEntryOrder(newLongFirst,
+                        FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(config.getQuantity()),
+                        orderId -> { currentShortOrderIds.add(orderId); },
+                        null);
+                log.info("[Gate] 反向条件空单已挂, trigger:{}, size:{}, 止盈:{}", newLongFirst, negate(config.getQuantity()), reverseShortTp);
+            }
+        }
+
     }
 
     // ---- 保证金安全阀 ----
 
+    /**
+     * 保证金安全阀检查。
+     *
+     * <p>实时查询当前保证金占用额(positionInitialMargin),计算其占初始本金的比例。
+     * 比例 ≥ marginRatioLimit(默认 20%)时拒绝开仓,但仍照常更新队列。
+     *
+     * <p>查询失败时默认放行(返回 true),避免因 REST API 异常导致策略完全停滞。
+     *
+     * @return true=安全可开仓 / false=保证金超限跳过开仓
+     */
     private boolean isMarginSafe() {
         try {
             FuturesAccount account = futuresApi.listFuturesAccounts(SETTLE);
@@ -446,6 +810,10 @@
 
     // ---- 工具 ----
 
+    /**
+     * 取反字符串数字。如 "1" → "-1","-2" → "2"。
+     * 用于开空单时将正数张数转为负数。
+     */
     private String negate(String qty) {
         return qty.startsWith("-") ? qty.substring(1) : "-" + qty;
     }
@@ -481,6 +849,9 @@
 
     /**
      * 根据配置的 PnLPriceMode 返回计价价格。
+     * MARK_PRICE 模式优先使用标记价格(外部注入),未注入时回退到最新成交价。
+     *
+     * @return 计价价格,可能为 null
      */
     private BigDecimal resolvePnlPrice() {
         if (config.getUnrealizedPnlPriceMode() == GateConfig.PnLPriceMode.MARK_PRICE
@@ -490,11 +861,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