From c0d48978e8dceeb15c5dedc5109b36a9a064d038 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 10 Jun 2026 15:55:28 +0800
Subject: [PATCH] refactor(gateApi): 优化网格交易服务中的止损和仓位管理逻辑
---
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java | 92 ++++++++++++++++++++++++---------------------
1 files changed, 49 insertions(+), 43 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 77e3cc2..8737e02 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -543,12 +543,14 @@
}
GridElement longStopLossElem = GridElement.findByLongStopLossOrderId(orderId);
- if (longStopLossElem != null && longPositionSize.compareTo(BigDecimal.ZERO) > 0 && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")) {
+// if (longStopLossElem != null && longPositionSize.compareTo(BigDecimal.ZERO) > 0 && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")) {
+ if (longStopLossElem != null && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")) {
handleLongStopLossTriggered(longStopLossElem);
return;
}
GridElement shortStopLossElem = GridElement.findByShortStopLossOrderId(orderId);
- if (shortStopLossElem != null && shortPositionSize.compareTo(BigDecimal.ZERO) > 0 && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")) {
+// if (shortStopLossElem != null && shortPositionSize.compareTo(BigDecimal.ZERO) > 0 && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")) {
+ if (shortStopLossElem != null && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")) {
handleShortStopLossTriggered(shortStopLossElem);
return;
}
@@ -856,27 +858,29 @@
GridElement matchedUpGridElement = GridElement.findByPrice(matched);
if (matchedUpGridElement != null){
- Integer upId = matchedUpGridElement.getUpId();
- GridElement newEntryGrid = GridElement.findById(upId);
+ if (!matchedUpGridElement.isHasLongOrder()){
+ Integer upId = matchedUpGridElement.getUpId();
+ GridElement newEntryGrid = GridElement.findById(upId);
- if (newEntryGrid != null) {
- if (!newEntryGrid.isHasLongOrder()) {
- BigDecimal triggerPrice = newEntryGrid.getGridPrice();
- String size = config.getBaseQuantity();
- log.info("[Gate] 多仓仓位归零 gridId:{}, 挂{}基础张多单",
- newEntryGrid.getId(), size);
- newEntryGrid.getLongTraderParam().setQuantity(size);
- placeEntryOrderWithPreFlag(newEntryGrid, true, triggerPrice,
- FuturesPriceTrigger.RuleEnum.NUMBER_1, size);
- }
+ if (newEntryGrid != null) {
+ if (!newEntryGrid.isHasLongOrder()) {
+ BigDecimal triggerPrice = newEntryGrid.getGridPrice();
+ String size = config.getBaseQuantity();
+ log.info("[Gate] 多仓仓位归零 gridId:{}, 挂{}基础张多单",
+ newEntryGrid.getId(), size);
+ newEntryGrid.getLongTraderParam().setQuantity(size);
+ placeEntryOrderWithPreFlag(newEntryGrid, true, triggerPrice,
+ FuturesPriceTrigger.RuleEnum.NUMBER_1, size);
+ }
- GridElement cancelGridElement = GridElement.findById(newEntryGrid.getUpId());
- if (cancelGridElement != null && cancelGridElement.isHasLongOrder()) {
- longEntryTraderIdParam(cancelGridElement, null, false);
- executor.cancelConditionalOrder(cancelGridElement.getLongOrderId(), oid -> {
- log.info("[Gate] 多仓仓位归零, 取消gridId:{}的多单", cancelGridElement.getId());
- });
+ GridElement cancelGridElement = GridElement.findById(newEntryGrid.getUpId());
+ if (cancelGridElement != null && cancelGridElement.isHasLongOrder()) {
+ longEntryTraderIdParam(cancelGridElement, null, false);
+ executor.cancelConditionalOrder(cancelGridElement.getLongOrderId(), oid -> {
+ log.info("[Gate] 多仓仓位归零, 取消gridId:{}的多单", cancelGridElement.getId());
+ });
+ }
}
}
}
@@ -902,32 +906,34 @@
GridElement matchedUpGridElement = GridElement.findByPrice(matched);
if (matchedUpGridElement != null){
- Integer downId = matchedUpGridElement.getDownId();
- GridElement newEntryGrid = GridElement.findById(downId);
+ if(!matchedUpGridElement.isHasShortOrder()){
+ Integer downId = matchedUpGridElement.getDownId();
+ GridElement newEntryGrid = GridElement.findById(downId);
- if (newEntryGrid != null) {
+ if (newEntryGrid != null) {
- if (!newEntryGrid.isHasShortOrder()){
- BigDecimal triggerPrice = newEntryGrid.getGridPrice();
- String size = config.getBaseQuantity();
- log.info("[Gate] 空仓仓位归零 gridId:{}, 挂{}基础张多单",
- newEntryGrid.getId(), size);
- newEntryGrid.getShortTraderParam().setQuantity(size);
- placeEntryOrderWithPreFlag(newEntryGrid, false, triggerPrice,
- FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(size));
+ if (!newEntryGrid.isHasShortOrder()){
+ BigDecimal triggerPrice = newEntryGrid.getGridPrice();
+ String size = config.getBaseQuantity();
+ log.info("[Gate] 空仓仓位归零 gridId:{}, 挂{}基础张多单",
+ newEntryGrid.getId(), size);
+ newEntryGrid.getShortTraderParam().setQuantity(size);
+ placeEntryOrderWithPreFlag(newEntryGrid, false, triggerPrice,
+ FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(size));
+ }
+
+ GridElement cancelGridElement = GridElement.findById(newEntryGrid.getDownId());
+ /**
+ * 看是否有空仓挂单，有就取消
+ */
+ if (cancelGridElement != null && cancelGridElement.isHasShortOrder()) {
+ shortEntryTraderIdParam(cancelGridElement, null, false);
+ executor.cancelConditionalOrder(cancelGridElement.getShortOrderId(), oid -> {
+ log.info("[Gate] 空仓仓位归零, 取消gridId:{}的多单", cancelGridElement.getId());
+ });
+ }
+
}
-
- GridElement cancelGridElement = GridElement.findById(newEntryGrid.getDownId());
- /**
- * 看是否有空仓挂单，有就取消
- */
- if (cancelGridElement != null && cancelGridElement.isHasShortOrder()) {
- shortEntryTraderIdParam(cancelGridElement, null, false);
- executor.cancelConditionalOrder(cancelGridElement.getShortOrderId(), oid -> {
- log.info("[Gate] 空仓仓位归零, 取消gridId:{}的多单", cancelGridElement.getId());
- });
- }
-
}
}
}
--
Gitblit v1.9.1