From 0017064558c515665645c3da68e073ec4a4c7ddf Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 28 May 2026 16:56:22 +0800
Subject: [PATCH] feat(gateApi): 添加保证金比例限制和网格队列容量配置选项

---
 src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java |  569 +++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 354 insertions(+), 215 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 02c2304..b3a4ea7 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;
@@ -14,7 +16,6 @@
 import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -342,6 +343,16 @@
         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;
         }
 
@@ -417,22 +428,8 @@
                     tryGenerateQueues();
                 }else {
                     longPositionSize = size;
-                    //取消多仓位线以上的开空仓挂单
-                    List<GridElement> allShortOrders = GridElement.findAllShortOrders(longEntryPrice);
-                    if (CollUtil.isNotEmpty(allShortOrders)){
-                        for (GridElement e : allShortOrders) {
-                            executor.cancelOrder(
-                                    e.getShortOrderId(),
-                                    orderId -> {
-                                        shortEntryTraderIdParam(
-                                                e,
-                                                null,
-                                                false
-                                        );
-                                    }
-                            );
-                        }
-                    }
+                    checkShortEntryOrderToCancel();
+                    checkLongEntryOrderToCancel();
                 }
             } else {
                 longActive = false;
@@ -450,26 +447,85 @@
                     tryGenerateQueues();
                 }else {
                     shortPositionSize = size.abs();
-                    //取消空仓仓位线以下的开多仓挂单
-                    List<GridElement> allLongOrders = GridElement.findAllLongOrders(shortEntryPrice);
-                    if (CollUtil.isNotEmpty(allLongOrders)){
-                        for (GridElement e : allLongOrders) {
-                            executor.cancelOrder(
-                                    e.getLongOrderId(),
-                                    orderId -> {
-                                        shortEntryTraderIdParam(
-                                                e,
-                                                null,
-                                                false
-                                        );
-                                    }
-                            );
-                        }
-                    }
+                    checkShortEntryOrderToCancel();
+                    checkLongEntryOrderToCancel();
                 }
             } else {
                 shortActive = false;
                 shortPositionSize = BigDecimal.ZERO;
+            }
+        }
+    }
+
+    private void checkShortEntryOrderToCancel() {
+        List<GridElement> allLongOrders = GridElement.findAllShortOrders(shortEntryPrice);
+        if (CollUtil.isNotEmpty(allLongOrders)){
+            GridElement keep = allLongOrders.stream()
+                    .min((a, b) -> a.getGridPrice().compareTo(b.getGridPrice()))
+                    .orElse(null);
+            for (GridElement e : allLongOrders) {
+                if (e == keep) {
+                    continue;
+                }
+                executor.cancelConditionalOrder(
+                        e.getShortOrderId(),
+                        orderId -> {
+                            shortEntryTraderIdParam(
+                                    e,
+                                    null,
+                                    false
+                            );
+                        }
+                );
+                if (e.getShortTakeProfitOrderId() != null){
+                    executor.cancelConditionalOrder(
+                            e.getShortTakeProfitOrderId(),
+                            orderId -> {
+                                shortTakeProfitTraderIdParam(
+                                        e,
+                                        null,
+                                        false
+                                );
+                            }
+                    );
+                }
+            }
+        }
+    }
+
+    private void checkLongEntryOrderToCancel() {
+        List<GridElement> allShortOrders = GridElement.findAllLongOrders(longEntryPrice);
+        if (CollUtil.isNotEmpty(allShortOrders)){
+            GridElement keep = allShortOrders.stream()
+                    .max((a, b) -> a.getGridPrice().compareTo(b.getGridPrice()))
+                    .orElse(null);
+            for (GridElement e : allShortOrders) {
+                if (e == keep) {
+                    continue;
+                }
+                executor.cancelConditionalOrder(
+                        e.getLongOrderId(),
+                        orderId -> {
+                            longEntryTraderIdParam(
+                                    e,
+                                    null,
+                                    false
+                            );
+                        }
+                );
+
+                if (e.getLongTakeProfitOrderId() != null){
+                    executor.cancelConditionalOrder(
+                            e.getLongTakeProfitOrderId(),
+                            orderId -> {
+                                longTakeProfitTraderIdParam(
+                                        e,
+                                        null,
+                                        false
+                                );
+                            }
+                    );
+                }
             }
         }
     }
@@ -492,14 +548,23 @@
             return;
         }
         cumulativePnl = cumulativePnl.add(pnl);
-        log.info("[Gate] 盈亏累加:{}, 方向:{}, 累计:{}", pnl, side, cumulativePnl);
+        updateUnrealizedPnl();
+        BigDecimal totalPnl = cumulativePnl.add(unrealizedPnl);
+        log.info("[Gate] 已实现:{}, 未实现:{}, 合计:{}",
+                cumulativePnl, unrealizedPnl, totalPnl);
 
-        if (cumulativePnl.compareTo(config.getOverallTp()) >= 0) {
-            log.info("[Gate] 已达止盈目标 {}→已停止", cumulativePnl);
+        if (totalPnl.compareTo(config.getOverallTp()) >= 0) {
+            log.info("[Gate] 已达止盈目标(合计{})→已停止, 已实现:{}, 未实现:{}",
+                    totalPnl, cumulativePnl, unrealizedPnl);
             state = StrategyState.STOPPED;
-        } else if (cumulativePnl.compareTo(config.getMaxLoss().negate()) <= 0) {
-            log.info("[Gate] 已达亏损上限 {}→已停止", cumulativePnl);
-            state = StrategyState.STOPPED;
+        } else if (totalPnl.compareTo(config.getMaxLoss().negate()) <= 0) {
+            String logMessage = StrUtil.format("[Gate] 已达亏损风险值(合计{}), 已实现:{}, 未实现:{}",
+                    totalPnl, cumulativePnl, unrealizedPnl);
+            log.info(logMessage);
+
+
+            DingTalkUtils.getDefault().sendActionCard("风险提醒", logMessage, config.getApiKey(), "");
+//            state = StrategyState.STOPPED;
         }
     }
 
@@ -532,11 +597,11 @@
                     null,
                     false
             );
-            longEntryTraderIdParam(
-                    byLongTakeProfitOrderId,
-                    null,
-                    false
-            );
+//            longEntryTraderIdParam(
+//                    byLongTakeProfitOrderId,
+//                    null,
+//                    false
+//            );
         }
         GridElement byShortTakeProfitOrderId = GridElement.findByShortTakeProfitOrderId(orderId);
         if (byShortTakeProfitOrderId != null){
@@ -545,11 +610,11 @@
                     null,
                     false
             );
-            shortEntryTraderIdParam(
-                    byShortTakeProfitOrderId,
-                    null,
-                    false
-            );
+//            shortEntryTraderIdParam(
+//                    byShortTakeProfitOrderId,
+//                    null,
+//                    false
+//            );
         }
 
         /**
@@ -558,6 +623,11 @@
         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) {
@@ -581,6 +651,11 @@
         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) {
@@ -631,7 +706,7 @@
      * @param reason    变更原因
      * @param orderType 订单类型(plan-close-long-position 等)
      */
-    public void onAutoOrder(String orderId, String status, String reason, String orderType) {
+    public void onAutoOrder(String orderId, String status, String reason, String orderType, String tradeId) {
         if (state == StrategyState.STOPPED) {
             return;
         }
@@ -644,19 +719,6 @@
         /**
          * 匹配止盈单止盈
          */
-        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(
@@ -669,37 +731,32 @@
                     null,
                     false
             );
+            TPonUserTradeShortEntry(byShortTakeProfitOrderId);
+        }
+        GridElement byLongTakeProfitOrderId = GridElement.findByLongTakeProfitOrderId(orderId);
+        if (byLongTakeProfitOrderId != null){
+            longTakeProfitTraderIdParam(
+                    byLongTakeProfitOrderId,
+                    null,
+                    false
+            );
+            longEntryTraderIdParam(
+                    byLongTakeProfitOrderId,
+                    null,
+                    false
+            );
+            TPonUserTradeLongEntry(byLongTakeProfitOrderId);
         }
 
         /**
          * 匹配挂单
          */
-        GridElement longGridElement = GridElement.findByLongOrderId(orderId);
-        if (longGridElement != null) {
-            if (longGridElement.isHasLongOrder()){
-                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()){
+            if (shortGridElement.isHasShortOrder() && !tradeId.equals("0")){
+
+                onUserTradeShortEntry(shortGridElement);
                 if (shortGridElement.getShortTakeProfitOrderId() == null){
                     BigDecimal shortTp = shortGridElement.getShortTraderParam().getTakeProfitPrice();
                     if (shortTp != null) {
@@ -716,6 +773,121 @@
                                 });
                         log.info("[Gate] 空单成交匹配止盈, orderId:{}, 止盈价:{}, size:{}", orderId, shortTp, config.getQuantity());
                     }
+                }
+            }
+        }
+        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()));
+                    }
+                }
+            }
+        }
+    }
+
+    private void TPonUserTradeShortEntry(GridElement gridElement) {
+        if (!isMarginSafe()) {
+            log.warn("[Gate] 保证金超限,跳过挂条件单");
+        } else {
+            // 判断网格是否能开多仓,如果不能则跳过
+            GridElement upGridElement = GridElement.findById(gridElement.getUpId());
+            if (upGridElement != null){
+                BigDecimal upGridPrice = upGridElement.getGridPrice();
+                TraderParam upLongTraderParam = upGridElement.getLongTraderParam();
+                if (
+                        !upGridElement.isHasLongOrder() &&
+                                upGridPrice.compareTo(longEntryPrice) <= 0
+                ){
+                    placeEntryOrderWithPreFlag(upGridElement, true,
+                            upLongTraderParam.getEntryPrice(),
+                            FuturesPriceTrigger.RuleEnum.NUMBER_1,
+                            upLongTraderParam.getQuantity());
+                }
+            }
+        }
+    }
+
+    private void TPonUserTradeLongEntry(GridElement gridElement) {
+        if (!isMarginSafe()) {
+            log.warn("[Gate] 保证金超限,跳过挂条件单");
+        } else {
+            // 判断网格是否能开空仓,如果不能则跳过
+            GridElement downGridElement = GridElement.findById(gridElement.getDownId());
+            if (downGridElement != null){
+
+                BigDecimal downGridPrice = downGridElement.getGridPrice();
+
+                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 onUserTradeShortEntry(GridElement gridElement) {
+        if (!isMarginSafe()) {
+            log.warn("[Gate] 保证金超限,跳过挂条件单");
+        } else {
+            //下一个开仓位置
+            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()));
+                }
+            }
+        }
+    }
+
+    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());
                 }
             }
         }
@@ -794,33 +966,17 @@
             Integer upId = baseGridElement.getUpId();
             GridElement upGridElementOne = GridElement.findById(upId);
             BigDecimal longTp = upGridElementOne.getGridPrice();
-            executor.placeConditionalEntryOrder(
+            placeEntryOrderWithPreFlag(upGridElementOne, true,
                     longTp,
                     FuturesPriceTrigger.RuleEnum.NUMBER_1,
-                    config.getQuantity(),
-                    orderId -> {
-                        longEntryTraderIdParam(
-                                upGridElementOne,
-                                orderId,
-                                true
-                        );
-                    },
-                    null);
+                    config.getQuantity());
             Integer downId = baseGridElement.getDownId();
             GridElement downGridElementOne = GridElement.findById(downId);
             BigDecimal shortTp = downGridElementOne.getGridPrice();
-            executor.placeConditionalEntryOrder(
+            placeEntryOrderWithPreFlag(downGridElementOne, false,
                     shortTp,
                     FuturesPriceTrigger.RuleEnum.NUMBER_2,
-                    negate(config.getQuantity()),
-                    orderId -> {
-                        shortEntryTraderIdParam(
-                                downGridElementOne,
-                                orderId,
-                                true
-                        );
-                    },
-                    null);
+                    negate(config.getQuantity()));
 
             state = StrategyState.ACTIVE;
         }
@@ -931,8 +1087,9 @@
         int longSize = longPriceQueue.size();
         //根据精度转换成小数
         int prec = config.getPriceScale();
-        BigDecimal minTick = BigDecimal.ONE.scaleByPowerOfTen(-prec);
-        BigDecimal step = config.getStep().subtract(minTick);
+//        BigDecimal minTick = BigDecimal.ONE.scaleByPowerOfTen(-prec);
+//        BigDecimal step = config.getStep().subtract(minTick);
+        BigDecimal step = config.getStep();
         String qty = config.getQuantity();
 
         // 空仓队列:id 从 -1 自减, shortPriceQueue[i] → id=-(i+1)
@@ -1079,73 +1236,42 @@
             // 判断网格是否能开空仓,如果不能则跳过
             if (UpGridElement != null) {
 
-                if (!UpGridElement.isHasShortOrder()) {
-
-                    //挂空仓条件单
-                    TraderParam upShortTraderParam = UpGridElement.getShortTraderParam();
-                    executor.placeConditionalEntryOrder(
-                            upShortTraderParam.getEntryPrice(),
-                            FuturesPriceTrigger.RuleEnum.NUMBER_2,
-                            negate(upShortTraderParam.getQuantity()),
-                            orderId ->
-                            {
-                                shortEntryTraderIdParam(
-                                        UpGridElement,
-                                        orderId,
-                                        true
-                                );
-                            },
-                            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
-                    ){
-                        executor.placeConditionalEntryOrder(
-                                downShortTraderParam.getEntryPrice(),
-                                FuturesPriceTrigger.RuleEnum.NUMBER_2,
-                                negate(downShortTraderParam.getQuantity()),
-                                orderId ->
-                                {
-                                    shortEntryTraderIdParam(
-                                            downGridElement,
-                                            orderId,
-                                            true
-                                    );
-                                },
-                                null
-                        );
-
-                    }
+//                    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
                     ){
-                        executor.placeConditionalEntryOrder(
+                        placeEntryOrderWithPreFlag(downGridElement, true,
                                 downLongTraderParam.getEntryPrice(),
-                                FuturesPriceTrigger.RuleEnum.NUMBER_2,
-                                downLongTraderParam.getQuantity(),
-                                orderId ->
-                                {
-                                    longEntryTraderIdParam(
-                                            downGridElement,
-                                            orderId,
-                                            true
-                                    );
-                                },
-                                null
-                        );
+                                FuturesPriceTrigger.RuleEnum.NUMBER_1,
+                                downLongTraderParam.getQuantity());
                     }
                 }
             }
@@ -1216,24 +1342,13 @@
             // 判断网格是否能开多仓,如果不能则跳过
             if (UpGridElement != null) {
 
-                if (!UpGridElement.isHasLongOrder()) {
-                    //挂多仓条件单
-                    TraderParam upLongTraderParam = UpGridElement.getLongTraderParam();
-                    executor.placeConditionalEntryOrder(
-                            upLongTraderParam.getEntryPrice(),
-                            FuturesPriceTrigger.RuleEnum.NUMBER_1,
-                            config.getQuantity(),
-                            orderId ->
-                            {
-                                longEntryTraderIdParam(
-                                        UpGridElement,
-                                        orderId,
-                                        true
-                                );
-                            },
-                            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 = UpGridElement.getId() - 2;
                 GridElement downGridElement = GridElement.findById(i);
@@ -1241,28 +1356,18 @@
 
                     BigDecimal downGridPrice = downGridElement.getGridPrice();
 
-                    TraderParam downLongTraderParam = downGridElement.getLongTraderParam();
-                    if (
-                            !downGridElement.isHasLongOrder() &&
-                                    downGridPrice.compareTo(shortEntryPrice) >= 0 &&
-                                    downGridPrice.compareTo(longEntryPrice) <= 0
-                    ){
-                        executor.placeConditionalEntryOrder(
-                                downLongTraderParam.getEntryPrice(),
-                                FuturesPriceTrigger.RuleEnum.NUMBER_2,
-                                config.getQuantity(),
-                                orderId ->
-                                {
-                                    longEntryTraderIdParam(
-                                            downGridElement,
-                                            orderId,
-                                            true
-                                    );
-                                },
-                                null
-                        );
-
-                    }
+//                    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 (
@@ -1270,20 +1375,10 @@
                                     downGridPrice.compareTo(shortEntryPrice) >= 0
                     ){
 
-                        executor.placeConditionalEntryOrder(
+                        placeEntryOrderWithPreFlag(downGridElement, false,
                                 shortTraderParam.getEntryPrice(),
                                 FuturesPriceTrigger.RuleEnum.NUMBER_2,
-                                negate(config.getQuantity()),
-                                orderId ->
-                                {
-                                    shortEntryTraderIdParam(
-                                            downGridElement,
-                                            orderId,
-                                            true
-                                    );
-                                },
-                                null
-                        );
+                                negate(config.getQuantity()));
                     }
                 }
             }
@@ -1326,6 +1421,50 @@
     }
 
     /**
+     * 预设标志位后提交条件开仓单,防止异步回调导致的竞态重复挂单。
+     *
+     * <p>在调用 {@link GateTradeExecutor#placeConditionalEntryOrder} 之前同步设置
+     * {@code isHasLongOrder / isHasShortOrder},关闭 WS 线程与 Executor 线程之间的
+     * 检查-下单时间窗口。API 失败时自动回滚标志位。
+     *
+     * @param gridElement 目标网格元素
+     * @param isLong      true=多仓下单,false=空仓下单
+     * @param triggerPrice 触发价
+     * @param rule        触发规则
+     * @param size        开仓张数
+     */
+    private void placeEntryOrderWithPreFlag(GridElement gridElement, boolean isLong,
+                                             BigDecimal triggerPrice,
+                                             FuturesPriceTrigger.RuleEnum rule,
+                                             String size) {
+        if (isLong) {
+            gridElement.setHasLongOrder(true);
+        } else {
+            gridElement.setHasShortOrder(true);
+        }
+        executor.placeConditionalEntryOrder(triggerPrice, rule, size,
+                orderId -> {
+                    if (isLong) {
+                        longEntryTraderIdParam(gridElement, orderId, true);
+                    } else {
+                        shortEntryTraderIdParam(gridElement, orderId, true);
+                    }
+                },
+                () -> {
+                    if (isLong) {
+                        gridElement.setHasLongOrder(false);
+                        gridElement.setLongOrderId(null);
+                    } else {
+                        gridElement.setHasShortOrder(false);
+                        gridElement.setShortOrderId(null);
+                    }
+                    GridElement.refreshIndices();
+                    log.warn("[Gate] 条件单创建失败,回滚标志位 gridId:{}, isLong:{}", gridElement.getId(), isLong);
+                }
+        );
+    }
+
+    /**
      * 根据持仓和当前价格计算未实现盈亏。
      *
      * <h3>正向合约公式</h3>

--
Gitblit v1.9.1