From 66ef3e024dcce9c01ded34fe4a49699400576acc Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 10 Jun 2026 13:59:16 +0800
Subject: [PATCH] refactor(gateApi): 调整订单取消逻辑执行顺序

---
 src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java |    7 ++-----
 1 files changed, 2 insertions(+), 5 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 0e9aaaa..6617f37 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -873,11 +873,8 @@
 
                     GridElement cancelGridElement = GridElement.findById(newEntryGrid.getUpId());
                     if (cancelGridElement != null && cancelGridElement.isHasLongOrder()) {
-                        /**
-                         * 看是否有多仓挂单,有就取消
-                         */
+                        longEntryTraderIdParam(cancelGridElement, null, false);
                         executor.cancelConditionalOrder(cancelGridElement.getLongOrderId(), oid -> {
-                            longEntryTraderIdParam(cancelGridElement, null, false);
                             log.info("[Gate] 多仓仓位归零, 取消gridId:{}的多单", cancelGridElement);
                         });
                     }
@@ -925,8 +922,8 @@
                      * 看是否有空仓挂单,有就取消
                      */
                     if (cancelGridElement != null && cancelGridElement.isHasShortOrder()) {
+                        shortEntryTraderIdParam(cancelGridElement, null, false);
                         executor.cancelConditionalOrder(cancelGridElement.getShortOrderId(), oid -> {
-                            shortEntryTraderIdParam(cancelGridElement, null, false);
                             log.info("[Gate] 空仓仓位归零, 取消gridId:{}的多单", cancelGridElement);
                         });
                     }

--
Gitblit v1.9.1