merge(HEL-208): 集成收盘行情修复 cf206c7 到 .11 正式线（基于 09a935a）

backend/data/providers/tushare_dashboard.py

@@ -26,18 +26,8 @@ class DashboardMixin:
             )
 
         daily = self._load_daily(trade_date)
-        if (
-            not daily
-            and requested_date == datetime.now().astimezone().strftime("%Y%m%d")
-            and trade_date == requested_date
-            and datetime.now().astimezone().time().replace(tzinfo=None) >= dt_time(9, 15)
-        ):
-            return self._realtime_dashboard(
-                requested_date,
-                trade_date,
-                previous_trade_date,
-            )
         if not daily:
+            # 15:05 后只走日线；日线未就绪时不得回退调用无权限的 rt_k。
             raise TushareError(f"No daily data returned for {trade_date}")
 
         notices: list[str] = []
@@ -96,13 +86,13 @@ class DashboardMixin:
 
     @staticmethod
     def should_use_realtime(requested_date: str, trade_date: str) -> bool:
-        """Use rt_k for today's open market until end-of-day datasets settle."""
+        """Use rt_k only inside the intraday window; 15:05+ must use daily bars."""
         now = datetime.now().astimezone()
         today = now.strftime("%Y%m%d")
         return (
             requested_date == today
             and trade_date == today
-            and dt_time(9, 15) <= now.time().replace(tzinfo=None) < dt_time(16, 30)
+            and dt_time(9, 15) <= now.time().replace(tzinfo=None) < dt_time(15, 5)
         )
 
     def _realtime_dashboard(

backend/features/market/service.py

@@ -188,6 +188,30 @@ class MarketServiceMixin:
         age_seconds = (now - updated_at.astimezone(now.tzinfo)).total_seconds()
         return age_seconds >= 8
 
+    def _closing_snapshot_due(
+        self,
+        normalized_date: str,
+        snapshot: dict[str, Any],
+    ) -> bool:
+        """After 15:05, keep requesting daily bars until today's EOD snapshot exists."""
+        if not self.configured or normalized_date != date.today().strftime("%Y%m%d"):
+            return False
+        now = datetime.now().astimezone()
+        if now.weekday() >= 5:
+            return False
+        local_time = now.time().replace(tzinfo=None)
+        if local_time < datetime.strptime("15:05", "%H:%M").time():
+            return False
+        meta = snapshot.get("meta") or {}
+        snapshot_trade_date = str(meta.get("trade_date") or "").replace("-", "")
+        if (
+            snapshot_trade_date == normalized_date
+            and not meta.get("realtime")
+            and not meta.get("carried_forward")
+        ):
+            return False
+        return True
+
     def sync_dashboard(self, trade_date: str) -> dict[str, Any]:
         normalized_date = normalize_date(trade_date)
         source = "tushare"
@@ -232,9 +256,15 @@ class MarketServiceMixin:
                         fallback, normalized_date, f"最新行情暂不可用，沿用最近收盘快照：{exc}"
                     )
                     self.database.finish_sync(
-                        sync_id, "fallback", self._record_count(carried), str(exc), "tushare"
+                        sync_id, "failed", self._record_count(carried), str(exc), "tushare"
                     )
-                    return self._apply_reason_overrides(self._with_storage(carried, cached=True))
+                    result = self._apply_reason_overrides(
+                        self._with_storage(carried, cached=True)
+                    )
+                    # 页面仍可读到沿用快照；后台任务通过顶层 status=failed 记失败。
+                    result["status"] = "failed"
+                    result["error"] = str(exc)
+                    return result
                 self.database.finish_sync(sync_id, "failed", message=str(exc))
                 raise ValueError("暂无可用的真实行情快照，请等待后台完成首次同步。") from exc
             except Exception as exc:

backend/jobs/service.py

@@ -46,4 +46,13 @@ class JobServiceMixin:
                 lambda: self.sync_dashboard(today),
                 {"trade_date": today, "trigger": "realtime-poll"},
             )
+        elif self._closing_snapshot_due(today, snapshot):
+            # 15:05 后改走日线生成当日快照；按分钟去重，避免日线未就绪时刷爆任务。
+            bucket = int(time.time() // 60)
+            self.jobs.submit(
+                "market.refresh",
+                f"closing:{today}:{bucket}",
+                lambda: self.sync_dashboard(today),
+                {"trade_date": today, "trigger": "post-close"},
+            )
         self._schedule_automatic_screeners(today, snapshot)