From e4c5d36a2da3fabd0f233df15a563d520d08b287 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 24 Jun 2026 16:10:34 +0800
Subject: [PATCH] refactor(okx): 删除K线处理器并重命名止盈单方法为止损单
---
src/main/java/com/xcong/excoin/modules/okxApi/OkxGridTradeService.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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..62fdc13 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();
@@ -629,7 +641,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 +655,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 +1144,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 +1172,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