From eb46807372965ca0d1661b540f37a0f972b04b86 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 21 Sep 2026 09:52:58 +0800
Subject: [PATCH] feat(gate): 添加分散止盈功能并重构止盈挂单模式

---
 src/main/java/com/xcong/excoin/modules/gateApi/GateConfigPersistenceService.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 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 4828f0a..6501868 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateConfigPersistenceService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateConfigPersistenceService.java
@@ -105,6 +105,13 @@
                 .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()))
                 .build();
     }
 
@@ -134,4 +141,22 @@
     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 "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