From 54369374b32b0552df75c9bdb4083b2e29f73a6e Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 08 Jun 2026 13:07:56 +0800
Subject: [PATCH] fix(gateApi): 修复网格交易中的空指针异常
---
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 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 d7b7c84..3cf0737 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -1203,11 +1203,11 @@
Integer upId = matchedUpGridElement.getUpId();
GridElement newEntryGrid = GridElement.findById(upId);
- GridElement cancelGridElement = GridElement.findById(newEntryGrid.getUpId());
- if (cancelGridElement != null) {
+ if (newEntryGrid != null) {
+ GridElement cancelGridElement = GridElement.findById(newEntryGrid.getUpId());
- if (newEntryGrid != null) {
+ if (cancelGridElement != null) {
BigDecimal triggerPrice = newEntryGrid.getGridPrice();
String size = cancelGridElement.getLongTraderParam().getQuantity();
log.info("[Gate] 多仓仓位归零 gridId:{}, 挂{}基础张多单",
@@ -1216,19 +1216,18 @@
placeEntryOrderWithPreFlag(newEntryGrid, true, triggerPrice,
FuturesPriceTrigger.RuleEnum.NUMBER_1, size);
- }
- /**
- * 看是否有多仓挂单，有就取消
- */
- if (cancelGridElement != null && cancelGridElement.isHasLongOrder()) {
- executor.cancelConditionalOrder(cancelGridElement.getLongOrderId(), oid -> {
- longEntryTraderIdParam(cancelGridElement, null, false);
- log.info("[Gate] 多仓仓位归零, 取消gridId:{}的多单", cancelGridElement);
- });
+ /**
+ * 看是否有多仓挂单，有就取消
+ */
+ if (cancelGridElement != null && cancelGridElement.isHasLongOrder()) {
+ executor.cancelConditionalOrder(cancelGridElement.getLongOrderId(), oid -> {
+ longEntryTraderIdParam(cancelGridElement, null, false);
+ log.info("[Gate] 多仓仓位归零, 取消gridId:{}的多单", cancelGridElement);
+ });
+ }
}
}
-
}
private void processLongGrid(BigDecimal currentPrice) {
@@ -1252,11 +1251,11 @@
Integer downId = matchedUpGridElement.getDownId();
GridElement newEntryGrid = GridElement.findById(downId);
- GridElement cancelGridElement = GridElement.findById(newEntryGrid.getDownId());
- if (cancelGridElement != null) {
+ if (newEntryGrid != null) {
+ GridElement cancelGridElement = GridElement.findById(newEntryGrid.getDownId());
- if (newEntryGrid != null) {
+ if (cancelGridElement != null) {
BigDecimal triggerPrice = newEntryGrid.getGridPrice();
String size = cancelGridElement.getShortTraderParam().getQuantity();
log.info("[Gate] 空仓仓位归零 gridId:{}, 挂{}基础张多单",
@@ -1264,17 +1263,18 @@
newEntryGrid.getShortTraderParam().setQuantity(size);
placeEntryOrderWithPreFlag(newEntryGrid, false, triggerPrice,
FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(size));
+
+ /**
+ * 看是否有空仓挂单，有就取消
+ */
+ if (cancelGridElement != null && cancelGridElement.isHasShortOrder()) {
+ executor.cancelConditionalOrder(cancelGridElement.getShortOrderId(), oid -> {
+ shortEntryTraderIdParam(cancelGridElement, null, false);
+ log.info("[Gate] 空仓仓位归零, 取消gridId:{}的多单", cancelGridElement);
+ });
+ }
}
- /**
- * 看是否有空仓挂单，有就取消
- */
- if (cancelGridElement != null && cancelGridElement.isHasShortOrder()) {
- executor.cancelConditionalOrder(cancelGridElement.getShortOrderId(), oid -> {
- shortEntryTraderIdParam(cancelGridElement, null, false);
- log.info("[Gate] 空仓仓位归零, 取消gridId:{}的多单", cancelGridElement);
- });
- }
}
}
--
Gitblit v1.9.1