From 7ff32aba4d8d763affa76c68260008bd45605f40 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 12 May 2026 17:39:44 +0800
Subject: [PATCH] fix(trade): 修复网格交易逻辑并更新生产配置
---
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java | 6 ++++--
src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java | 42 +++++++++++++++++++++---------------------
src/main/java/com/xcong/excoin/modules/gateApi/GateTradeExecutor.java | 4 ++--
3 files changed, 27 insertions(+), 25 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 a2ec807..ebe9149 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -662,7 +662,8 @@
null);
if (newShortFirst.compareTo(shortEntryPrice) > 0
- && newShortFirst.compareTo(longEntryPrice) < 0) {
+ && newShortFirst.compareTo(longEntryPrice) < 0
+ && longPositionSize.compareTo(new BigDecimal("3")) < 0) {
BigDecimal reverseLongTp = newShortFirst.add(step).setScale(1, RoundingMode.HALF_UP);
longTakeProfitQueue.add(reverseLongTp);
longTakeProfitQueue.sort(BigDecimal::compareTo);
@@ -769,7 +770,8 @@
null);
if (newLongFirst.compareTo(shortEntryPrice) > 0
- && newLongFirst.compareTo(longEntryPrice) < 0) {
+ && newLongFirst.compareTo(longEntryPrice) < 0
+ && shortPositionSize.compareTo(new BigDecimal("3")) < 0) {
BigDecimal reverseShortTp = newLongFirst.subtract(step).setScale(1, RoundingMode.HALF_UP);
shortTakeProfitQueue.add(reverseShortTp);
shortTakeProfitQueue.sort((a, b) -> b.compareTo(a));
diff --git a/src/main/java/com/xcong/excoin/modules/gateApi/GateTradeExecutor.java b/src/main/java/com/xcong/excoin/modules/gateApi/GateTradeExecutor.java
index 33b0e2d..1f3dcda 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateTradeExecutor.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateTradeExecutor.java
@@ -358,8 +358,8 @@
FuturesInitialOrder initial = new FuturesInitialOrder();
initial.setContract(contract);
initial.setSize(Long.parseLong(size));
- initial.setPrice("0");
- initial.setTif(FuturesInitialOrder.TifEnum.IOC);
+ initial.setPrice(triggerPrice.toString());
+ initial.setTif(FuturesInitialOrder.TifEnum.GTC);
initial.setReduceOnly(true);
FuturesPriceTriggeredOrder order = new FuturesPriceTriggeredOrder();
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 409d2ed..c154490 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java
@@ -49,39 +49,39 @@
try {
//测试盘
+// config = GateConfig.builder()
+// .apiKey("d90ca272391992b8e74f8f92cedb21ec")
+// .apiSecret("1861e4f52de4bb53369ea3208d9ede38ece4777368030f96c77d27934c46c274")
+// .contract("ETH_USDT")
+// .leverage("100")
+// .marginMode("CROSS")
+// .positionMode("dual")
+// .gridRate(new BigDecimal("0.003"))
+// .overallTp(new BigDecimal("5"))
+// .maxLoss(new BigDecimal("15"))
+// .quantity("1")
+// .contractMultiplier(new BigDecimal("0.01"))
+// .unrealizedPnlPriceMode(GateConfig.PnLPriceMode.LAST_PRICE)
+// .isProduction(false)
+// .reopenMaxRetries(3)
+// .build();
+ //实盘
config = GateConfig.builder()
- .apiKey("d90ca272391992b8e74f8f92cedb21ec")
- .apiSecret("1861e4f52de4bb53369ea3208d9ede38ece4777368030f96c77d27934c46c274")
+ .apiKey("865371cdaccd5d238aceb06a55f0143a")
+ .apiSecret("49589c30dfdc3acba007eed445a94990c4b0aa5faac9843e32defdd7371f5a50")
.contract("ETH_USDT")
.leverage("100")
.marginMode("CROSS")
.positionMode("dual")
- .gridRate(new BigDecimal("0.003"))
+ .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(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.0035"))
-// .overallTp(new BigDecimal("1"))
-// .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);
--
Gitblit v1.9.1