From f99dee2edbbc0cc1c8003b7a32e5a52759dec098 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Sat, 11 Jul 2026 14:46:30 +0800
Subject: [PATCH] 初始化开仓撤销挂止盈单

---
 src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java |   76 +++++++++++++++++++-------------------
 1 files changed, 38 insertions(+), 38 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 5f2b380..4ae1acd 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -599,7 +599,7 @@
         if (longTpElem != null && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")) {
             longTakeProfitTraderIdParam(longTpElem, null, false);
             log.info("[Gate] 多仓止盈触发 gridId:{}, orderId:{}", longTpElem.getId(), orderId);
-//            cancelFarthestLongStopLoss();
+            cancelFarthestLongStopLoss();
 //            checkLastTakeProfitAndRestart();
             return;
         }
@@ -608,7 +608,7 @@
         if (shortTpElem != null && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")) {
             shortTakeProfitTraderIdParam(shortTpElem, null, false);
             log.info("[Gate] 空仓止盈触发 gridId:{}, orderId:{}", shortTpElem.getId(), orderId);
-//            cancelFarthestShortStopLoss();
+            cancelFarthestShortStopLoss();
 //            checkLastTakeProfitAndRestart();
             return;
         }
@@ -877,42 +877,42 @@
             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);
-                    }
-            );
+//            // 空仓止损对应的多仓止盈:多仓止盈挂在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);

--
Gitblit v1.9.1