From c854617480135e089fcb7128bf3ce33f733e15ac Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 24 Jun 2026 16:21:41 +0800
Subject: [PATCH] refactor(okxApi): 移除基座止盈挂单逻辑
---
src/main/java/com/xcong/excoin/modules/okxApi/OkxGridTradeService.java | 38 ++++++++++++++++----------------------
1 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/okxApi/OkxGridTradeService.java b/src/main/java/com/xcong/excoin/modules/okxApi/OkxGridTradeService.java
index 99fdd44..71e8ddb 100644
--- a/src/main/java/com/xcong/excoin/modules/okxApi/OkxGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/okxApi/OkxGridTradeService.java
@@ -298,6 +298,12 @@
return;
}
+ // OPENING 状态下若 WS 仓位已确认但 REST 回调尚未完成，等标记价格推送时重试队列生成
+ if (state == StrategyState.OPENING &&
+ baseLongOpened && baseShortOpened) {
+ tryGenerateQueues();
+ }
+
if (state == StrategyState.ACTIVE &&
!longActive &&
longPositionSize.compareTo(BigDecimal.ZERO) == 0) {
@@ -590,6 +596,12 @@
private void tryGenerateQueues() {
if (baseLongOpened && baseShortOpened) {
+ // 确保 openLong/openShort 的 REST 回调已完成（WS 推送可能比回调更快到达）
+ if (config.getBaseLongTraderParam() == null || config.getBaseShortTraderParam() == null) {
+ log.warn("[OKX] 基底REST回调尚未完成, 延后队列生成");
+ return;
+ }
+
generateShortQueue();
generateLongQueue();
updateGridElements();
@@ -602,24 +614,6 @@
baseGridElement.setShortOrderId(baseShortTraderParam.getEntryOrderId());
baseGridElement.setHasShortOrder(true);
- // 挂基座止盈
- {
- BigDecimal tpPrice = baseGridElement.getGridPrice().add(config.getStep());
- executor.placeTakeProfit(tpPrice, "close_long", config.getBaseQuantity(),
- profitId -> {
- longTakeProfitTraderIdParam(baseGridElement, profitId, true);
- log.info("[OKX] 基座多仓止盈已挂, gridId:0, 触发价:{}, tpId:{}", tpPrice, profitId);
- });
- }
- {
- BigDecimal tpPrice = baseGridElement.getGridPrice().subtract(config.getStep());
- executor.placeTakeProfit(tpPrice, "close_short", config.getBaseQuantity(),
- profitId -> {
- shortTakeProfitTraderIdParam(baseGridElement, profitId, true);
- log.info("[OKX] 基座空仓止盈已挂, gridId:0, 触发价:{}, tpId:{}", tpPrice, profitId);
- });
- }
-
// 挂初始止损
int stopCount = Integer.parseInt(config.getBaseQuantity()) / Integer.parseInt(config.getQuantity()) + 1;
for (int id = 2; id <= stopCount; id++) {
@@ -629,7 +623,7 @@
}
BigDecimal triggerPrice = elem.getGridPrice();
int finalId = id;
- executor.placeTakeProfit(triggerPrice, "close_short", config.getQuantity(),
+ executor.placeStopLoss(triggerPrice, "close_short", config.getQuantity(),
profitId -> {
elem.setShortStopLossOrderId(profitId);
GridElement.refreshIndices();
@@ -643,7 +637,7 @@
}
BigDecimal triggerPrice = elem.getGridPrice();
int finalId = id;
- executor.placeTakeProfit(triggerPrice, "close_long", config.getQuantity(),
+ executor.placeStopLoss(triggerPrice, "close_long", config.getQuantity(),
profitId -> {
elem.setLongStopLossOrderId(profitId);
GridElement.refreshIndices();
@@ -1132,7 +1126,7 @@
}
BigDecimal triggerPrice = elem.getGridPrice();
int finalSlId = newSlId;
- executor.placeTakeProfit(triggerPrice, "close_long", config.getQuantity(),
+ executor.placeStopLoss(triggerPrice, "close_long", config.getQuantity(),
profitId -> {
elem.setLongStopLossOrderId(profitId);
GridElement.refreshIndices();
@@ -1160,7 +1154,7 @@
}
BigDecimal triggerPrice = elem.getGridPrice();
int finalSlId = newSlId;
- executor.placeTakeProfit(triggerPrice, "close_short", config.getQuantity(),
+ executor.placeStopLoss(triggerPrice, "close_short", config.getQuantity(),
profitId -> {
elem.setShortStopLossOrderId(profitId);
GridElement.refreshIndices();
--
Gitblit v1.9.1