From 5a9a6dedff749b410c62837f2a5c8900328cdb37 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 10 Jun 2026 16:46:06 +0800
Subject: [PATCH] fix(gateApi): 修复网格交易订单取消功能中的潜在空指针异常

---
 src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java |   10 ++++++----
 1 files changed, 6 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 b189632..40f09e0 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -878,9 +878,10 @@
 
                         GridElement cancelGridElement = GridElement.findById(newEntryGrid.getUpId());
                         if (cancelGridElement != null && cancelGridElement.isHasLongOrder()) {
+                            String longOrderId = cancelGridElement.getLongOrderId();
                             longEntryTraderIdParam(cancelGridElement, null, false);
-                            executor.cancelConditionalOrder(cancelGridElement.getLongOrderId(), oid -> {
-                                log.info("[Gate] 多仓仓位归零, 取消gridId:{}的多单", cancelGridElement.getId());
+                            executor.cancelConditionalOrder(longOrderId, oid -> {
+                                log.info("[Gate] 多仓仓位归零, 取消gridId:{}的多单,{}", cancelGridElement.getId(),longOrderId);
                             });
                         }
                     }
@@ -927,9 +928,10 @@
                          * 看是否有空仓挂单,有就取消
                          */
                         if (cancelGridElement != null && cancelGridElement.isHasShortOrder()) {
+                            String shortOrderId = cancelGridElement.getShortOrderId();
                             shortEntryTraderIdParam(cancelGridElement, null, false);
-                            executor.cancelConditionalOrder(cancelGridElement.getShortOrderId(), oid -> {
-                                log.info("[Gate] 空仓仓位归零, 取消gridId:{}的多单", cancelGridElement.getId());
+                            executor.cancelConditionalOrder(shortOrderId, oid -> {
+                                log.info("[Gate] 空仓仓位归零, 取消gridId:{}的多单{}", cancelGridElement.getId(),shortOrderId);
                             });
                         }
 

--
Gitblit v1.9.1