From a6cfe49c18edeef351e61bbef46ca7facc01c94a Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 23 Jun 2026 11:18:32 +0800
Subject: [PATCH] fix(gateApi): 修复网格交易止盈订单ID计算逻辑
---
src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java | 47 ++++++++++++++---------------------------------
1 files changed, 14 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java b/src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java
index 80b2e45..94aadac 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java
@@ -2,10 +2,8 @@
import com.xcong.excoin.modules.gateApi.wsHandler.handler.AutoOrdersChannelHandler;
import com.xcong.excoin.modules.gateApi.wsHandler.handler.CandlestickChannelHandler;
-import com.xcong.excoin.modules.gateApi.wsHandler.handler.OrdersChannelHandler;
import com.xcong.excoin.modules.gateApi.wsHandler.handler.PositionClosesChannelHandler;
import com.xcong.excoin.modules.gateApi.wsHandler.handler.PositionsChannelHandler;
-import com.xcong.excoin.modules.gateApi.wsHandler.handler.UserTradesChannelHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -58,61 +56,44 @@
log.info("[管理器] 开始初始化...");
try {
- //测试盘
+ //实盘
config = GateConfig.builder()
- .apiKey("d90ca272391992b8e74f8f92cedb21ec")
- .apiSecret("1861e4f52de4bb53369ea3208d9ede38ece4777368030f96c77d27934c46c274")
+ .apiKey("dbf5cc322a0f3d6f308e143c494fb0b4")
+ .apiSecret("83cb291e21e62148ec99bc9adef493ee9f7fc195f2b9dc929466d70350ec58c3")
.contract("ETH_USDT")
.leverage("100")
.marginMode("CROSS")
.positionMode("dual")
- .gridRate(new BigDecimal("0.002"))
- .overallTp(new BigDecimal("5"))
+ .gridRate(new BigDecimal("0.0045"))
+ .expectedProfit(new BigDecimal("25"))
.maxLoss(new BigDecimal("15"))
- .quantity("1")
- .priceScale(1)
+ .baseQuantity("45")
+ .quantity("15")
+ .restartGridSpan(2)
+ .maxPositionSize(2)
+ .priceScale(2)
.contractMultiplier(new BigDecimal("0.01"))
.unrealizedPnlPriceMode(GateConfig.PnLPriceMode.LAST_PRICE)
- .isProduction(false)
+ .isProduction(true)
.reopenMaxRetries(3)
.build();
- //实盘
-// config = GateConfig.builder()
-// .apiKey("865371cdaccd5d238aceb06a55f0143a")
-// .apiSecret("49589c30dfdc3acba007eed445a94990c4b0aa5faac9843e32defdd7371f5a50")
-// .contract("ETH_USDT")
-// .leverage("100")
-// .marginMode("CROSS")
-// .positionMode("dual")
-// .gridRate(new BigDecimal("0.005"))
-// .overallTp(new BigDecimal("5"))
-// .maxLoss(new BigDecimal("15"))
-// .quantity("1")
-// .contractMultiplier(new BigDecimal("0.01"))
-// .unrealizedPnlPriceMode(GateConfig.PnLPriceMode.LAST_PRICE)
-// .isProduction(true)
-// .reopenMaxRetries(3)
-// .build();
// 1. 初始化交易服务：查用户ID → 切持仓模式 → 清条件单 → 平已有仓位 → 设杠杆
gridTradeService = new GateGridTradeService(config);
gridTradeService.init();
- // 2. 创建 WS 客户端并注册 3 个频道处理器
+ // 2. 创建 WS 客户端并注册频道处理器
wsClient = new GateKlineWebSocketClient(config.getWsUrl());
wsClient.addChannelHandler(new CandlestickChannelHandler(config.getContract(), gridTradeService));
wsClient.addChannelHandler(new PositionsChannelHandler(
config.getApiKey(), config.getApiSecret(), config.getContract(), gridTradeService));
wsClient.addChannelHandler(new PositionClosesChannelHandler(
config.getApiKey(), config.getApiSecret(), config.getContract(), gridTradeService));
- wsClient.addChannelHandler(new OrdersChannelHandler(
- config.getApiKey(), config.getApiSecret(), config.getContract(), gridTradeService));
- wsClient.addChannelHandler(new UserTradesChannelHandler(
- config.getApiKey(), config.getApiSecret(), config.getContract(), gridTradeService));
wsClient.addChannelHandler(new AutoOrdersChannelHandler(
config.getApiKey(), config.getApiSecret(), config.getContract(), gridTradeService));
+ gridTradeService.setWsClient(wsClient);
wsClient.init();
- log.info("[管理器] WS已连接, 已注册 6 个频道处理器");
+ log.info("[管理器] WS已连接, 已注册 4 个频道处理器");
// 3. 激活策略，等待首根 K 线触发基底双开
gridTradeService.startGrid();
--
Gitblit v1.9.1