From 45a8cb4931ee06e92917bbdf4b5915cf3d01acf6 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 07 Jul 2026 10:20:28 +0800
Subject: [PATCH] feat(gateApi): 网格初始化的止盈单

---
 src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java |  229 ++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 161 insertions(+), 68 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 874e60d..137d05e 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -394,31 +394,32 @@
 
         checkProfitAndReset();
 
-        if (state == StrategyState.ACTIVE &&
-                longActive == false &&
-                    longPositionSize.compareTo(BigDecimal.ZERO) == 0){
-            processShortGrid(closePrice);
-        }
-
-
-        if (state == StrategyState.ACTIVE &&
-                shortActive == false &&
-                        shortPositionSize.compareTo(BigDecimal.ZERO) == 0){
-            processLongGrid(closePrice);
-        }
+//        if (state == StrategyState.ACTIVE &&
+//                longActive == false &&
+//                    longPositionSize.compareTo(BigDecimal.ZERO) == 0){
+//            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() {
+        if (state == StrategyState.STOPPED || state == StrategyState.WAITING_KLINE) {
+            return;
+        }
         try {
 
             BigDecimal target = initialPrincipal.add(config.getExpectedProfit());
 
             FuturesAccount account = futuresApi.listFuturesAccounts(SETTLE);
-            BigDecimal totalEquity = new BigDecimal(account.getTotal());
-            //加一个日志
-            log.info("[Gate] 当前权益: {} USDT,目标:{} USDT", totalEquity, target);
+            BigDecimal totalEquity = new BigDecimal(account.getTotal()).add(new BigDecimal(account.getUnrealisedPnl()));
 
             if (totalEquity.compareTo(target) > 0) {
                 log.info("[Gate] 盈亏达标(净权益{}>目标{}),重置策略", totalEquity, target);
@@ -632,7 +633,6 @@
                 // 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);
 
                 // 空仓持仓超过baseQuantity时,先找多仓第一个止损位置,从该位置向下挂止盈(间隔=1)
@@ -691,7 +691,6 @@
                 // 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);
 
                 // 多仓持仓超过baseQuantity时,先找空仓第一个止损位置,从该位置向上挂止盈(间隔=1)
@@ -817,6 +816,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.getQuantity();
+            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.getQuantity();
+            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) {
@@ -877,6 +913,7 @@
             }
 
 
+
             int longTime = Integer.parseInt(config.getBaseQuantity()) / Integer.parseInt(config.getQuantity()) + 1;
             for (int id = -2; id >= -longTime; id--) {
                 GridElement elem = GridElement.findById(id);
@@ -899,7 +936,7 @@
                 );
             }
 
-            log.info("[Gate] 止损单已全部挂完, 空仓止损: 2~{}, 多仓止损: -2~-{}", shortTime, longTime);
+            log.info("[Gate] 止损止盈单已全部挂完, 空仓止损:2~{}, 多仓止损:-2~-{}", shortTime, longTime);
 
             state = StrategyState.ACTIVE;
         }
@@ -1218,8 +1255,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);
@@ -1236,7 +1274,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;
@@ -1252,8 +1296,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);
@@ -1293,8 +1337,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);
@@ -1311,7 +1356,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;
@@ -1327,8 +1378,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));
@@ -1564,28 +1615,49 @@
             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 stopLossCount = filledQty;
+        log.info("[Gate] 多仓追挂止损, 当前最远止损gridId:{}, 成交{}张, 追加{}张止损单", furthestSlId, filledQty, stopLossCount);
+        int newSlId = furthestSlId - interval;
+        GridElement elem = GridElement.findById(newSlId);
+        if (elem == null) {
+            return;
         }
+        BigDecimal triggerPrice = elem.getGridPrice();
+        int finalSlId = newSlId;
+        executor.placeTakeProfit(
+                triggerPrice,
+                FuturesPriceTrigger.RuleEnum.NUMBER_2,
+                ORDER_TYPE_CLOSE_LONG,
+                negate(String.valueOf(stopLossCount)),
+                profitId -> {
+                    elem.setLongStopLossOrderId(profitId);
+                    GridElement.refreshIndices();
+                    log.info("[Gate] 多仓止损追加, gridId:{}, 触发价:{}, stopLossId:{}", finalSlId, triggerPrice, profitId);
+                }
+        );
+
+//        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) {
@@ -1601,28 +1673,49 @@
             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 stopLossCount = filledQty ;
+        log.info("[Gate] 空仓追挂止损, 当前最远止损gridId:{}, 成交{}张, 追加{}张止损单", furthestSlId, filledQty, stopLossCount);
+        int newSlId = furthestSlId + interval;
+        GridElement elem = GridElement.findById(newSlId);
+        if (elem == null) {
+            return;
         }
+        BigDecimal triggerPrice = elem.getGridPrice();
+        int finalSlId = newSlId;
+        executor.placeTakeProfit(
+                triggerPrice,
+                FuturesPriceTrigger.RuleEnum.NUMBER_1,
+                ORDER_TYPE_CLOSE_SHORT,
+                String.valueOf(stopLossCount),
+                profitId -> {
+                    elem.setShortStopLossOrderId(profitId);
+                    GridElement.refreshIndices();
+                    log.info("[Gate] 空仓止损追加, gridId:{}, 触发价:{}, stopLossId:{}", finalSlId, triggerPrice, profitId);
+                }
+        );
+
+//        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);
+//                    }
+//            );
+//        }
     }
 
     // ---- 工具 ----

--
Gitblit v1.9.1