Merge branch 'main' into fix/moneypagefix

88f2380 把 origin/main 合进本分支后,两条迁移线在 git 上汇合了、在 alembic 图上
却没有:本分支的 ad_reward_boost_round_id → drop_signin_boost_record 与 main 的
merge_active_phone 同从 comparison_llm_cost 分叉,此后再无迁移 revise
drop_signin_boost_record,它成了悬空的第二个 head。

后果:`alembic upgrade head`(单数)报 "Multiple head revisions are present"。
按 CLAUDE.md,run.sh 启动即自动迁移 —— app server 直接起不来,CI/线上同样报错。

用标准 merge revision 收敛(而非改 down_revision 指向),保留两侧作者文件不动。
纯 merge,无表结构/数据改动。

验证:alembic heads 恰好一个 merge_signin_boost_main;空库 alembic upgrade head
全链路跑通,current 停在 (head) (mergepoint);ruff 通过;pytest 435 passed
(6 个既有失败,与本次改动前一致)。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

app/admin/repositories/coupon_data.py

@@ -21,9 +21,6 @@ from app.models.user import User
 from app.repositories import ad_ecpm as crud_ecpm
 from app.repositories.coupon_state import DEFAULT_PLATFORMS, coupon_id_to_platform
 
-_SLOT_OK = ("success", "already_claimed")
-_SLOT_TRIED = ("success", "already_claimed", "failed")
-
 
 def _cn_hour(dt: datetime) -> int:
     """started_at(UTC 口径)→ 北京时间小时(0–23)。naive 当 UTC(sqlite),tz-aware 直接换算(pg)。"""
@@ -89,13 +86,7 @@ def _success_rates(rows: list) -> dict:
     }
 
 
-def _session_to_row(
-    r,
-    phone: str | None = None,
-    nickname: str | None = None,
-    ad_revenue_yuan: float = 0.0,
-    point_stats: dict | None = None,
-) -> dict:
+def _session_to_row(r, phone: str | None = None, nickname: str | None = None, ad_revenue_yuan: float = 0.0) -> dict:
     """CouponSession ORM → 明细行 dict(主表「领券数据」与「用户全部领券」抽屉共用)。"""
     return {
         "id": r.id,
@@ -113,60 +104,11 @@ def _session_to_row(
         "app_env": r.app_env,
         "started_at": r.started_at,
         "claimed_count": r.claimed_count,
-        "point_success_count": point_stats["succeeded"] if point_stats else None,
-        "point_total_count": point_stats["tried"] if point_stats else None,
         "trace_url": r.trace_url,
         "ad_revenue_yuan": ad_revenue_yuan,
     }
 
 
-def _point_scores_by_trace(db: Session, trace_ids: list[str]) -> dict[str, dict[str, int]]:
-    """聚合查询批量返回逐场点位分数，不加载逐券明细。"""
-    if not trace_ids:
-        return {}
-    succeeded = func.sum(case((CouponClaimRecord.status.in_(_SLOT_OK), 1), else_=0))
-    rows = db.execute(
-        select(
-            CouponClaimRecord.trace_id,
-            succeeded.label("succeeded"),
-            func.count().label("tried"),
-        )
-        .where(
-            CouponClaimRecord.trace_id.in_(trace_ids),
-            CouponClaimRecord.status.in_(_SLOT_TRIED),
-        )
-        .group_by(CouponClaimRecord.trace_id)
-    ).all()
-    return {
-        trace_id: {"succeeded": int(success_count or 0), "tried": int(tried or 0)}
-        for trace_id, success_count, tried in rows
-        if trace_id is not None
-    }
-
-
-def coupon_point_details(db: Session, *, trace_id: str) -> list[dict]:
-    """按单个 trace 查询逐券结果；仅在后台用户点击分数时调用。"""
-    rows = db.execute(
-        select(
-            CouponClaimRecord.coupon_id,
-            CouponClaimRecord.coupon_name,
-            CouponClaimRecord.status,
-            CouponClaimRecord.reason,
-        )
-        .where(CouponClaimRecord.trace_id == trace_id)
-        .order_by(CouponClaimRecord.id)
-    ).all()
-    return [
-        {
-            "coupon_id": coupon_id,
-            "coupon_name": coupon_name,
-            "status": status,
-            "reason": reason,
-        }
-        for coupon_id, coupon_name, status, reason in rows
-    ]
-
-
 def _empty_result() -> dict:
     return {
         "summary": {
@@ -307,17 +249,10 @@ def coupon_data_report(
             ).all()
         }
     rev_map = crud_ecpm.revenue_yuan_by_trace(db, [r.trace_id for r in page])
-    point_stats_map = _point_scores_by_trace(db, [r.trace_id for r in page])
     items = []
     for r in page:
         phone, nickname = user_map.get(r.user_id, (None, None)) if r.user_id is not None else (None, None)
-        items.append(_session_to_row(
-            r,
-            phone,
-            nickname,
-            ad_revenue_yuan=rev_map.get(r.trace_id, 0.0),
-            point_stats=point_stats_map.get(r.trace_id),
-        ))
+        items.append(_session_to_row(r, phone, nickname, ad_revenue_yuan=rev_map.get(r.trace_id, 0.0)))
 
     return {
         "summary": summary,
@@ -341,17 +276,15 @@ def coupon_user_records(db: Session, *, user_id: int, limit: int = 100) -> dict:
     ).scalar_one()
     rev_map = crud_ecpm.revenue_yuan_by_trace(db, [r.trace_id for r in rows])
     return {
-        "items": [
-            _session_to_row(
-                r,
-                ad_revenue_yuan=rev_map.get(r.trace_id, 0.0),
-            )
-            for r in rows
-        ],
+        "items": [_session_to_row(r, ad_revenue_yuan=rev_map.get(r.trace_id, 0.0)) for r in rows],
         "total": int(total),
     }
 
 
+_SLOT_OK = ("success", "already_claimed")
+_SLOT_TRIED = ("success", "already_claimed", "failed")
+
+
 def coupon_slot_report(
     db: Session, *, date_from: str, date_to: str, app_env: str | None = None
 ) -> dict:

app/admin/repositories/stats.py

@@ -6,10 +6,10 @@ user.last_login_at / comparison_record.status / withdraw_order.status)要加索
 from __future__ import annotations
 
 from collections import Counter
-from datetime import UTC, date, datetime, time, timedelta, timezone
+from datetime import date, datetime, time, timedelta, timezone
 from decimal import ROUND_HALF_UP, Decimal, InvalidOperation
 
-from sqlalchemy import case, func, or_, select
+from sqlalchemy import case, func, select
 from sqlalchemy.orm import Session
 
 from app.admin.repositories.coupon_data import _percentile
@@ -37,13 +37,14 @@ REWARD_VIDEO_BIZ_TYPES = ("reward_video", "ad_reward")
 # ad_reward 是激励视频,单独成桶、不再混进领券奖励(历史误并会把激励视频金币双计进领券)。
 COUPON_REWARD_BIZ_TYPES = ("coupon", "coupon_reward")
 COMPARISON_REWARD_BIZ_TYPES = ("comparison", "compare_reward", "comparison_reward")
-# 常规任务必须按明确来源相加；不能从全部正向流水反减排除项，否则新增广告/运营
-# biz_type 时会在排除清单更新前自动混入该桶。task_ 前缀在查询处单独覆盖现有及未来任务。
-REGULAR_TASK_EXACT_BIZ_TYPES = (
-    "signin",
-    "signin_boost",
-    "price_report_reward",
-    "feedback_reward",
+EXCLUDED_REWARD_BIZ_TYPES = ("invite_inviter", "invite_invitee", "admin_grant")
+UNCLASSIFIED_FEED_BIZ_TYPES = ("feed_ad_reward",)
+REGULAR_TASK_EXCLUDED_BIZ_TYPES = (
+    *REWARD_VIDEO_BIZ_TYPES,
+    *COUPON_REWARD_BIZ_TYPES,
+    *COMPARISON_REWARD_BIZ_TYPES,
+    *EXCLUDED_REWARD_BIZ_TYPES,
+    *UNCLASSIFIED_FEED_BIZ_TYPES,
 )
 MEITUAN_CPS_INVALID_STATUSES = ("4", "5")
 MEITUAN_CPS_SETTLED_STATUS = "6"
@@ -60,7 +61,7 @@ def _beijing_today_start_utc() -> datetime:
     """北京时间今天 0 点对应的 UTC 时刻(DAU / 今日新增按北京时区切天)。"""
     now_bj = datetime.now(_BEIJING)
     start_bj = now_bj.replace(hour=0, minute=0, second=0, microsecond=0)
-    return start_bj.astimezone(UTC)
+    return start_bj.astimezone(timezone.utc)
 
 
 def today_dau(db: Session) -> int:
@@ -93,8 +94,8 @@ def _period_bounds(date_from: date, date_to: date) -> tuple[datetime, datetime,
     """
     start_bj = datetime.combine(date_from, time.min, tzinfo=_BEIJING)
     end_bj = datetime.combine(date_to + timedelta(days=1), time.min, tzinfo=_BEIJING)
-    start_utc = start_bj.astimezone(UTC)
-    end_utc = end_bj.astimezone(UTC)
+    start_utc = start_bj.astimezone(timezone.utc)
+    end_utc = end_bj.astimezone(timezone.utc)
     return (
         start_utc,
         end_utc,
@@ -504,10 +505,7 @@ def dashboard_overview(
     period_regular_task_coin_total = _sum(
         CoinTransaction.amount,
         *period_coin_conds,
-        or_(
-            CoinTransaction.biz_type.in_(REGULAR_TASK_EXACT_BIZ_TYPES),
-            CoinTransaction.biz_type.like(r"task\_%", escape="\\"),
-        ),
+        CoinTransaction.biz_type.notin_(REGULAR_TASK_EXCLUDED_BIZ_TYPES),
     )
     period_cps_orders = list(
         db.execute(

app/admin/routers/coupon_data.py

@@ -18,8 +18,6 @@ from app.admin.schemas.coupon_data import (
     CouponDataOut,
     CouponDataRow,
     CouponDataSummary,
-    CouponPointDetail,
-    CouponPointDetailsOut,
     CouponSlotRow,
     CouponSlotsOut,
     CouponUserRecordsOut,
@@ -124,22 +122,6 @@ def get_coupon_slots(
     )
 
 
-@router.get(
-    "/point-details",
-    response_model=CouponPointDetailsOut,
-    summary="按 trace 查询单次领券任务的逐券点位明细",
-)
-def get_coupon_point_details(
-    db: AdminDb,
-    trace_id: Annotated[str, Query(min_length=1, max_length=64, description="领券 trace_id")],
-) -> CouponPointDetailsOut:
-    items = coupon_data.coupon_point_details(db, trace_id=trace_id)
-    return CouponPointDetailsOut(
-        trace_id=trace_id,
-        items=[CouponPointDetail(**item) for item in items],
-    )
-
-
 @router.get(
     "/user-records",
     response_model=CouponUserRecordsOut,

app/admin/schemas/coupon_data.py

@@ -49,15 +49,6 @@ class CouponDataHourly(BaseModel):
     avg_elapsed_ms: int | None = None
 
 
-class CouponPointDetail(BaseModel):
-    """一次领券任务中的单券点位结果。"""
-
-    coupon_id: str
-    coupon_name: str | None = None
-    status: str = Field(..., description="success / already_claimed / failed / skipped")
-    reason: str | None = None
-
-
 class CouponDataRow(BaseModel):
     """一条领券明细(一次领券任务)。"""
 
@@ -78,12 +69,6 @@ class CouponDataRow(BaseModel):
     app_env: str | None = None
     started_at: datetime = Field(..., description="发起时刻(明细「时间」列)")
     claimed_count: int | None = None
-    point_success_count: int | None = Field(
-        None, description="本次成功券点位数(success+already_claimed);无逐券埋点为空"
-    )
-    point_total_count: int | None = Field(
-        None, description="本次尝试券点位数(success+already_claimed+failed,不含 skipped);无逐券埋点为空"
-    )
     trace_url: str | None = Field(None, description="pricebot 公网 trace 链接(仅 completed 有);admin 渲染可点链接,无则显示可复制 trace_id")
     ad_revenue_yuan: float = Field(
         0.0, description="本次领券看的信息流广告预估收益(元);按 trace_id 聚合 ad_ecpm_record"
@@ -104,13 +89,6 @@ class CouponDataOut(BaseModel):
     items: list[CouponDataRow] = Field(..., description="逐条领券明细(当前页)")
 
 
-class CouponPointDetailsOut(BaseModel):
-    """单次领券任务的逐券点位结果，供点击分数时按需加载。"""
-
-    trace_id: str
-    items: list[CouponPointDetail] = Field(default_factory=list)
-
-
 class CouponUserRecordsOut(BaseModel):
     """某用户全部领券记录(点手机号抽屉用):total=该用户领券总次数,items=记录列表(UserRecordsDrawer 渲染)。"""
 

tests/test_admin_read.py

@@ -455,62 +455,3 @@ def test_period_coupon_reward_excludes_reward_video(
     coins = r.json()["period"]["coins"]
     assert coins["coupon_reward_coin_total"] == 0        # 激励视频不计入领券奖励
     assert coins["reward_video_coin_total"] == 50        # 仍计入激励视频卡
-
-
-def test_period_regular_task_coin_uses_explicit_allowlist(
-    admin_client: TestClient, admin_token: str
-) -> None:
-    """常规任务金币只加明确任务来源，领券/比价及未知新类型不得自动混入。"""
-    from datetime import datetime
-
-    from app.models.wallet import CoinTransaction
-
-    d = "2021-06-18"
-    included = {
-        "signin": 100,
-        "signin_boost": 200,
-        "task_enable_notification": 300,
-        "task_other": 400,
-        "price_report_reward": 500,
-        "feedback_reward": 600,
-    }
-    excluded = {
-        "feed_ad_reward_coupon": 700,
-        "feed_ad_reward_comparison": 800,
-        "feed_ad_reward": 900,
-        "reward_video": 1000,
-        "admin_grant": 1100,
-        "invite_inviter": 1200,
-        "future_unknown_reward": 1300,
-    }
-    db = SessionLocal()
-    try:
-        uid = user_repo.upsert_user_for_login(
-            db, phone="13800008804", register_channel="sms"
-        ).id
-        balance = 0
-        rows = []
-        for index, (biz_type, amount) in enumerate((included | excluded).items(), start=1):
-            balance += amount
-            rows.append(CoinTransaction(
-                user_id=uid,
-                amount=amount,
-                balance_after=balance,
-                biz_type=biz_type,
-                ref_id=f"regular-task-{index}",
-                created_at=datetime(2021, 6, 18, 12, 0, index),
-            ))
-        db.add_all(rows)
-        db.commit()
-    finally:
-        db.close()
-
-    response = admin_client.get(
-        "/admin/api/stats/overview",
-        params={"date_from": d, "date_to": d},
-        headers=_auth(admin_token),
-    )
-    assert response.status_code == 200, response.text
-    coins = response.json()["period"]["coins"]
-    assert coins["regular_task_coin_total"] == sum(included.values())
-    assert coins["task_coin_total"] == 700

tests/test_coupon_point_score.py

@@ -1,161 +0,0 @@
-"""admin 领券明细逐场点位分数与按需明细。"""
-from datetime import UTC, date, datetime
-
-from fastapi.testclient import TestClient
-from sqlalchemy import delete
-
-from app.admin.main import admin_app
-from app.admin.repositories import admin_user as admin_repo
-from app.admin.repositories.coupon_data import (
-    _point_scores_by_trace,
-    coupon_data_report,
-    coupon_point_details,
-)
-from app.admin.security import create_admin_token
-from app.db.session import SessionLocal
-from app.models.coupon_state import CouponClaimRecord, CouponSession
-
-
-def test_point_scores_by_trace() -> None:
-    """已领算成功、失败算尝试、跳过不进分母。"""
-    db = SessionLocal()
-    trace = "point-score-trace"
-    try:
-        db.add_all([
-            CouponClaimRecord(
-                device_id="score-device",
-                coupon_id=f"mt-score-{status}",
-                claim_date=date(2020, 1, 2),
-                status=status,
-                coupon_name=f"测试点位-{status}",
-                reason="测试失败" if status == "failed" else None,
-                trace_id=trace,
-            )
-            for status in ("success", "already_claimed", "failed", "skipped")
-        ])
-        db.flush()
-
-        stats = _point_scores_by_trace(db, [trace])[trace]
-        assert stats["succeeded"] == 2
-        assert stats["tried"] == 3
-        details = coupon_point_details(db, trace_id=trace)
-        assert [item["status"] for item in details] == [
-            "success", "already_claimed", "failed", "skipped"
-        ]
-        assert details[2]["reason"] == "测试失败"
-    finally:
-        db.rollback()
-        db.close()
-
-
-def test_skipped_detail_does_not_create_a_score() -> None:
-    """仅有 skipped 时按需明细仍可查到，但列表没有虚假的 0/0 分数。"""
-    db = SessionLocal()
-    trace = "point-score-skipped"
-    try:
-        db.add(CouponClaimRecord(
-            device_id="score-device-skipped",
-            coupon_id="mt-score-skipped-only",
-            claim_date=date(2020, 1, 2),
-            status="skipped",
-            trace_id=trace,
-        ))
-        db.flush()
-
-        scores = _point_scores_by_trace(db, [trace, "missing-trace"])
-        assert trace not in scores
-        assert "missing-trace" not in scores
-        assert coupon_point_details(db, trace_id=trace)[0]["status"] == "skipped"
-    finally:
-        db.rollback()
-        db.close()
-
-
-def test_coupon_data_report_returns_scores_without_embedding_details() -> None:
-    """主列表只返回聚合分数，逐券记录必须走按 trace 的明细查询。"""
-    db = SessionLocal()
-    trace = "point-score-report"
-    report_date = date(2020, 1, 4)
-    try:
-        db.add(CouponSession(
-            trace_id=trace,
-            device_id="score-report-device",
-            status="completed",
-            app_env="prod",
-            platforms=["meituan-waimai"],
-            started_at=datetime(2020, 1, 4, tzinfo=UTC),
-            started_date=report_date,
-        ))
-        db.add_all([
-            CouponClaimRecord(
-                device_id="score-report-device",
-                coupon_id=f"mt-report-{status}",
-                claim_date=report_date,
-                status=status,
-                trace_id=trace,
-            )
-            for status in ("success", "failed")
-        ])
-        db.flush()
-
-        report = coupon_data_report(
-            db,
-            date_from=report_date.isoformat(),
-            date_to=report_date.isoformat(),
-            app_env="prod",
-        )
-        row = next(item for item in report["items"] if item["trace_id"] == trace)
-        assert row["point_success_count"] == 1
-        assert row["point_total_count"] == 2
-        assert "point_details" not in row
-        assert len(coupon_point_details(db, trace_id=trace)) == 2
-    finally:
-        db.rollback()
-        db.close()
-
-
-def test_coupon_point_details_endpoint() -> None:
-    """前端点击使用的接口按约定返回 trace_id 和逐券 items。"""
-    db = SessionLocal()
-    trace = "point-details-endpoint"
-    try:
-        admin = admin_repo.get_by_username(db, "point_details_admin")
-        if admin is None:
-            admin = admin_repo.create_admin(
-                db,
-                username="point_details_admin",
-                password="pass1234",
-                role="super_admin",
-            )
-        token, _expires_at = create_admin_token(admin_id=admin.id, role=admin.role)
-        db.add(CouponClaimRecord(
-            device_id="point-details-endpoint-device",
-            coupon_id="mt-point-details-endpoint",
-            coupon_name="接口测试券",
-            claim_date=date(2020, 1, 5),
-            status="failed",
-            reason="接口测试失败",
-            trace_id=trace,
-        ))
-        db.commit()
-
-        response = TestClient(admin_app).get(
-            "/admin/api/coupon-data/point-details",
-            params={"trace_id": trace},
-            headers={"Authorization": f"Bearer {token}"},
-        )
-        assert response.status_code == 200, response.text
-        assert response.json() == {
-            "trace_id": trace,
-            "items": [{
-                "coupon_id": "mt-point-details-endpoint",
-                "coupon_name": "接口测试券",
-                "status": "failed",
-                "reason": "接口测试失败",
-            }],
-        }
-    finally:
-        db.rollback()
-        db.execute(delete(CouponClaimRecord).where(CouponClaimRecord.trace_id == trace))
-        db.commit()
-        db.close()