From 97b7f914d060b2a052299416384fc80e061f4b1d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 06 Jan 2026 13:49:58 +0800
Subject: [PATCH] refactor(MacdEmaStrategy): 调整多头和空头开仓条件的逻辑顺序
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MacdEmaStrategy.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MacdEmaStrategy.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MacdEmaStrategy.java
index d6bab5f..0eeacd0 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MacdEmaStrategy.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MacdEmaStrategy.java
@@ -283,8 +283,8 @@
log.info("多头信号检查, 价格位于200日EMA上方: {}, 金叉: {}, MACD柱状线由负转正: {}, 底背离: {}",
isAboveTrend, isGoldenCross, isMacdHistTurningPositive, isBottomDivergence);
- // 多头开仓条件：趋势向上 + 金叉 + (柱状线转强或底背离)
- return isAboveTrend && isGoldenCross && (isMacdHistTurningPositive || isBottomDivergence);
+ // 多头开仓条件：柱状线转强 + 金叉 + (趋势向上或底背离)
+ return isMacdHistTurningPositive && isGoldenCross && ( isAboveTrend|| isBottomDivergence);
}
/**
@@ -320,8 +320,8 @@
log.info("空头信号检查, 价格位于200日EMA下方: {}, 死叉: {}, MACD柱状线由正转负: {}, 顶背离: {}",
isBelowTrend, isDeathCross, isMacdHistTurningNegative, isTopDivergence);
- // 空头开仓条件：趋势向下 + 死叉 + (柱状线转弱或顶背离)
- return isBelowTrend && isDeathCross && (isMacdHistTurningNegative || isTopDivergence);
+ // 空头开仓条件：柱状线转弱 + 死叉 + (趋势向下或顶背离)
+ return isMacdHistTurningNegative && isDeathCross && ( isBelowTrend || isTopDivergence);
}
// 平仓条件检查方法
--
Gitblit v1.9.1