From fe567e81a50a00beb1a26f70e69e923ecb3d6bb3 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 26 May 2026 10:25:16 +0800
Subject: [PATCH] fix(grid): 修复网格交易中多空订单查找逻辑错误

---
 src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 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 4e0776f..71dbafd 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -426,10 +426,15 @@
                     tryGenerateQueues();
                 }else {
                     longPositionSize = size;
-                    //取消多仓位线以上的开多仓挂单
-                    List<GridElement> allShortOrders = GridElement.findAllShortOrders(longEntryPrice);
+                    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 -> {
@@ -472,10 +477,15 @@
                     tryGenerateQueues();
                 }else {
                     shortPositionSize = size.abs();
-                    //取消空仓仓位线以下的开空仓挂单
-                    List<GridElement> allLongOrders = GridElement.findAllLongOrders(shortEntryPrice);
+                    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 -> {

--
Gitblit v1.9.1