From 5982ab32ef6f4af48426f35e57ccd829fea7bfbf Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 25 Jun 2026 15:39:14 +0800
Subject: [PATCH] fix(okxApi): 修正条件单状态判断逻辑
---
src/main/java/com/xcong/excoin/modules/okxApi/OkxGridTradeService.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 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 131952d..c6d8490 100644
--- a/src/main/java/com/xcong/excoin/modules/okxApi/OkxGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/okxApi/OkxGridTradeService.java
@@ -415,13 +415,13 @@
/**
* 自动订单状态变更回调。由 OrdersOkxChannelHandler 调用。
*/
- public void onAutoOrder(String orderId, String status, String reason, String orderType, String tradeId) {
+ public void onAutoOrder(String orderId, String status, String orderType, String tradeId) {
if (state == StrategyState.STOPPED) {
return;
}
- log.info("[OKX] 条件单状态变更, id:{}, status:{}, reason:{}, order_type:{}",
- orderId, status, reason, orderType);
- if (!"finished".equals(status)) {
+ log.info("[OKX] 条件单状态变更, id:{}, status:{}, order_type:{}",
+ orderId, status, orderType);
+ if (!"filled".equals(status)) {
return;
}
@@ -476,8 +476,7 @@
BigDecimal shortExcess = BigDecimal.valueOf(posSize).subtract(shortBaseQty);
int shortExcessCount = shortExcess.divide(shortGridQty, 0, RoundingMode.DOWN).intValue();
for (int i = 0; i < shortExcessCount; i++) {
- int tpGridId = shortGridElement.getId() - 2 - i;
- if (i > 0) { tpGridId = tpGridId - 1; }
+ int tpGridId = shortGridElement.getId() - 2 * (i + 1);
GridElement tpElem = GridElement.findById(tpGridId);
if (tpElem == null || tpElem.getShortTakeProfitOrderId() != null) {
continue;
@@ -517,8 +516,7 @@
BigDecimal longExcess = BigDecimal.valueOf(posSize).subtract(longBaseQty);
int longExcessCount = longExcess.divide(longGridQty, 0, RoundingMode.DOWN).intValue();
for (int i = 0; i < longExcessCount; i++) {
- int tpGridId = longGridElement.getId() + 2 + i;
- if (i > 0) { tpGridId = tpGridId + 1; }
+ int tpGridId = longGridElement.getId() + 2 * (i + 1);
GridElement tpElem = GridElement.findById(tpGridId);
if (tpElem == null || tpElem.getLongTakeProfitOrderId() != null) {
continue;
--
Gitblit v1.9.1