From dfd143f7f90f697db1731cf2c653556593786bbf Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 22 Jun 2026 11:33:21 +0800
Subject: [PATCH] feat(gateApi): 添加网格策略重启跨度阈值功能

---
 src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java | 1463 ++++++++++++++++++++++++++++++---------------------------
 1 files changed, 771 insertions(+), 692 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 f95f766..aae6ebc 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -1,6 +1,8 @@
 package com.xcong.excoin.modules.gateApi;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.xcong.excoin.utils.dingtalk.DingTalkUtils;
 import io.gate.gateapi.ApiClient;
 import io.gate.gateapi.ApiException;
 import io.gate.gateapi.GateApiException;
@@ -12,11 +14,7 @@
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import com.xcong.excoin.modules.gateApi.wsHandler.handler.CandlestickChannelHandler;
 import com.xcong.excoin.modules.gateApi.wsHandler.handler.PositionClosesChannelHandler;
@@ -114,6 +112,8 @@
     private final List<BigDecimal> shortPriceQueue = Collections.synchronizedList(new ArrayList<>());
     /** 多仓价格队列,升序排列(小→大),容量 gridQueueSize */
     private final List<BigDecimal> longPriceQueue = Collections.synchronizedList(new ArrayList<>());
+    private final List<BigDecimal> totalLongPriceQueue = Collections.synchronizedList(new ArrayList<>());
+    private final List<BigDecimal> totalShortPriceQueue = Collections.synchronizedList(new ArrayList<>());
 
     /** 当前多仓条件单映射:订单ID → 止盈价格,订单成交后通过订单订阅推送匹配止盈 */
     private final Map<String, BigDecimal> currentLongOrderIds = Collections.synchronizedMap(new LinkedHashMap<>());
@@ -134,6 +134,11 @@
     /** 多头是否活跃(有仓位) */
     private volatile boolean longActive = false;
 
+    /** 多头累计止损张数(加仓订单成交后归零) */
+    private volatile int accumulatedLongLossCount = 0;
+    /** 空头累计止损张数(加仓订单成交后归零) */
+    private volatile int accumulatedShortLossCount = 0;
+
     private volatile BigDecimal lastKlinePrice;
     private volatile BigDecimal markPrice = BigDecimal.ZERO;
     private volatile BigDecimal cumulativePnl = BigDecimal.ZERO;
@@ -144,6 +149,7 @@
     private volatile BigDecimal shortPositionSize = BigDecimal.ZERO;
     private Long userId;
     private volatile BigDecimal initialPrincipal = BigDecimal.ZERO;
+    private volatile GateKlineWebSocketClient wsClient;
 
     public GateGridTradeService(GateConfig config) {
         this.config = config;
@@ -299,11 +305,28 @@
         baseShortOpened = false;
         longActive = false;
         shortActive = false;
+        accumulatedLongLossCount = 0;
+        accumulatedShortLossCount = 0;
         shortPriceQueue.clear();
         longPriceQueue.clear();
         currentLongOrderIds.clear();
         currentShortOrderIds.clear();
-        log.info("[Gate] 网格策略已启动");
+        // 每次重启重新获取当前本金
+        refreshInitialPrincipal();
+
+        log.info("[Gate] 网格策略已启动, 当前本金: {} USDT", initialPrincipal);
+    }
+
+    /**
+     * 重新获取当前账户权益作为初始本金。
+     */
+    private void refreshInitialPrincipal() {
+        try {
+            FuturesAccount account = futuresApi.listFuturesAccounts(SETTLE);
+            this.initialPrincipal = new BigDecimal(account.getTotal());
+        } catch (Exception e) {
+            log.warn("[Gate] 获取初始化本金失败,使用旧值: {}", initialPrincipal);
+        }
     }
 
     /**
@@ -313,6 +336,7 @@
     public void stopGrid() {
         state = StrategyState.STOPPED;
         executor.cancelAllPriceTriggeredOrders();
+        closeExistingPositions();
         executor.shutdown();
         log.info("[Gate] 策略已停止, 累计盈亏: {}", cumulativePnl);
     }
@@ -339,46 +363,88 @@
      */
     public void onKline(BigDecimal closePrice) {
         lastKlinePrice = closePrice;
-        updateUnrealizedPnl();
-        if (state == StrategyState.STOPPED) {
-            try {
-                futuresApi.cancelPriceTriggeredOrderList(SETTLE, config.getContract());
-            } catch (ApiException e) {
-                e.printStackTrace();
-            }
-            closeExistingPositions();
-
-            BigDecimal totalPnl = cumulativePnl.add(unrealizedPnl);
-            log.info("[Gate] 已实现:{}, 未实现:{}, 合计:{}",
-                    cumulativePnl, unrealizedPnl, totalPnl);
-            return;
-        }
 
         //初始化0位置的开仓,并且用空的开仓价格,作为价格基准来划分网格
         if (state == StrategyState.WAITING_KLINE) {
+            if (wsClient == null || !wsClient.areAllSubscribed()) {
+                return;
+            }
+
             state = StrategyState.OPENING;
-            log.info("[Gate] 首根K线到达,开基底仓位...");
-            executor.openLong(config.getQuantity(), (orderId) -> {
+
+            String size = config.getBaseQuantity();
+            log.info("[Gate] 首根K线到达,开基底仓位 多空各{}张...", size);
+            executor.openLong(size, (orderId) -> {
                 TraderParam baseLongTp = TraderParam.builder()
                         .entryOrderId(orderId)
                         .build();
                 config.setBaseLongTraderParam(baseLongTp);
             }, null);
-            executor.openShort(negate(config.getQuantity()), (orderId) -> {
+            executor.openShort(negate(size), (orderId) -> {
                 TraderParam baseShortTp = TraderParam.builder()
                         .entryOrderId(orderId)
                         .build();
                 config.setBaseShortTraderParam(baseShortTp);
             }, null);
-
             return;
         }
 
-        if (state != StrategyState.ACTIVE) {
-            return;
+
+//        checkProfitAndReset();
+
+
+        if (state == StrategyState.ACTIVE &&
+                longActive == false &&
+                    longPositionSize.compareTo(BigDecimal.ZERO) == 0){
+            processShortGrid(closePrice);
         }
-        processLongGrid(closePrice);
-        processShortGrid(closePrice);
+
+
+        if (state == StrategyState.ACTIVE &&
+                shortActive == false &&
+                        shortPositionSize.compareTo(BigDecimal.ZERO) == 0){
+            processLongGrid(closePrice);
+        }
+    }
+
+    /** Gate 永续合约 taker 费率 0.05% */
+    private static final BigDecimal TAKER_FEE_RATE = new BigDecimal("0.0005");
+    private void checkProfitAndReset() {
+        try {
+
+            BigDecimal target = initialPrincipal.add(config.getExpectedProfit());
+
+            FuturesAccount account = futuresApi.listFuturesAccounts(SETTLE);
+            BigDecimal unrealisedPnl = new BigDecimal(account.getCrossUnrealisedPnl());
+            BigDecimal available = new BigDecimal(account.getCrossAvailable());
+            BigDecimal totalEquity = unrealisedPnl.add(available);
+
+            // 估算平仓手续费:(多仓张数+空仓张数) × 合约面值 × 当前价 × taker费率
+            BigDecimal totalSize = longPositionSize.abs().add(shortPositionSize.abs());
+            BigDecimal closeContractValue =
+                    totalSize.multiply(config.getContractMultiplier()).multiply(lastKlinePrice != null ? lastKlinePrice : BigDecimal.ZERO);
+            BigDecimal estimatedFee = closeContractValue.multiply(TAKER_FEE_RATE);
+            BigDecimal netEquity = totalEquity.subtract(estimatedFee);
+            log.info("[Gate] 盈亏检查,总张数:{}, upl:{}, avail:{}, 合计:{}, 估手续费:{}, 净权益:{}, 目标:{}",
+                    totalSize,unrealisedPnl, available, totalEquity, estimatedFee, netEquity, target);
+            if (netEquity.compareTo(target) > 0) {
+                log.info("[Gate] 盈亏达标(净权益{}>目标{}),重置策略", netEquity, target);
+                state = StrategyState.STOPPED;
+                try {
+                    futuresApi.cancelPriceTriggeredOrderList(SETTLE, config.getContract());
+                } catch (ApiException e) {
+                    e.printStackTrace();
+                }
+                closeExistingPositions();
+                // 提交到 executor 末尾:单线程FIFO保证前面所有平仓/取消任务完成后才重置
+                executor.submitTask(() -> {
+                    try { Thread.sleep(3000); } catch (InterruptedException e) { Thread.currentThread().interrupt(); }
+                    startGrid();
+                });
+            }
+        } catch (Exception e) {
+            log.warn("[Gate] 盈亏检查失败", e);
+        }
     }
 
     // ---- 仓位推送回调 ----
@@ -393,7 +459,6 @@
      *       <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>
@@ -413,98 +478,70 @@
         }
 
         boolean hasPosition = size.abs().compareTo(BigDecimal.ZERO) > 0;
-
-        if (Position.ModeEnum.DUAL_LONG == mode) {
-            if (hasPosition) {
+        if (state == StrategyState.OPENING){
+            if (Position.ModeEnum.DUAL_LONG == mode && hasPosition && !baseLongOpened) {
                 longActive = true;
+                longPositionSize = size;
                 longEntryPrice = entryPrice;
-                if (!baseLongOpened) {
-                    longPositionSize = size;
-                    longBaseEntryPrice = entryPrice;
-                    baseLongOpened = true;
-                    log.info("[Gate] 基底多成交价: {}", longBaseEntryPrice);
-                    tryGenerateQueues();
-                }else {
-                    longPositionSize = size;
-                    //取消多仓位线以上的开空仓挂单
-                    List<GridElement> allShortOrders = GridElement.findAllShortOrders(longEntryPrice);
-                    if (CollUtil.isNotEmpty(allShortOrders)){
-                        for (GridElement e : allShortOrders) {
-                            executor.cancelConditionalOrder(
-                                    e.getShortOrderId(),
-                                    orderId -> {
-                                        shortEntryTraderIdParam(
-                                                e,
-                                                null,
-                                                false
-                                        );
-                                    }
-                            );
-
-                            if (e.getShortTakeProfitOrderId() != null){
-                                executor.cancelConditionalOrder(
-                                        e.getShortTakeProfitOrderId(),
-                                        orderId -> {
-                                            shortTakeProfitTraderIdParam(
-                                                    e,
-                                                    null,
-                                                    false
-                                            );
-                                        }
-                                );
-                            }
-                        }
-                    }
-                }
-            } else {
-                longActive = false;
-                longPositionSize = BigDecimal.ZERO;
-            }
-        } else if (Position.ModeEnum.DUAL_SHORT == mode) {
-            if (hasPosition) {
+                longBaseEntryPrice = entryPrice;
+                baseLongOpened = true;
+                log.info("[Gate] 基底多成交价: {}", longBaseEntryPrice);
+                tryGenerateQueues();
+            } else if (Position.ModeEnum.DUAL_SHORT == mode  && hasPosition && !baseShortOpened) {
                 shortActive = true;
+                shortPositionSize = size.abs();
                 shortEntryPrice = entryPrice;
-                if (!baseShortOpened) {
-                    shortPositionSize = size.abs();
-                    shortBaseEntryPrice = entryPrice;
-                    baseShortOpened = true;
-                    log.info("[Gate] 基底空成交价: {}", shortBaseEntryPrice);
-                    tryGenerateQueues();
-                }else {
-                    shortPositionSize = size.abs();
-                    //取消空仓仓位线以下的开多仓挂单
-                    List<GridElement> allLongOrders = GridElement.findAllLongOrders(shortEntryPrice);
-                    if (CollUtil.isNotEmpty(allLongOrders)){
-                        for (GridElement e : allLongOrders) {
-                            executor.cancelConditionalOrder(
-                                    e.getLongOrderId(),
-                                    orderId -> {
-                                        longEntryTraderIdParam(
-                                                e,
-                                                null,
-                                                false
-                                        );
-                                    }
-                            );
-                            if (e.getLongTakeProfitOrderId() != null){
-                                executor.cancelConditionalOrder(
-                                        e.getLongTakeProfitOrderId(),
-                                        orderId -> {
-                                            longTakeProfitTraderIdParam(
-                                                    e,
-                                                    null,
-                                                    false
-                                            );
-                                        }
-                                );
-                            }
-                        }
-                    }
-                }
-            } else {
-                shortActive = false;
-                shortPositionSize = BigDecimal.ZERO;
+                shortBaseEntryPrice = entryPrice;
+                baseShortOpened = true;
+                log.info("[Gate] 基底空成交价: {}", shortBaseEntryPrice);
+                tryGenerateQueues();
             }
+        }
+
+        if (state == StrategyState.ACTIVE){
+            if (Position.ModeEnum.DUAL_LONG == mode) {
+                if (hasPosition) {
+                    longActive = true;
+                    longPositionSize = size;
+                    longEntryPrice = entryPrice;
+                } else {
+
+                    log.info("[Gate-0]多仓: {}", shortBaseEntryPrice);
+                    longActive = false;
+                    longPositionSize = BigDecimal.ZERO;
+                    longEntryPrice = BigDecimal.ZERO;
+                }
+            } else if (Position.ModeEnum.DUAL_SHORT == mode) {
+                if (hasPosition) {
+                    shortActive = true;
+                    shortPositionSize = size.abs();
+                    shortEntryPrice = entryPrice;
+                } else {
+
+                    log.info("[Gate-0]空仓: {}", shortBaseEntryPrice);
+                    shortActive = false;
+                    shortPositionSize = BigDecimal.ZERO;
+                    shortEntryPrice = BigDecimal.ZERO;
+                }
+            }
+        }
+
+        if (state == StrategyState.ACTIVE && shortActive == false && longActive == false) {
+            try {
+                futuresApi.cancelPriceTriggeredOrderList(SETTLE, config.getContract());
+            } catch (ApiException e) {
+                e.printStackTrace();
+            }
+            closeExistingPositions();
+
+            state = StrategyState.STOPPED;
+            // 提交到 executor 末尾:单线程FIFO保证前面所有平仓/取消任务完成后才重置
+            executor.submitTask(() -> {
+                try { Thread.sleep(3000); } catch (InterruptedException e) { Thread.currentThread().interrupt(); }
+                startGrid();
+            });
+            log.info("[Gate] 重置策略");
+            return;
         }
     }
 
@@ -526,148 +563,19 @@
             return;
         }
         cumulativePnl = cumulativePnl.add(pnl);
+        updateUnrealizedPnl();
         BigDecimal totalPnl = cumulativePnl.add(unrealizedPnl);
         log.info("[Gate] 已实现:{}, 未实现:{}, 合计:{}",
                 cumulativePnl, unrealizedPnl, totalPnl);
-
-        if (totalPnl.compareTo(config.getOverallTp()) >= 0) {
-            log.info("[Gate] 已达止盈目标(合计{})→已停止, 已实现:{}, 未实现:{}",
+        if(totalPnl.compareTo(config.getMaxLoss().negate()) <= 0) {
+            String logMessage = StrUtil.format("[Gate] 已达亏损风险值(合计{}), 已实现:{}, 未实现:{}",
                     totalPnl, cumulativePnl, unrealizedPnl);
-            state = StrategyState.STOPPED;
-        } else if (totalPnl.compareTo(config.getMaxLoss().negate()) <= 0) {
-            log.info("[Gate] 已达亏损上限(合计{})→已停止, 已实现:{}, 未实现:{}",
-                    totalPnl, cumulativePnl, unrealizedPnl);
-            state = StrategyState.STOPPED;
+            log.info(logMessage);
+
+            DingTalkUtils.getDefault().sendActionCard("风险提醒", logMessage, config.getApiKey(), "");
         }
     }
 
-    // ---- 订单推送回调 ----
-
-    /**
-     * 订单推送回调。由 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;
-        }
-
-        /**
-         * 匹配止盈单止盈
-         */
-        GridElement byLongTakeProfitOrderId = GridElement.findByLongTakeProfitOrderId(orderId);
-        if (byLongTakeProfitOrderId != null){
-            longTakeProfitTraderIdParam(
-                    byLongTakeProfitOrderId,
-                    null,
-                    false
-            );
-//            longEntryTraderIdParam(
-//                    byLongTakeProfitOrderId,
-//                    null,
-//                    false
-//            );
-        }
-        GridElement byShortTakeProfitOrderId = GridElement.findByShortTakeProfitOrderId(orderId);
-        if (byShortTakeProfitOrderId != null){
-            shortTakeProfitTraderIdParam(
-                    byShortTakeProfitOrderId,
-                    null,
-                    false
-            );
-//            shortEntryTraderIdParam(
-//                    byShortTakeProfitOrderId,
-//                    null,
-//                    false
-//            );
-        }
-
-        /**
-         * 匹配挂单
-         */
-        GridElement longGridElement = GridElement.findByLongOrderId(orderId);
-        if (longGridElement != null) {
-            if (longGridElement.isHasLongOrder()){
-                longEntryTraderIdParam(
-                        longGridElement,
-                        null,
-                        false
-                );
-                if (longGridElement.getLongTakeProfitOrderId() == null){
-                    BigDecimal longTp = longGridElement.getLongTraderParam().getTakeProfitPrice();
-                    if (longTp != null) {
-                        executor.placeTakeProfit(longTp,
-                                FuturesPriceTrigger.RuleEnum.NUMBER_1,
-                                ORDER_TYPE_CLOSE_LONG,
-                                negate(config.getQuantity()),
-                                (profitId) -> {
-                                    longTakeProfitTraderIdParam(
-                                            longGridElement,
-                                            profitId,
-                                            true
-                                    );
-                                });
-                        log.info("[Gate] 多单成交匹配止盈, orderId:{}, 止盈价:{}, size:{}", orderId, longTp, negate(config.getQuantity()));
-                        return;
-                    }
-                }
-            }
-        }
-        GridElement shortGridElement = GridElement.findByShortOrderId(orderId);
-        if (shortGridElement != null) {
-            if (shortGridElement.isHasShortOrder()){
-                shortEntryTraderIdParam(
-                        shortGridElement,
-                        null,
-                        false
-                );
-                if (shortGridElement.getShortTakeProfitOrderId() == null){
-                    BigDecimal shortTp = shortGridElement.getShortTraderParam().getTakeProfitPrice();
-                    if (shortTp != null) {
-                        executor.placeTakeProfit(shortTp,
-                                FuturesPriceTrigger.RuleEnum.NUMBER_2,
-                                ORDER_TYPE_CLOSE_SHORT,
-                                config.getQuantity(),
-                                (profitId) -> {
-                                    shortTakeProfitTraderIdParam(
-                                            shortGridElement,
-                                            profitId,
-                                            true
-                                    );
-                                });
-                        log.info("[Gate] 空单成交匹配止盈, orderId:{}, 止盈价:{}, size:{}", orderId, shortTp, config.getQuantity());
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * 用户私有成交回调。由 {@link com.xcong.excoin.modules.gateApi.wsHandler.handler.UserTradesChannelHandler}
-     * 在收到 {@code futures.usertrades} 推送时调用。
-     *
-     * @param contract 合约名称
-     * @param orderId  订单 ID
-     * @param price    成交价格
-     * @param size     成交数量
-     * @param role     用户角色(maker / taker)
-     * @param fee      手续费
-     */
-    public void onUserTrade(String contract, String orderId, BigDecimal price, String size, String role, BigDecimal fee) {
-        if (state == StrategyState.STOPPED) {
-            return;
-        }
-        log.info("[Gate] 成交明细, 合约:{}, 订单ID:{}, 价格:{}, 数量:{}, 角色:{}, 手续费:{}",
-                contract, orderId, price, size, role, fee);
-    }
 
     /**
      * 自动订单(条件单)状态变更回调。
@@ -689,218 +597,121 @@
             return;
         }
 
-        /**
-         * 匹配止盈单止盈
-         */
-        GridElement byLongTakeProfitOrderId = GridElement.findByLongTakeProfitOrderId(orderId);
-        if (byLongTakeProfitOrderId != null){
-            longTakeProfitTraderIdParam(
-                    byLongTakeProfitOrderId,
-                    null,
-                    false
-            );
-            longEntryTraderIdParam(
-                    byLongTakeProfitOrderId,
-                    null,
-                    false
-            );
-            Integer downId = byLongTakeProfitOrderId.getDownId();
-            GridElement shortGridElement = GridElement.findById(downId);
-            onUserTradeShortEntry(shortGridElement);
+        // [Gate-需求1] 多仓止盈触发:清空止盈状态 + 取消最远多仓止损 + 检查是否最后一个止盈
+        GridElement longTpElem = GridElement.findByLongTakeProfitOrderId(orderId);
+        if (longTpElem != null && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")) {
+            longTakeProfitTraderIdParam(longTpElem, null, false);
+            log.info("[Gate] 多仓止盈触发 gridId:{}, orderId:{}", longTpElem.getId(), orderId);
+            cancelFarthestLongStopLoss();
+            checkLastTakeProfitAndRestart();
+            return;
         }
-        GridElement byShortTakeProfitOrderId = GridElement.findByShortTakeProfitOrderId(orderId);
-        if (byShortTakeProfitOrderId != null){
-            shortTakeProfitTraderIdParam(
-                    byShortTakeProfitOrderId,
-                    null,
-                    false
-            );
-            shortEntryTraderIdParam(
-                    byShortTakeProfitOrderId,
-                    null,
-                    false
-            );
-            Integer upId = byShortTakeProfitOrderId.getUpId();
-            GridElement longGridElement = GridElement.findById(upId);
-            onUserTradeLongEntry(longGridElement);
+        // [Gate-需求1] 空仓止盈触发:清空止盈状态 + 取消最远空仓止损 + 检查是否最后一个止盈
+        GridElement shortTpElem = GridElement.findByShortTakeProfitOrderId(orderId);
+        if (shortTpElem != null && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")) {
+            shortTakeProfitTraderIdParam(shortTpElem, null, false);
+            log.info("[Gate] 空仓止盈触发 gridId:{}, orderId:{}", shortTpElem.getId(), orderId);
+            cancelFarthestShortStopLoss();
+            checkLastTakeProfitAndRestart();
+            return;
         }
 
-        /**
-         * 匹配挂单
-         */
-        GridElement longGridElement = GridElement.findByLongOrderId(orderId);
-        if (longGridElement != null) {
-            if (longGridElement.isHasLongOrder() && !tradeId.equals("0")){
-
-                onUserTradeLongEntry(longGridElement);
-                if (longGridElement.getLongTakeProfitOrderId() == null){
-                    BigDecimal longTp = longGridElement.getLongTraderParam().getTakeProfitPrice();
-                    if (longTp != null) {
-                        executor.placeTakeProfit(longTp,
-                                FuturesPriceTrigger.RuleEnum.NUMBER_1,
-                                ORDER_TYPE_CLOSE_LONG,
-                                negate(config.getQuantity()),
-                                (profitId) -> {
-                                    longTakeProfitTraderIdParam(
-                                            longGridElement,
-                                            profitId,
-                                            true
-                                    );
-                                });
-                        log.info("[Gate] 多单成交匹配止盈, orderId:{}, 止盈价:{}, size:{}", orderId, longTp, negate(config.getQuantity()));
-                        return;
-                    }
-                }
-            }
+        GridElement longStopLossElem = GridElement.findByLongStopLossOrderId(orderId);
+//        if (longStopLossElem != null && longPositionSize.compareTo(BigDecimal.ZERO) > 0 && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")) {
+        if (longStopLossElem != null && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")) {
+            handleLongStopLossTriggered(longStopLossElem);
+            return;
         }
+        GridElement shortStopLossElem = GridElement.findByShortStopLossOrderId(orderId);
+//        if (shortStopLossElem != null && shortPositionSize.compareTo(BigDecimal.ZERO) > 0 && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")) {
+        if (shortStopLossElem != null && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")) {
+            handleShortStopLossTriggered(shortStopLossElem);
+            return;
+        }
+
         GridElement shortGridElement = GridElement.findByShortOrderId(orderId);
         if (shortGridElement != null) {
-            if (shortGridElement.isHasShortOrder() && !tradeId.equals("0")){
+            if (shortGridElement.isHasShortOrder() && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0") ){
+                int filledQty = Integer.parseInt(shortGridElement.getShortTraderParam().getQuantity());
+                shortEntryTraderIdParam(shortGridElement, null, false);
+                // [Gate-需求2] 加仓后先撤空仓所有止盈+止损,再重挂
+                cancelAllShortTakeProfitsAndStopLosses();
+                extendShortStopLoss(filledQty,shortGridElement.getId());
+                accumulatedShortLossCount = 0; // 加仓订单成交,重置止损累计
+                log.info("[Gate] 空单成交 gridId:{}", filledQty);
 
-                onUserTradeShortEntry(shortGridElement);
-                if (shortGridElement.getShortTakeProfitOrderId() == null){
-                    BigDecimal shortTp = shortGridElement.getShortTraderParam().getTakeProfitPrice();
-                    if (shortTp != null) {
-                        executor.placeTakeProfit(shortTp,
+                // 空仓持仓超过baseQuantity时,从gridId-2开始向外追挂止盈
+                BigDecimal shortBaseQty = new BigDecimal(config.getBaseQuantity());
+                BigDecimal shortGridQty = new BigDecimal(config.getQuantity());
+                if (shortPositionSize.compareTo(shortBaseQty) > 0) {
+                    BigDecimal shortExcess = shortPositionSize.subtract(shortBaseQty);
+                    int shortExcessCount = shortExcess.divide(shortGridQty, 0, RoundingMode.DOWN).intValue();
+                    for (int i = 0; i < shortExcessCount; i++) {
+                        int tpGridId = shortGridElement.getId() - 2 - i;
+                        GridElement tpElem = GridElement.findById(tpGridId);
+                        if (tpElem == null || tpElem.getShortTakeProfitOrderId() != null) {
+                            continue;
+                        }
+                        BigDecimal tpPrice = tpElem.getGridPrice();
+                        int finalTpGridId = tpGridId;
+                        executor.placeTakeProfit(
+                                tpPrice,
                                 FuturesPriceTrigger.RuleEnum.NUMBER_2,
                                 ORDER_TYPE_CLOSE_SHORT,
                                 config.getQuantity(),
-                                (profitId) -> {
-                                    shortTakeProfitTraderIdParam(
-                                            shortGridElement,
-                                            profitId,
-                                            true
-                                    );
-                                });
-                        log.info("[Gate] 空单成交匹配止盈, orderId:{}, 止盈价:{}, size:{}", orderId, shortTp, config.getQuantity());
+                                profitId -> {
+                                    shortTakeProfitTraderIdParam(tpElem, profitId, true);
+                                    log.info("[Gate] 空仓止盈挂单, gridId:{}, 触发价:{}, takeProfitId:{}",
+                                            finalTpGridId, tpPrice, profitId);
+                                }
+                        );
                     }
                 }
             }
         }
-    }
+        GridElement longGridElement = GridElement.findByLongOrderId(orderId);
+        if (longGridElement != null) {
+            if (longGridElement.isHasLongOrder() && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")){
 
-    private void onUserTradeShortEntry(GridElement gridElement) {
-        if (!isMarginSafe()) {
-            log.warn("[Gate] 保证金超限,跳过挂条件单");
-        } else {
+                int filledQty = Integer.parseInt(longGridElement.getLongTraderParam().getQuantity());
+                longEntryTraderIdParam(longGridElement, null, false);
+                // [Gate-需求2] 加仓后先撤多仓所有止盈+止损,再重挂
+                cancelAllLongTakeProfitsAndStopLosses();
+                extendLongStopLoss(filledQty,longGridElement.getId());
+                accumulatedLongLossCount = 0; // 加仓订单成交,重置止损累计
+                log.info("[Gate] 多单成交 gridId:{}", filledQty);
 
-            /**
-             * 下一个开仓位置
-             *      获取队列第一个元素的价格对应的网格
-             *      判断网格是否能开空仓,如果不能则跳过
-             *      前进方向挂空仓条件单
-             *      后置方向挂多空条件单
-             */
-            //下一个开仓位置
-            GridElement UpGridElement = GridElement.findById(gridElement.getDownId());
-            BigDecimal newLongFirst = UpGridElement.getGridPrice();
-
-            // 判断网格是否能开空仓,如果不能则跳过
-            if (UpGridElement != null) {
-
-                if (!UpGridElement.isHasShortOrder() && shortEntryPrice.compareTo(newLongFirst) > 0) {
-
-                    TraderParam upShortTraderParam = UpGridElement.getShortTraderParam();
-                    placeEntryOrderWithPreFlag(UpGridElement, false,
-                            upShortTraderParam.getEntryPrice(),
-                            FuturesPriceTrigger.RuleEnum.NUMBER_2,
-                            negate(upShortTraderParam.getQuantity()));
-                }
-                int i = gridElement.getUpId();
-                GridElement downGridElement = GridElement.findById(i);
-                if (downGridElement != null){
-
-                    BigDecimal downGridPrice = downGridElement.getGridPrice();
-
-                    TraderParam downShortTraderParam = downGridElement.getShortTraderParam();
-                    if (
-                            !downGridElement.isHasShortOrder() &&
-                                    downGridPrice.compareTo(longEntryPrice) <= 0 &&
-                                    downGridPrice.compareTo(shortEntryPrice) >= 0
-                    ){
-                        placeEntryOrderWithPreFlag(downGridElement, false,
-                                downShortTraderParam.getEntryPrice(),
+                // 多仓持仓超过baseQuantity时,从gridId+2开始向外追挂止盈
+                BigDecimal longBaseQty = new BigDecimal(config.getBaseQuantity());
+                BigDecimal longGridQty = new BigDecimal(config.getQuantity());
+                if (longPositionSize.compareTo(longBaseQty) > 0) {
+                    BigDecimal longExcess = longPositionSize.subtract(longBaseQty);
+                    int longExcessCount = longExcess.divide(longGridQty, 0, RoundingMode.DOWN).intValue();
+                    for (int i = 0; i < longExcessCount; i++) {
+                        int tpGridId = longGridElement.getId() + 2 + i;
+                        GridElement tpElem = GridElement.findById(tpGridId);
+                        if (tpElem == null || tpElem.getLongTakeProfitOrderId() != null) {
+                            continue;
+                        }
+                        BigDecimal tpPrice = tpElem.getGridPrice();
+                        int finalTpGridId = tpGridId;
+                        executor.placeTakeProfit(
+                                tpPrice,
                                 FuturesPriceTrigger.RuleEnum.NUMBER_1,
-                                negate(downShortTraderParam.getQuantity()));
-
-                    }
-
-                    TraderParam downLongTraderParam = downGridElement.getLongTraderParam();
-                    if (
-                            !downGridElement.isHasLongOrder() &&
-                                    downGridPrice.compareTo(longEntryPrice) <= 0
-                    ){
-                        placeEntryOrderWithPreFlag(downGridElement, true,
-                                downLongTraderParam.getEntryPrice(),
-                                FuturesPriceTrigger.RuleEnum.NUMBER_1,
-                                downLongTraderParam.getQuantity());
+                                ORDER_TYPE_CLOSE_LONG,
+                                negate(config.getQuantity()),
+                                profitId -> {
+                                    longTakeProfitTraderIdParam(tpElem, profitId, true);
+                                    log.info("[Gate] 多仓止盈挂单, gridId:{}, 触发价:{}, takeProfitId:{}",
+                                            finalTpGridId, tpPrice, profitId);
+                                }
+                        );
                     }
                 }
             }
         }
     }
 
-    private void onUserTradeLongEntry(GridElement gridElement) {
-        if (!isMarginSafe()) {
-            log.warn("[Gate] 保证金超限,跳过挂条件单");
-        } else {
-
-            /**
-             * 下一个开仓位置
-             *      获取队列第一个元素的价格对应的网格
-             *      判断网格是否能开多仓,如果不能则跳过
-             *      前进方向挂多仓条件单
-             *      后置方向挂多空条件单
-             */
-            //下一个开仓位置
-            GridElement UpGridElement = GridElement.findById(gridElement.getUpId());
-            BigDecimal newLongFirst = UpGridElement.getGridPrice() ;
-
-            // 判断网格是否能开多仓,如果不能则跳过
-            if (UpGridElement != null) {
-
-                if (!UpGridElement.isHasLongOrder() && longEntryPrice.compareTo(newLongFirst) < 0) {
-                    TraderParam upLongTraderParam = UpGridElement.getLongTraderParam();
-                    placeEntryOrderWithPreFlag(UpGridElement, true,
-                            upLongTraderParam.getEntryPrice(),
-                            FuturesPriceTrigger.RuleEnum.NUMBER_1,
-                            config.getQuantity());
-                }
-
-                int i = gridElement.getDownId();
-                GridElement downGridElement = GridElement.findById(i);
-                if (downGridElement != null){
-
-                    BigDecimal downGridPrice = downGridElement.getGridPrice();
-
-                    TraderParam downLongTraderParam = downGridElement.getLongTraderParam();
-                    if (
-                            !downGridElement.isHasLongOrder() &&
-                                    downGridPrice.compareTo(shortEntryPrice) >= 0 &&
-                                    downGridPrice.compareTo(longEntryPrice) <= 0
-                    ){
-                        placeEntryOrderWithPreFlag(downGridElement, true,
-                                downLongTraderParam.getEntryPrice(),
-                                FuturesPriceTrigger.RuleEnum.NUMBER_2,
-                                config.getQuantity());
-
-                    }
-
-                    TraderParam shortTraderParam = downGridElement.getShortTraderParam();
-                    if (
-                            !downGridElement.isHasShortOrder() &&
-                                    downGridPrice.compareTo(shortEntryPrice) >= 0
-                    ){
-
-                        placeEntryOrderWithPreFlag(downGridElement, false,
-                                shortTraderParam.getEntryPrice(),
-                                FuturesPriceTrigger.RuleEnum.NUMBER_2,
-                                negate(config.getQuantity()));
-                    }
-                }
-            }
-        }
-    }
 
     // ---- 网格队列处理 ----
 
@@ -914,78 +725,104 @@
      *       止盈价 = 触发价 − step,通过 onSuccess 回调将 orderId → 止盈价存入 currentShortOrderIds</li>
      *   <li>状态切换为 ACTIVE</li>
      * </ol>
-     * 条件单成交后由 {@link #onOrderUpdate} 匹配止盈价并挂止盈条件单。
      */
     private void tryGenerateQueues() {
         if (baseLongOpened && baseShortOpened) {
-            //初始化空仓队列
             generateShortQueue();
-            //初始化多仓队列
             generateLongQueue();
-            //初始化网格数据
             updateGridElements();
 
-            /**
-             * 挂初始位置多空仓条件单
-             * 0位置的多单止盈
-             * 0位置的空单止盈
-             */
             GridElement baseGridElement = GridElement.findById(0);
             TraderParam baseLongTraderParam = config.getBaseLongTraderParam();
             baseGridElement.setLongOrderId(baseLongTraderParam.getEntryOrderId());
             baseGridElement.setHasLongOrder(true);
-            //0位置的网格的多单止盈
-            BigDecimal upTakeProfitPrice = baseGridElement.getLongTraderParam().getTakeProfitPrice();
-            executor.placeTakeProfit(
-                    upTakeProfitPrice,
-                    FuturesPriceTrigger.RuleEnum.NUMBER_1,
-                    ORDER_TYPE_CLOSE_LONG,
-                    negate(config.getQuantity()),
-                    profitId -> {
-                        longTakeProfitTraderIdParam(
-                                baseGridElement,
-                                profitId,
-                                true
-                        );
-                    }
-            );
-            //0位置的网格的空单止盈
             TraderParam baseShortTraderParam = config.getBaseShortTraderParam();
             baseGridElement.setShortOrderId(baseShortTraderParam.getEntryOrderId());
             baseGridElement.setHasShortOrder(true);
-            BigDecimal downTakeProfitPrice = baseGridElement.getShortTraderParam().getTakeProfitPrice();
-            executor.placeTakeProfit(
-                    downTakeProfitPrice,
-                    FuturesPriceTrigger.RuleEnum.NUMBER_2,
-                    ORDER_TYPE_CLOSE_SHORT,
-                    config.getQuantity(),
-                    profitId -> {
-                        shortTakeProfitTraderIdParam(
-                                baseGridElement,
-                                profitId,
-                                true
-                        );
-                    }
-            );
 
-            /**
-             * 挂初始位置的up位置的多单
-             * 挂初始位置的down位置的空单
-             */
-            Integer upId = baseGridElement.getUpId();
-            GridElement upGridElementOne = GridElement.findById(upId);
-            BigDecimal longTp = upGridElementOne.getGridPrice();
-            placeEntryOrderWithPreFlag(upGridElementOne, true,
-                    longTp,
-                    FuturesPriceTrigger.RuleEnum.NUMBER_1,
-                    config.getQuantity());
-            Integer downId = baseGridElement.getDownId();
-            GridElement downGridElementOne = GridElement.findById(downId);
-            BigDecimal shortTp = downGridElementOne.getGridPrice();
-            placeEntryOrderWithPreFlag(downGridElementOne, false,
-                    shortTp,
-                    FuturesPriceTrigger.RuleEnum.NUMBER_2,
-                    negate(config.getQuantity()));
+//            int shortTime = 2;
+//            GridElement elemShort = GridElement.findById(shortTime);
+//            if (elemShort != null) {
+//                BigDecimal triggerPrice = elemShort.getGridPrice();
+//                String size = config.getBaseQuantity();
+//                executor.placeTakeProfit(
+//                        triggerPrice,
+//                        FuturesPriceTrigger.RuleEnum.NUMBER_1,
+//                        ORDER_TYPE_CLOSE_SHORT,
+//                        size,
+//                        profitId -> {
+//                            elemShort.setShortStopLossOrderId(profitId);
+//                            GridElement.refreshIndices();
+//                            log.info("[Gate] 空仓止损已挂, gridId:{}, 触发价:{}, stopLossId:{}", shortTime, triggerPrice, profitId);
+//                        }
+//                );
+//            }
+//
+//
+//            int longTime = -2;
+//            GridElement elemLong = GridElement.findById(longTime);
+//            if (elemLong != null) {
+//                BigDecimal triggerPrice = elemLong.getGridPrice();
+//                String size = config.getBaseQuantity();
+//                executor.placeTakeProfit(
+//                        triggerPrice,
+//                        FuturesPriceTrigger.RuleEnum.NUMBER_2,
+//                        ORDER_TYPE_CLOSE_LONG,
+//                        negate(size),
+//                        profitId -> {
+//                            elemLong.setLongStopLossOrderId(profitId);
+//                            GridElement.refreshIndices();
+//                            log.info("[Gate] 多仓止损已挂, gridId:{}, 触发价:{}, stopLossId:{}", longTime, triggerPrice, profitId);
+//                        }
+//                );
+//            }
+
+            int shortTime = Integer.parseInt(config.getBaseQuantity()) / Integer.parseInt(config.getQuantity()) + 1;
+            for (int id = 2; id <= shortTime; id++) {
+                GridElement elem = GridElement.findById(id);
+                if (elem == null) {
+                    continue;
+                }
+                BigDecimal triggerPrice = elem.getGridPrice();
+                String size = config.getQuantity();
+                int finalId = id;
+                executor.placeTakeProfit(
+                        triggerPrice,
+                        FuturesPriceTrigger.RuleEnum.NUMBER_1,
+                        ORDER_TYPE_CLOSE_SHORT,
+                        size,
+                        profitId -> {
+                            elem.setShortStopLossOrderId(profitId);
+                            GridElement.refreshIndices();
+                            log.info("[Gate] 空仓止损已挂, gridId:{}, 触发价:{}, stopLossId:{}", finalId, triggerPrice, profitId);
+                        }
+                );
+            }
+
+
+            int longTime = Integer.parseInt(config.getBaseQuantity()) / Integer.parseInt(config.getQuantity()) + 1;
+            for (int id = -2; id >= -longTime; id--) {
+                GridElement elem = GridElement.findById(id);
+                if (elem == null) {
+                    continue;
+                }
+                BigDecimal triggerPrice = elem.getGridPrice();
+                String size = config.getQuantity();
+                int finalId = id;
+                executor.placeTakeProfit(
+                        triggerPrice,
+                        FuturesPriceTrigger.RuleEnum.NUMBER_2,
+                        ORDER_TYPE_CLOSE_LONG,
+                        negate(size),
+                        profitId -> {
+                            elem.setLongStopLossOrderId(profitId);
+                            GridElement.refreshIndices();
+                            log.info("[Gate] 多仓止损已挂, gridId:{}, 触发价:{}, stopLossId:{}", finalId, triggerPrice, profitId);
+                        }
+                );
+            }
+
+            log.info("[Gate] 止损单已全部挂完, 空仓止损: 2~{}, 多仓止损: -2~-{}", shortTime, longTime);
 
             state = StrategyState.ACTIVE;
         }
@@ -1049,6 +886,9 @@
         BigDecimal elem = shortBaseEntryPrice.subtract(step).setScale(prec, RoundingMode.HALF_UP);
             for (int i = 0; i < config.getGridQueueSize(); i++) {
                 shortPriceQueue.add(elem);
+                totalLongPriceQueue.add( elem);
+                totalShortPriceQueue.add( elem);
+
                 elem = elem.subtract(step).setScale(prec, RoundingMode.HALF_UP);
                 if (elem.compareTo(BigDecimal.ZERO) <= 0) {
                     break;
@@ -1070,10 +910,16 @@
         BigDecimal elem = shortBaseEntryPrice.add(step).setScale(prec, RoundingMode.HALF_UP);
         for (int i = 0; i < config.getGridQueueSize(); i++) {
             longPriceQueue.add(elem);
+            totalLongPriceQueue.add( elem);
+            totalShortPriceQueue.add( elem);
             elem = elem.add(step).setScale(prec, RoundingMode.HALF_UP);
         }
         longPriceQueue.sort(BigDecimal::compareTo);
         log.info("[Gate] 多队列:{}", longPriceQueue);
+        totalShortPriceQueue.sort((a, b) -> b.compareTo(a));
+        log.info("[Gate] 队列从大到小:{}", totalShortPriceQueue);
+        totalLongPriceQueue.sort(BigDecimal::compareTo);
+        log.info("[Gate] 队列从小到大:{}", totalLongPriceQueue);
     }
 
     /**
@@ -1096,8 +942,8 @@
         int longSize = longPriceQueue.size();
         //根据精度转换成小数
         int prec = config.getPriceScale();
-        BigDecimal minTick = BigDecimal.ONE.scaleByPowerOfTen(-prec);
-        BigDecimal step = config.getStep().subtract(minTick);
+        BigDecimal step = config.getStep();
+//        String qty = config.getBaseQuantity();
         String qty = config.getQuantity();
 
         // 空仓队列:id 从 -1 自减, shortPriceQueue[i] → id=-(i+1)
@@ -1185,236 +1031,467 @@
         log.info("[Gate] 网格元素列表已构建, 共{}个元素 (空仓:{} 位置:0 多仓:{})", elements.size(), shortSize, longSize);
     }
 
+
     private void processShortGrid(BigDecimal currentPrice) {
-        int prec = config.getPriceScale();
-        List<BigDecimal> matched = new ArrayList<>();
-        synchronized (shortPriceQueue) {
-            for (BigDecimal p : shortPriceQueue) {
+        BigDecimal matched = BigDecimal.ZERO;
+        synchronized (totalLongPriceQueue) {
+            for (BigDecimal p : totalLongPriceQueue) {
                 if (p.compareTo(currentPrice) >= 0) {
-                    matched.add(p);
-                } else {
+                    matched =  p;
                     break;
                 }
             }
-        }
-        if (matched.isEmpty()) {
-            return;
-        }
-        log.info("[Gate] 空仓队列触发, 匹配{}个元素, 当前价:{}", matched.size(), currentPrice);
-
-        synchronized (shortPriceQueue) {
-            shortPriceQueue.removeAll(matched);
-            BigDecimal min = shortPriceQueue.isEmpty() ? matched.get(matched.size() - 1) : shortPriceQueue.get(shortPriceQueue.size() - 1);
-            BigDecimal gridStep = config.getStep();
-            for (int i = 0; i < matched.size(); i++) {
-                min = min.subtract(gridStep).setScale(prec, RoundingMode.HALF_UP);
-                shortPriceQueue.add(min);
+//            log.info("[Gate-1] 多仓仓位归零 空仓队列触发, 匹配:{},当前价:{}", matched, currentPrice);
+            if (BigDecimal.ZERO.compareTo( matched) == 0) {
+                return;
             }
-            shortPriceQueue.sort((a, b) -> b.compareTo(a));
-        }
 
-        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(prec, RoundingMode.HALF_UP);
-                longPriceQueue.add(elem);
-            }
-            longPriceQueue.sort(BigDecimal::compareTo);
-            while (longPriceQueue.size() > config.getGridQueueSize()) {
-                longPriceQueue.remove(longPriceQueue.size() - 1);
-            }
-        }
+            GridElement matchedUpGridElement = GridElement.findByPrice(matched);
+            if (matchedUpGridElement != null){
+                if (!matchedUpGridElement.isHasLongOrder()){
+                    Integer upId = matchedUpGridElement.getUpId();
+                    GridElement newEntryGrid = GridElement.findById(upId);
 
-        if (!isMarginSafe()) {
-            log.warn("[Gate] 保证金超限,跳过挂条件单");
-        } else {
+                    if (newEntryGrid != null) {
 
-            /**
-             * 下一个开仓位置
-             *      获取队列第一个元素的价格对应的网格
-             *      判断网格是否能开空仓,如果不能则跳过
-             *      前进方向挂空仓条件单
-             *      后置方向挂多空条件单
-             */
-            //下一个开仓位置
-            BigDecimal newLongFirst = shortPriceQueue.get(0);
-            GridElement UpGridElement = GridElement.findByPrice(newLongFirst);
-
-            // 判断网格是否能开空仓,如果不能则跳过
-            if (UpGridElement != null) {
-
-                if (!UpGridElement.isHasShortOrder() && shortEntryPrice.compareTo(newLongFirst) > 0) {
-
-                    TraderParam upShortTraderParam = UpGridElement.getShortTraderParam();
-                    placeEntryOrderWithPreFlag(UpGridElement, false,
-                            upShortTraderParam.getEntryPrice(),
-                            FuturesPriceTrigger.RuleEnum.NUMBER_2,
-                            negate(upShortTraderParam.getQuantity()));
-                }
-                int i = UpGridElement.getId() + 2;
-                GridElement downGridElement = GridElement.findById(i);
-                if (downGridElement != null){
-
-                    BigDecimal downGridPrice = downGridElement.getGridPrice();
-
-                    TraderParam downShortTraderParam = downGridElement.getShortTraderParam();
-                    if (
-                            !downGridElement.isHasShortOrder() &&
-                                    downGridPrice.compareTo(longEntryPrice) <= 0 &&
-                                    downGridPrice.compareTo(shortEntryPrice) >= 0
-                    ){
-                        placeEntryOrderWithPreFlag(downGridElement, false,
-                                downShortTraderParam.getEntryPrice(),
-                                FuturesPriceTrigger.RuleEnum.NUMBER_1,
-                                negate(downShortTraderParam.getQuantity()));
-
-                    }
-
-                    TraderParam downLongTraderParam = downGridElement.getLongTraderParam();
-                    if (
-                            !downGridElement.isHasLongOrder() &&
-                                    downGridPrice.compareTo(longEntryPrice) <= 0
-                    ){
-                        placeEntryOrderWithPreFlag(downGridElement, true,
-                                downLongTraderParam.getEntryPrice(),
-                                FuturesPriceTrigger.RuleEnum.NUMBER_1,
-                                downLongTraderParam.getQuantity());
+                        GridElement cancelGridElement = GridElement.findById(newEntryGrid.getUpId());
+                        String quantity = cancelGridElement != null
+                                ? cancelGridElement.getLongTraderParam().getQuantity()
+                                : config.getBaseQuantity();
+                        if (cancelGridElement != null && cancelGridElement.isHasLongOrder()) {
+                            String longOrderId = cancelGridElement.getLongOrderId();
+                            executor.cancelConditionalOrder(longOrderId, oid -> {
+                                longEntryTraderIdParam(cancelGridElement, null, false);
+                                log.info("[Gate] 多仓仓位归零, 取消gridId:{}的多单,{}", cancelGridElement.getId(),longOrderId);
+                            });
+                        }
+//                        log.info("[Gate-2] 多仓仓位归零 空仓队列触发, 匹配:{},当前价:{}", matched, currentPrice);
+                        if (!newEntryGrid.isHasLongOrder()) {
+                            BigDecimal triggerPrice = newEntryGrid.getGridPrice();
+                            String size = quantity;
+                            log.info("[Gate] 多仓仓位归零 gridId:{}, 挂{}基础张多单",
+                                    newEntryGrid.getId(),  size);
+                            newEntryGrid.getLongTraderParam().setQuantity(size);
+                            placeEntryOrderWithPreFlag(newEntryGrid, true, triggerPrice,
+                                    FuturesPriceTrigger.RuleEnum.NUMBER_1, size);
+                        }
                     }
                 }
             }
         }
+
     }
 
     private void processLongGrid(BigDecimal currentPrice) {
-        int prec = config.getPriceScale();
-        List<BigDecimal> matched = new ArrayList<>();
-        synchronized (longPriceQueue) {
-            for (BigDecimal p : longPriceQueue) {
+        BigDecimal matched = BigDecimal.ZERO;
+        synchronized (totalShortPriceQueue) {
+            for (BigDecimal p : totalShortPriceQueue) {
                 if (p.compareTo(currentPrice) <= 0) {
-                    matched.add(p);
-                } else {
+                    matched = p;
                     break;
                 }
             }
-        }
-        if (matched.isEmpty()) {
-            return;
-        }
-
-        log.info("[Gate] 多仓队列触发, 匹配{}个元素, 当前价:{}", matched.size(), currentPrice);
-
-        /**
-         * 匹配到元素后,
-         *  多仓队列更新
-         *  空仓队列更新
-         */
-        synchronized (longPriceQueue) {
-            longPriceQueue.removeAll(matched);
-            BigDecimal max = longPriceQueue.isEmpty() ? matched.get(matched.size() - 1) : longPriceQueue.get(longPriceQueue.size() - 1);
-            BigDecimal gridStep = config.getStep();
-            for (int i = 0; i < matched.size(); i++) {
-                max = max.add(gridStep).setScale(prec, RoundingMode.HALF_UP);
-                longPriceQueue.add(max);
+//            log.info("[Gate-3] 空仓仓位归零 多仓队列触发, 匹配:{},当前价:{}", matched, currentPrice);
+            if (BigDecimal.ZERO.compareTo( matched) == 0) {
+                return;
             }
-            longPriceQueue.sort(BigDecimal::compareTo);
-        }
-        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(prec, 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 {
+            GridElement matchedUpGridElement = GridElement.findByPrice(matched);
+            if (matchedUpGridElement != null){
+                if(!matchedUpGridElement.isHasShortOrder()){
+                    Integer downId = matchedUpGridElement.getDownId();
+                    GridElement newEntryGrid = GridElement.findById(downId);
 
-            /**
-             * 下一个开仓位置
-             *      获取队列第一个元素的价格对应的网格
-             *      判断网格是否能开多仓,如果不能则跳过
-             *      前进方向挂多仓条件单
-             *      后置方向挂多空条件单
-             */
-            //下一个开仓位置
-            BigDecimal newLongFirst = longPriceQueue.get(0);
-            GridElement UpGridElement = GridElement.findByPrice(newLongFirst);
+                    if (newEntryGrid != null) {
 
-            // 判断网格是否能开多仓,如果不能则跳过
-            if (UpGridElement != null) {
+                        GridElement cancelGridElement = GridElement.findById(newEntryGrid.getDownId());
 
-                if (!UpGridElement.isHasLongOrder() && longEntryPrice.compareTo(newLongFirst) < 0) {
-                    TraderParam upLongTraderParam = UpGridElement.getLongTraderParam();
-                    placeEntryOrderWithPreFlag(UpGridElement, true,
-                            upLongTraderParam.getEntryPrice(),
-                            FuturesPriceTrigger.RuleEnum.NUMBER_1,
-                            config.getQuantity());
-                }
+                        String quantity = cancelGridElement != null
+                                ? cancelGridElement.getShortTraderParam().getQuantity()
+                                : config.getBaseQuantity();
+                        /**
+                         * 看是否有空仓挂单,有就取消
+                         */
+                        if (cancelGridElement != null && cancelGridElement.isHasShortOrder()) {
+                            String shortOrderId = cancelGridElement.getShortOrderId();
+                            executor.cancelConditionalOrder(shortOrderId, oid -> {
+                                shortEntryTraderIdParam(cancelGridElement, null, false);
+                                log.info("[Gate] 空仓仓位归零, 取消gridId:{}的多单{}", cancelGridElement.getId(),shortOrderId);
+                            });
+                        }
+//                        log.info("[Gate-4] 空仓仓位归零 多仓队列触发, 匹配:{},当前价:{}", matched, currentPrice);
+                        if (!newEntryGrid.isHasShortOrder()){
+                            BigDecimal triggerPrice = newEntryGrid.getGridPrice();
+                            String size = quantity;
+                            log.info("[Gate] 空仓仓位归零 gridId:{}, 挂{}基础张多单",
+                                    newEntryGrid.getId(),  size);
+                            newEntryGrid.getShortTraderParam().setQuantity(size);
+                            placeEntryOrderWithPreFlag(newEntryGrid, false, triggerPrice,
+                                    FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(size));
+                        }
 
-                int i = UpGridElement.getId() - 2;
-                GridElement downGridElement = GridElement.findById(i);
-                if (downGridElement != null){
-
-                    BigDecimal downGridPrice = downGridElement.getGridPrice();
-
-                    TraderParam downLongTraderParam = downGridElement.getLongTraderParam();
-                    if (
-                            !downGridElement.isHasLongOrder() &&
-                                    downGridPrice.compareTo(shortEntryPrice) >= 0 &&
-                                    downGridPrice.compareTo(longEntryPrice) <= 0
-                    ){
-                        placeEntryOrderWithPreFlag(downGridElement, true,
-                                downLongTraderParam.getEntryPrice(),
-                                FuturesPriceTrigger.RuleEnum.NUMBER_2,
-                                config.getQuantity());
-
-                    }
-
-                    TraderParam shortTraderParam = downGridElement.getShortTraderParam();
-                    if (
-                            !downGridElement.isHasShortOrder() &&
-                                    downGridPrice.compareTo(shortEntryPrice) >= 0
-                    ){
-
-                        placeEntryOrderWithPreFlag(downGridElement, false,
-                                shortTraderParam.getEntryPrice(),
-                                FuturesPriceTrigger.RuleEnum.NUMBER_2,
-                                negate(config.getQuantity()));
                     }
                 }
             }
         }
     }
 
-    // ---- 保证金安全阀 ----
+    private void handleLongStopLossTriggered(GridElement gridElement) {
+        gridElement.setLongStopLossOrderId(null);
+
+        int gridId = gridElement.getId();
+        log.info("[Gate] 多仓止损触发 gridId:{}, 开始追单", gridId);
+        int newEntryGridId = gridId + 1;
+
+        GridElement newEntryGrid = GridElement.findById(newEntryGridId);
+        if (newEntryGrid == null) {
+            log.warn("[Gate] 多仓止损触发 but gridId:{} 不存在", newEntryGridId);
+            GridElement.refreshIndices();
+            return;
+        }
+
+        // [Gate-BugFix] 防止与"仓位归零"重复下单:若该网格已有挂单则跳过
+        if (!newEntryGrid.isHasLongOrder()) {
+            BigDecimal triggerPrice = newEntryGrid.getGridPrice();
+
+            // 累计止损张数 + 当前止损量作为追单size,不再依赖positionSize(避免WS竞态)
+            accumulatedLongLossCount += Integer.parseInt(config.getQuantity());
+            String size = String.valueOf(accumulatedLongLossCount + Integer.parseInt(config.getQuantity()));
+            log.info("[Gate] 多仓止损触发 gridId:{}, 在gridId:{}挂{}基础张多单",
+                    gridId, newEntryGridId, size);
+
+            newEntryGrid.getLongTraderParam().setQuantity(size);
+            placeEntryOrderWithPreFlag(newEntryGrid, true, triggerPrice,
+                    FuturesPriceTrigger.RuleEnum.NUMBER_1, size);
+        }else{
+            log.warn("[Gate] 多仓止损触发 gridId:{}, 目标gridId:{}已有挂单,跳过重复下单", gridId, newEntryGridId);
+        }
+
+        int cancelGridId = gridId + 2;
+        GridElement cancelGrid = GridElement.findById(cancelGridId);
+        if (cancelGrid != null && cancelGrid.isHasLongOrder()) {
+            executor.cancelConditionalOrder(cancelGrid.getLongOrderId(), oid -> {
+                longEntryTraderIdParam(cancelGrid, null, false);
+                log.info("[Gate] 多仓止损触发, 取消gridId:{}的多单", cancelGridId);
+            });
+        }
+
+        // 止损触发时,取消最远的多仓止盈订单
+        GridElement farthestLongTp = null;
+        for (GridElement e : config.getGridElements()) {
+            if (e.getLongTakeProfitOrderId() != null) {
+                if (farthestLongTp == null || e.getGridPrice().compareTo(farthestLongTp.getGridPrice()) > 0) {
+                    farthestLongTp = e;
+                }
+            }
+        }
+        if (farthestLongTp != null) {
+            String tpOrderId = farthestLongTp.getLongTakeProfitOrderId();
+            GridElement finalFarthestLongTp = farthestLongTp;
+            executor.cancelConditionalOrder(tpOrderId, oid -> {
+                longTakeProfitTraderIdParam(finalFarthestLongTp, null, false);
+                log.info("[Gate] 多仓止损触发, 取消最远止盈 gridId:{}, orderId:{}", finalFarthestLongTp.getId(), tpOrderId);
+            });
+        }
+    }
+
+    private void handleShortStopLossTriggered(GridElement gridElement) {
+        gridElement.setShortStopLossOrderId(null);
+
+        int gridId = gridElement.getId();
+        log.info("[Gate] 空仓止损触发 gridId:{}, 开始追单", gridId);
+        int newEntryGridId = gridId - 1;
+
+        GridElement newEntryGrid = GridElement.findById(newEntryGridId);
+        if (newEntryGrid == null) {
+            log.warn("[Gate] 空仓止损触发 but gridId:{} 不存在", newEntryGridId);
+            GridElement.refreshIndices();
+            return;
+        }
+
+        // [Gate-BugFix] 防止与"仓位归零"重复下单:若该网格已有挂单则跳过
+        if (!newEntryGrid.isHasShortOrder()) {
+            BigDecimal triggerPrice = newEntryGrid.getGridPrice();
+
+            // 累计止损张数 + 当前止损量作为追单size,不再依赖positionSize(避免WS竞态)
+            accumulatedShortLossCount += Integer.parseInt(config.getQuantity());
+            String size = String.valueOf(accumulatedShortLossCount + Integer.parseInt(config.getQuantity()));
+            log.info("[Gate] 空仓止损触发 gridId:{}, 在gridId:{}挂{}基础张空单",
+                    gridId, newEntryGridId, size);
+            newEntryGrid.getShortTraderParam().setQuantity(size);
+            placeEntryOrderWithPreFlag(newEntryGrid, false, triggerPrice,
+                    FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(size));
+        }else{
+            log.warn("[Gate] 空仓止损触发 gridId:{}, 目标gridId:{}已有挂单,跳过重复下单", gridId, newEntryGridId);
+        }
+
+
+
+
+        int cancelGridId = gridId - 2;
+        GridElement cancelGrid = GridElement.findById(cancelGridId);
+        if (cancelGrid != null && cancelGrid.isHasShortOrder()) {
+            executor.cancelConditionalOrder(cancelGrid.getShortOrderId(), oid -> {
+                shortEntryTraderIdParam(cancelGrid, null, false);
+                log.info("[Gate] 空仓止损触发, 取消gridId:{}的空单", cancelGridId);
+            });
+        }
+
+        // 止损触发时,取消最远的空仓止盈订单
+        GridElement farthestShortTp = null;
+        for (GridElement e : config.getGridElements()) {
+            if (e.getShortTakeProfitOrderId() != null) {
+                if (farthestShortTp == null || e.getGridPrice().compareTo(farthestShortTp.getGridPrice()) < 0) {
+                    farthestShortTp = e;
+                }
+            }
+        }
+        if (farthestShortTp != null) {
+            String tpOrderId = farthestShortTp.getShortTakeProfitOrderId();
+            GridElement finalFarthestShortTp = farthestShortTp;
+            executor.cancelConditionalOrder(tpOrderId, oid -> {
+                shortTakeProfitTraderIdParam(finalFarthestShortTp, null, false);
+                log.info("[Gate] 空仓止损触发, 取消最远止盈 gridId:{}, orderId:{}", finalFarthestShortTp.getId(), tpOrderId);
+            });
+        }
+    }
+
+    // ========== 止盈/止损取消辅助方法 ==========
 
     /**
-     * 保证金安全阀检查。
+     * 止盈触发后检查跨度是否达至要求,满足条件则重启策略。
      *
-     * <p>实时查询当前保证金占用额(positionInitialMargin),计算其占初始本金的比例。
-     * 比例 ≥ marginRatioLimit(默认 20%)时拒绝开仓,但仍照常更新队列。
+     * <h3>跨度定义</h3>
+     * {@code restartGridSpan} 表示多少倍的绝对步长 step(= 短基价 × gridRate)。
      *
-     * <p>查询失败时默认放行(返回 true),避免因 REST API 异常导致策略完全停滞。
-     *
-     * @return true=安全可开仓 / false=保证金超限跳过开仓
+     * <h3>判断逻辑</h3>
+     * <ol>
+     *   <li>多空双边均有持仓:longEntryPrice − shortEntryPrice > span × step</li>
+     *   <li>仅持多仓:currentPrice − longEntryPrice > span × step</li>
+     *   <li>仅持空仓:shortEntryPrice − currentPrice > span × step</li>
+     * </ol>
+     * restartGridSpan=0 时禁用此功能。重启复用仓位归零模式:取消全部条件单 → 平仓 → 延迟启动。
      */
-    private boolean isMarginSafe() {
-        try {
-            FuturesAccount account = futuresApi.listFuturesAccounts(SETTLE);
-            BigDecimal margin = new BigDecimal(account.getPositionInitialMargin());
-            BigDecimal ratio = margin.divide(initialPrincipal, 4, RoundingMode.HALF_UP);
-            log.debug("[Gate] 保证金比例: {}/{}={}", margin, initialPrincipal, ratio);
-            return ratio.compareTo(config.getMarginRatioLimit()) < 0;
-        } catch (Exception e) {
-            log.warn("[Gate] 查保证金失败,默认放行", e);
-            return true;
+    private void checkLastTakeProfitAndRestart() {
+        int span = config.getRestartGridSpan();
+        if (span <= 0) {
+            return;
+        }
+        BigDecimal step = config.getStep();
+        if (step == null || step.compareTo(BigDecimal.ZERO) == 0) {
+            return;
+        }
+        BigDecimal threshold = step.multiply(new BigDecimal(span));
+
+        BigDecimal currentPrice = lastKlinePrice;
+        if (currentPrice == null || currentPrice.compareTo(BigDecimal.ZERO) == 0) {
+            return;
+        }
+
+        boolean shouldRestart = false;
+        String reason = "";
+
+        if (longActive && shortActive) {
+            // 多空双边持仓:多均价 − 空均价 > span × step
+            BigDecimal gap = longEntryPrice.subtract(shortEntryPrice);
+            if (gap.compareTo(threshold) > 0) {
+                shouldRestart = true;
+                reason = StrUtil.format("双边跨度 多均价:{} − 空均价:{} = {} > {} (span:{}×step:{})",
+                        longEntryPrice, shortEntryPrice, gap, threshold, span, step);
+            }
+        } else if (longActive) {
+            // 仅持多仓:当前价 − 多均价 > span × step
+            BigDecimal gap = currentPrice.subtract(longEntryPrice);
+            if (gap.compareTo(threshold) > 0) {
+                shouldRestart = true;
+                reason = StrUtil.format("多仓跨度 当前价:{} − 多均价:{} = {} > {} (span:{}×step:{})",
+                        currentPrice, longEntryPrice, gap, threshold, span, step);
+            }
+        } else if (shortActive) {
+            // 仅持空仓:空均价 − 当前价 > span × step
+            BigDecimal gap = shortEntryPrice.subtract(currentPrice);
+            if (gap.compareTo(threshold) > 0) {
+                shouldRestart = true;
+                reason = StrUtil.format("空仓跨度 空均价:{} − 当前价:{} = {} > {} (span:{}×step:{})",
+                        shortEntryPrice, currentPrice, gap, threshold, span, step);
+            }
+        }
+
+        if (shouldRestart) {
+            log.info("[Gate] 跨度已达要求 → {},最后一个止盈触发策略重启", reason);
+            try {
+                futuresApi.cancelPriceTriggeredOrderList(SETTLE, config.getContract());
+            } catch (ApiException ex) {
+                log.warn("[Gate] 重启前清理条件单失败", ex);
+            }
+            closeExistingPositions();
+            state = StrategyState.STOPPED;
+            executor.submitTask(() -> {
+                try { Thread.sleep(3000); } catch (InterruptedException ex) { Thread.currentThread().interrupt(); }
+                startGrid();
+            });
+        }
+    }
+
+    /**
+     * 取消最远的多仓止损订单。
+     * 多仓止损在 gridId 负方向,最远 = id 最小。
+     */
+    private void cancelFarthestLongStopLoss() {
+        GridElement farthest = null;
+        for (GridElement e : config.getGridElements()) {
+            if (e.getLongStopLossOrderId() != null) {
+                if (farthest == null || e.getId() < farthest.getId()) {
+                    farthest = e;
+                }
+            }
+        }
+        if (farthest != null) {
+            String slId = farthest.getLongStopLossOrderId();
+            farthest.setLongStopLossOrderId(null);
+            GridElement.refreshIndices();
+            GridElement finalFarthest = farthest;
+            executor.cancelConditionalOrder(slId, oid ->
+                    log.info("[Gate] 止盈触发, 取消最远多仓止损 gridId:{}, orderId:{}", finalFarthest.getId(), slId));
+        }
+    }
+
+    /**
+     * 取消最远的空仓止损订单。
+     * 空仓止损在 gridId 正方向,最远 = id 最大。
+     */
+    private void cancelFarthestShortStopLoss() {
+        GridElement farthest = null;
+        for (GridElement e : config.getGridElements()) {
+            if (e.getShortStopLossOrderId() != null) {
+                if (farthest == null || e.getId() > farthest.getId()) {
+                    farthest = e;
+                }
+            }
+        }
+        if (farthest != null) {
+            String slId = farthest.getShortStopLossOrderId();
+            farthest.setShortStopLossOrderId(null);
+            GridElement.refreshIndices();
+            GridElement finalFarthest = farthest;
+            executor.cancelConditionalOrder(slId, oid ->
+                    log.info("[Gate] 止盈触发, 取消最远空仓止损 gridId:{}, orderId:{}", finalFarthest.getId(), slId));
+        }
+    }
+
+    /**
+     * 取消所有多仓止盈 + 多仓止损订单(加仓后重建前清场)。
+     */
+    private void cancelAllLongTakeProfitsAndStopLosses() {
+        for (GridElement e : config.getGridElements()) {
+            String tpId = e.getLongTakeProfitOrderId();
+            if (tpId != null) {
+                e.setLongTakeProfitOrderId(null);
+                executor.cancelConditionalOrder(tpId, oid -> {});
+            }
+            String slId = e.getLongStopLossOrderId();
+            if (slId != null) {
+                e.setLongStopLossOrderId(null);
+                executor.cancelConditionalOrder(slId, oid -> {});
+            }
+        }
+        GridElement.refreshIndices();
+        log.info("[Gate] 已提交取消所有多仓止盈+止损");
+    }
+
+    /**
+     * 取消所有空仓止盈 + 空仓止损订单(加仓后重建前清场)。
+     */
+    private void cancelAllShortTakeProfitsAndStopLosses() {
+        for (GridElement e : config.getGridElements()) {
+            String tpId = e.getShortTakeProfitOrderId();
+            if (tpId != null) {
+                e.setShortTakeProfitOrderId(null);
+                executor.cancelConditionalOrder(tpId, oid -> {});
+            }
+            String slId = e.getShortStopLossOrderId();
+            if (slId != null) {
+                e.setShortStopLossOrderId(null);
+                executor.cancelConditionalOrder(slId, oid -> {});
+            }
+        }
+        GridElement.refreshIndices();
+        log.info("[Gate] 已提交取消所有空仓止盈+止损");
+    }
+
+    // ========== 止损追单 ==========
+
+    private void extendLongStopLoss(int filledQty,int gridId) {
+        int furthestSlId = 0;
+        for (GridElement e : config.getGridElements()) {
+            if (e.getLongStopLossOrderId() != null && e.getId() < furthestSlId) {
+                furthestSlId = e.getId();
+            }
+        }
+
+        int interval  = 1;
+        if (furthestSlId == 0) {
+            furthestSlId = gridId;
+            interval = 2;
+        }
+        int stopLossCount = filledQty / Integer.parseInt(config.getQuantity());
+        log.info("[Gate] 多仓追挂止损, 当前最远止损gridId:{}, 成交{}张, 追加{}个止损单", furthestSlId, filledQty, stopLossCount);
+        for (int i = 0; i < stopLossCount; i++) {
+            int newSlId = furthestSlId - i - interval;
+            GridElement elem = GridElement.findById(newSlId);
+            if (elem == null) {
+                continue;
+            }
+            BigDecimal triggerPrice = elem.getGridPrice();
+            int finalSlId = newSlId;
+            executor.placeTakeProfit(
+                    triggerPrice,
+                    FuturesPriceTrigger.RuleEnum.NUMBER_2,
+                    ORDER_TYPE_CLOSE_LONG,
+                    negate(config.getQuantity()),
+                    profitId -> {
+                        elem.setLongStopLossOrderId(profitId);
+                        GridElement.refreshIndices();
+                        log.info("[Gate] 多仓止损追加, gridId:{}, 触发价:{}, stopLossId:{}", finalSlId, triggerPrice, profitId);
+                    }
+            );
+        }
+    }
+
+    private void extendShortStopLoss(int filledQty, int gridId) {
+        int furthestSlId = 0;
+        for (GridElement e : config.getGridElements()) {
+            if (e.getShortStopLossOrderId() != null && e.getId() > furthestSlId) {
+                furthestSlId = e.getId();
+            }
+        }
+
+        int interval  = 1;
+        if (furthestSlId == 0) {
+            furthestSlId = gridId;
+            interval = 2;
+        }
+        int stopLossCount = filledQty / Integer.parseInt(config.getQuantity());
+        log.info("[Gate] 空仓追挂止损, 当前最远止损gridId:{}, 成交{}张, 追加{}个止损单", furthestSlId, filledQty, stopLossCount);
+        for (int i = 0; i < stopLossCount; i++) {
+            int newSlId = furthestSlId + i + interval;
+            GridElement elem = GridElement.findById(newSlId);
+            if (elem == null) {
+                continue;
+            }
+            BigDecimal triggerPrice = elem.getGridPrice();
+            int finalSlId = newSlId;
+            executor.placeTakeProfit(
+                    triggerPrice,
+                    FuturesPriceTrigger.RuleEnum.NUMBER_1,
+                    ORDER_TYPE_CLOSE_SHORT,
+                    config.getQuantity(),
+                    profitId -> {
+                        elem.setShortStopLossOrderId(profitId);
+                        GridElement.refreshIndices();
+                        log.info("[Gate] 空仓止损追加, gridId:{}, 触发价:{}, stopLossId:{}", finalSlId, triggerPrice, profitId);
+                    }
+            );
         }
     }
 
@@ -1529,4 +1606,6 @@
     public Long getUserId() { return userId; }
     /** @return 当前策略状态 */
     public StrategyState getState() { return state; }
+    /** 注入WS客户端,用于订阅状态检查 */
+    public void setWsClient(GateKlineWebSocketClient wsClient) { this.wsClient = wsClient; }
 }

--
Gitblit v1.9.1