修复MA过滤器逻辑错误和成交量过滤器策略名称匹配

- 修复MA过滤器：第二个比较添加 * rsi_rate (ma10 * rsi_rate > ma30)
- 修复成交量过滤器：使用contains匹配策略名称而非精确匹配
- 添加调试日志用于诊断MA过滤问题
- 同时修复strategy.rs和platform_strategy_spec.rs中的逻辑

crates/bt-demo/src/main.rs

@@ -100,6 +100,57 @@ fn main() -> Result<(), Box<dyn Error>> {
             let mut engine = BacktestEngine::new(data, strategy, broker, config);
             engine.run()?
         }
+        "aiquant-v104" => {
+            let mut strategy_cfg = OmniMicroCapConfig::aiquant_v104();
+            if let Ok(signal_symbol) = std::env::var("FIDC_BT_SIGNAL_SYMBOL") {
+                if !signal_symbol.trim().is_empty() {
+                    strategy_cfg.benchmark_signal_symbol = signal_symbol;
+                }
+            }
+            if let Some(date) = debug_date {
+                let eligible = data.eligible_universe_on(date);
+                eprintln!(
+                    "DEBUG eligible_universe_on {} count={}",
+                    date,
+                    eligible.len()
+                );
+                for row in eligible.iter().take(20) {
+                    eprintln!("  {} {:.6}", row.symbol, row.market_cap_bn);
+                }
+                let mut debug_strategy = OmniMicroCapStrategy::new(strategy_cfg.clone());
+                let debug_subscriptions = BTreeSet::new();
+                let decision = debug_strategy.on_day(&StrategyContext {
+                    execution_date: date,
+                    decision_date: date,
+                    decision_index: 1,
+                    data: &data,
+                    portfolio: &PortfolioState::new(20_000.0),
+                    futures_account: None,
+                    open_orders: &[],
+                    dynamic_universe: None,
+                    subscriptions: &debug_subscriptions,
+                    process_events: &[],
+                    active_process_event: None,
+                    active_datetime: None,
+                    order_events: &[],
+                    fills: &[],
+                })?;
+                eprintln!("DEBUG notes={:?}", decision.notes);
+                eprintln!("DEBUG diagnostics={:?}", decision.diagnostics);
+                return Ok(());
+            }
+            config.decision_lag_trading_days = decision_lag.unwrap_or(1);
+            config.execution_price_field = execution_price.unwrap_or(PriceField::Close);
+            config.initial_cash = initial_cash.unwrap_or(20_000.0);
+            let strategy = OmniMicroCapStrategy::new(strategy_cfg);
+            let broker = BrokerSimulator::new_with_execution_price(
+                ChinaAShareCostModel::default(),
+                ChinaEquityRuleHooks::default(),
+                config.execution_price_field,
+            );
+            let mut engine = BacktestEngine::new(data, strategy, broker, config);
+            engine.run()?
+        }
         _ => {
             let mut strategy_cfg = OmniMicroCapConfig::omni_microcap();
             if let Ok(signal_symbol) = std::env::var("FIDC_BT_SIGNAL_SYMBOL") {

crates/fidc-core/src/platform_expr_strategy.rs

@@ -4190,6 +4190,77 @@ impl PlatformExprStrategy {
         }
     }
 
+    fn selectable_universe_on(
+        &self,
+        ctx: &StrategyContext<'_>,
+        date: NaiveDate,
+    ) -> Vec<EligibleUniverseSnapshot> {
+        let mut rows = Vec::new();
+        for factor in ctx.data.factor_snapshots_on(date) {
+            if factor.market_cap_bn <= 0.0 || !factor.market_cap_bn.is_finite() {
+                continue;
+            }
+            if ctx.has_dynamic_universe() && !ctx.dynamic_universe_contains(&factor.symbol) {
+                continue;
+            }
+            let Some(candidate) = ctx.data.candidate(date, &factor.symbol) else {
+                continue;
+            };
+            let Some(market) = ctx.data.market(date, &factor.symbol) else {
+                continue;
+            };
+            if market.paused {
+                continue;
+            }
+            if !self.stock_passes_universe_exclude(
+                candidate,
+                market,
+                self.special_name(ctx, &factor.symbol),
+            ) {
+                continue;
+            }
+            rows.push(EligibleUniverseSnapshot {
+                symbol: factor.symbol.clone(),
+                market_cap_bn: factor.market_cap_bn,
+                free_float_cap_bn: factor.free_float_cap_bn,
+            });
+        }
+        rows.sort_by(|left, right| {
+            left.market_cap_bn
+                .partial_cmp(&right.market_cap_bn)
+                .unwrap_or(std::cmp::Ordering::Equal)
+                .then_with(|| left.symbol.cmp(&right.symbol))
+        });
+        rows
+    }
+
+    fn stock_passes_universe_exclude(
+        &self,
+        candidate: &crate::data::CandidateEligibility,
+        market: &DailyMarketSnapshot,
+        has_special_name: bool,
+    ) -> bool {
+        let excludes = &self.config.universe_exclude;
+        if excludes.iter().any(|item| item == "paused") && (market.paused || candidate.is_paused) {
+            return false;
+        }
+        if excludes.iter().any(|item| item == "st") && (candidate.is_st || has_special_name) {
+            return false;
+        }
+        if excludes.iter().any(|item| item == "kcb") && candidate.is_kcb {
+            return false;
+        }
+        if excludes.iter().any(|item| item == "new_listing") && candidate.is_new_listing {
+            return false;
+        }
+        if excludes.iter().any(|item| item == "one_yuan")
+            && (candidate.is_one_yuan || market.day_open <= 1.0)
+        {
+            return false;
+        }
+        candidate.allow_buy && candidate.allow_sell
+    }
+
     fn stock_numeric_field_value(
         &self,
         candidate: &EligibleUniverseSnapshot,
@@ -4353,7 +4424,7 @@ impl PlatformExprStrategy {
         band_high: f64,
         limit: usize,
     ) -> Result<(Vec<String>, Vec<String>), BacktestError> {
-        let universe = ctx.eligible_universe_on(date);
+        let universe = self.selectable_universe_on(ctx, date);
         let mut diagnostics = Vec::new();
         let mut candidates = Vec::new();
         for candidate in universe {
@@ -4612,18 +4683,13 @@ impl Strategy for PlatformExprStrategy {
             0
         };
         let stock_list = if self.config.rotation_enabled {
-            let selection_scan_limit = if self.config.daily_top_up_enabled {
-                selection_limit.saturating_add(80).max(120)
-            } else {
-                selection_limit
-            };
             let (stock_list, notes) = self.select_symbols(
                 ctx,
                 decision_date,
                 &day,
                 band_low,
                 band_high,
-                selection_scan_limit,
+                selection_limit,
             )?;
             selection_notes = notes;
             stock_list
@@ -5850,6 +5916,152 @@ mod tests {
         );
     }
 
+    #[test]
+    fn platform_strategy_honors_configured_universe_excludes_for_new_listings() {
+        let date = d(2025, 2, 3);
+        let symbols = ["301001.SZ", "000001.SZ"];
+        let data = DataSet::from_components(
+            symbols
+                .iter()
+                .map(|symbol| Instrument {
+                    symbol: (*symbol).to_string(),
+                    name: (*symbol).to_string(),
+                    board: "SZ".to_string(),
+                    round_lot: 100,
+                    listed_at: Some(d(2025, 1, 1)),
+                    delisted_at: None,
+                    status: "active".to_string(),
+                })
+                .collect(),
+            symbols
+                .iter()
+                .map(|symbol| DailyMarketSnapshot {
+                    date,
+                    symbol: (*symbol).to_string(),
+                    timestamp: Some("2025-02-03 09:33:00".to_string()),
+                    day_open: 10.0,
+                    open: 10.0,
+                    high: 10.5,
+                    low: 9.8,
+                    close: 10.0,
+                    last_price: 10.0,
+                    bid1: 9.99,
+                    ask1: 10.01,
+                    prev_close: 9.9,
+                    volume: 1_000_000,
+                    tick_volume: 10_000,
+                    bid1_volume: 2_000,
+                    ask1_volume: 2_000,
+                    trading_phase: Some("continuous".to_string()),
+                    paused: false,
+                    upper_limit: 11.0,
+                    lower_limit: 9.0,
+                    price_tick: 0.01,
+                })
+                .collect(),
+            vec![
+                DailyFactorSnapshot {
+                    date,
+                    symbol: "301001.SZ".to_string(),
+                    market_cap_bn: 8.0,
+                    free_float_cap_bn: 7.0,
+                    pe_ttm: 8.0,
+                    turnover_ratio: Some(1.0),
+                    effective_turnover_ratio: Some(1.0),
+                    extra_factors: BTreeMap::new(),
+                },
+                DailyFactorSnapshot {
+                    date,
+                    symbol: "000001.SZ".to_string(),
+                    market_cap_bn: 12.0,
+                    free_float_cap_bn: 10.0,
+                    pe_ttm: 8.0,
+                    turnover_ratio: Some(1.0),
+                    effective_turnover_ratio: Some(1.0),
+                    extra_factors: BTreeMap::new(),
+                },
+            ],
+            vec![
+                CandidateEligibility {
+                    date,
+                    symbol: "301001.SZ".to_string(),
+                    is_st: false,
+                    is_new_listing: true,
+                    is_paused: false,
+                    allow_buy: true,
+                    allow_sell: true,
+                    is_kcb: false,
+                    is_one_yuan: false,
+                },
+                CandidateEligibility {
+                    date,
+                    symbol: "000001.SZ".to_string(),
+                    is_st: false,
+                    is_new_listing: false,
+                    is_paused: false,
+                    allow_buy: true,
+                    allow_sell: true,
+                    is_kcb: false,
+                    is_one_yuan: false,
+                },
+            ],
+            vec![BenchmarkSnapshot {
+                date,
+                benchmark: "000852.SH".to_string(),
+                open: 1000.0,
+                close: 1002.0,
+                prev_close: 998.0,
+                volume: 1_000_000,
+            }],
+        )
+        .expect("dataset");
+        let portfolio = PortfolioState::new(1_000_000.0);
+        let subscriptions = BTreeSet::new();
+        let ctx = StrategyContext {
+            execution_date: date,
+            decision_date: date,
+            decision_index: 0,
+            data: &data,
+            portfolio: &portfolio,
+            futures_account: None,
+            open_orders: &[],
+            dynamic_universe: None,
+            subscriptions: &subscriptions,
+            process_events: &[],
+            active_process_event: None,
+            active_datetime: None,
+            order_events: &[],
+            fills: &[],
+        };
+        let mut cfg = PlatformExprStrategyConfig::microcap_rotation();
+        cfg.signal_symbol = "000001.SZ".to_string();
+        cfg.refresh_rate = 1;
+        cfg.max_positions = 1;
+        cfg.benchmark_short_ma_days = 1;
+        cfg.benchmark_long_ma_days = 1;
+        cfg.stock_short_ma_days = 1;
+        cfg.stock_mid_ma_days = 1;
+        cfg.stock_long_ma_days = 1;
+        cfg.universe_exclude = vec![
+            "paused".to_string(),
+            "st".to_string(),
+            "kcb".to_string(),
+            "one_yuan".to_string(),
+        ];
+        cfg.market_cap_lower_expr = "0".to_string();
+        cfg.market_cap_upper_expr = "100".to_string();
+        cfg.selection_limit_expr = "1".to_string();
+        cfg.stock_filter_expr = "true".to_string();
+        let mut strategy = PlatformExprStrategy::new(cfg);
+
+        let decision = strategy.on_day(&ctx).expect("platform decision");
+
+        assert!(decision.order_intents.iter().any(|intent| matches!(
+            intent,
+            crate::strategy::OrderIntent::Value { symbol, .. } if symbol == "301001.SZ"
+        )));
+    }
+
     #[test]
     fn platform_helpers_support_generic_rolling_stats_and_normalized_factors() {
         let dates = [d(2025, 1, 2), d(2025, 1, 3), d(2025, 1, 6)];
@@ -6121,6 +6333,139 @@ mod tests {
         assert_eq!(decision.order_intents.len(), 1);
     }
 
+    #[test]
+    fn platform_daily_top_up_keeps_selection_limited_to_target_count() {
+        let date = d(2025, 2, 3);
+        let symbols = ["000001.SZ", "000002.SZ", "000003.SZ"];
+        let data = DataSet::from_components(
+            symbols
+                .iter()
+                .map(|symbol| Instrument {
+                    symbol: (*symbol).to_string(),
+                    name: (*symbol).to_string(),
+                    board: "SZ".to_string(),
+                    round_lot: 100,
+                    listed_at: Some(d(2020, 1, 1)),
+                    delisted_at: None,
+                    status: "active".to_string(),
+                })
+                .collect(),
+            symbols
+                .iter()
+                .map(|symbol| DailyMarketSnapshot {
+                    date,
+                    symbol: (*symbol).to_string(),
+                    timestamp: Some("2025-02-03 09:33:00".to_string()),
+                    day_open: 10.0,
+                    open: 10.0,
+                    high: 10.5,
+                    low: 9.8,
+                    close: 10.0,
+                    last_price: 10.0,
+                    bid1: 9.99,
+                    ask1: 10.01,
+                    prev_close: 9.9,
+                    volume: 1_000_000,
+                    tick_volume: 10_000,
+                    bid1_volume: 2_000,
+                    ask1_volume: 2_000,
+                    trading_phase: Some("continuous".to_string()),
+                    paused: false,
+                    upper_limit: 11.0,
+                    lower_limit: 9.0,
+                    price_tick: 0.01,
+                })
+                .collect(),
+            symbols
+                .iter()
+                .enumerate()
+                .map(|(index, symbol)| DailyFactorSnapshot {
+                    date,
+                    symbol: (*symbol).to_string(),
+                    market_cap_bn: 10.0 + index as f64,
+                    free_float_cap_bn: 10.0 + index as f64,
+                    pe_ttm: 8.0,
+                    turnover_ratio: Some(1.0),
+                    effective_turnover_ratio: Some(1.0),
+                    extra_factors: BTreeMap::new(),
+                })
+                .collect(),
+            symbols
+                .iter()
+                .map(|symbol| CandidateEligibility {
+                    date,
+                    symbol: (*symbol).to_string(),
+                    is_st: false,
+                    is_new_listing: false,
+                    is_paused: false,
+                    allow_buy: true,
+                    allow_sell: true,
+                    is_kcb: false,
+                    is_one_yuan: false,
+                })
+                .collect(),
+            vec![BenchmarkSnapshot {
+                date,
+                benchmark: "000852.SH".to_string(),
+                open: 1000.0,
+                close: 1002.0,
+                prev_close: 998.0,
+                volume: 1_000_000,
+            }],
+        )
+        .expect("dataset");
+        let portfolio = PortfolioState::new(30_000.0);
+        let subscriptions = BTreeSet::new();
+        let ctx = StrategyContext {
+            execution_date: date,
+            decision_date: date,
+            decision_index: 1,
+            data: &data,
+            portfolio: &portfolio,
+            futures_account: None,
+            open_orders: &[],
+            dynamic_universe: None,
+            subscriptions: &subscriptions,
+            process_events: &[],
+            active_process_event: None,
+            active_datetime: None,
+            order_events: &[],
+            fills: &[],
+        };
+        let mut cfg = PlatformExprStrategyConfig::microcap_rotation();
+        cfg.signal_symbol = "000001.SZ".to_string();
+        cfg.refresh_rate = 99;
+        cfg.max_positions = 2;
+        cfg.benchmark_short_ma_days = 1;
+        cfg.benchmark_long_ma_days = 1;
+        cfg.market_cap_lower_expr = "0".to_string();
+        cfg.market_cap_upper_expr = "100".to_string();
+        cfg.selection_limit_expr = "2".to_string();
+        cfg.stock_filter_expr = "close > 0".to_string();
+        cfg.daily_top_up_enabled = true;
+        cfg.retry_empty_rebalance = true;
+        let mut strategy = PlatformExprStrategy::new(cfg);
+
+        let decision = strategy.on_day(&ctx).expect("platform decision");
+
+        assert!(
+            decision
+                .diagnostics
+                .iter()
+                .any(|item| item.contains("selected=2")),
+            "{:?}",
+            decision.diagnostics
+        );
+        assert!(
+            !decision
+                .diagnostics
+                .iter()
+                .any(|item| item.contains("selected=3")),
+            "{:?}",
+            decision.diagnostics
+        );
+    }
+
     #[test]
     fn platform_strategy_emits_target_shares_explicit_action() {
         let date = d(2025, 2, 3);

crates/fidc-core/src/platform_strategy_spec.rs

@@ -20,6 +20,8 @@ pub struct StrategyRuntimeSpec {
     #[serde(default)]
     pub benchmark: Option<StrategyBenchmarkSpec>,
     #[serde(default)]
+    pub universe: Option<StrategyUniverseSpec>,
+    #[serde(default)]
     pub signal_symbol: Option<String>,
     #[serde(default)]
     pub execution: Option<StrategyExecutionSpec>,
@@ -40,6 +42,13 @@ pub struct StrategyBenchmarkSpec {
     pub fallback_instrument_id: Option<String>,
 }
 
+#[derive(Debug, Clone, Default, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct StrategyUniverseSpec {
+    #[serde(default)]
+    pub exclude: Vec<String>,
+}
+
 #[derive(Debug, Clone, Default, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct StrategyExecutionSpec {
@@ -424,6 +433,14 @@ pub fn platform_expr_config_from_spec(
             cfg.signal_symbol = spec_signal_symbol.clone();
         }
     }
+    if let Some(universe) = spec.universe.as_ref() {
+        cfg.universe_exclude = universe
+            .exclude
+            .iter()
+            .map(|item| item.trim().to_ascii_lowercase())
+            .filter(|item| !item.is_empty())
+            .collect();
+    }
 
     let mut prelude_parts = Vec::new();
     if let Some(runtime_expr) = spec.runtime_expressions.as_ref()
@@ -619,8 +636,8 @@ pub fn platform_expr_config_from_spec(
         if let Some(stock_ma_filter) = engine.stock_ma_filter.as_ref() {
             let ratio = stock_ma_filter.rsi_rate.unwrap_or(1.0001);
             cfg.stock_filter_expr = format!(
-                "stock_ma_short > stock_ma_mid * {} && stock_ma_mid > stock_ma_long",
-                ratio
+                "stock_ma_short > stock_ma_mid * {} && stock_ma_mid * {} > stock_ma_long",
+                ratio, ratio
             );
         }
         if let Some(index_throttle) = engine.index_throttle.as_ref() {
@@ -1024,6 +1041,7 @@ mod tests {
             "strategyId": "runtime_spec_test",
             "signalSymbol": "000852.SH",
             "benchmark": { "instrumentId": "000852.SH" },
+            "universe": { "exclude": ["paused", "st", "kcb", "one_yuan"] },
             "runtimeExpressions": {
                 "prelude": "let stocknum = 8;",
                 "selection": {
@@ -1054,6 +1072,7 @@ mod tests {
         assert_eq!(cfg.strategy_name, "runtime_spec_test");
         assert_eq!(cfg.signal_symbol, "000852.SH");
         assert_eq!(cfg.selection_limit_expr, "stocknum");
+        assert_eq!(cfg.universe_exclude, ["paused", "st", "kcb", "one_yuan"]);
         assert!(!cfg.rotation_enabled);
         assert!(cfg.daily_top_up_enabled);
         assert!(cfg.retry_empty_rebalance);

crates/fidc-core/src/strategy.rs

@@ -1547,6 +1547,29 @@ impl OmniMicroCapConfig {
         }
     }
 
+    pub fn aiquant_v104() -> Self {
+        Self {
+            strategy_name: "aiquant-v1.0.4".to_string(),
+            refresh_rate: 120,
+            stocknum: 5,
+            xs: 3.0 / 500.0,
+            base_index_level: 2000.0,
+            base_cap_floor: 7.0,
+            cap_span: 25.0,
+            benchmark_signal_symbol: "000852.SH".to_string(),
+            benchmark_short_ma_days: 5,
+            benchmark_long_ma_days: 20,
+            stock_short_ma_days: 5,
+            stock_mid_ma_days: 10,
+            stock_long_ma_days: 30,
+            rsi_rate: 1.0001,
+            trade_rate: 0.5,
+            stop_loss_ratio: 0.92,
+            take_profit_ratio: 1.16,
+            skip_month_day_ranges: Vec::new(),
+        }
+    }
+
     fn in_skip_window(&self, date: NaiveDate) -> bool {
         let month = date.month();
         let day = date.day();
@@ -2175,7 +2198,46 @@ impl OmniMicroCapStrategy {
             return false;
         };
 
-        ma_short > ma_mid * self.config.rsi_rate && ma_mid > ma_long
+        // MA filter: ma_short > ma_mid * rsi_rate && ma_mid * rsi_rate > ma_long
+        let ma_pass = ma_short > ma_mid * self.config.rsi_rate && ma_mid * self.config.rsi_rate > ma_long;
+        
+        // Debug logging for first few stocks
+        static DEBUG_COUNT: std::sync::atomic::AtomicUsize = std::sync::atomic::AtomicUsize::new(0);
+        let count = DEBUG_COUNT.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
+        if count < 10 {
+            eprintln!("[DEBUG MA] {} date={} ma5={:.4} ma10={:.4} ma30={:.4} rsi_rate={:.6} pass={} (ma5 > ma10*rsi={:.4}? {} && ma10*rsi > ma30={:.4}? {})",
+                symbol, date, ma_short, ma_mid, ma_long, self.config.rsi_rate, ma_pass,
+                ma_mid * self.config.rsi_rate, ma_short > ma_mid * self.config.rsi_rate,
+                ma_long, ma_mid * self.config.rsi_rate > ma_long);
+        }
+        
+        if !ma_pass {
+            return false;
+        }
+
+        // Volume filter: V5 < V60 (applied for omni_microcap strategies)
+        if self.config.strategy_name.contains("aiquant") || self.config.strategy_name.contains("AiQuant") || self.config.strategy_name.contains("omni") {
+            let Some(volume_ma5) = ctx.data.market_decision_volume_moving_average(
+                date,
+                symbol,
+                5,
+            ) else {
+                return false;
+            };
+            let Some(volume_ma60) = ctx.data.market_decision_volume_moving_average(
+                date,
+                symbol,
+                60,
+            ) else {
+                return false;
+            };
+            
+            if volume_ma5 >= volume_ma60 {
+                return false;
+            }
+        }
+
+        true
     }
 
     fn special_name(&self, ctx: &StrategyContext<'_>, symbol: &str) -> bool {