From 795ed86a6f3623f0a11e0e2f4edadc1b94008c4a Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 25 Jun 2026 15:12:23 +0800
Subject: [PATCH] refactor(gateApi): 止盈都严格保持 2 个 grid 间距
---
src/main/java/com/xcong/excoin/modules/okxApi/OkxGridTradeService.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 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 7d5f6b0..c537429 100644
--- a/src/main/java/com/xcong/excoin/modules/okxApi/OkxGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/okxApi/OkxGridTradeService.java
@@ -288,12 +288,14 @@
.entryOrderId(orderId)
.build();
config.setBaseLongTraderParam(baseLongTp);
+ baseLongOpened = true;
}, null);
executor.openShort(size, (orderId) -> {
TraderParam baseShortTp = TraderParam.builder()
.entryOrderId(orderId)
.build();
config.setBaseShortTraderParam(baseShortTp);
+ baseShortOpened = true;
}, null);
return;
}
@@ -329,20 +331,19 @@
boolean isLong = (direction == TraderParam.Direction.LONG);
if (state == StrategyState.OPENING) {
- if (isLong && hasPosition && !baseLongOpened) {
+ // 基底成交通知仅记录价格/数量，flag 在 REST 回调中设置
+ if (isLong && hasPosition) {
longActive = true;
longPositionSize = size;
longEntryPrice = entryPrice;
longBaseEntryPrice = entryPrice;
- baseLongOpened = true;
log.info("[OKX] 基底多成交价: {}", longBaseEntryPrice);
tryGenerateQueues();
- } else if (!isLong && hasPosition && !baseShortOpened) {
+ } else if (!isLong && hasPosition) {
shortActive = true;
shortPositionSize = size.abs();
shortEntryPrice = entryPrice;
shortBaseEntryPrice = entryPrice;
- baseShortOpened = true;
log.info("[OKX] 基底空成交价: {}", shortBaseEntryPrice);
tryGenerateQueues();
}
@@ -412,7 +413,7 @@
// ---- 自动订单（条件单）状态变更回调 ----
/**
- * 自动订单状态变更回调。由 OrderAlgoOkxChannelHandler 调用。
+ * 自动订单状态变更回调。由 OrdersOkxChannelHandler 调用。
*/
public void onAutoOrder(String orderId, String status, String reason, String orderType, String tradeId) {
if (state == StrategyState.STOPPED) {
@@ -466,7 +467,8 @@
int posSize = queryPositionSize(OkxPosMode.SHORT);
extendShortStopLoss(posSize, shortGridElement.getId());
accumulatedShortLossCount = 0;
- log.info("[OKX] 空单成交 gridId:{}, 当前持仓:{}张", filledQty, posSize);
+ log.info("[OKX] 空单成交 gridId:{}, 成交{}张, 当前持仓:{}张",
+ shortGridElement.getId(), filledQty, posSize);
BigDecimal shortBaseQty = new BigDecimal(config.getBaseQuantity());
BigDecimal shortGridQty = new BigDecimal(config.getQuantity());
@@ -474,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;
@@ -506,7 +507,8 @@
int posSize = queryPositionSize(OkxPosMode.LONG);
extendLongStopLoss(posSize, longGridElement.getId());
accumulatedLongLossCount = 0;
- log.info("[OKX] 多单成交 gridId:{}, 当前持仓:{}张", filledQty, posSize);
+ log.info("[OKX] 多单成交 gridId:{}, 成交{}张, 当前持仓:{}张",
+ longGridElement.getId(), filledQty, posSize);
BigDecimal longBaseQty = new BigDecimal(config.getBaseQuantity());
BigDecimal longGridQty = new BigDecimal(config.getQuantity());
@@ -514,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