From 388b37f251aa1c589a56f900b53c7239fd4fc50f Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 23 Sep 2026 11:11:12 +0800
Subject: [PATCH] fix(gateApi): 修复止损订单数量计算逻辑
---
src/main/java/com/xcong/excoin/modules/gateApi/GateConfigPersistenceService.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 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 480b87c..f14fc93 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateConfigPersistenceService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateConfigPersistenceService.java
@@ -93,7 +93,7 @@
.priceScale(GateWebSocketClientManager.DEFAULT_PRICE_SCALE)
.contractMultiplier(new BigDecimal(GateWebSocketClientManager.DEFAULT_CONTRACT_MULTIPLIER))
.unrealizedPnlPriceMode(GateConfig.PnLPriceMode.valueOf(GateWebSocketClientManager.DEFAULT_PNL_MODE))
- .isProduction(true)
+ .isProduction(false)
.reopenMaxRetries(GateWebSocketClientManager.DEFAULT_REOPEN_MAX_RETRIES)
// 可调参数 — 从 DTO 读取
.gridRate(nvl(dto.getGridRate(), new BigDecimal("0.005")))
@@ -103,6 +103,18 @@
.quantity(nvl(dto.getQuantity(), "2"))
.maxPositionSize(dto.getMaxPositionSize())
.stopLossCount(dto.getStopLossCount())
+ .takeProfitGridSpan(dto.getTakeProfitGridSpan())
+ .priceDriveEnabled(nvl(dto.getPriceDriveEnabled(), true))
+ .rounds(dto.getRounds())
+ .stopLossCountMode(nvl(dto.getStopLossCountMode(), "dual"))
+ .addPositionInterval(dto.getAddPositionInterval() >= 0 ? dto.getAddPositionInterval() : 3)
+ .addPositionQuantity(dto.getAddPositionQuantity() > 0 ? dto.getAddPositionQuantity() : 1)
+ .maxPositionPerSide(dto.getMaxPositionPerSide())
+ .addPositionStartThreshold(dto.getAddPositionStartThreshold() >= 0 ? dto.getAddPositionStartThreshold() : 1)
+ .placeExcessTakeProfit(normalizeTakeProfitMode(dto.getPlaceExcessTakeProfit()))
+ .dualStopLossEnabled(nvl(dto.getDualStopLossEnabled(), false))
+ .longStopLossPrice(dto.getLongStopLossPrice())
+ .shortStopLossPrice(dto.getShortStopLossPrice())
.build();
}
@@ -132,4 +144,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