From bb4ead3dd4967741ce2b5444b7da9cfd1d3df272 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Sat, 11 Jul 2026 14:47:23 +0800
Subject: [PATCH] 挂单成交后,止盈单在成交网格往上每两个网格挂一个

---
 src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java |  431 ++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 342 insertions(+), 89 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 2f39c61..ffe25cc 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -138,6 +138,8 @@
     private volatile int accumulatedLongLossCount = 0;
     /** 空头累计止损张数(加仓订单成交后归零) */
     private volatile int accumulatedShortLossCount = 0;
+    /** 是否首次挂单成交(初始化后重置为 true,首次成交后置 false) */
+    private volatile boolean firstFillAfterInit = true;
 
     private volatile BigDecimal lastKlinePrice;
     private volatile BigDecimal markPrice = BigDecimal.ZERO;
@@ -307,6 +309,7 @@
         shortActive = false;
         accumulatedLongLossCount = 0;
         accumulatedShortLossCount = 0;
+        firstFillAfterInit = true;
         shortPriceQueue.clear();
         longPriceQueue.clear();
         totalShortPriceQueue.clear();
@@ -411,6 +414,9 @@
     /** Gate 永续合约 taker 费率 0.05% */
     private static final BigDecimal TAKER_FEE_RATE = new BigDecimal("0.0005");
     private void checkProfitAndReset() {
+        if (state == StrategyState.STOPPED || state == StrategyState.WAITING_KLINE) {
+            return;
+        }
         try {
 
             BigDecimal target = initialPrincipal.add(config.getExpectedProfit());
@@ -625,13 +631,41 @@
             if (shortGridElement.isHasShortOrder() && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0") ){
                 int filledQty = Integer.parseInt(shortGridElement.getShortTraderParam().getQuantity());
                 shortEntryTraderIdParam(shortGridElement, null, false);
+//                // 首次挂单成交,取消初始化阶段挂的所有止盈单
+//                if (firstFillAfterInit) {
+//                    cancelAllInitialTakeProfits();
+//                    firstFillAfterInit = false;
+//                }
                 // [Gate-需求2] 加仓后先撤空仓所有止盈+止损,再查交易所持仓后重挂
                 cancelAllShortTakeProfitsAndStopLosses();
                 // REST 查询可能因交易所延迟返回旧值,与 WS 本地缓存取最大值兜底
                 int posSize = Math.max(queryPositionSize(Position.ModeEnum.DUAL_SHORT), shortPositionSize.intValue());
                 extendShortStopLoss(posSize, shortGridElement.getId());
-                accumulatedShortLossCount = 0; // 加仓订单成交,重置止损累计
                 log.info("[Gate] 空单成交 gridId:{}, 当前持仓:{}张", filledQty, posSize);
+
+//                int tpGridId = 0;
+//                GridElement tpElem = GridElement.findById(tpGridId);
+//                // 已有止盈单先取消再重挂
+//                String existingShortTpId = tpElem.getShortTakeProfitOrderId();
+//                if (existingShortTpId != null) {
+//                    executor.cancelConditionalOrder(existingShortTpId, oid -> {
+//                        shortTakeProfitTraderIdParam(tpElem, null, false);
+//                        log.info("[Gate] 空仓止盈取消(gridId:{}),准备重挂", tpGridId);
+//                    });
+//                }
+//                BigDecimal tpPrice = tpElem.getGridPrice();
+//                int finalTpGridId = tpGridId;
+//                executor.placeTakeProfit(
+//                        tpPrice,
+//                        FuturesPriceTrigger.RuleEnum.NUMBER_2,
+//                        ORDER_TYPE_CLOSE_SHORT,
+//                        config.getQuantity(),
+//                        profitId -> {
+//                            shortTakeProfitTraderIdParam(tpElem, profitId, true);
+//                            log.info("[Gate] 空仓止盈挂单, gridId:{}, 触发价:{}, takeProfitId:{}",
+//                                    finalTpGridId, tpPrice, profitId);
+//                        }
+//                );
 
                 // 空仓持仓超过baseQuantity时,先找多仓第一个止损位置,从该位置向下挂止盈(间隔=1)
                 BigDecimal shortBaseQty = new BigDecimal(config.getBaseQuantity());
@@ -640,23 +674,18 @@
                     BigDecimal shortExcess = BigDecimal.valueOf(posSize).subtract(shortBaseQty);
                     int shortExcessCount = shortExcess.divide(shortGridQty, 0, RoundingMode.DOWN).intValue();
 
-                    // 找多仓第一个(最近的)止损位置
-                    int firstLongSlId = 0;
-                    for (GridElement e : config.getGridElements()) {
-                        if (e.getLongStopLossOrderId() != null) {
-                            if (firstLongSlId == 0 || e.getId() > firstLongSlId) {
-                                firstLongSlId = e.getId();
-                            }
-                        }
-                    }
+//                    // 找多仓第一个(最近的)止损位置
+//                    int firstLongSlId = 0;
+//                    for (GridElement e : config.getGridElements()) {
+//                        if (e.getLongStopLossOrderId() != null) {
+//                            if (firstLongSlId == 0 || e.getId() > firstLongSlId) {
+//                                firstLongSlId = e.getId();
+//                            }
+//                        }
+//                    }
 
                     for (int i = 0; i < shortExcessCount; i++) {
-                        int tpGridId;
-                        if (firstLongSlId != 0) {
-                            tpGridId = firstLongSlId - i; // 从多仓第一个止损位置开始,向下挂,间隔=1
-                        } else {
-                            tpGridId = shortGridElement.getId() - 2 * (i + 1); // 无多仓止损时回退原逻辑
-                        }
+                        int tpGridId = shortGridElement.getId() - 2 * (i + 1);
                         GridElement tpElem = GridElement.findById(tpGridId);
                         if (tpElem == null || tpElem.getShortTakeProfitOrderId() != null) {
                             continue;
@@ -684,13 +713,41 @@
 
                 int filledQty = Integer.parseInt(longGridElement.getLongTraderParam().getQuantity());
                 longEntryTraderIdParam(longGridElement, null, false);
+                // 首次挂单成交,取消初始化阶段挂的所有止盈单
+                if (firstFillAfterInit) {
+                    cancelAllInitialTakeProfits();
+                    firstFillAfterInit = false;
+                }
                 // [Gate-需求2] 加仓后先撤多仓所有止盈+止损,再查交易所持仓后重挂
                 cancelAllLongTakeProfitsAndStopLosses();
                 // REST 查询可能因交易所延迟返回旧值,与 WS 本地缓存取最大值兜底
                 int posSize = Math.max(queryPositionSize(Position.ModeEnum.DUAL_LONG), longPositionSize.intValue());
                 extendLongStopLoss(posSize, longGridElement.getId());
-                accumulatedLongLossCount = 0; // 加仓订单成交,重置止损累计
                 log.info("[Gate] 多单成交 gridId:{}, 当前持仓:{}张", filledQty, posSize);
+
+//                int tpGridId = 0;
+//                GridElement tpElem = GridElement.findById(tpGridId);
+//                // 已有止盈单先取消再重挂
+//                String existingLongTpId = tpElem.getLongTakeProfitOrderId();
+//                if (existingLongTpId != null) {
+//                    executor.cancelConditionalOrder(existingLongTpId, oid -> {
+//                        longTakeProfitTraderIdParam(tpElem, null, false);
+//                        log.info("[Gate] 多仓止盈取消(gridId:{}),准备重挂", tpGridId);
+//                    });
+//                }
+//                BigDecimal tpPrice = tpElem.getGridPrice();
+//                int finalTpGridId = tpGridId;
+//                executor.placeTakeProfit(
+//                        tpPrice,
+//                        FuturesPriceTrigger.RuleEnum.NUMBER_1,
+//                        ORDER_TYPE_CLOSE_LONG,
+//                        negate(config.getQuantity()),
+//                        profitId -> {
+//                            longTakeProfitTraderIdParam(tpElem, profitId, true);
+//                            log.info("[Gate] 多仓止盈挂单, gridId:{}, 触发价:{}, takeProfitId:{}",
+//                                    finalTpGridId, tpPrice, profitId);
+//                        }
+//                );
 
                 // 多仓持仓超过baseQuantity时,先找空仓第一个止损位置,从该位置向上挂止盈(间隔=1)
                 BigDecimal longBaseQty = new BigDecimal(config.getBaseQuantity());
@@ -699,23 +756,18 @@
                     BigDecimal longExcess = BigDecimal.valueOf(posSize).subtract(longBaseQty);
                     int longExcessCount = longExcess.divide(longGridQty, 0, RoundingMode.DOWN).intValue();
 
-                    // 找空仓第一个(最近的)止损位置
-                    int firstShortSlId = 0;
-                    for (GridElement e : config.getGridElements()) {
-                        if (e.getShortStopLossOrderId() != null) {
-                            if (firstShortSlId == 0 || e.getId() < firstShortSlId) {
-                                firstShortSlId = e.getId();
-                            }
-                        }
-                    }
+//                    // 找空仓第一个(最近的)止损位置
+//                    int firstShortSlId = 0;
+//                    for (GridElement e : config.getGridElements()) {
+//                        if (e.getShortStopLossOrderId() != null) {
+//                            if (firstShortSlId == 0 || e.getId() < firstShortSlId) {
+//                                firstShortSlId = e.getId();
+//                            }
+//                        }
+//                    }
 
                     for (int i = 0; i < longExcessCount; i++) {
-                        int tpGridId;
-                        if (firstShortSlId != 0) {
-                            tpGridId = firstShortSlId + i; // 从空仓第一个止损位置开始,向上挂,间隔=1
-                        } else {
-                            tpGridId = longGridElement.getId() + 2 * (i + 1); // 无空仓止损时回退原逻辑
-                        }
+                        int tpGridId = longGridElement.getId() + 2 * (i + 1);
                         GridElement tpElem = GridElement.findById(tpGridId);
                         if (tpElem == null || tpElem.getLongTakeProfitOrderId() != null) {
                             continue;
@@ -815,6 +867,43 @@
             baseGridElement.setShortOrderId(baseShortTraderParam.getEntryOrderId());
             baseGridElement.setHasShortOrder(true);
 
+//            // 空仓止损对应的多仓止盈:多仓止盈挂在ID=3
+//            int tpGridIdLong = 3;
+//            GridElement tpElemLong = GridElement.findById(tpGridIdLong);
+//            BigDecimal triggerPriceLong = tpElemLong.getGridPrice();
+//            String sizeLong = config.getBaseQuantity();
+//            executor.placeTakeProfit(
+//                    triggerPriceLong,
+//                    FuturesPriceTrigger.RuleEnum.NUMBER_1,
+//                    ORDER_TYPE_CLOSE_LONG,
+//                    negate(sizeLong),
+//                    profitId -> {
+//                        tpElemLong.setLongTakeProfitOrderId(profitId);
+//                        GridElement.refreshIndices();
+//                        log.info("[Gate] 多仓止盈已挂(gridId:{}多止盈), 触发价:{}, takeProfitId:{}",
+//                                tpGridIdLong, triggerPriceLong, profitId);
+//                    }
+//            );
+//
+//
+//            // 多仓止损对应的空仓止盈:空仓止盈挂在ID=-3
+//            int tpGridIdShort = -3;
+//            GridElement tpElemShort = GridElement.findById(tpGridIdShort);
+//            BigDecimal triggerPriceShort = tpElemShort.getGridPrice();
+//            String sizeShort = config.getBaseQuantity();
+//            executor.placeTakeProfit(
+//                    triggerPriceShort,
+//                    FuturesPriceTrigger.RuleEnum.NUMBER_2,
+//                    ORDER_TYPE_CLOSE_SHORT,
+//                    sizeShort,
+//                    profitId -> {
+//                        tpElemShort.setShortTakeProfitOrderId(profitId);
+//                        GridElement.refreshIndices();
+//                        log.info("[Gate] 空仓止盈已挂(gridId:{}空止盈), 触发价:{}, takeProfitId:{}",
+//                                tpGridIdShort, triggerPriceShort, profitId);
+//                    }
+//            );
+
 //            int shortTime = 2;
 //            GridElement elemShort = GridElement.findById(shortTime);
 //            if (elemShort != null) {
@@ -875,6 +964,7 @@
             }
 
 
+
             int longTime = Integer.parseInt(config.getBaseQuantity()) / Integer.parseInt(config.getQuantity()) + 1;
             for (int id = -2; id >= -longTime; id--) {
                 GridElement elem = GridElement.findById(id);
@@ -897,7 +987,7 @@
                 );
             }
 
-            log.info("[Gate] 止损单已全部挂完, 空仓止损: 2~{}, 多仓止损: -2~-{}", shortTime, longTime);
+            log.info("[Gate] 止损止盈单已全部挂完, 空仓止损:2~{}, 多仓止损:-2~-{}", shortTime, longTime);
 
             state = StrategyState.ACTIVE;
         }
@@ -1216,8 +1306,9 @@
     private void handleLongStopLossTriggered(GridElement gridElement) {
         gridElement.setLongStopLossOrderId(null);
 
+        accumulatedLongLossCount++;
         int gridId = gridElement.getId();
-        log.info("[Gate] 多仓止损触发 gridId:{}, 开始追单", gridId);
+        log.info("[Gate] 多仓止损触发 gridId:{}, 止损次数:{}, 开始追单", gridId, accumulatedLongLossCount);
         int newEntryGridId = gridId + 1;
 
         GridElement newEntryGrid = GridElement.findById(newEntryGridId);
@@ -1234,7 +1325,13 @@
             // 止损触发后持仓在减少,取REST和WS缓存中较小值更准确
             int posSize = Math.min(queryPositionSize(Position.ModeEnum.DUAL_LONG), longPositionSize.intValue());
             int maxPos = config.getMaxPositionSize();
-            int targetAmount = Integer.parseInt(config.getQuantity()) * 2; // quantity + 本次止损量
+            // 止损阶梯:止损次数≤阈值时挂单量=单笔数量,超过后恢复默认逻辑(quantity*2)
+            int targetAmount;
+            if (config.getStopLossCount() > 0 && accumulatedLongLossCount <= config.getStopLossCount()) {
+                targetAmount = Integer.parseInt(config.getQuantity());
+            } else {
+                targetAmount = Integer.parseInt(config.getQuantity()) * 2; // quantity + 本次止损量
+            }
             int addSize;
             if (maxPos > 0) {
                 int remainingRoom = maxPos - posSize;
@@ -1250,8 +1347,8 @@
             }
             if (addSize > 0) {
                 String size = String.valueOf(addSize);
-                log.info("[Gate] 多仓止损触发 gridId:{}, 在gridId:{}补{}张多单(当前{}/上限{})",
-                        gridId, newEntryGridId, size, posSize, maxPos > 0 ? maxPos : "无");
+                log.info("[Gate] 多仓止损触发 gridId:{}, 止损次数:{}, 在gridId:{}补{}张多单(当前{}/上限{})",
+                        gridId, accumulatedLongLossCount, newEntryGridId, size, posSize, maxPos > 0 ? maxPos : "无");
                 newEntryGrid.getLongTraderParam().setQuantity(size);
                 placeEntryOrderWithPreFlag(newEntryGrid, true, triggerPrice,
                         FuturesPriceTrigger.RuleEnum.NUMBER_1, size);
@@ -1291,8 +1388,9 @@
     private void handleShortStopLossTriggered(GridElement gridElement) {
         gridElement.setShortStopLossOrderId(null);
 
+        accumulatedShortLossCount++;
         int gridId = gridElement.getId();
-        log.info("[Gate] 空仓止损触发 gridId:{}, 开始追单", gridId);
+        log.info("[Gate] 空仓止损触发 gridId:{}, 止损次数:{}, 开始追单", gridId, accumulatedShortLossCount);
         int newEntryGridId = gridId - 1;
 
         GridElement newEntryGrid = GridElement.findById(newEntryGridId);
@@ -1309,7 +1407,13 @@
             // 止损触发后持仓在减少,取REST和WS缓存中较小值更准确
             int posSize = Math.min(queryPositionSize(Position.ModeEnum.DUAL_SHORT), shortPositionSize.intValue());
             int maxPos = config.getMaxPositionSize();
-            int targetAmount = Integer.parseInt(config.getQuantity()) * 2; // quantity + 本次止损量
+            // 止损阶梯:止损次数≤阈值时挂单量=单笔数量,超过后恢复默认逻辑(quantity*2)
+            int targetAmount;
+            if (config.getStopLossCount() > 0 && accumulatedShortLossCount <= config.getStopLossCount()) {
+                targetAmount = Integer.parseInt(config.getQuantity());
+            } else {
+                targetAmount = Integer.parseInt(config.getQuantity()) * 2; // quantity + 本次止损量
+            }
             int addSize;
             if (maxPos > 0) {
                 int remainingRoom = maxPos - posSize;
@@ -1325,8 +1429,8 @@
             }
             if (addSize > 0) {
                 String size = String.valueOf(addSize);
-                log.info("[Gate] 空仓止损触发 gridId:{}, 在gridId:{}补{}张空单(当前{}/上限{})",
-                        gridId, newEntryGridId, size, posSize, maxPos > 0 ? maxPos : "无");
+                log.info("[Gate] 空仓止损触发 gridId:{}, 止损次数:{}, 在gridId:{}补{}张空单(当前{}/上限{})",
+                        gridId, accumulatedShortLossCount, newEntryGridId, size, posSize, maxPos > 0 ? maxPos : "无");
                 newEntryGrid.getShortTraderParam().setQuantity(size);
                 placeEntryOrderWithPreFlag(newEntryGrid, false, triggerPrice,
                         FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(size));
@@ -1547,6 +1651,29 @@
         log.info("[Gate] 已提交取消所有空仓止盈+止损");
     }
 
+    /**
+     * 首次挂单成交时,取消初始化阶段挂的所有止盈单(多+空),止损单保留不动。
+     */
+    private void cancelAllInitialTakeProfits() {
+
+
+        GridElement tpElemLong = GridElement.findById(3);
+        String longTpId = tpElemLong.getLongTakeProfitOrderId();
+        if (longTpId != null) {
+            longTakeProfitTraderIdParam(tpElemLong, null, false);
+            executor.cancelConditionalOrder(longTpId, oid -> {});
+        }
+
+        GridElement tpElemShort = GridElement.findById(-3);
+        String shortTpId = tpElemShort.getShortTakeProfitOrderId();
+        if (shortTpId != null) {
+            shortTakeProfitTraderIdParam(tpElemShort, null, false);
+            executor.cancelConditionalOrder(shortTpId, oid -> {});
+        }
+        GridElement.refreshIndices();
+        log.info("[Gate] 首次成交,取消所有初始化止盈单");
+    }
+
     // ========== 止损追单 ==========
 
     private void extendLongStopLoss(int filledQty,int gridId) {
@@ -1557,33 +1684,96 @@
             }
         }
 
-        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;
+//        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);
+//                    }
+//            );
+//        }
+
+        int parseInt = Integer.parseInt(config.getQuantity());
+        int total = filledQty - parseInt;
+        if (total > parseInt) {
+            String firstNum = String.valueOf(total);
+            log.info("[Gate] 多仓追挂止损, 当前最远止损gridId:{}, 成交{}张, 追加{}个止损单", furthestSlId, filledQty, 2);
+            int newSlId = gridId - 2;
             GridElement elem = GridElement.findById(newSlId);
-            if (elem == null) {
-                continue;
+            if (elem != null) {
+                BigDecimal triggerPrice = elem.getGridPrice();
+                int finalSlId = newSlId;
+                executor.placeTakeProfit(
+                        triggerPrice,
+                        FuturesPriceTrigger.RuleEnum.NUMBER_2,
+                        ORDER_TYPE_CLOSE_LONG,
+                        negate(firstNum),
+                        profitId -> {
+                            elem.setLongStopLossOrderId(profitId);
+                            GridElement.refreshIndices();
+                            log.info("[Gate] 多仓止损追加, gridId:{}, 触发价:{}, 数量:{}, stopLossId:{}", finalSlId, triggerPrice, firstNum, profitId);
+                        }
+                );
             }
-            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);
-                    }
-            );
+            int newSecendSlId = gridId - 3;
+            GridElement elemSecend = GridElement.findById(newSecendSlId);
+            if (elemSecend != null) {
+                BigDecimal triggerPrice = elemSecend.getGridPrice();
+                int finalSlId = newSecendSlId;
+                executor.placeTakeProfit(
+                        triggerPrice,
+                        FuturesPriceTrigger.RuleEnum.NUMBER_2,
+                        ORDER_TYPE_CLOSE_LONG,
+                        negate(config.getQuantity()),
+                        profitId -> {
+                            elemSecend.setLongStopLossOrderId(profitId);
+                            GridElement.refreshIndices();
+                            log.info("[Gate] 多仓止损追加, gridId:{}, 触发价:{}, 数量:{}, stopLossId:{}", finalSlId, triggerPrice, config.getQuantity(), profitId);
+                        }
+                );
+            }
         }
+        if (total == parseInt){
+            String firstNum = config.getQuantity();
+            log.info("[Gate] 多仓追挂止损, 当前最远止损gridId:{}, 成交{}张, 追加{}个止损单", furthestSlId, filledQty, 1);
+            int newSlId = gridId - 2;
+            GridElement elem = GridElement.findById(newSlId);
+            if (elem != null) {
+                BigDecimal triggerPrice = elem.getGridPrice();
+                int finalSlId = newSlId;
+                executor.placeTakeProfit(
+                        triggerPrice,
+                        FuturesPriceTrigger.RuleEnum.NUMBER_2,
+                        ORDER_TYPE_CLOSE_LONG,
+                        negate(firstNum),
+                        profitId -> {
+                            elem.setLongStopLossOrderId(profitId);
+                            GridElement.refreshIndices();
+                            log.info("[Gate] 多仓止损追加, gridId:{}, 触发价:{}, 数量:{}, stopLossId:{}", finalSlId, triggerPrice, firstNum, profitId);
+                        }
+                );
+            }
+        }
+
     }
 
     private void extendShortStopLoss(int filledQty, int gridId) {
@@ -1594,33 +1784,96 @@
             }
         }
 
-        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;
+//        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);
+//                    }
+//            );
+//        }
+
+        int parseInt = Integer.parseInt(config.getQuantity());
+        int total = filledQty - parseInt;
+        if (total > parseInt) {
+            String firstNum = String.valueOf(total);
+            log.info("[Gate] 空仓追挂止损, 当前最远止损gridId:{}, 成交{}张, 追加{}个止损单", furthestSlId, filledQty, 2);
+            int newSlId = gridId + 2;
             GridElement elem = GridElement.findById(newSlId);
-            if (elem == null) {
-                continue;
+            if (elem != null) {
+                BigDecimal triggerPrice = elem.getGridPrice();
+                int finalSlId = newSlId;
+                executor.placeTakeProfit(
+                        triggerPrice,
+                        FuturesPriceTrigger.RuleEnum.NUMBER_1,
+                        ORDER_TYPE_CLOSE_SHORT,
+                        firstNum,
+                        profitId -> {
+                            elem.setShortStopLossOrderId(profitId);
+                            GridElement.refreshIndices();
+                            log.info("[Gate] 空仓止损追加, gridId:{}, 触发价:{}, 数量:{}, stopLossId:{}", finalSlId, triggerPrice, firstNum, profitId);
+                        }
+                );
             }
-            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);
-                    }
-            );
+            int newSecendSlId = gridId + 2;
+            GridElement elemSecend = GridElement.findById(newSecendSlId);
+            if (elemSecend != null) {
+                BigDecimal triggerPrice = elemSecend.getGridPrice();
+                int finalSlId = newSecendSlId;
+                executor.placeTakeProfit(
+                        triggerPrice,
+                        FuturesPriceTrigger.RuleEnum.NUMBER_1,
+                        ORDER_TYPE_CLOSE_SHORT,
+                        config.getQuantity(),
+                        profitId -> {
+                            elemSecend.setShortStopLossOrderId(profitId);
+                            GridElement.refreshIndices();
+                            log.info("[Gate] 空仓止损追加, gridId:{}, 触发价:{}, 数量:{}, stopLossId:{}", finalSlId, triggerPrice, config.getQuantity(), profitId);
+                        }
+                );
+            }
         }
+        if (total == parseInt) {
+            String firstNum = config.getQuantity();
+            log.info("[Gate] 空仓追挂止损, 当前最远止损gridId:{}, 成交{}张, 追加{}个止损单", furthestSlId, filledQty, 1);
+            int newSlId = gridId + 2;
+            GridElement elem = GridElement.findById(newSlId);
+            if (elem != null) {
+                BigDecimal triggerPrice = elem.getGridPrice();
+                int finalSlId = newSlId;
+                executor.placeTakeProfit(
+                        triggerPrice,
+                        FuturesPriceTrigger.RuleEnum.NUMBER_1,
+                        ORDER_TYPE_CLOSE_SHORT,
+                        firstNum,
+                        profitId -> {
+                            elem.setShortStopLossOrderId(profitId);
+                            GridElement.refreshIndices();
+                            log.info("[Gate] 空仓止损追加, gridId:{}, 触发价:{}, 数量:{}, stopLossId:{}", finalSlId, triggerPrice, firstNum, profitId);
+                        }
+                );
+            }
+        }
+
     }
 
     // ---- 工具 ----

--
Gitblit v1.9.1