From e99f0fc7c21ce99513fb377639fe67ad12cf5abb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=87=E8=96=87=E5=AE=89?= Date: Wed, 25 Feb 2026 11:20:17 +0800 Subject: [PATCH] =?UTF-8?q?feat(market=5Fscanner):=20=E5=A2=9E=E5=8A=A04H?= =?UTF-8?q?=E8=B6=8B=E5=8A=BF=E4=B8=AD=E6=80=A7=E5=85=81=E8=AE=B8=E9=80=89?= =?UTF-8?q?=E9=A1=B9=E4=BB=A5=E4=BC=98=E5=8C=96=E4=BF=A1=E5=8F=B7=E5=A4=84?= =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在市场扫描逻辑中引入了配置选项 `AUTO_TRADE_ALLOW_4H_NEUTRAL`，允许在逆势情况下不清零信号强度，便于推荐与列表展示。此改动旨在提升策略灵活性，同时确保策略层仍然禁止逆势自动下单，增强了系统的可用性与用户友好性。 --- trading_system/market_scanner.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/trading_system/market_scanner.py b/trading_system/market_scanner.py index 2280dd9..58dd1af 100644 --- a/trading_system/market_scanner.py +++ b/trading_system/market_scanner.py @@ -840,14 +840,16 @@ class MarketScanner: if trend_4h in ('down', 'neutral', None) and direction == 'SELL': signal_strength += TREND_SIGNAL_WEIGHTS['price_above_ema20'] - # 4H趋势确认加分 + # 4H趋势确认加分 / 逆势是否清零 + allow_4h_neutral = bool(config.TRADING_CONFIG.get("AUTO_TRADE_ALLOW_4H_NEUTRAL", False)) if direction and trend_4h: if (direction == 'BUY' and trend_4h == 'up') or (direction == 'SELL' and trend_4h == 'down'): signal_strength += TREND_SIGNAL_WEIGHTS['4h_trend_confirmation'] elif (direction == 'BUY' and trend_4h == 'down') or (direction == 'SELL' and trend_4h == 'up'): - # 逆势信号，直接拒绝 - signal_strength = 0 - direction = None + # 逆势时：若开启「允许4H中性」，仅不加分、不清零，便于出推荐与列表展示；策略层仍会禁止逆势自动下单 + if not allow_4h_neutral: + signal_strength = 0 + direction = None # 强度上限归一到 0-10 signal_strength = max(0, min(int(signal_strength), 10))