fix: 价格提醒时间字段统一转换为应用时区格式，并在规则更新时重置当日触发计数

Author: TNT-Likely

src/web/api/price_alerts.py

@@ -1,10 +1,12 @@
 import logging
-from datetime import datetime
+from datetime import datetime, timezone
 
 from fastapi import APIRouter, Depends, HTTPException
 from pydantic import BaseModel, Field
 from sqlalchemy.orm import Session
+from zoneinfo import ZoneInfo
 
+from src.config import Settings
 from src.core.price_alert_engine import ENGINE
 from src.web.database import get_db
 from src.web.models import PriceAlertHit, PriceAlertRule, Stock
@@ -13,6 +15,20 @@
 router = APIRouter()
 
 
+def _format_datetime(dt) -> str:
+    """格式化时间为当前时区的 ISO 格式（naive datetime 视为 UTC）。"""
+    if not dt:
+        return ""
+    tz_name = Settings().app_timezone or "UTC"
+    try:
+        tzinfo = ZoneInfo(tz_name)
+    except Exception:
+        tzinfo = timezone.utc
+    if dt.tzinfo is None:
+        dt = dt.replace(tzinfo=timezone.utc)
+    return dt.astimezone(tzinfo).isoformat(timespec="seconds")
+
+
 class AlertConditionItem(BaseModel):
     type: str = Field(..., description="price/change_pct/turnover/volume/volume_ratio")
     op: str = Field(..., description=">=/<=/>/</==/between")
@@ -85,14 +101,14 @@ def _to_response(rule: PriceAlertRule) -> dict:
         "cooldown_minutes": rule.cooldown_minutes,
         "max_triggers_per_day": rule.max_triggers_per_day,
         "repeat_mode": rule.repeat_mode,
-        "expire_at": rule.expire_at.isoformat() if rule.expire_at else None,
+        "expire_at": _format_datetime(rule.expire_at) or None,
         "notify_channel_ids": rule.notify_channel_ids or [],
-        "last_trigger_at": rule.last_trigger_at.isoformat() if rule.last_trigger_at else None,
+        "last_trigger_at": _format_datetime(rule.last_trigger_at) or None,
         "last_trigger_price": rule.last_trigger_price,
         "trigger_count_today": rule.trigger_count_today or 0,
         "trigger_date": rule.trigger_date or "",
-        "created_at": rule.created_at.isoformat() if rule.created_at else "",
-        "updated_at": rule.updated_at.isoformat() if rule.updated_at else "",
+        "created_at": _format_datetime(rule.created_at),
+        "updated_at": _format_datetime(rule.updated_at),
     }
 
 
@@ -165,6 +181,11 @@ def update_alert_rule(rule_id: int, body: PriceAlertUpdate, db: Session = Depend
 
     for k, v in updates.items():
         setattr(row, k, v)
+
+    # 修改提醒规则后重置当日触发计数
+    row.trigger_count_today = 0
+    row.trigger_date = ""
+
     db.commit()
     db.refresh(row)
     return _to_response(row)
@@ -206,7 +227,7 @@ def list_alert_hits(rule_id: int, limit: int = 50, db: Session = Depends(get_db)
             "id": r.id,
             "rule_id": r.rule_id,
             "stock_id": r.stock_id,
-            "trigger_time": r.trigger_time.isoformat() if r.trigger_time else "",
+            "trigger_time": _format_datetime(r.trigger_time),
             "trigger_snapshot": r.trigger_snapshot or {},
             "notify_success": bool(r.notify_success),
             "notify_error": r.notify_error or "",