From 61eedc678d299b7e54f0ee43355fa963cddbc622 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 08 Oct 2026 10:35:31 +0800
Subject: [PATCH] fix(gate-api): 修复网格交易重置策略中的竞态条件问题
---
src/main/java/com/xcong/excoin/modules/gateApi/GateConfigPersistenceService.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/gateApi/GateConfigPersistenceService.java b/src/main/java/com/xcong/excoin/modules/gateApi/GateConfigPersistenceService.java
index 0ceb025..78e402e 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateConfigPersistenceService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateConfigPersistenceService.java
@@ -111,7 +111,14 @@
.addPositionQuantity(dto.getAddPositionQuantity() > 0 ? dto.getAddPositionQuantity() : 1)
.maxPositionPerSide(dto.getMaxPositionPerSide())
.addPositionStartThreshold(dto.getAddPositionStartThreshold() >= 0 ? dto.getAddPositionStartThreshold() : 1)
- .placeExcessTakeProfit(dto.isPlaceExcessTakeProfit())
+ .placeExcessTakeProfit(normalizeTakeProfitMode(dto.getPlaceExcessTakeProfit()))
+ .dualStopLossEnabled(nvl(dto.getDualStopLossEnabled(), false))
+ .longStopLossPrice(dto.getLongStopLossPrice())
+ .shortStopLossPrice(dto.getShortStopLossPrice())
+ .tpTriggerOppositeAddEnabled(nvl(dto.getTpTriggerOppositeAddEnabled(), false))
+ .tpTriggerOppositeAddQuantity(dto.getTpTriggerOppositeAddQuantity() != null && dto.getTpTriggerOppositeAddQuantity() > 0 ? dto.getTpTriggerOppositeAddQuantity() : 0)
+ .baseTakeProfitPerGrid(dto.getBaseTakeProfitPerGrid() != null && dto.getBaseTakeProfitPerGrid().compareTo(BigDecimal.ZERO) > 0 ? dto.getBaseTakeProfitPerGrid() : BigDecimal.ZERO)
+ .baseTakeProfitGridCount(dto.getBaseTakeProfitGridCount() != null && dto.getBaseTakeProfitGridCount() > 0 ? dto.getBaseTakeProfitGridCount() : 0)
.build();
}
@@ -141,4 +148,24 @@
private static <T> T nvl(T value, T fallback) {
return value != null ? value : fallback;
}
+
+ /**
+ * 归一化止盈挂单模式，兼容旧版 boolean 配置（旧 JSON 的 true/false 会被 Jackson 反序列化为字符串）。
+ */
+ private static String normalizeTakeProfitMode(String raw) {
+ if (raw == null || raw.trim().isEmpty()) {
+ return GateConfig.EXCESS_TP_OFF;
+ }
+ switch (raw.trim()) {
+ case "off":
+ return GateConfig.EXCESS_TP_OFF;
+ case "true":
+ case "concentrated":
+ return GateConfig.EXCESS_TP_CONCENTRATED;
+ case "dispersed":
+ return GateConfig.EXCESS_TP_DISPERSED;
+ default:
+ return GateConfig.EXCESS_TP_OFF;
+ }
+ }
}
--
Gitblit v1.9.1