fix(time): created_at 统一存北京时间,修面向用户展示慢 8h

savings/comparison/wallet(金币·现金流水)/report 写入显式 created_at=datetime.now(CN_TZ).replace(tzinfo=None),替代 SQLite 下返回 UTC 的 server_default=func.now()。后台统计 admin/ops 依赖 created_at 是 UTC,不动。

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

.env.example

@@ -79,10 +79,6 @@ WXPAY_MCH_PRIVATE_KEY_PATH=./secrets/apiclient_key.pem
 WXPAY_PUBLIC_KEY_ID=PUB_KEY_ID_xxxxxxxx
 WXPAY_PUBLIC_KEY_PATH=./secrets/pub_key.pem
 WXPAY_TRANSFER_SCENE_ID=1000
-WXPAY_AUTH_NOTIFY_URL=
-WITHDRAW_AUTO_RECONCILE_ENABLED=false
-WITHDRAW_AUTO_RECONCILE_INTERVAL_SEC=300
-WITHDRAW_AUTO_RECONCILE_OLDER_THAN_MINUTES=15
 
 # ===== 穿山甲激励视频(服务端发奖回调)=====
 # 看完激励视频后穿山甲服务器 S2S 回调本服务发金币(客户端不参与发奖)。

.gitignore

@@ -43,4 +43,3 @@ secrets/*
 
 # 运行日志(run.sh 输出, 不入库)
 *.log
-logs/

alembic/versions/a8c47fc4dc39_merge_invite_fingerprint_and_ad_reward_.py

@@ -1,26 +0,0 @@
-"""merge invite_fingerprint and ad_reward heads
-
-Revision ID: a8c47fc4dc39
-Revises: invite_fingerprint_table, 044dce6e9b1f
-Create Date: 2026-06-10 01:03:03.699443
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = 'a8c47fc4dc39'
-down_revision: Union[str, Sequence[str], None] = ('invite_fingerprint_table', '044dce6e9b1f')
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    pass
-
-
-def downgrade() -> None:
-    pass

alembic/versions/ad_feed_reward_session_id.py

@@ -1,38 +0,0 @@
-"""add ad_session_id to ad feed reward record
-
-Revision ID: ad_feed_reward_session
-Revises: coin_reward_phase2
-Create Date: 2026-06-09
-"""
-
-from __future__ import annotations
-
-from alembic import op
-import sqlalchemy as sa
-
-
-revision = "ad_feed_reward_session"
-down_revision = "coin_reward_phase2"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    op.add_column(
-        "ad_feed_reward_record",
-        sa.Column("ad_session_id", sa.String(length=64), nullable=True),
-    )
-    op.create_index(
-        op.f("ix_ad_feed_reward_record_ad_session_id"),
-        "ad_feed_reward_record",
-        ["ad_session_id"],
-        unique=False,
-    )
-
-
-def downgrade() -> None:
-    op.drop_index(
-        op.f("ix_ad_feed_reward_record_ad_session_id"),
-        table_name="ad_feed_reward_record",
-    )
-    op.drop_column("ad_feed_reward_record", "ad_session_id")

alembic/versions/coin_reward_points_phase2.py

@@ -1,71 +0,0 @@
-"""coin reward points phase2
-
-Revision ID: coin_reward_phase2
-Revises: 0cf18d590b1d
-Create Date: 2026-06-08
-"""
-
-from __future__ import annotations
-
-from alembic import op
-import sqlalchemy as sa
-
-
-revision = "coin_reward_phase2"
-down_revision = "0cf18d590b1d"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    op.add_column(
-        "ad_ecpm_record",
-        sa.Column("ad_session_id", sa.String(length=64), nullable=True),
-    )
-    op.create_index(
-        op.f("ix_ad_ecpm_record_ad_session_id"),
-        "ad_ecpm_record",
-        ["ad_session_id"],
-        unique=False,
-    )
-    op.create_index(
-        "uq_ad_ecpm_record_session",
-        "ad_ecpm_record",
-        ["ad_session_id"],
-        unique=True,
-    )
-
-    op.add_column(
-        "ad_reward_record",
-        sa.Column(
-            "reward_scene",
-            sa.String(length=32),
-            nullable=False,
-            server_default="reward_video",
-        ),
-    )
-    op.add_column(
-        "ad_reward_record",
-        sa.Column("ad_session_id", sa.String(length=64), nullable=True),
-    )
-    op.add_column(
-        "ad_reward_record",
-        sa.Column("ecpm_raw", sa.String(length=32), nullable=True),
-    )
-    op.create_index(
-        op.f("ix_ad_reward_record_ad_session_id"),
-        "ad_reward_record",
-        ["ad_session_id"],
-        unique=False,
-    )
-
-
-def downgrade() -> None:
-    op.drop_index(op.f("ix_ad_reward_record_ad_session_id"), table_name="ad_reward_record")
-    op.drop_column("ad_reward_record", "ecpm_raw")
-    op.drop_column("ad_reward_record", "ad_session_id")
-    op.drop_column("ad_reward_record", "reward_scene")
-
-    op.drop_index("uq_ad_ecpm_record_session", table_name="ad_ecpm_record")
-    op.drop_index(op.f("ix_ad_ecpm_record_ad_session_id"), table_name="ad_ecpm_record")
-    op.drop_column("ad_ecpm_record", "ad_session_id")

alembic/versions/f8d3b1e60a27_add_debug_trace_and_merge_heads.py

@@ -1,49 +0,0 @@
-"""add user.debug_trace_enabled + comparison_record.trace_url
-
-调试链接权限功能：
-  - user.debug_trace_enabled：运营后台给指定用户开「复制调试链接」权限
-  - comparison_record.trace_url：比价记录页「复制调试链接」的数据（pricebot done 帧给，
-    dir 名含落盘时分秒、前端/server 拼不出，必须落库）
-
-注：本迁移最初基于旧 main（#31，双 head）写、down_revision 曾指向那对父；但 #33 已用
-a8c47fc4dc39 合并了那对双 head，故改为线性接在 a8c47fc4dc39 之后、只负责加两列
-（避免与 a8c47fc4dc39 平行再造一个双 head）。
-
-Revision ID: f8d3b1e60a27
-Revises: a8c47fc4dc39
-Create Date: 2026-06-10 02:40:00.000000
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = "f8d3b1e60a27"
-down_revision: Union[str, Sequence[str], None] = "a8c47fc4dc39"
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    # sa.false() 渲染成 PG 的 false / SQLite 的 0，两端兼容（避免字符串 "false" 在 SQLite 上存歪）
-    op.add_column(
-        "user",
-        sa.Column(
-            "debug_trace_enabled",
-            sa.Boolean(),
-            nullable=False,
-            server_default=sa.false(),
-        ),
-    )
-    op.add_column(
-        "comparison_record",
-        sa.Column("trace_url", sa.String(length=512), nullable=True),
-    )
-
-
-def downgrade() -> None:
-    op.drop_column("comparison_record", "trace_url")
-    op.drop_column("user", "debug_trace_enabled")

alembic/versions/invite_fingerprint_table.py

@@ -1,50 +0,0 @@
-"""invite_fingerprint table (任务 3 指纹归因兜底)
-
-Revision ID: invite_fingerprint_table
-Revises: 0cf18d590b1d
-Create Date: 2026-06-08 14:00:00.000000
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = 'invite_fingerprint_table'
-down_revision: Union[str, Sequence[str], None] = '0cf18d590b1d'
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    # 邀请指纹归因表:落地页访问时记一行,登录后剪贴板没拿到邀请码时反查
-    op.create_table(
-        'invite_fingerprint',
-        sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
-        sa.Column('inviter_user_id', sa.Integer(), nullable=False),
-        sa.Column('ip', sa.String(length=64), nullable=False),
-        sa.Column('device_model', sa.String(length=64), nullable=False, server_default=''),
-        sa.Column('screen', sa.String(length=32), nullable=False, server_default=''),
-        sa.Column('user_agent', sa.Text(), nullable=False, server_default=''),
-        sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.func.now(), nullable=False),
-        sa.ForeignKeyConstraint(['inviter_user_id'], ['user.id']),
-        sa.PrimaryKeyConstraint('id'),
-    )
-    # 反查主索引:(ip, screen, device_model, created_at)
-    # /bind 兜底分支 WHERE ip=? AND screen=? AND device_model=? AND created_at > now - 7d
-    # ORDER BY created_at DESC LIMIT 1 — SQLite/PG 优化器都能反向扫该索引
-    op.create_index(
-        'ix_invite_fp_match',
-        'invite_fingerprint',
-        ['ip', 'screen', 'device_model', 'created_at'],
-    )
-    # 兜底/统计索引:按 inviter 看"这个邀请人的落地页被谁访问过"
-    op.create_index('ix_invite_fp_inviter', 'invite_fingerprint', ['inviter_user_id'])
-
-
-def downgrade() -> None:
-    op.drop_index('ix_invite_fp_inviter', table_name='invite_fingerprint')
-    op.drop_index('ix_invite_fp_match', table_name='invite_fingerprint')
-    op.drop_table('invite_fingerprint')

alembic/versions/merge_ad_feed_reward_session_and_withdraw_safety_heads.py

@@ -1,26 +0,0 @@
-"""merge ad feed reward session and withdraw safety heads
-
-Revision ID: 044dce6e9b1f
-Revises: ad_feed_reward_session, withdraw_safety_indexes
-Create Date: 2026-06-09 09:52:08.276767
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = '044dce6e9b1f'
-down_revision: Union[str, Sequence[str], None] = ('ad_feed_reward_session', 'withdraw_safety_indexes')
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    pass
-
-
-def downgrade() -> None:
-    pass

alembic/versions/withdraw_safety_indexes.py

@@ -1,42 +0,0 @@
-"""add withdraw concurrency safety indexes
-
-Revision ID: withdraw_safety_indexes
-Revises: 0cf18d590b1d
-Create Date: 2026-06-08 16:20:00.000000
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = "withdraw_safety_indexes"
-down_revision: Union[str, Sequence[str], None] = "0cf18d590b1d"
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    op.create_index(
-        "ux_withdraw_order_user_active",
-        "withdraw_order",
-        ["user_id"],
-        unique=True,
-        sqlite_where=sa.text("status IN ('reviewing', 'pending')"),
-        postgresql_where=sa.text("status IN ('reviewing', 'pending')"),
-    )
-    op.create_index(
-        "ux_cash_transaction_withdraw_refund_ref",
-        "cash_transaction",
-        ["ref_id"],
-        unique=True,
-        sqlite_where=sa.text("biz_type = 'withdraw_refund' AND ref_id IS NOT NULL"),
-        postgresql_where=sa.text("biz_type = 'withdraw_refund' AND ref_id IS NOT NULL"),
-    )
-
-
-def downgrade() -> None:
-    op.drop_index("ux_cash_transaction_withdraw_refund_ref", table_name="cash_transaction")
-    op.drop_index("ux_withdraw_order_user_active", table_name="withdraw_order")

app/admin/main.py

@@ -21,7 +21,6 @@ from app.admin.routers.dashboard import router as dashboard_router
 from app.admin.routers.ops_stat_config import router as ops_stat_config_router
 from app.admin.routers.feedback import router as feedback_router
 from app.admin.routers.ops_marquee_seed import router as ops_marquee_seed_router
-from app.admin.routers.price_report import router as price_report_router
 from app.admin.routers.users import router as users_router
 from app.admin.routers.wallet import router as wallet_router
 from app.admin.routers.withdraw import router as withdraw_router
@@ -81,7 +80,6 @@ admin_app.include_router(ops_marquee_seed_router)
 admin_app.include_router(users_router)
 admin_app.include_router(wallet_router)
 admin_app.include_router(withdraw_router)
-admin_app.include_router(price_report_router)
 admin_app.include_router(feedback_router)
 admin_app.include_router(admins_router)
 admin_app.include_router(audit_router)

app/admin/repositories/mutations.py

@@ -8,13 +8,9 @@ set_user_status / update_feedback_status 支持 commit=False,让 router 把"业
 """
 from __future__ import annotations
 
-from datetime import datetime
-
 from sqlalchemy.orm import Session
 
-from app.core.rewards import CN_TZ
 from app.models.feedback import Feedback
-from app.models.price_report import PriceReport
 from app.models.user import User
 
 
@@ -28,20 +24,6 @@ def set_user_status(db: Session, user: User, *, status: str, commit: bool = True
     return user
 
 
-def set_user_debug_trace(
-    db: Session, user: User, *, enabled: bool, commit: bool = True
-) -> User:
-    """开关用户「复制调试链接」权限。同 set_user_status：支持 commit=False 让 router 把
-    业务写 + 审计写放进同一事务。"""
-    user.debug_trace_enabled = enabled
-    if commit:
-        db.commit()
-        db.refresh(user)
-    else:
-        db.flush()
-    return user
-
-
 def update_feedback_status(
     db: Session, feedback: Feedback, *, status: str, commit: bool = True
 ) -> Feedback:
@@ -52,30 +34,3 @@ def update_feedback_status(
     else:
         db.flush()
     return feedback
-
-
-def review_price_report(
-    db: Session,
-    report: PriceReport,
-    *,
-    status: str,
-    reward_coins: int | None = None,
-    reject_reason: str | None = None,
-    commit: bool = True,
-) -> PriceReport:
-    """审核上报:置 approved/rejected + 记审核时间;通过填 reward_coins、拒绝填 reject_reason。
-
-    发金币(wallet.grant_coins)不在这里——由 router 在同一事务里调,涉钱逻辑不重写(见模块头注释)。
-    """
-    report.status = status
-    if reward_coins is not None:
-        report.reward_coins = reward_coins
-    if reject_reason is not None:
-        report.reject_reason = reject_reason
-    report.reviewed_at = datetime.now(CN_TZ).replace(tzinfo=None)  # 北京 wall-clock,同 created_at
-    if commit:
-        db.commit()
-        db.refresh(report)
-    else:
-        db.flush()
-    return report

app/admin/repositories/queries.py

@@ -5,16 +5,11 @@
 """
 from __future__ import annotations
 
-from datetime import datetime, timedelta, timezone
-from zoneinfo import ZoneInfo
-
-from sqlalchemy import Select, asc, desc, func, or_, select
+from sqlalchemy import Select, func, select
 from sqlalchemy.orm import Session
 
-from app.models.admin import AdminAuditLog
 from app.models.comparison import ComparisonRecord
 from app.models.feedback import Feedback
-from app.models.price_report import PriceReport
 from app.models.user import User
 from app.models.wallet import CashTransaction, CoinAccount, CoinTransaction, WithdrawOrder
 
@@ -93,114 +88,15 @@ def list_all_withdraw_orders(
     *,
     user_id: int | None = None,
     status: str | None = None,
-    keyword: str | None = None,
-    date_from: datetime | None = None,
-    date_to: datetime | None = None,
-    date_field: str = "created_at",
-    sort_by: str = "created_at",
-    sort_order: str = "desc",
-    quick_filter: str | None = None,
     limit: int = 20,
     cursor: int | None = None,
 ) -> tuple[list[WithdrawOrder], int | None]:
     stmt = select(WithdrawOrder)
-    needs_user_join = bool(keyword and keyword.strip()) or quick_filter == "high_risk"
-    if needs_user_join:
-        stmt = stmt.outerjoin(User, User.id == WithdrawOrder.user_id)
-
     if user_id is not None:
         stmt = stmt.where(WithdrawOrder.user_id == user_id)
     if status:
         stmt = stmt.where(WithdrawOrder.status == status)
-
-    kw = (keyword or "").strip()
-    if kw:
-        pattern = f"%{kw}%"
-        conditions = [
-            WithdrawOrder.out_bill_no.ilike(pattern),
-            WithdrawOrder.transfer_bill_no.ilike(pattern),
-            WithdrawOrder.user_name.ilike(pattern),
-            WithdrawOrder.wechat_state.ilike(pattern),
-            WithdrawOrder.fail_reason.ilike(pattern),
-            User.phone.ilike(pattern),
-            User.nickname.ilike(pattern),
-            User.wechat_nickname.ilike(pattern),
-        ]
-        if kw.isdigit():
-            conditions.append(WithdrawOrder.user_id == int(kw))
-        stmt = stmt.where(or_(*conditions))
-
-    date_col = WithdrawOrder.updated_at if date_field == "updated_at" else WithdrawOrder.created_at
-    if date_from is not None:
-        stmt = stmt.where(date_col >= _as_utc_naive(date_from))
-    if date_to is not None:
-        stmt = stmt.where(date_col <= _as_utc_naive(date_to))
-
-    now = datetime.now(timezone.utc).replace(tzinfo=None)
-    today_start = (
-        datetime.now(ZoneInfo("Asia/Shanghai"))
-        .replace(hour=0, minute=0, second=0, microsecond=0)
-        .astimezone(timezone.utc)
-        .replace(tzinfo=None)
-    )
-    if quick_filter == "abnormal":
-        stmt = stmt.where(
-            or_(
-                WithdrawOrder.status.in_(("failed", "rejected")),
-                WithdrawOrder.fail_reason.is_not(None),
-                WithdrawOrder.wechat_state.in_(("FAIL", "CANCELLED", "CLOSED")),
-            )
-        )
-    elif quick_filter == "failed":
-        stmt = stmt.where(WithdrawOrder.status == "failed")
-    elif quick_filter == "overdue_reviewing":
-        stmt = stmt.where(
-            WithdrawOrder.status == "reviewing",
-            WithdrawOrder.created_at <= now - timedelta(minutes=30),
-        )
-    elif quick_filter == "pending_overdue":
-        stmt = stmt.where(
-            WithdrawOrder.status == "pending",
-            WithdrawOrder.updated_at <= now - timedelta(minutes=15),
-        )
-    elif quick_filter == "today":
-        stmt = stmt.where(WithdrawOrder.created_at >= today_start)
-    elif quick_filter == "high_risk":
-        stmt = stmt.where(
-            or_(
-                WithdrawOrder.user_name.is_(None),
-                WithdrawOrder.user_name == "",
-                User.status != "active",
-                User.created_at >= now - timedelta(hours=24),
-                WithdrawOrder.status.in_(("failed", "rejected")),
-                WithdrawOrder.fail_reason.is_not(None),
-            )
-        )
-
-    sort_cols = {
-        "id": WithdrawOrder.id,
-        "created_at": WithdrawOrder.created_at,
-        "updated_at": WithdrawOrder.updated_at,
-        "amount_cents": WithdrawOrder.amount_cents,
-    }
-    sort_col = sort_cols.get(sort_by, WithdrawOrder.created_at)
-    order_fn = asc if sort_order == "asc" else desc
-    id_order = asc(WithdrawOrder.id) if sort_order == "asc" else desc(WithdrawOrder.id)
-    stmt = stmt.order_by(order_fn(sort_col), id_order)
-
-    offset = max(cursor or 0, 0)
-    rows = list(db.execute(stmt.offset(offset).limit(limit + 1)).scalars().all())
-    has_more = len(rows) > limit
-    items = rows[:limit]
-    next_cursor = offset + limit if has_more else None
-    return items, next_cursor
-
-
-def _as_utc_naive(value: datetime) -> datetime:
-    """前端传 ISO 时间;DB 当前按 UTC naive 比较最稳(SQLite/本地开发一致)。"""
-    if value.tzinfo is None:
-        return value
-    return value.astimezone(timezone.utc).replace(tzinfo=None)
+    return cursor_paginate(db, stmt, WithdrawOrder.id, limit=limit, cursor=cursor)
 
 
 def list_feedbacks(
@@ -226,147 +122,6 @@ def get_withdraw_by_out_bill_no(db: Session, out_bill_no: str) -> WithdrawOrder
     ).scalar_one_or_none()
 
 
-def withdraw_summary(db: Session) -> dict:
-    """提现审核台顶部统计。金额单位:分。"""
-    rows = db.execute(
-        select(
-            WithdrawOrder.status,
-            func.count(WithdrawOrder.id),
-            func.coalesce(func.sum(WithdrawOrder.amount_cents), 0),
-        ).group_by(WithdrawOrder.status)
-    ).all()
-    by_status = {
-        status: {"count": int(count), "amount_cents": int(amount_cents)}
-        for status, count, amount_cents in rows
-    }
-
-    today_start = (
-        datetime.now(ZoneInfo("Asia/Shanghai"))
-        .replace(hour=0, minute=0, second=0, microsecond=0)
-        .astimezone(timezone.utc)
-    )
-
-    def _today_count(status: str) -> int:
-        return db.execute(
-            select(func.count(WithdrawOrder.id)).where(
-                WithdrawOrder.status == status,
-                WithdrawOrder.updated_at >= today_start,
-            )
-        ).scalar_one()
-
-    today_success_amount = db.execute(
-        select(func.coalesce(func.sum(WithdrawOrder.amount_cents), 0)).where(
-            WithdrawOrder.status == "success",
-            WithdrawOrder.updated_at >= today_start,
-        )
-    ).scalar_one()
-
-    return {
-        "reviewing_count": by_status.get("reviewing", {}).get("count", 0),
-        "reviewing_amount_cents": by_status.get("reviewing", {}).get("amount_cents", 0),
-        "pending_count": by_status.get("pending", {}).get("count", 0),
-        "failed_count": by_status.get("failed", {}).get("count", 0),
-        "today_success_count": _today_count("success"),
-        "today_success_amount_cents": int(today_success_amount),
-        "today_rejected_count": _today_count("rejected"),
-    }
-
-
-def list_withdraw_audit_logs(
-    db: Session, out_bill_no: str, *, limit: int = 20
-) -> list[AdminAuditLog]:
-    return list(
-        db.execute(
-            select(AdminAuditLog)
-            .where(AdminAuditLog.target_type == "withdraw", AdminAuditLog.target_id == out_bill_no)
-            .order_by(AdminAuditLog.id.desc())
-            .limit(limit)
-        ).scalars().all()
-    )
-
-
-def withdraw_risk_flags(
-    order: WithdrawOrder,
-    user: User | None,
-    recent_withdraws: list[WithdrawOrder],
-    cash_balance_cents: int,
-) -> tuple[list[str], int]:
-    flags: list[str] = []
-    if not order.user_name:
-        flags.append("缺少提现实名")
-    if user and user.status != "active":
-        flags.append(f"账号状态:{user.status}")
-    if user and user.created_at:
-        created_at = user.created_at.replace(tzinfo=timezone.utc) if user.created_at.tzinfo is None else user.created_at
-        if datetime.now(timezone.utc) - created_at < timedelta(hours=24):
-            flags.append("新注册用户")
-    failed_or_rejected = sum(1 for item in recent_withdraws if item.status in {"failed", "rejected"})
-    if failed_or_rejected:
-        flags.append(f"历史异常提现{failed_or_rejected}笔")
-    recent_reviewing = sum(1 for item in recent_withdraws if item.status == "reviewing")
-    if recent_reviewing >= 3:
-        flags.append(f"待审核提现偏多:{recent_reviewing}笔")
-    if cash_balance_cents < 0:
-        flags.append("现金余额为负")
-    score = min(100, len(flags) * 20 + failed_or_rejected * 10)
-    return flags, score
-
-
-def withdraw_ledger_check(db: Session) -> dict:
-    cash_balance_total = int(
-        db.execute(select(func.coalesce(func.sum(CoinAccount.cash_balance_cents), 0))).scalar_one()
-    )
-    cash_txn_total = int(
-        db.execute(select(func.coalesce(func.sum(CashTransaction.amount_cents), 0))).scalar_one()
-    )
-
-    orders = list(db.execute(select(WithdrawOrder)).scalars().all())
-    cash_txns = list(
-        db.execute(
-            select(CashTransaction).where(
-                CashTransaction.biz_type.in_(("withdraw", "withdraw_refund"))
-            )
-        ).scalars().all()
-    )
-    withdraw_refs = {txn.ref_id for txn in cash_txns if txn.biz_type == "withdraw"}
-    refund_counts: dict[str, int] = {}
-    for txn in cash_txns:
-        if txn.biz_type == "withdraw_refund" and txn.ref_id:
-            refund_counts[txn.ref_id] = refund_counts.get(txn.ref_id, 0) + 1
-
-    missing_withdraw = 0
-    missing_refund = 0
-    refund_on_non_terminal = 0
-    for order in orders:
-        if order.out_bill_no not in withdraw_refs:
-            missing_withdraw += 1
-        has_refund = refund_counts.get(order.out_bill_no, 0) > 0
-        if order.status in {"failed", "rejected"} and not has_refund:
-            missing_refund += 1
-        if has_refund and order.status not in {"failed", "rejected"}:
-            refund_on_non_terminal += 1
-
-    duplicate_refund = sum(1 for count in refund_counts.values() if count > 1)
-    diff = cash_balance_total - cash_txn_total
-    ok = (
-        diff == 0
-        and missing_withdraw == 0
-        and missing_refund == 0
-        and duplicate_refund == 0
-        and refund_on_non_terminal == 0
-    )
-    return {
-        "ok": ok,
-        "cash_balance_total_cents": cash_balance_total,
-        "cash_transaction_total_cents": cash_txn_total,
-        "balance_diff_cents": diff,
-        "missing_withdraw_txn_count": missing_withdraw,
-        "missing_refund_txn_count": missing_refund,
-        "duplicate_refund_txn_count": duplicate_refund,
-        "refund_txn_on_non_terminal_count": refund_on_non_terminal,
-    }
-
-
 def get_user_overview(db: Session, user_id: int) -> dict | None:
     """用户 360 概览:基础资料 + 钱包余额 + 各项 count。历史明细走各自分页接口(带 user_id 过滤)。"""
     user = db.get(User, user_id)
@@ -396,34 +151,3 @@ def get_user_overview(db: Session, user_id: int) -> dict | None:
         ).scalar_one(),
         "feedback_total": _count(Feedback, Feedback.user_id == user_id),
     }
-
-
-def list_price_reports(
-    db: Session,
-    *,
-    status: str | None = None,
-    user_id: int | None = None,
-    limit: int = 20,
-    cursor: int | None = None,
-) -> tuple[list[PriceReport], int | None]:
-    """上报更低价列表(admin 全量,可按状态/用户筛)。游标同 feedback:id 倒序。"""
-    stmt = select(PriceReport)
-    if status:
-        stmt = stmt.where(PriceReport.status == status)
-    if user_id is not None:
-        stmt = stmt.where(PriceReport.user_id == user_id)
-    return cursor_paginate(db, stmt, PriceReport.id, limit=limit, cursor=cursor)
-
-
-def price_report_summary(db: Session) -> dict:
-    """上报审核台各状态计数(待审核/已通过/已拒绝/合计)。"""
-    rows = db.execute(
-        select(PriceReport.status, func.count(PriceReport.id)).group_by(PriceReport.status)
-    ).all()
-    by_status = {status: int(count) for status, count in rows}
-    return {
-        "pending": by_status.get("pending", 0),
-        "approved": by_status.get("approved", 0),
-        "rejected": by_status.get("rejected", 0),
-        "total": sum(by_status.values()),
-    }

app/admin/repositories/stats.py

@@ -10,11 +10,8 @@ from datetime import datetime, timedelta, timezone
 from sqlalchemy import func, select
 from sqlalchemy.orm import Session
 
-from app.models.ad_feed_reward import AdFeedRewardRecord
-from app.models.ad_reward import AdRewardRecord
 from app.models.comparison import ComparisonRecord
 from app.models.feedback import Feedback
-from app.models.signin import SigninBoostRecord, SigninRecord
 from app.models.user import User
 from app.models.wallet import CoinTransaction, WithdrawOrder
 
@@ -74,37 +71,6 @@ def dashboard_overview(db: Session) -> dict:
         "coins": {
             # 累计发放金币(coin_transaction 里所有 amount>0 之和;负数是兑换/扣减不计)
             "granted_total": _sum(CoinTransaction.amount, CoinTransaction.amount > 0),
-            "reward_video_coin_total": _sum(
-                CoinTransaction.amount,
-                CoinTransaction.amount > 0,
-                CoinTransaction.biz_type.in_(("reward_video", "ad_reward")),
-            ),
-            "reward_video_watch_count": _count(
-                AdRewardRecord,
-                AdRewardRecord.reward_scene == "reward_video",
-                AdRewardRecord.status == "granted",
-            ),
-            "feed_ad_coin_total": _sum(
-                CoinTransaction.amount,
-                CoinTransaction.amount > 0,
-                CoinTransaction.biz_type == "feed_ad_reward",
-            ),
-            "feed_ad_watch_count": _count(
-                AdFeedRewardRecord,
-                AdFeedRewardRecord.status == "granted",
-            ),
-            "signin_coin_total": _sum(
-                CoinTransaction.amount,
-                CoinTransaction.amount > 0,
-                CoinTransaction.biz_type == "signin",
-            ),
-            "signin_count": _count(SigninRecord),
-            "signin_boost_coin_total": _sum(
-                CoinTransaction.amount,
-                CoinTransaction.amount > 0,
-                CoinTransaction.biz_type == "signin_boost",
-            ),
-            "signin_boost_watch_count": _count(SigninBoostRecord),
         },
         "cash": {
             "withdraw_success_cents": _sum(

app/admin/routers/price_report.py

@@ -1,103 +0,0 @@
-"""admin 上报更低价审核:列表 + 统计(读)+ 通过(发金币)/拒绝(写,带审计)。
-
-数据由客户端 POST /api/v1/report 写入 price_report 表(提交即 pending);本路由是运营后台
-对它的人工审核窗口。**通过** → 给上报用户钱包发固定金币(PRICE_REPORT_REWARD_COINS):
-改状态 + 发金币(wallet.grant_coins)+ 审计同一事务一起 commit(原子,仿 users.grant_user_coins),
-绝不只改状态不发钱或反之。客户端轮询 GET /api/v1/report/records 自动看到结果(无需推送)。
-"""
-from __future__ import annotations
-
-from typing import Annotated
-
-from fastapi import APIRouter, Depends, HTTPException, Query, Request
-
-from app.admin.audit import write_audit
-from app.admin.deps import AdminDb, get_client_ip, get_current_admin, require_role
-from app.admin.repositories import mutations, queries
-from app.admin.schemas.common import CursorPage, OkResponse
-from app.admin.schemas.price_report import (
-    PriceReportOut,
-    PriceReportRejectRequest,
-    PriceReportSummary,
-)
-from app.core.rewards import PRICE_REPORT_REWARD_COINS
-from app.models.admin import AdminUser
-from app.models.price_report import PriceReport
-from app.repositories import wallet as wallet_repo
-
-router = APIRouter(
-    prefix="/admin/api/price-reports",
-    tags=["admin-price-report"],
-    dependencies=[Depends(get_current_admin)],
-)
-
-
-@router.get("", response_model=CursorPage[PriceReportOut], summary="上报更低价列表(筛选+分页)")
-def list_price_reports(
-    db: AdminDb,
-    status: Annotated[str | None, Query()] = None,
-    user_id: Annotated[int | None, Query()] = None,
-    limit: Annotated[int, Query(ge=1, le=100)] = 20,
-    cursor: Annotated[int | None, Query()] = None,
-) -> CursorPage[PriceReportOut]:
-    items, next_cursor = queries.list_price_reports(
-        db, status=status, user_id=user_id, limit=limit, cursor=cursor,
-    )
-    return CursorPage(
-        items=[PriceReportOut.model_validate(r) for r in items], next_cursor=next_cursor,
-    )
-
-
-@router.get("/summary", response_model=PriceReportSummary, summary="上报审核统计(各状态计数)")
-def price_report_summary(db: AdminDb) -> PriceReportSummary:
-    return PriceReportSummary.model_validate(queries.price_report_summary(db))
-
-
-@router.post("/{report_id}/approve", response_model=OkResponse, summary="通过上报(发固定金币)")
-def approve_price_report(
-    report_id: int,
-    request: Request,
-    admin: Annotated[AdminUser, Depends(require_role("operator"))],
-    db: AdminDb,
-) -> OkResponse:
-    rep = db.get(PriceReport, report_id)
-    if rep is None:
-        raise HTTPException(status_code=404, detail="上报记录不存在")
-    if rep.status != "pending":
-        raise HTTPException(status_code=400, detail=f"该上报已审核过(当前 {rep.status}),不可重复操作")
-    coins = PRICE_REPORT_REWARD_COINS
-    # 改状态 + 发金币 + 审计同一事务(commit=False),最后一起 commit:改了就有痕、发了就留账
-    mutations.review_price_report(db, rep, status="approved", reward_coins=coins, commit=False)
-    wallet_repo.grant_coins(
-        db, rep.user_id, coins,
-        biz_type="price_report_reward", ref_id=str(rep.id), remark="上报更低价审核通过",
-    )
-    write_audit(
-        db, admin, action="price_report.approve", target_type="price_report", target_id=report_id,
-        detail={"reward_coins": coins, "user_id": rep.user_id}, ip=get_client_ip(request), commit=False,
-    )
-    db.commit()
-    return OkResponse()
-
-
-@router.post("/{report_id}/reject", response_model=OkResponse, summary="拒绝上报")
-def reject_price_report(
-    report_id: int,
-    body: PriceReportRejectRequest,
-    request: Request,
-    admin: Annotated[AdminUser, Depends(require_role("operator"))],
-    db: AdminDb,
-) -> OkResponse:
-    rep = db.get(PriceReport, report_id)
-    if rep is None:
-        raise HTTPException(status_code=404, detail="上报记录不存在")
-    if rep.status != "pending":
-        raise HTTPException(status_code=400, detail=f"该上报已审核过(当前 {rep.status}),不可重复操作")
-    reason = body.reason.strip()
-    mutations.review_price_report(db, rep, status="rejected", reject_reason=reason, commit=False)
-    write_audit(
-        db, admin, action="price_report.reject", target_type="price_report", target_id=report_id,
-        detail={"reason": reason, "user_id": rep.user_id}, ip=get_client_ip(request), commit=False,
-    )
-    db.commit()
-    return OkResponse()

app/admin/routers/users.py

@@ -13,7 +13,6 @@ from app.admin.schemas.user import (
     AdminUserListItem,
     AdminUserOverview,
     GrantCoinsRequest,
-    SetDebugTraceRequest,
     SetUserStatusRequest,
 )
 from app.models.admin import AdminUser
@@ -78,28 +77,6 @@ def set_user_status(
     return OkResponse()
 
 
-@router.post("/{user_id}/debug-trace", response_model=OkResponse, summary="开关调试链接权限")
-def set_user_debug_trace(
-    user_id: int,
-    body: SetDebugTraceRequest,
-    request: Request,
-    admin: Annotated[AdminUser, Depends(require_role("operator"))],
-    db: AdminDb,
-) -> OkResponse:
-    user = user_repo.get_user_by_id(db, user_id)
-    if user is None:
-        raise HTTPException(status_code=404, detail="用户不存在")
-    before = user.debug_trace_enabled
-    # 业务写 + 审计写同一事务(commit=False),最后一起 commit(同 set_user_status)
-    mutations.set_user_debug_trace(db, user, enabled=body.enabled, commit=False)
-    write_audit(
-        db, admin, action="user.debug_trace.set", target_type="user", target_id=user_id,
-        detail={"before": before, "after": body.enabled}, ip=get_client_ip(request), commit=False,
-    )
-    db.commit()
-    return OkResponse()
-
-
 @router.post("/{user_id}/coins", response_model=OkResponse, summary="手动增减金币(带审计)")
 def grant_user_coins(
     user_id: int,

app/admin/routers/withdraw.py

@@ -6,7 +6,6 @@
 """
 from __future__ import annotations
 
-from datetime import datetime
 from typing import Annotated
 
 from fastapi import APIRouter, Depends, HTTPException, Query, Request
@@ -15,23 +14,7 @@ from app.admin.audit import write_audit
 from app.admin.deps import AdminDb, get_client_ip, get_current_admin, require_role
 from app.admin.repositories import queries
 from app.admin.schemas.common import CursorPage
-from app.admin.schemas.admin import AdminAuditLogOut
-from app.admin.schemas.wallet import (
-    CashTxnOut,
-    ReconcileResult,
-    WithdrawBulkRejectRequest,
-    WithdrawBulkRequest,
-    WithdrawBulkResult,
-    WithdrawBulkItemResult,
-    WithdrawDetailOut,
-    WithdrawLedgerCheckOut,
-    WithdrawOrderOut,
-    WithdrawRejectRequest,
-    WithdrawSummaryOut,
-    WithdrawUserSnapshot,
-    WxpayHealthCheckOut,
-)
-from app.core.config import settings
+from app.admin.schemas.wallet import ReconcileResult, WithdrawOrderOut, WithdrawRejectRequest
 from app.integrations import wxpay
 from app.models.admin import AdminUser
 from app.repositories import wallet as wallet_repo
@@ -48,143 +31,17 @@ def list_withdraws(
     db: AdminDb,
     user_id: Annotated[int | None, Query()] = None,
     status: Annotated[str | None, Query()] = None,
-    keyword: Annotated[str | None, Query(max_length=100)] = None,
-    date_from: Annotated[datetime | None, Query()] = None,
-    date_to: Annotated[datetime | None, Query()] = None,
-    date_field: Annotated[str, Query(pattern="^(created_at|updated_at)$")] = "created_at",
-    sort_by: Annotated[
-        str, Query(pattern="^(id|created_at|updated_at|amount_cents)$")
-    ] = "created_at",
-    sort_order: Annotated[str, Query(pattern="^(asc|desc)$")] = "desc",
-    quick_filter: Annotated[
-        str | None,
-        Query(pattern="^(abnormal|failed|overdue_reviewing|pending_overdue|today|high_risk)$"),
-    ] = None,
     limit: Annotated[int, Query(ge=1, le=100)] = 20,
     cursor: Annotated[int | None, Query()] = None,
 ) -> CursorPage[WithdrawOrderOut]:
     items, next_cursor = queries.list_all_withdraw_orders(
-        db,
-        user_id=user_id,
-        status=status,
-        keyword=keyword,
-        date_from=date_from,
-        date_to=date_to,
-        date_field=date_field,
-        sort_by=sort_by,
-        sort_order=sort_order,
-        quick_filter=quick_filter,
-        limit=limit,
-        cursor=cursor,
+        db, user_id=user_id, status=status, limit=limit, cursor=cursor,
     )
     return CursorPage(
         items=[WithdrawOrderOut.model_validate(o) for o in items], next_cursor=next_cursor,
     )
 
 
-@router.get("/summary", response_model=WithdrawSummaryOut, summary="提现审核台统计")
-def withdraws_summary(db: AdminDb) -> WithdrawSummaryOut:
-    return WithdrawSummaryOut(**queries.withdraw_summary(db))
-
-
-@router.get("/health-check", response_model=WxpayHealthCheckOut, summary="提现配置健康检查")
-def withdraw_health_check() -> WxpayHealthCheckOut:
-    private_path = wxpay._resolve_config_path(settings.WXPAY_MCH_PRIVATE_KEY_PATH)  # noqa: SLF001
-    public_path = wxpay._resolve_config_path(settings.WXPAY_PUBLIC_KEY_PATH)  # noqa: SLF001
-    issues: list[str] = []
-
-    private_loadable = False
-    public_loadable = False
-    try:
-        wxpay._load_private_key()  # noqa: SLF001
-        private_loadable = True
-    except Exception as e:  # noqa: BLE001
-        issues.append(f"商户私钥不可用:{e}")
-    try:
-        wxpay._load_public_key()  # noqa: SLF001
-        public_loadable = True
-    except Exception as e:  # noqa: BLE001
-        issues.append(f"微信支付平台公钥不可用:{e}")
-
-    if not settings.wxpay_configured:
-        issues.append("微信支付基础配置不完整")
-    if not settings.WXPAY_AUTH_NOTIFY_URL:
-        issues.append("免确认授权回调地址未配置")
-    if not settings.WITHDRAW_AUTO_RECONCILE_ENABLED:
-        issues.append("自动对账未开启")
-
-    return WxpayHealthCheckOut(
-        ok=not issues,
-        wxpay_configured=settings.wxpay_configured,
-        wxpay_auth_configured=settings.wxpay_auth_configured,
-        private_key_path=str(private_path),
-        private_key_exists=private_path.exists(),
-        private_key_loadable=private_loadable,
-        public_key_path=str(public_path),
-        public_key_exists=public_path.exists(),
-        public_key_loadable=public_loadable,
-        auth_notify_url_configured=bool(settings.WXPAY_AUTH_NOTIFY_URL),
-        auto_reconcile_enabled=settings.WITHDRAW_AUTO_RECONCILE_ENABLED,
-        auto_reconcile_interval_sec=settings.WITHDRAW_AUTO_RECONCILE_INTERVAL_SEC,
-        auto_reconcile_older_than_minutes=settings.WITHDRAW_AUTO_RECONCILE_OLDER_THAN_MINUTES,
-        issues=issues,
-    )
-
-
-@router.get("/ledger-check", response_model=WithdrawLedgerCheckOut, summary="提现资金账本校验")
-def withdraw_ledger_check(db: AdminDb) -> WithdrawLedgerCheckOut:
-    return WithdrawLedgerCheckOut(**queries.withdraw_ledger_check(db))
-
-
-@router.get("/{out_bill_no}", response_model=WithdrawDetailOut, summary="提现单详情")
-def withdraw_detail(out_bill_no: str, db: AdminDb) -> WithdrawDetailOut:
-    order = queries.get_withdraw_by_out_bill_no(db, out_bill_no)
-    if order is None:
-        raise HTTPException(status_code=404, detail="提现单不存在")
-
-    overview = queries.get_user_overview(db, order.user_id)
-    user_snapshot = None
-    if overview is not None:
-        user = overview["user"]
-        user_snapshot = WithdrawUserSnapshot(
-            id=user.id,
-            phone=user.phone,
-            nickname=user.nickname,
-            status=user.status,
-            wechat_nickname=user.wechat_nickname,
-            wechat_avatar_url=user.wechat_avatar_url,
-            created_at=user.created_at,
-            last_login_at=user.last_login_at,
-            cash_balance_cents=overview["cash_balance_cents"],
-            withdraw_total=overview["withdraw_total"],
-            withdraw_success_cents=overview["withdraw_success_cents"],
-        )
-
-    recent_withdraws, _ = queries.list_all_withdraw_orders(
-        db, user_id=order.user_id, limit=5, cursor=None,
-    )
-    recent_cash_transactions, _ = queries.list_all_cash_transactions(
-        db, user_id=order.user_id, limit=8, cursor=None,
-    )
-    audit_logs = queries.list_withdraw_audit_logs(db, out_bill_no, limit=10)
-    risk_flags, risk_score = queries.withdraw_risk_flags(
-        order,
-        overview["user"] if overview else None,
-        recent_withdraws,
-        overview["cash_balance_cents"] if overview else 0,
-    )
-
-    return WithdrawDetailOut(
-        order=WithdrawOrderOut.model_validate(order),
-        user=user_snapshot,
-        risk_flags=risk_flags,
-        risk_score=risk_score,
-        recent_withdraws=[WithdrawOrderOut.model_validate(o) for o in recent_withdraws],
-        recent_cash_transactions=[CashTxnOut.model_validate(t) for t in recent_cash_transactions],
-        audit_logs=[AdminAuditLogOut.model_validate(log) for log in audit_logs],
-    )
-
-
 # 注意:/reconcile 必须在 /{out_bill_no}/refresh 之前声明(静态路径优先于路径参数)
 @router.post("/reconcile", response_model=ReconcileResult, summary="批量对账(扫超时 pending 单)")
 def reconcile(
@@ -204,159 +61,6 @@ def reconcile(
     return ReconcileResult(**result)
 
 
-def _bulk_result(items: list[WithdrawBulkItemResult]) -> WithdrawBulkResult:
-    success = sum(1 for item in items if item.ok)
-    return WithdrawBulkResult(
-        total=len(items),
-        success=success,
-        failed=len(items) - success,
-        items=items,
-    )
-
-
-@router.post("/bulk/refresh", response_model=WithdrawBulkResult, summary="批量刷新查单")
-def bulk_refresh_withdraws(
-    body: WithdrawBulkRequest,
-    request: Request,
-    admin: Annotated[AdminUser, Depends(require_role("finance"))],
-    db: AdminDb,
-) -> WithdrawBulkResult:
-    results: list[WithdrawBulkItemResult] = []
-    ip = get_client_ip(request)
-    for out_bill_no in body.out_bill_nos:
-        try:
-            order = queries.get_withdraw_by_out_bill_no(db, out_bill_no)
-            if order is None:
-                raise wallet_repo.WithdrawOrderNotFound
-            refreshed = wallet_repo.refresh_withdraw_status(
-                db, order.user_id, out_bill_no, cancel_if_unconfirmed=True,
-            )
-            write_audit(
-                db, admin, action="withdraw.refresh", target_type="withdraw",
-                target_id=out_bill_no,
-                detail={
-                    "status": refreshed.status,
-                    "wechat_state": refreshed.wechat_state,
-                    "fail_reason": refreshed.fail_reason,
-                    "bulk": True,
-                },
-                ip=ip, commit=True,
-            )
-            results.append(
-                WithdrawBulkItemResult(
-                    out_bill_no=out_bill_no, ok=True, status=refreshed.status
-                )
-            )
-        except wallet_repo.WithdrawOrderNotFound:
-            db.rollback()
-            results.append(
-                WithdrawBulkItemResult(out_bill_no=out_bill_no, ok=False, error="提现单不存在")
-            )
-        except wxpay.WxPayNotConfiguredError:
-            db.rollback()
-            results.append(
-                WithdrawBulkItemResult(out_bill_no=out_bill_no, ok=False, error="微信支付未配置")
-            )
-        except Exception as e:  # noqa: BLE001 - 批量操作单笔失败不打断整批
-            db.rollback()
-            results.append(
-                WithdrawBulkItemResult(out_bill_no=out_bill_no, ok=False, error=f"系统异常: {e}")
-            )
-    return _bulk_result(results)
-
-
-@router.post("/bulk/approve", response_model=WithdrawBulkResult, summary="批量审核通过并打款")
-def bulk_approve_withdraws(
-    body: WithdrawBulkRequest,
-    request: Request,
-    admin: Annotated[AdminUser, Depends(require_role("finance"))],
-    db: AdminDb,
-) -> WithdrawBulkResult:
-    results: list[WithdrawBulkItemResult] = []
-    ip = get_client_ip(request)
-    for out_bill_no in body.out_bill_nos:
-        try:
-            order = wallet_repo.approve_withdraw(db, out_bill_no)
-            write_audit(
-                db, admin, action="withdraw.approve", target_type="withdraw",
-                target_id=out_bill_no,
-                detail={
-                    "status": order.status,
-                    "wechat_state": order.wechat_state,
-                    "amount_cents": order.amount_cents,
-                    "bulk": True,
-                },
-                ip=ip, commit=True,
-            )
-            results.append(
-                WithdrawBulkItemResult(out_bill_no=out_bill_no, ok=True, status=order.status)
-            )
-        except wallet_repo.WithdrawOrderNotFound:
-            db.rollback()
-            results.append(
-                WithdrawBulkItemResult(out_bill_no=out_bill_no, ok=False, error="提现单不存在")
-            )
-        except wallet_repo.WithdrawNotReviewable as e:
-            db.rollback()
-            results.append(
-                WithdrawBulkItemResult(out_bill_no=out_bill_no, ok=False, error=str(e))
-            )
-        except wxpay.WxPayNotConfiguredError:
-            db.rollback()
-            results.append(
-                WithdrawBulkItemResult(out_bill_no=out_bill_no, ok=False, error="微信支付未配置")
-            )
-        except Exception as e:  # noqa: BLE001 - 批量操作单笔失败不打断整批
-            db.rollback()
-            results.append(
-                WithdrawBulkItemResult(out_bill_no=out_bill_no, ok=False, error=f"系统异常: {e}")
-            )
-    return _bulk_result(results)
-
-
-@router.post("/bulk/reject", response_model=WithdrawBulkResult, summary="批量审核拒绝并退款")
-def bulk_reject_withdraws(
-    body: WithdrawBulkRejectRequest,
-    request: Request,
-    admin: Annotated[AdminUser, Depends(require_role("finance"))],
-    db: AdminDb,
-) -> WithdrawBulkResult:
-    results: list[WithdrawBulkItemResult] = []
-    ip = get_client_ip(request)
-    for out_bill_no in body.out_bill_nos:
-        try:
-            order = wallet_repo.reject_withdraw(db, out_bill_no, body.reason)
-            write_audit(
-                db, admin, action="withdraw.reject", target_type="withdraw",
-                target_id=out_bill_no,
-                detail={
-                    "reason": body.reason,
-                    "amount_cents": order.amount_cents,
-                    "bulk": True,
-                },
-                ip=ip, commit=True,
-            )
-            results.append(
-                WithdrawBulkItemResult(out_bill_no=out_bill_no, ok=True, status=order.status)
-            )
-        except wallet_repo.WithdrawOrderNotFound:
-            db.rollback()
-            results.append(
-                WithdrawBulkItemResult(out_bill_no=out_bill_no, ok=False, error="提现单不存在")
-            )
-        except wallet_repo.WithdrawNotReviewable as e:
-            db.rollback()
-            results.append(
-                WithdrawBulkItemResult(out_bill_no=out_bill_no, ok=False, error=str(e))
-            )
-        except Exception as e:  # noqa: BLE001 - 批量操作单笔失败不打断整批
-            db.rollback()
-            results.append(
-                WithdrawBulkItemResult(out_bill_no=out_bill_no, ok=False, error=f"系统异常: {e}")
-            )
-    return _bulk_result(results)
-
-
 @router.post("/{out_bill_no}/refresh", response_model=WithdrawOrderOut, summary="单笔重试查单")
 def refresh_withdraw(
     out_bill_no: str,
@@ -375,11 +79,7 @@ def refresh_withdraw(
         raise HTTPException(status_code=503, detail="微信支付未配置") from e
     write_audit(
         db, admin, action="withdraw.refresh", target_type="withdraw", target_id=out_bill_no,
-        detail={
-            "status": refreshed.status,
-            "wechat_state": refreshed.wechat_state,
-            "fail_reason": refreshed.fail_reason,
-        },
+        detail={"status": refreshed.status, "wechat_state": refreshed.wechat_state},
         ip=get_client_ip(request), commit=True,
     )
     return WithdrawOrderOut.model_validate(refreshed)

app/admin/schemas/dashboard.py

@@ -14,14 +14,6 @@ class DashboardUsers(BaseModel):
 
 
 class DashboardCoins(BaseModel):
-    reward_video_coin_total: int = 0
-    reward_video_watch_count: int = 0
-    feed_ad_coin_total: int = 0
-    feed_ad_watch_count: int = 0
-    signin_coin_total: int = 0
-    signin_count: int = 0
-    signin_boost_coin_total: int = 0
-    signin_boost_watch_count: int = 0
     granted_total: int
 
 

app/admin/schemas/price_report.py

@@ -1,46 +0,0 @@
-"""admin 上报更低价审核 schemas。"""
-from __future__ import annotations
-
-from datetime import datetime
-
-from pydantic import BaseModel, ConfigDict, Field
-
-
-class PriceReportOut(BaseModel):
-    """admin 列表项:price_report 全字段(审核要看的快照 + 截图 + 状态 + 奖励)。"""
-
-    model_config = ConfigDict(from_attributes=True)
-
-    id: int
-    user_id: int
-    comparison_record_id: int | None = None
-    # 选中比价记录的快照
-    store_name: str | None = None
-    dish_summary: str | None = None
-    original_platform_id: str | None = None
-    original_platform_name: str | None = None
-    original_price_cents: int | None = None
-    # 用户上报的更低价
-    reported_platform_id: str
-    reported_platform_name: str
-    reported_price_cents: int
-    images: list[str] = []
-    # 审核
-    status: str
-    reject_reason: str | None = None
-    reward_coins: int | None = None
-    reviewed_at: datetime | None = None
-    created_at: datetime
-
-
-class PriceReportRejectRequest(BaseModel):
-    reason: str = Field(min_length=1, max_length=256, description="拒绝理由,用户端记录页会看到")
-
-
-class PriceReportSummary(BaseModel):
-    """审核台顶部各状态计数。"""
-
-    pending: int
-    approved: int
-    rejected: int
-    total: int

app/admin/schemas/user.py

@@ -15,7 +15,6 @@ class AdminUserListItem(BaseModel):
     nickname: str | None = None
     register_channel: str
     status: str
-    debug_trace_enabled: bool = False
     wechat_openid: str | None = None
     created_at: datetime
     last_login_at: datetime
@@ -46,7 +45,3 @@ class SetUserStatusRequest(BaseModel):
     status: Literal["active", "disabled"] = Field(
         ..., description="active=解封 / disabled=封禁(注销 deleted 不走此接口)"
     )
-
-
-class SetDebugTraceRequest(BaseModel):
-    enabled: bool = Field(..., description="是否给该用户开「复制调试链接」权限")

app/admin/schemas/wallet.py

@@ -5,8 +5,6 @@ from datetime import datetime
 
 from pydantic import BaseModel, ConfigDict, Field
 
-from app.admin.schemas.admin import AdminAuditLogOut
-
 
 class CoinTxnOut(BaseModel):
     model_config = ConfigDict(from_attributes=True)
@@ -50,99 +48,11 @@ class WithdrawOrderOut(BaseModel):
     updated_at: datetime
 
 
-class WithdrawSummaryOut(BaseModel):
-    reviewing_count: int
-    reviewing_amount_cents: int
-    pending_count: int
-    failed_count: int
-    today_success_count: int
-    today_success_amount_cents: int
-    today_rejected_count: int
-
-
-class WithdrawUserSnapshot(BaseModel):
-    id: int
-    phone: str
-    nickname: str | None = None
-    status: str
-    wechat_nickname: str | None = None
-    wechat_avatar_url: str | None = None
-    created_at: datetime
-    last_login_at: datetime
-    cash_balance_cents: int
-    withdraw_total: int
-    withdraw_success_cents: int
-
-
-class WithdrawDetailOut(BaseModel):
-    order: WithdrawOrderOut
-    user: WithdrawUserSnapshot | None = None
-    risk_flags: list[str]
-    risk_score: int
-    recent_withdraws: list[WithdrawOrderOut]
-    recent_cash_transactions: list[CashTxnOut]
-    audit_logs: list[AdminAuditLogOut]
-
-
 class ReconcileResult(BaseModel):
     checked: int
     resolved: int
 
 
-class WithdrawBulkRequest(BaseModel):
-    out_bill_nos: list[str] = Field(
-        ..., min_length=1, max_length=50, description="提现商户单号列表"
-    )
-
-
-class WithdrawBulkRejectRequest(WithdrawBulkRequest):
-    reason: str = Field(
-        ..., min_length=1, max_length=200, description="批量拒绝理由(用户可见)"
-    )
-
-
-class WithdrawBulkItemResult(BaseModel):
-    out_bill_no: str
-    ok: bool
-    status: str | None = None
-    error: str | None = None
-
-
-class WithdrawBulkResult(BaseModel):
-    total: int
-    success: int
-    failed: int
-    items: list[WithdrawBulkItemResult]
-
-
-class WithdrawLedgerCheckOut(BaseModel):
-    ok: bool
-    cash_balance_total_cents: int
-    cash_transaction_total_cents: int
-    balance_diff_cents: int
-    missing_withdraw_txn_count: int
-    missing_refund_txn_count: int
-    duplicate_refund_txn_count: int
-    refund_txn_on_non_terminal_count: int
-
-
-class WxpayHealthCheckOut(BaseModel):
-    ok: bool
-    wxpay_configured: bool
-    wxpay_auth_configured: bool
-    private_key_path: str
-    private_key_exists: bool
-    private_key_loadable: bool
-    public_key_path: str
-    public_key_exists: bool
-    public_key_loadable: bool
-    auth_notify_url_configured: bool
-    auto_reconcile_enabled: bool
-    auto_reconcile_interval_sec: int
-    auto_reconcile_older_than_minutes: int
-    issues: list[str]
-
-
 class WithdrawRejectRequest(BaseModel):
     reason: str = Field(
         ..., min_length=1, max_length=200, description="拒绝理由(写入 fail_reason,用户可见)"

app/api/v1/ad.py

@@ -10,7 +10,6 @@
 from __future__ import annotations
 
 import logging
-import json
 import uuid
 
 from fastapi import APIRouter, Depends, HTTPException, Request, status
@@ -24,7 +23,6 @@ from app.repositories import ad_ecpm as crud_ecpm
 from app.repositories import ad_feed_reward as crud_feed
 from app.repositories import ad_reward as crud_ad
 from app.repositories import ad_watch as crud_watch
-from app.repositories import signin as crud_signin
 from app.schemas.ad import (
     AdRewardStatusOut,
     EcpmReportIn,
@@ -32,7 +30,6 @@ from app.schemas.ad import (
     FeedRewardIn,
     FeedRewardOut,
     PangleCallbackOut,
-    TestGrantIn,
     TestGrantOut,
     WatchReportIn,
     WatchReportOut,
@@ -47,23 +44,6 @@ REASON_OK = 0
 REASON_BAD_PARAMS = 1  # 验签过但缺 trans_id / user_id 非数字
 REASON_UNKNOWN_USER = 2  # user_id 不存在(可能伪造)
 
-REWARD_SCENE_REWARD_VIDEO = "reward_video"
-REWARD_SCENE_SIGNIN_BOOST = "signin_boost"
-SUPPORTED_REWARD_SCENES = {REWARD_SCENE_REWARD_VIDEO, REWARD_SCENE_SIGNIN_BOOST}
-
-
-def _parse_extra(raw_extra: str | None) -> dict[str, str]:
-    """解析客户端 setMediaExtra 透传的 JSON;旧格式/异常返回空 dict。"""
-    if not raw_extra:
-        return {}
-    try:
-        data = json.loads(raw_extra)
-    except (TypeError, ValueError):
-        return {}
-    if not isinstance(data, dict):
-        return {}
-    return {str(k): str(v) for k, v in data.items() if v is not None}
-
 
 @router.get(
     "/pangle-callback",
@@ -72,9 +52,9 @@ def _parse_extra(raw_extra: str | None) -> dict[str, str]:
     dependencies=[Depends(rate_limit(300, 60, "pangle-callback"))],
 )
 def pangle_callback(request: Request, db: DbSession) -> PangleCallbackOut:
-    """穿山甲 GroMore 在激励视频播完后回调,带 user_id / trans_id / ecpm / sign 等 query 参数。
+    """穿山甲 GroMore 在激励视频播完后回调,带 user_id / trans_id / reward_amount / sign 等 query 参数。
 
-    流程:开关/密钥就绪 → 验签(SHA256(m-key:trans_id)) → 解析 user_id/场景/eCPM → 幂等发金币。
+    流程:开关/密钥就绪 → 验签(SHA256(m-key:trans_id)) → 解析 user_id/reward_amount → 幂等发金币。
     验签失败 403(留给真请求重试);参数缺/坏或 user 不存在 → is_verify=false + reason(不发,不重试)。
     granted / capped → is_verify=true + reason=0。
     """
@@ -97,86 +77,19 @@ def pangle_callback(request: Request, db: DbSession) -> PangleCallbackOut:
         return PangleCallbackOut(is_verify=False, reason=REASON_BAD_PARAMS)
 
     user_id = int(raw_user_id)
+    coin = rewards.resolve_ad_reward_coin(db, params.get("reward_amount"))
     raw = "&".join(f"{k}={v}" for k, v in sorted(params.items()) if k != "sign")
-    extra = {}
-    for extra_key in ("extra", "gromoreExtra", "gromore_extra"):
-        extra.update(_parse_extra(params.get(extra_key)))
-    reward_scene = extra.get("reward_scene") or REWARD_SCENE_REWARD_VIDEO
-    ad_session_id = extra.get("ad_session_id")
-    ecpm = params.get("ecpm")
-
-    existing = crud_ad.find_by_trans(db, trans_id)
-    if existing is not None:
-        logger.info(
-            "pangle callback idempotent user_id=%d trans_id=%s status=%s scene=%s",
-            user_id, trans_id, existing.status, existing.reward_scene,
-        )
-        return PangleCallbackOut(is_verify=True, reason=REASON_OK)
-
     try:
-        if reward_scene not in SUPPORTED_REWARD_SCENES:
-            rec = crud_ad.record_external_reward(
-                db, user_id, trans_id, coin=0, reward_scene=reward_scene[:32],
-                ad_session_id=ad_session_id, ecpm=ecpm,
-                reward_name=params.get("reward_name"), raw=raw[:1024],
-                status="unknown_scene",
-            )
-            logger.warning(
-                "pangle callback unknown scene user_id=%d trans_id=%s scene=%s",
-                user_id, trans_id, reward_scene,
-            )
-            return PangleCallbackOut(is_verify=False, reason=REASON_BAD_PARAMS)
-        if reward_scene == REWARD_SCENE_SIGNIN_BOOST:
-            try:
-                boost, _balance = crud_signin.boost_today_signin(
-                    db, user_id, ad_ref_id=trans_id, commit=False
-                )
-            except crud_signin.NotSignedTodayError:
-                db.rollback()
-                rec = crud_ad.record_external_reward(
-                    db, user_id, trans_id, coin=0, reward_scene=reward_scene,
-                    ad_session_id=ad_session_id, ecpm=ecpm,
-                    reward_name=params.get("reward_name"), raw=raw[:1024],
-                    status="not_signed",
-                )
-            except crud_signin.AlreadyBoostedError:
-                db.rollback()
-                rec = crud_ad.record_external_reward(
-                    db, user_id, trans_id, coin=0, reward_scene=reward_scene,
-                    ad_session_id=ad_session_id, ecpm=ecpm,
-                    reward_name=params.get("reward_name"), raw=raw[:1024],
-                    status="already_boosted",
-                )
-            except crud_signin.LastCycleDayBoostBlockedError:
-                db.rollback()
-                rec = crud_ad.record_external_reward(
-                    db, user_id, trans_id, coin=0, reward_scene=reward_scene,
-                    ad_session_id=ad_session_id, ecpm=ecpm,
-                    reward_name=params.get("reward_name"), raw=raw[:1024],
-                    status="last_day",
-                )
-            else:
-                rec = crud_ad.record_external_reward(
-                    db, user_id, trans_id, coin=boost.coin_awarded,
-                    reward_scene=reward_scene, ad_session_id=ad_session_id, ecpm=ecpm,
-                    reward_name=params.get("reward_name"), raw=raw[:1024],
-                    commit=False,
-                )
-                db.commit()
-                db.refresh(rec)
-        else:
-            rec = crud_ad.grant_ad_reward(
-                db, user_id, trans_id, ecpm=ecpm, ad_session_id=ad_session_id,
-                reward_scene=REWARD_SCENE_REWARD_VIDEO,
-                reward_name=params.get("reward_name"), raw=raw[:1024],
-            )
+        rec = crud_ad.grant_ad_reward(
+            db, user_id, trans_id, coin=coin,
+            reward_name=params.get("reward_name"), raw=raw[:1024],
+        )
     except crud_ad.UnknownUserError:
         logger.warning("pangle callback unknown user_id=%d trans_id=%s", user_id, trans_id)
         return PangleCallbackOut(is_verify=False, reason=REASON_UNKNOWN_USER)
 
     logger.info(
-        "ad reward user_id=%d trans_id=%s scene=%s status=%s coin=%d",
-        user_id, trans_id, rec.reward_scene, rec.status, rec.coin,
+        "ad reward user_id=%d trans_id=%s status=%s coin=%d", user_id, trans_id, rec.status, rec.coin
     )
     # granted / capped 均算"已处理":is_verify=true 不让穿山甲重试(capped 只是没加币)
     return PangleCallbackOut(is_verify=True, reason=REASON_OK)
@@ -240,12 +153,11 @@ def ecpm_report(payload: EcpmReportIn, user: CurrentUser, db: DbSession) -> Ecpm
     crud_ecpm.create_ecpm_record(
         db, user.id,
         ad_type=payload.ad_type, ecpm_raw=payload.ecpm,
-        ad_session_id=payload.ad_session_id,
         adn=payload.adn, slot_id=payload.slot_id,
     )
     logger.info(
-        "ad ecpm report user_id=%d type=%s session=%s ecpm=%s adn=%s slot=%s",
-        user.id, payload.ad_type, payload.ad_session_id, payload.ecpm, payload.adn, payload.slot_id,
+        "ad ecpm report user_id=%d type=%s ecpm=%s adn=%s slot=%s",
+        user.id, payload.ad_type, payload.ecpm, payload.adn, payload.slot_id,
     )
     return EcpmReportOut(ok=True)
 
@@ -256,7 +168,7 @@ def ecpm_report(payload: EcpmReportIn, user: CurrentUser, db: DbSession) -> Ecpm
     summary="[仅本地联调]模拟穿山甲回调发奖",
     dependencies=[Depends(rate_limit(60, 60, "ad-test-grant"))],
 )
-def test_grant(user: CurrentUser, db: DbSession, payload: TestGrantIn | None = None) -> TestGrantOut:
+def test_grant(user: CurrentUser, db: DbSession) -> TestGrantOut:
     """⚠️ 仅本地联调用:没部署公网、穿山甲 S2S 回调打不到本地时,客户端(debug 包)看完广告后
     调这个接口,直接走与回调相同的发奖逻辑(幂等 + 每日上限),验证"看广告→金币到账"全链路。
 
@@ -266,58 +178,18 @@ def test_grant(user: CurrentUser, db: DbSession, payload: TestGrantIn | None = N
     if not settings.AD_REWARD_TEST_GRANT_ENABLED:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="not found")
 
-    reward_scene = (payload.reward_scene if payload is not None else REWARD_SCENE_REWARD_VIDEO)
-    if reward_scene not in SUPPORTED_REWARD_SCENES:
-        raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail="bad reward_scene")
-
-    # 每次新 trans_id,模拟一次独立的穿山甲发奖回调(幂等键各不相同 → 每次都发,直到当日上限/今日膨胀一次)
+    # 每次新 trans_id,模拟一次独立的穿山甲发奖回调(幂等键各不相同 → 每次都发,直到当日上限)
     trans_id = f"test-{user.id}-{uuid.uuid4().hex}"
-    if reward_scene == REWARD_SCENE_SIGNIN_BOOST:
-        try:
-            boost, _balance = crud_signin.boost_today_signin(
-                db, user.id, ad_ref_id=trans_id, commit=False
-            )
-        except crud_signin.NotSignedTodayError:
-            db.rollback()
-            rec = crud_ad.record_external_reward(
-                db, user.id, trans_id, coin=0, reward_scene=reward_scene,
-                raw="client debug test-grant signin_boost", status="not_signed",
-            )
-        except crud_signin.AlreadyBoostedError:
-            db.rollback()
-            rec = crud_ad.record_external_reward(
-                db, user.id, trans_id, coin=0, reward_scene=reward_scene,
-                raw="client debug test-grant signin_boost", status="already_boosted",
-            )
-        except crud_signin.LastCycleDayBoostBlockedError:
-            db.rollback()
-            rec = crud_ad.record_external_reward(
-                db, user.id, trans_id, coin=0, reward_scene=reward_scene,
-                raw="client debug test-grant signin_boost", status="last_day",
-            )
-        else:
-            rec = crud_ad.record_external_reward(
-                db, user.id, trans_id, coin=boost.coin_awarded,
-                reward_scene=reward_scene, reward_name="测试签到膨胀",
-                raw="client debug test-grant signin_boost", commit=False,
-            )
-            db.commit()
-            db.refresh(rec)
-    else:
-        try:
-            rec = crud_ad.grant_ad_reward(
-                db, user.id, trans_id, ecpm="200", reward_name="测试发奖",
-                raw="client debug test-grant ecpm=200",
-            )
-        except crud_ad.UnknownUserError as e:
-            raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="user not found") from e
+    try:
+        rec = crud_ad.grant_ad_reward(
+            db, user.id, trans_id, reward_name="测试发奖", raw="client debug test-grant"
+        )
+    except crud_ad.UnknownUserError as e:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="user not found") from e
 
     (used, limit, coin_per, round_count, cooldown_until,
      _watched, _watch_limit) = crud_ad.today_status(db, user.id)
-    logger.info(
-        "ad TEST grant user_id=%d scene=%s status=%s coin=%d",
-        user.id, reward_scene, rec.status, rec.coin,
-    )
+    logger.info("ad TEST grant user_id=%d status=%s coin=%d", user.id, rec.status, rec.coin)
     return TestGrantOut(
         granted=(rec.status == "granted"),
         status=rec.status,
@@ -348,7 +220,6 @@ def feed_reward(payload: FeedRewardIn, user: CurrentUser, db: DbSession) -> Feed
         client_event_id=payload.client_event_id,
         ecpm=payload.ecpm,
         duration_seconds=payload.duration_seconds,
-        ad_session_id=payload.ad_session_id,
         adn=payload.adn,
         slot_id=payload.slot_id,
     )

app/api/v1/compare_record.py

@@ -77,12 +77,10 @@ def list_records(
     items, next_cursor = crud_compare.list_records(
         db, user.id, limit=limit, cursor=cursor
     )
-    outs = [ComparisonRecordOut.model_validate(it) for it in items]
-    # 权限闸:未开 debug_trace_enabled 的用户不下发 trace_url(列表页「复制调试链接」靠它)
-    if not user.debug_trace_enabled:
-        for o in outs:
-            o.trace_url = None
-    return ComparisonRecordPage(items=outs, next_cursor=next_cursor)
+    return ComparisonRecordPage(
+        items=[ComparisonRecordOut.model_validate(it) for it in items],
+        next_cursor=next_cursor,
+    )
 
 
 @router.get(
@@ -96,12 +94,4 @@ def get_record(
     rec = crud_compare.get_record(db, user.id, record_id)
     if rec is None:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="record not found")
-    out = ComparisonRecordDetailOut.model_validate(rec)
-    # 权限闸:未开 debug_trace_enabled 的用户不下发 trace_url。
-    # ⚠️ raw_payload 是上报体全量(model_dump),里面也藏着一份 trace_url,必须一并抹掉——
-    # 否则无权限用户从详情接口的 raw_payload 绕过权限闸拿到 trace_url。
-    if not user.debug_trace_enabled:
-        out.trace_url = None
-        if isinstance(out.raw_payload, dict):
-            out.raw_payload.pop("trace_url", None)
-    return out
+    return ComparisonRecordDetailOut.model_validate(rec)

app/api/v1/coupon.py

@@ -183,15 +183,7 @@ def coupon_prompt_should_show(
     device_id: str, db: DbSession
 ) -> CouponPromptShouldShowOut:
     """今天这台设备已 engage(领或拒)过 → should_show=false。客户端据此决定弹不弹
-    (纯后台判据,客户端不再做前台 SP 缓存判断)。"""
+    (前台 SP 缓存做快速路径,这里是权威)。"""
     return CouponPromptShouldShowOut(
         should_show=not coupon_repo.has_engaged_today(db, device_id)
     )
-
-
-@router.post("/prompt/reset", summary="重置今日领券引导窗 engagement(开发测频控用)")
-def coupon_prompt_reset(payload: CouponPromptDismissIn, db: DbSession) -> dict[str, bool]:
-    """删这台设备今天的 engagement → has_engaged_today 变 false,今天又能弹。
-    开发设置「重置今日领券弹窗状态」按钮调。MVP 不鉴权,按 device_id。"""
-    coupon_repo.reset_today_engagement(db, payload.device_id)
-    return {"ok": True}

app/api/v1/invite.py

@@ -1,37 +1,25 @@
 """好友邀请 endpoint。
 
-路由前缀 /api/v1/invite,需 Bearer 鉴权(用户级数据);唯一例外是 /landing-track
-(落地页 dl.html 浏览器访问、无 token,详见任务 3 [[invite-three-tasks]]):
-  GET  /me                我的邀请码 + 分享链接 + 已邀人数/已得金币(邀请页展示)
-  POST /bind              把当前登录用户(被邀请人)绑定到某邀请码;支持三种归因:
-                          ① clipboard:首启读剪贴板拿邀请码 → 上报码
-                          ② manual:用户在邀请页输入邀请码 → 上报码
-                          ③ fingerprint:剪贴板没拿到时上报指纹,后端反查
-  POST /landing-track     落地页 dl.html 访问时上报指纹(剪贴板兜底的服务端一端,无需鉴权)
+路由前缀 /api/v1/invite,需 Bearer 鉴权(用户级数据):
+  GET  /me     我的邀请码 + 分享链接 + 已邀人数/已得金币(邀请页展示)
+  POST /bind   把当前登录用户(被邀请人)绑定到某邀请码,注册即生效,双方各发金币
 
-绑定的真正逻辑(邀请码生成/反查、幂等、自邀屏蔽、发金币、指纹反查)在
-repositories/invite.py。
+客户端两种调用 /bind:
+  - 自动:首启读剪贴板拿到邀请码 → 登录后调本接口(channel=clipboard)
+  - 手动:用户在邀请页输入好友邀请码(channel=manual)
+
+绑定的真正逻辑(邀请码生成/反查、幂等、自邀屏蔽、发金币)在 repositories/invite.py。
 """
 from __future__ import annotations
 
 import logging
-import re
 
-from fastapi import APIRouter, Request
+from fastapi import APIRouter
 
 from app.api.deps import CurrentUser, DbSession
-from app.core import rewards
 from app.core.config import settings
 from app.repositories import invite as invite_repo
-from app.schemas.invite import (
-    BindInviteIn,
-    BindInviteOut,
-    InviteeItem,
-    InviteeListOut,
-    InviteInfoOut,
-    LandingTrackIn,
-    LandingTrackOut,
-)
+from app.schemas.invite import BindInviteIn, BindInviteOut, InviteInfoOut
 
 logger = logging.getLogger("shagua.invite")
 
@@ -43,43 +31,9 @@ _BIND_MESSAGES = {
     "invalid_code": "邀请码无效",
     "self_invite": "不能填写自己的邀请码",
     "not_eligible": "邀请仅对新注册用户生效",
-    "fp_not_found": "未匹配到邀请关系",
 }
 
 
-def _client_ip(request: Request) -> str:
-    """从 HTTP 头拿真实 IP。nginx 反代时走 X-Forwarded-For;裸跑 uvicorn 走 request.client。"""
-    xff = request.headers.get("x-forwarded-for", "")
-    if xff:
-        # X-Forwarded-For 可能是 "client, proxy1, proxy2" 链;取第一个 = 真实客户端
-        return xff.split(",")[0].strip()
-    return request.client.host if request.client else ""
-
-
-# Android UA 形如 '... ; <Model> Build/<id>) AppleWebKit/...';抓 ';' 后到 ' Build/' 前
-# 的 token = Build.MODEL(跨端跟客户端 android.os.Build.MODEL 对齐)。user-agents 库
-# 把 Android 设备归为 'Smartphone' 通用名,抓不到真实型号,只能正则。
-_ANDROID_BUILD_MODEL_RE = re.compile(r";\s*([^;]+?)\s+Build/", re.IGNORECASE)
-
-
-def _parse_device_model(ua: str) -> str:
-    """解析浏览器 UA 拿手机型号(如 '24115RA8EC'、'PJF110')。
-
-    Android:正则抓 UA 里 ';...Build/' 前的 token(== Build.MODEL),跨端可严格匹配。
-    iOS / 解析不到:退到 user-agents 库的通用解析,失败/UA 空 → 返空字符串。
-    """
-    if not ua:
-        return ""
-    m = _ANDROID_BUILD_MODEL_RE.search(ua)
-    if m:
-        return m.group(1).strip()
-    try:
-        from user_agents import parse
-        return (parse(ua).device.model or "").strip()
-    except Exception:  # noqa: BLE001
-        return ""
-
-
 @router.get("/me", response_model=InviteInfoOut, summary="我的邀请码 + 分享链接 + 战绩")
 def my_invite(user: CurrentUser, db: DbSession) -> InviteInfoOut:
     code = invite_repo.ensure_code(db, user)
@@ -94,124 +48,17 @@ def my_invite(user: CurrentUser, db: DbSession) -> InviteInfoOut:
     )
 
 
-@router.get("/invitees", response_model=InviteeListOut, summary="我邀请的人列表(分页)")
-def my_invitees(
-    user: CurrentUser, db: DbSession, limit: int = 20, offset: int = 0
-) -> InviteeListOut:
-    """邀请页小窗(取前几条) + 完整列表页(分页加载)共用。
-
-    名字/头像的降级兜底在 repositories/invite.get_invitees 算好,这里只组装响应。
-    limit 夹到 [1,50] 防滥用;offset 不小于 0。
-    """
-    limit = max(1, min(limit, 50))
-    offset = max(0, offset)
-    items, total, has_more = invite_repo.get_invitees(
-        db, user.id, limit=limit, offset=offset,
-    )
-    return InviteeListOut(
-        items=[InviteeItem(**it) for it in items],
-        total=total,
-        has_more=has_more,
-    )
-
-
-@router.post(
-    "/landing-track",
-    response_model=LandingTrackOut,
-    summary="落地页指纹采集(无需鉴权)",
-)
-def landing_track(
-    req: LandingTrackIn, request: Request, db: DbSession
-) -> LandingTrackOut:
-    """B 浏览器打开 dl.html?ref=xxx 时上报指纹。
-
-    服务端从 HTTP 头拿 IP/UA、解析 UA 拿 device_model,跟 req.screen 一起入库。
-    无需鉴权(浏览器没 token)。invalid_code / no_ip 走 silent 返回(不抛 5xx 影响下载流程)。
-    """
-    inviter = invite_repo.resolve_inviter(db, req.ref)
-    if inviter is None or inviter.status != "active":
-        return LandingTrackOut(status="invalid_code")
-
-    ip = _client_ip(request)
-    if not ip:
-        return LandingTrackOut(status="no_ip")
-
-    ua_str = request.headers.get("user-agent", "")
-    device_model = _parse_device_model(ua_str)
-
-    invite_repo.record_fingerprint(
-        db,
-        inviter_user_id=inviter.id,
-        ip=ip,
-        screen=req.screen,
-        device_model=device_model,
-        user_agent=ua_str,
+@router.post("/bind", response_model=BindInviteOut, summary="绑定邀请人(注册即生效,双方发金币)")
+def bind_invite(req: BindInviteIn, user: CurrentUser, db: DbSession) -> BindInviteOut:
+    result = invite_repo.bind(
+        db, invitee=user, invite_code=req.invite_code, channel=req.channel,
     )
     logger.info(
-        "invite landing-track inviter=%d ip=%s screen=%s model=%s",
-        inviter.id, ip, req.screen, device_model,
+        "invite bind invitee=%d code=%s channel=%s -> %s",
+        user.id, req.invite_code, req.channel, result.status,
     )
-    return LandingTrackOut(status="ok")
-
-
-@router.post("/bind", response_model=BindInviteOut, summary="绑定邀请人(注册即生效,双方发金币)")
-def bind_invite(
-    req: BindInviteIn, user: CurrentUser, db: DbSession, request: Request
-) -> BindInviteOut:
-    code = (req.invite_code or "").strip()
-
-    # 路径 1:有邀请码 → 走原路径(clipboard / manual)
-    if code:
-        result = invite_repo.bind(
-            db, invitee=user, invite_code=code, channel=req.channel,
-        )
-        logger.info(
-            "invite bind invitee=%d code=%s channel=%s -> %s",
-            user.id, code, req.channel, result.status,
-        )
-        return BindInviteOut(
-            status=result.status,
-            coins_awarded=result.invitee_coin,
-            message=_BIND_MESSAGES.get(result.status, result.status),
-        )
-
-    # 路径 2:无邀请码 + 有指纹 → 指纹兜底反查
-    if req.fingerprint is not None:
-        ip = _client_ip(request)
-        inviter = invite_repo.resolve_inviter_by_fingerprint(
-            db,
-            ip=ip,
-            screen=req.fingerprint.screen,
-            device_model=req.fingerprint.device_model,
-            window_days=rewards.INVITE_FP_WINDOW_DAYS,
-        )
-        if inviter is None:
-            logger.info(
-                "invite bind invitee=%d fingerprint not_found ip=%s screen=%s model=%s",
-                user.id, ip, req.fingerprint.screen, req.fingerprint.device_model,
-            )
-            return BindInviteOut(
-                status="fp_not_found",
-                coins_awarded=0,
-                message=_BIND_MESSAGES["fp_not_found"],
-            )
-        # 用反查到的 inviter.invite_code 走原 bind 流程(走原幂等/自邀/新人闸/发币逻辑)
-        result = invite_repo.bind(
-            db, invitee=user, invite_code=inviter.invite_code, channel="fingerprint",
-        )
-        logger.info(
-            "invite bind invitee=%d fingerprint -> inviter=%d code=%s -> %s",
-            user.id, inviter.id, inviter.invite_code, result.status,
-        )
-        return BindInviteOut(
-            status=result.status,
-            coins_awarded=result.invitee_coin,
-            message=_BIND_MESSAGES.get(result.status, result.status),
-        )
-
-    # 路径 3:啥都没传 → 无效请求
     return BindInviteOut(
-        status="invalid_code",
-        coins_awarded=0,
-        message=_BIND_MESSAGES["invalid_code"],
+        status=result.status,
+        coins_awarded=result.invitee_coin,
+        message=_BIND_MESSAGES.get(result.status, result.status),
     )

app/api/v1/signin.py

@@ -12,9 +12,7 @@ import logging
 from fastapi import APIRouter, HTTPException, status
 
 from app.api.deps import CurrentUser, DbSession
-from app.repositories import ad_reward as crud_ad
 from app.repositories import signin as crud_signin
-from app.repositories import wallet as crud_wallet
 from app.schemas.welfare import (
     SigninBoostRequest,
     SigninBoostResultOut,
@@ -56,21 +54,14 @@ def do_signin(user: CurrentUser, db: DbSession) -> SigninResultOut:
 def boost_signin(
     payload: SigninBoostRequest, user: CurrentUser, db: DbSession
 ) -> SigninBoostResultOut:
-    if not payload.ad_ref_id:
-        raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail="ad reward required")
-    ad_rec = crud_ad.find_by_trans(db, payload.ad_ref_id)
-    if (
-        ad_rec is None
-        or ad_rec.user_id != user.id
-        or ad_rec.reward_scene != "signin_boost"
-        or ad_rec.status != "granted"
-    ):
-        raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail="ad reward not verified")
-    record = crud_signin.boost_by_ad_ref(db, user.id, payload.ad_ref_id)
-    if record is None:
-        raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail="signin boost not granted")
-    acc = crud_wallet.get_or_create_account(db, user.id)
-    balance = acc.coin_balance
+    try:
+        record, balance = crud_signin.boost_today_signin(
+            db, user.id, ad_ref_id=payload.ad_ref_id
+        )
+    except crud_signin.NotSignedTodayError as e:
+        raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail="not signed today") from e
+    except crud_signin.AlreadyBoostedError as e:
+        raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail="already boosted today") from e
 
     logger.info(
         "signin boost ok user_id=%d date=%s coin=%d",

app/api/v1/wallet.py

@@ -176,7 +176,7 @@ def withdraw_info(user: CurrentUser, db: DbSession) -> WithdrawInfoOut:
     "/withdraw",
     response_model=WithdrawResultOut,
     summary="发起提现(扣款建单,待人工审核;审核通过后才打款)",
-    dependencies=[Depends(rate_limit(5, 60, "withdraw"))],  # IP 级粗限流;用户级未完成单限制在仓库层
+    dependencies=[Depends(rate_limit(20, 60, "withdraw"))],  # #6 同 IP 每分钟≤20 次
 )
 def withdraw(req: WithdrawRequest, user: CurrentUser, db: DbSession) -> WithdrawResultOut:
     # 提现发起本身不调微信(打款在审核通过后),但仍要求微信支付已配置——否则审核通过也打不了款,提前拦
@@ -189,17 +189,12 @@ def withdraw(req: WithdrawRequest, user: CurrentUser, db: DbSession) -> Withdraw
     except crud_wallet.InvalidWithdrawAmountError as e:
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST,
-            detail="提现金额不符合要求",
+            detail=f"amount_cents must be within [{WITHDRAW_MIN_CENTS}, {WITHDRAW_MAX_CENTS}]",
         ) from e
     except crud_wallet.WechatNotBoundError as e:
-        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="请先绑定微信") from e
-    except crud_wallet.WithdrawTooFrequentError as e:
-        raise HTTPException(
-            status_code=status.HTTP_409_CONFLICT,
-            detail="已有提现申请正在审核或打款中,请处理完成后再申请",
-        ) from e
+        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="wechat not bound") from e
     except crud_wallet.InsufficientCashError as e:
-        raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail="现金余额不足") from e
+        raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail="insufficient cash balance") from e
 
     # 调试直发(非生产):skip_review=true 时跳过人工审核,立即发起微信转账(等价 admin approve)。
     # 双闸保护——客户端仅 debug 包下发此 flag,服务端仅非 prod 才认;任一道闸拦住即恢复正常审核,

app/core/config.py

@@ -102,9 +102,6 @@ class Settings(BaseSettings):
     WXPAY_PUBLIC_KEY_PATH: str = "./secrets/pub_key.pem"             # 微信支付平台公钥
     WXPAY_TRANSFER_SCENE_ID: str = "1000"  # 转账场景 ID(1000=现金营销)
     WXPAY_REQUEST_TIMEOUT_SEC: int = 10
-    WITHDRAW_AUTO_RECONCILE_ENABLED: bool = False
-    WITHDRAW_AUTO_RECONCILE_INTERVAL_SEC: int = 300
-    WITHDRAW_AUTO_RECONCILE_OLDER_THAN_MINUTES: int = 15
     # 免确认收款授权(用户授权免确认模式)的授权结果回调地址,必须公网可访问 HTTPS、不带参数。
     # 发起授权 / 首单顺带授权时作为 authorization_notify_url 传给微信。一期不处理回调内容
     # (授权状态靠 query 查询兜底),但微信要求该字段非空,故启用免确认前必须配置;留空时免确认相关接口返回未配置。

app/core/config_schema.py

@@ -42,7 +42,7 @@ CONFIG_DEFS: dict[str, dict[str, Any]] = {
     "ad_reward_coin": {
         "default": r.AD_REWARD_COIN, "label": "看广告单次金币",
         "group": "看广告", "type": "int",
-        "help": "历史兼容/测试展示值;正式发放按 eCPM 公式计算。",
+        "help": "看完一个激励视频发的金币;须与穿山甲后台代码位'奖励数量'保持一致。",
     },
     "ad_daily_limit": {
         "default": r.DAILY_AD_REWARD_LIMIT, "label": "看广告每日上限(次)",
@@ -50,7 +50,7 @@ CONFIG_DEFS: dict[str, dict[str, Any]] = {
     },
     "ad_max_coin": {
         "default": r.MAX_AD_REWARD_COIN, "label": "看广告单次金币上限",
-        "group": "看广告", "type": "int", "help": "历史 reward_amount 口径保留项;正式发放按 eCPM 公式计算。",
+        "group": "看广告", "type": "int", "help": "夹紧穿山甲回调里异常的 reward_amount,防刷爆。",
     },
     "ad_round_count": {
         "default": r.VIDEO_ROUND_REQUIRED_COUNT, "label": "每轮看广告次数",
@@ -60,9 +60,4 @@ CONFIG_DEFS: dict[str, dict[str, Any]] = {
         "default": r.VIDEO_ROUND_COOLDOWN_SECONDS, "label": "广告关闭后冷却(秒)",
         "group": "看广告", "type": "int", "help": "点击退出广告后,下次点击观看前的冷却时间,默认 3 秒。",
     },
-    "signin_boost_coin": {
-        "default": r.SIGNIN_BOOST_COIN, "label": "签到膨胀固定金币",
-        "group": "签到", "type": "int",
-        "help": "Day1-Day13 签到后看完激励视频额外发放的固定金币;Day14 不展示也不允许膨胀。",
-    },
 }

app/core/rewards.py

@@ -77,12 +77,6 @@ def record_milestone_reward(milestone: int) -> int:
     return RECORD_MILESTONES[milestone - 1]
 
 
-# ===== 上报更低价(人工审核通过发固定金币)=====
-# 用户上报"某平台比我们算的最低价更便宜"+ 截图,经运营后台人工审核通过后发放的固定金币奖励。
-# 与广告/任务同量级;固定值(产品 2026-06 定),要调直接改这里;客户端记录页按 reward_coins 显示。
-PRICE_REPORT_REWARD_COINS: int = 1000
-
-
 # ===== 邀请好友(注册即生效,邀请人 + 被邀请人各发金币)=====
 # 10000 金币 = 1 元,双方各得 1 元。MVP 先用固定常量(不走 app_config)。
 INVITE_INVITER_COINS: int = 10000
@@ -91,11 +85,6 @@ INVITE_INVITEE_COINS: int = 10000
 # 自动绑(剪贴板)在首次注册登录后几秒内发生;留 72h 给手动填码兜底。
 INVITE_NEW_USER_WINDOW_HOURS: int = 72
 
-# 指纹归因兜底(剪贴板被覆盖时):落地页 POST /landing-track 存的指纹记录,在此窗口内可被
-# /bind 反查撞库。窗口取舍:太短(24h)覆盖不到"晚上看链接、第二天装"的常见场景;太宽
-# (30d)IP/设备会漂、匹配错率上升。7 天兼顾"看广告→使用"周期与匹配精度。
-INVITE_FP_WINDOW_DAYS: int = 7
-
 
 # ===== 看激励视频 / 信息流广告发金币 =====
 # 金币数值体系约定:eCPM 单位按"元/千次展示"处理,单次收入 = eCPM / 1000 元。
@@ -155,14 +144,14 @@ def calculate_ad_reward_coin(ecpm: str | int | float | None, today_count_after_t
     return max(0, round(yuan * COIN_PER_YUAN))
 
 
-SIGNIN_BOOST_COIN: int = 2000
-
-
 # ===== 看激励视频发金币(穿山甲 S2S 服务端回调发奖)=====
-# 历史固定金币口径保留项。正式激励视频实发按 calculate_ad_reward_coin(eCPM, 当日第 N 次)
-# 计算;该值只用于旧接口兼容、配置页展示和本地联调兜底。
+# 看完一个激励视频发的金币(666 金币 ≈¥0.0666,汇率 10000 金币=1 元)。
+# 作用:① 回调缺/坏 reward_amount 时的回退值;② 客户端进度接口展示的"单次预告金币";
+#       ③ test-grant 本地联调的发奖额。
+# 真实发放以穿山甲回调带回的 reward_amount 为准(见 resolve_ad_reward_coin),后台应把
+# 代码位"奖励数量"配成与本值一致(=666),保证"广告内展示 / 进度预告 / 实际到账"三者一致。
 AD_REWARD_COIN: int = 666
-# 历史 reward_amount 口径保留项。正式激励视频实发按 eCPM 公式计算。
+# 单次发奖金币上限:夹紧穿山甲回调里异常的 reward_amount(如后台多打一个 0),防刷爆余额。
 MAX_AD_REWARD_COIN: int = 1000
 # 每用户每日发奖次数上限。产品口径:一天最多看 500 次广告。
 DAILY_AD_REWARD_LIMIT: int = 500
@@ -180,7 +169,7 @@ VIDEO_ROUND_COOLDOWN_SECONDS: int = 3
 
 
 def resolve_ad_reward_coin(db, reward_amount: str | int | None) -> int:  # noqa: ANN001
-    """历史 reward_amount 口径解析函数,保留给旧脚本/旧配置兼容。
+    """把穿山甲回调的 reward_amount(后台代码位配的"奖励数量")解析成本次发放金币。
 
     缺失 / 非数字 / ≤0 → 回退配置单次金币;超过配置单次上限 → 夹紧(均从 app_config 读)。
     注:reward_amount 不参与穿山甲 sign(只签 trans_id),但伪造回调需先伪造合法 sign
@@ -247,7 +236,3 @@ def get_ad_round_count(db) -> int:  # noqa: ANN001
 
 def get_ad_cooldown_sec(db) -> int:  # noqa: ANN001
     return int(_cfg(db, "ad_cooldown_sec"))
-
-
-def get_signin_boost_coin(db) -> int:  # noqa: ANN001
-    return int(_cfg(db, "signin_boost_coin"))

app/core/withdraw_reconcile_worker.py

@@ -1,118 +0,0 @@
-"""提现 pending 单自动对账后台任务。"""
-from __future__ import annotations
-
-import asyncio
-import contextlib
-import logging
-import os
-import time
-from collections.abc import Iterator
-from pathlib import Path
-
-from sqlalchemy.exc import SQLAlchemyError
-
-from app.core.config import settings
-from app.db.session import SessionLocal
-from app.integrations.wxpay import WxPayNotConfiguredError
-from app.repositories import wallet as wallet_repo
-
-logger = logging.getLogger("shagua.withdraw_reconcile")
-_LOCK_PATH = Path(__file__).resolve().parents[2] / "data" / "withdraw_reconcile.lock"
-
-
-def _touch_lock() -> None:
-    with contextlib.suppress(FileNotFoundError):
-        os.utime(_LOCK_PATH, None)
-
-
-@contextlib.contextmanager
-def _single_instance_lock(stale_after_sec: int) -> Iterator[bool]:
-    """同机多进程保护:同一时间只允许一个自动查单 worker 运行。"""
-    _LOCK_PATH.parent.mkdir(parents=True, exist_ok=True)
-    fd: int | None = None
-    try:
-        try:
-            fd = os.open(str(_LOCK_PATH), os.O_CREAT | os.O_EXCL | os.O_WRONLY)
-        except FileExistsError:
-            try:
-                age = time.time() - _LOCK_PATH.stat().st_mtime
-            except FileNotFoundError:
-                age = stale_after_sec + 1
-            if age > stale_after_sec:
-                with contextlib.suppress(FileNotFoundError):
-                    _LOCK_PATH.unlink()
-                try:
-                    fd = os.open(str(_LOCK_PATH), os.O_CREAT | os.O_EXCL | os.O_WRONLY)
-                except FileExistsError:
-                    fd = None
-
-        if fd is None:
-            yield False
-            return
-
-        os.write(fd, f"pid={os.getpid()} started_at={int(time.time())}\n".encode("ascii"))
-        yield True
-    finally:
-        if fd is not None:
-            os.close(fd)
-            with contextlib.suppress(FileNotFoundError):
-                _LOCK_PATH.unlink()
-
-
-def _reconcile_once(older_than_minutes: int) -> dict:
-    with SessionLocal() as db:
-        return wallet_repo.reconcile_pending_withdraws(db, older_than_minutes=older_than_minutes)
-
-
-async def _run_loop() -> None:
-    interval = max(30, int(settings.WITHDRAW_AUTO_RECONCILE_INTERVAL_SEC))
-    older_than = max(1, int(settings.WITHDRAW_AUTO_RECONCILE_OLDER_THAN_MINUTES))
-    lock_stale_after = max(interval * 3, 600)
-    with _single_instance_lock(lock_stale_after) as lock_acquired:
-        if not lock_acquired:
-            logger.warning("withdraw auto reconcile skipped: another worker owns lock")
-            return
-
-        await _run_locked_loop(interval, older_than)
-
-
-async def _run_locked_loop(interval: int, older_than: int) -> None:
-    logger.info(
-        "withdraw auto reconcile started interval=%ss older_than=%sm",
-        interval,
-        older_than,
-    )
-    try:
-        while True:
-            try:
-                _touch_lock()
-                result = await asyncio.to_thread(_reconcile_once, older_than)
-                if result["checked"] or result["resolved"]:
-                    logger.info("withdraw auto reconcile result=%s", result)
-            except WxPayNotConfiguredError:
-                logger.warning("withdraw auto reconcile skipped: wxpay not configured")
-            except SQLAlchemyError:
-                logger.exception("withdraw auto reconcile db error")
-            except Exception:  # noqa: BLE001 - 后台任务不能因单次异常退出
-                logger.exception("withdraw auto reconcile unexpected error")
-            await asyncio.sleep(interval)
-    except asyncio.CancelledError:
-        logger.info("withdraw auto reconcile stopped")
-        raise
-
-
-def start_withdraw_reconcile_worker() -> asyncio.Task | None:
-    if not settings.WITHDRAW_AUTO_RECONCILE_ENABLED:
-        logger.info("withdraw auto reconcile disabled")
-        return None
-    if not settings.wxpay_configured:
-        logger.warning("withdraw auto reconcile enabled but wxpay not configured")
-    return asyncio.create_task(_run_loop(), name="withdraw-auto-reconcile")
-
-
-async def stop_withdraw_reconcile_worker(task: asyncio.Task | None) -> None:
-    if task is None:
-        return
-    task.cancel()
-    with contextlib.suppress(asyncio.CancelledError):
-        await task

app/integrations/pangle.py

@@ -8,9 +8,9 @@
 我们客户端是 useMediation(true) 融合,回调走 GroMore 广告位层级,**不是**联盟代码位层级):
 **sign = SHA256("{m-key}:{trans_id}")** 的十六进制串。注意:
 - 是**普通 SHA256**,不是 HMAC,也不是 RSA;
-- **只对 `m-key:trans_id` 这一个字符串**签名,user_id / ecpm / extra 等其余参数**不参与**签名
+- **只对 `m-key:trans_id` 这一个字符串**签名,user_id / reward_amount 等其余参数**不参与**签名
   (它们的可信度由"能算出正确 sign = 知道 m-key"间接保证——伪造者没有 m-key 就连合法 sign
-  都造不出,自然也无法注入假 user_id/ecpm/extra)。
+  都造不出,自然也无法注入假 user_id/reward_amount)。
 m-key(安全密钥)在穿山甲后台「GroMore 聚合管理 → 搜广告位ID → 编辑」处获取,配到
 `settings.PANGLE_REWARD_SECRET`。(联盟代码位层级用的是另一套 Security Key + isValid 响应,我们不走那条。)
 """

app/integrations/wxpay.py

@@ -14,9 +14,7 @@ import base64
 import json
 import time
 import uuid
-from pathlib import Path
 
-import certifi
 import httpx
 from cryptography.hazmat.primitives import hashes, serialization
 from cryptography.hazmat.primitives.asymmetric import padding
@@ -25,7 +23,6 @@ from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey, RSAPubl
 from app.core.config import settings
 
 _API_HOST = "https://api.mch.weixin.qq.com"
-_PROJECT_ROOT = Path(__file__).resolve().parents[2]
 _TRANSFER_PATH = "/v3/fund-app/mch-transfer/transfer-bills"
 # 免确认收款授权(用户授权免确认模式)
 _AUTH_PATH = "/v3/fund-app/mch-transfer/user-confirm-authorization"
@@ -41,30 +38,15 @@ class WxPayNotConfiguredError(Exception):
     """微信支付凭证 / 证书缺失,无法调用。"""
 
 
-def _http_client() -> httpx.Client:
-    """微信相关 HTTP 客户端。
-
-    显式使用当前 Python 环境的 certifi 证书,避免被外部 SSL_CERT_FILE 指到不存在文件。
-    代理仍允许从环境变量读取,方便本地开发。
-    """
-    return httpx.Client(verify=certifi.where())
-
-
-def _resolve_config_path(value: str) -> Path:
-    path = Path(value)
-    return path if path.is_absolute() else _PROJECT_ROOT / path
-
-
 def _load_private_key() -> RSAPrivateKey:
     global _private_key
     if _private_key is None:
-        key_path = _resolve_config_path(settings.WXPAY_MCH_PRIVATE_KEY_PATH)
         try:
-            with key_path.open("rb") as f:
+            with open(settings.WXPAY_MCH_PRIVATE_KEY_PATH, "rb") as f:
                 _private_key = serialization.load_pem_private_key(f.read(), password=None)
         except FileNotFoundError as e:
             raise WxPayNotConfiguredError(
-                f"商户私钥不存在: {key_path}"
+                f"商户私钥不存在: {settings.WXPAY_MCH_PRIVATE_KEY_PATH}"
             ) from e
     return _private_key
 
@@ -72,13 +54,12 @@ def _load_private_key() -> RSAPrivateKey:
 def _load_public_key() -> RSAPublicKey:
     global _public_key
     if _public_key is None:
-        key_path = _resolve_config_path(settings.WXPAY_PUBLIC_KEY_PATH)
         try:
-            with key_path.open("rb") as f:
+            with open(settings.WXPAY_PUBLIC_KEY_PATH, "rb") as f:
                 _public_key = serialization.load_pem_public_key(f.read())
         except FileNotFoundError as e:
             raise WxPayNotConfiguredError(
-                f"微信支付平台公钥不存在: {key_path}"
+                f"微信支付平台公钥不存在: {settings.WXPAY_PUBLIC_KEY_PATH}"
             ) from e
     return _public_key
 
@@ -145,7 +126,7 @@ def create_transfer(
         "Content-Type": "application/json",
         "Wechatpay-Serial": settings.WXPAY_PUBLIC_KEY_ID,
     }
-    with _http_client() as client:
+    with httpx.Client() as client:
         resp = client.post(
             f"{_API_HOST}{_TRANSFER_PATH}",
             content=body_str,
@@ -162,7 +143,7 @@ def query_transfer(out_bill_no: str) -> dict:
         "Authorization": _build_authorization("GET", path, ""),
         "Accept": "application/json",
     }
-    with _http_client() as client:
+    with httpx.Client() as client:
         resp = client.get(
             f"{_API_HOST}{path}", headers=headers, timeout=settings.WXPAY_REQUEST_TIMEOUT_SEC
         )
@@ -178,7 +159,7 @@ def cancel_transfer(out_bill_no: str) -> dict:
         "Accept": "application/json",
         "Content-Type": "application/json",
     }
-    with _http_client() as client:
+    with httpx.Client() as client:
         resp = client.post(
             f"{_API_HOST}{path}", headers=headers, timeout=settings.WXPAY_REQUEST_TIMEOUT_SEC
         )
@@ -190,17 +171,16 @@ def code_to_userinfo(code: str) -> dict:
     返回 {openid, nickname, avatar_url, raw}。失败抛 ValueError。
     注意:微信隐私新政下,部分 app 的 sns/userinfo 可能返回脱敏值(昵称"微信用户"/灰头像);
     nickname/avatar_url 可能为空,调用方需兜底。"""
-    with _http_client() as client:
-        r1 = client.get(
-            "https://api.weixin.qq.com/sns/oauth2/access_token",
-            params={
-                "appid": settings.WECHAT_APP_ID,
-                "secret": settings.WECHAT_APP_SECRET,
-                "code": code,
-                "grant_type": "authorization_code",
-            },
-            timeout=settings.WXPAY_REQUEST_TIMEOUT_SEC,
-        )
+    r1 = httpx.get(
+        "https://api.weixin.qq.com/sns/oauth2/access_token",
+        params={
+            "appid": settings.WECHAT_APP_ID,
+            "secret": settings.WECHAT_APP_SECRET,
+            "code": code,
+            "grant_type": "authorization_code",
+        },
+        timeout=settings.WXPAY_REQUEST_TIMEOUT_SEC,
+    )
     d1 = r1.json()
     if "openid" not in d1 or "access_token" not in d1:
         raise ValueError(f"微信授权失败: {d1.get('errmsg', d1)}")
@@ -211,12 +191,11 @@ def code_to_userinfo(code: str) -> dict:
     raw: dict = {}
     # userinfo 拉取失败不应让绑定失败(openid 已拿到),吞掉异常只是没昵称头像
     try:
-        with _http_client() as client:
-            r2 = client.get(
-                "https://api.weixin.qq.com/sns/userinfo",
-                params={"access_token": d1["access_token"], "openid": openid, "lang": "zh_CN"},
-                timeout=settings.WXPAY_REQUEST_TIMEOUT_SEC,
-            )
+        r2 = httpx.get(
+            "https://api.weixin.qq.com/sns/userinfo",
+            params={"access_token": d1["access_token"], "openid": openid, "lang": "zh_CN"},
+            timeout=settings.WXPAY_REQUEST_TIMEOUT_SEC,
+        )
         raw = r2.json()
         nickname = raw.get("nickname") or None
         avatar_url = raw.get("headimgurl") or None
@@ -265,7 +244,7 @@ def apply_transfer_authorization(
         "Accept": "application/json",
         "Content-Type": "application/json",
     }
-    with _http_client() as client:
+    with httpx.Client() as client:
         resp = client.post(
             f"{_API_HOST}{_AUTH_PATH}",
             content=body_str,
@@ -283,7 +262,7 @@ def query_transfer_authorization(out_authorization_no: str) -> dict:
         "Authorization": _build_authorization("GET", path, ""),
         "Accept": "application/json",
     }
-    with _http_client() as client:
+    with httpx.Client() as client:
         resp = client.get(
             f"{_API_HOST}{path}", headers=headers, timeout=settings.WXPAY_REQUEST_TIMEOUT_SEC
         )
@@ -298,7 +277,7 @@ def close_transfer_authorization(out_authorization_no: str) -> dict:
         "Accept": "application/json",
         "Content-Type": "application/json",
     }
-    with _http_client() as client:
+    with httpx.Client() as client:
         resp = client.post(
             f"{_API_HOST}{path}", headers=headers, timeout=settings.WXPAY_REQUEST_TIMEOUT_SEC
         )
@@ -340,7 +319,7 @@ def pre_transfer_with_authorization(
         "Content-Type": "application/json",
         "Wechatpay-Serial": settings.WXPAY_PUBLIC_KEY_ID,
     }
-    with _http_client() as client:
+    with httpx.Client() as client:
         resp = client.post(
             f"{_API_HOST}{_PRE_TRANSFER_AUTH_PATH}",
             content=body_str,
@@ -377,7 +356,7 @@ def transfer_with_authorization(
         "Content-Type": "application/json",
         "Wechatpay-Serial": settings.WXPAY_PUBLIC_KEY_ID,
     }
-    with _http_client() as client:
+    with httpx.Client() as client:
         resp = client.post(
             f"{_API_HOST}{_TRANSFER_WITH_AUTH_PATH}",
             content=body_str,

app/main.py

@@ -35,10 +35,6 @@ from app.api.v1.wallet import router as wallet_router
 from app.api.v1.wxpay import router as wxpay_router
 from app.core.config import settings
 from app.core.logging import setup_logging
-from app.core.withdraw_reconcile_worker import (
-    start_withdraw_reconcile_worker,
-    stop_withdraw_reconcile_worker,
-)
 
 setup_logging(debug=settings.APP_DEBUG)
 logger = logging.getLogger("shagua.main")
@@ -54,12 +50,8 @@ async def lifespan(_: FastAPI) -> AsyncIterator[None]:
         settings.APP_DEBUG,
         settings.DATABASE_URL.split("://", 1)[0],
     )
-    reconcile_task = start_withdraw_reconcile_worker()
-    try:
-        yield
-    finally:
-        await stop_withdraw_reconcile_worker(reconcile_task)
-        logger.info("shutting down")
+    yield
+    logger.info("shutting down")
 
 
 app = FastAPI(

app/models/__init__.py

@@ -13,7 +13,6 @@ from app.models.coupon_state import (  # noqa: F401
 )
 from app.models.feedback import Feedback  # noqa: F401
 from app.models.invite import InviteRelation  # noqa: F401
-from app.models.invite_fingerprint import InviteFingerprint  # noqa: F401
 from app.models.meituan_coupon import MeituanCoupon  # noqa: F401
 from app.models.ops_marquee_seed import OpsMarqueeSeed  # noqa: F401
 from app.models.ops_stat_config import OpsStatConfig  # noqa: F401

app/models/ad_ecpm.py

@@ -1,8 +1,11 @@
 """广告展示 eCPM 上报记录(内部收益统计/对账)。
 
-每条 = 客户端一次广告展示(`onAdShow`)后读到的 eCPM 信息。`ad_session_id`
-由客户端生成,并通过激励视频 extra 透传给 S2S 回调,用于把"展示 eCPM"与
-"奖励完成"绑定。没有 session id 的旧上报仍可作为按天对账补充。
+每条 = 客户端一次广告展示(`onAdShow`)后读到的 eCPM 信息。和发奖记录
+[ad_reward.AdRewardRecord] 是**两条独立的数据流**:
+- 发奖走穿山甲 S2S 回调(后端 → 有 trans_id、无 ecpm);
+- eCPM 走客户端上报(客户端 → 有 ecpm、无 trans_id)。
+两者没有公共键,无法逐条一一对应,所以本表用于**按用户/按天聚合收益**口径的对账,
+不做"这条发奖 = 这条 ecpm"的精确关联。穿山甲后台报表才是结算权威,本表是细粒度补充。
 
 ⚠️ `ecpm_raw` 原样存客户端上报的字符串——eCPM 单位(分 / 元)截至 2026-05-31 尚未最终确认,
 确认后再加一列解析好的数值;在此之前对账按"待定单位"处理。
@@ -11,7 +14,7 @@ from __future__ import annotations
 
 from datetime import datetime
 
-from sqlalchemy import DateTime, ForeignKey, Integer, String, UniqueConstraint, func
+from sqlalchemy import DateTime, ForeignKey, Integer, String, func
 from sqlalchemy.orm import Mapped, mapped_column
 
 from app.db.base import Base
@@ -19,9 +22,6 @@ from app.db.base import Base
 
 class AdEcpmRecord(Base):
     __tablename__ = "ad_ecpm_record"
-    __table_args__ = (
-        UniqueConstraint("ad_session_id", name="uq_ad_ecpm_record_session"),
-    )
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
     user_id: Mapped[int] = mapped_column(
@@ -29,13 +29,11 @@ class AdEcpmRecord(Base):
     )
     # 广告类型:reward_video(激励视频) / draw(Draw 信息流) 等;不强行统一代码位,各类型各自上报
     ad_type: Mapped[str] = mapped_column(String(32), nullable=False)
-    # 客户端生成的一次广告会话 id;激励视频 S2S 回调 extra 会透传同值
-    ad_session_id: Mapped[str | None] = mapped_column(String(64), index=True, nullable=True)
     # 实际投放的 ADN(穿山甲 getShowEcpm().getSdkName(),如 pangle / gdt)
     adn: Mapped[str | None] = mapped_column(String(32), nullable=True)
     # 实际展示用的代码位(底层 mediation rit,非客户端配置位)
     slot_id: Mapped[str | None] = mapped_column(String(64), nullable=True)
-    # 客户端上报的 eCPM 原始字符串(单位:元/千次展示,原样存)
+    # 客户端上报的 eCPM 原始字符串(单位待确认,原样存)
     ecpm_raw: Mapped[str] = mapped_column(String(32), nullable=False)
     # 北京时间日期串 'YYYY-MM-DD',按它等值做"按天聚合"(不在 SQL 里做跨时区 date 比较)
     report_date: Mapped[str] = mapped_column(String(10), index=True, nullable=False)

app/models/ad_feed_reward.py

@@ -20,7 +20,6 @@ class AdFeedRewardRecord(Base):
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
     client_event_id: Mapped[str] = mapped_column(String(64), nullable=False)
-    ad_session_id: Mapped[str | None] = mapped_column(String(64), index=True, nullable=True)
     user_id: Mapped[int] = mapped_column(
         Integer, ForeignKey("user.id"), index=True, nullable=False
     )

app/models/ad_reward.py

@@ -1,8 +1,8 @@
 """看激励视频发奖记录(穿山甲 S2S 回调)。
 
-每条 = 穿山甲/GroMore 一次服务端激励回调。`trans_id`(交易号)唯一,做幂等键:
-穿山甲会重试回调,同号只处理一次。`reward_scene` 区分福利页激励视频、签到膨胀等
-不同奖励场景,避免统计和每日上限互相污染。
+每条 = 穿山甲一次发奖回调。`trans_id`(穿山甲交易号)唯一,做幂等键:穿山甲会重试回调,
+同号只发一次金币。`reward_date`(北京时间日期串)给"每日上限"计数用——按日期串等值查,
+不在 SQL 里做跨时区 date 比较(SQLite 上不可靠)。审计 / 对账时整张表可逐笔回溯。
 """
 from __future__ import annotations
 
@@ -25,14 +25,8 @@ class AdRewardRecord(Base):
     )
     # 实发金币(capped 时为 0)
     coin: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
-    # granted(已发) / capped(当日超限未发) / ecpm_missing(缺 eCPM 未发)
+    # granted(已发) / capped(当日超限未发)
     status: Mapped[str] = mapped_column(String(16), nullable=False, default="granted")
-    # reward_video(福利页看视频) / signin_boost(签到膨胀)
-    reward_scene: Mapped[str] = mapped_column(String(32), nullable=False, default="reward_video")
-    # 客户端生成并通过 extra 透传的广告会话 id
-    ad_session_id: Mapped[str | None] = mapped_column(String(64), index=True, nullable=True)
-    # 本次发奖采用的 eCPM 原始值(回调自带或按 ad_session_id 匹配的客户端上报)
-    ecpm_raw: Mapped[str | None] = mapped_column(String(32), nullable=True)
     # 北京时间日期串 'YYYY-MM-DD',按它等值统计当日发奖次数
     reward_date: Mapped[str] = mapped_column(String(10), index=True, nullable=False)
     # 穿山甲上报的奖励名(参考,不作发奖依据)
@@ -45,7 +39,4 @@ class AdRewardRecord(Base):
     )
 
     def __repr__(self) -> str:  # pragma: no cover
-        return (
-            f"<AdRewardRecord trans_id={self.trans_id} user_id={self.user_id} "
-            f"scene={self.reward_scene} {self.status} coin={self.coin}>"
-        )
+        return f"<AdRewardRecord trans_id={self.trans_id} user_id={self.user_id} {self.status} coin={self.coin}>"

app/models/comparison.py

@@ -53,10 +53,6 @@ class ComparisonRecord(Base):
     )
     # pricebot 侧 trace_id:关联调试落盘 + 幂等去重键
     trace_id: Mapped[str] = mapped_column(String(64), nullable=False)
-    # 本次比价的公网调试链接(price.shaguabijia.com/traces/{dir}/)。pricebot done 帧给、
-    # 客户端上报带上——dir 名含 pricebot 落盘的时分秒,前端/server 都拼不出,必须存。
-    # 查看接口按 user.debug_trace_enabled 决定返不返回。旧记录 / 未开上云为 None。
-    trace_url: Mapped[str | None] = mapped_column(String(512), nullable=True)
 
     # ===== 源平台(发起比价的那家)=====
     source_platform_id: Mapped[str | None] = mapped_column(String(32), nullable=True)

app/models/invite_fingerprint.py

@@ -1,46 +0,0 @@
-"""邀请指纹归因表(剪贴板归因兜底)。
-
-数据流(对应 [[invite-three-tasks]] 任务 3):
-  1. B 浏览器打开落地页 dl.html?ref=邀请码 → JS POST /api/v1/invite/landing-track
-  2. 后端从 HTTP 头拿 IP/UA,解析 UA 得 device_model,跟 JS 上报的 screen 一起入库
-  3. B 装包首启 → 登录后,若剪贴板没拿到邀请码(被覆盖),客户端再算一次 screen+Build.MODEL
-     上报 → 后端用 (ip, screen, device_model) 反查本表 7 天内最近匹配 → 拿出 inviter_user_id
-     → 走原 bind 路径(channel=fingerprint)
-
-不要索引(IP, created_at) 单独,组合索引 (ip, screen, device_model, created_at desc) 反查更省。
-"""
-from __future__ import annotations
-
-from datetime import datetime
-
-from sqlalchemy import DateTime, ForeignKey, Integer, String, Text, func
-from sqlalchemy.orm import Mapped, mapped_column
-
-from app.db.base import Base
-
-
-class InviteFingerprint(Base):
-    __tablename__ = "invite_fingerprint"
-
-    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
-    inviter_user_id: Mapped[int] = mapped_column(
-        Integer, ForeignKey("user.id"), index=True, nullable=False
-    )
-    # 落地页访问者 IP(服务端从 HTTP 头拿,X-Forwarded-For 由部署侧 nginx 透传)
-    ip: Mapped[str] = mapped_column(String(64), nullable=False)
-    # 客户端 Build.MODEL / 浏览器 UA 解析出来的型号(如 "PJF110"、"23046PNC9C")
-    device_model: Mapped[str] = mapped_column(String(64), nullable=False, default="")
-    # 屏幕分辨率 "1080x2400"(浏览器 screen.width × height,客户端 DisplayMetrics)
-    screen: Mapped[str] = mapped_column(String(32), nullable=False, default="")
-    # 完整 UA 字符串(留 debug / 排查"匹配不上"用,不直接参与匹配)
-    user_agent: Mapped[str] = mapped_column(Text, nullable=False, default="")
-
-    created_at: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), server_default=func.now(), index=True, nullable=False
-    )
-
-    def __repr__(self) -> str:  # pragma: no cover
-        return (
-            f"<InviteFingerprint inviter={self.inviter_user_id} "
-            f"ip={self.ip} model={self.device_model} screen={self.screen}>"
-        )

app/models/user.py

@@ -11,7 +11,7 @@ from __future__ import annotations
 
 from datetime import datetime, timezone
 
-from sqlalchemy import Boolean, DateTime, Integer, String, false, func
+from sqlalchemy import DateTime, Integer, String, func
 from sqlalchemy.orm import Mapped, mapped_column
 
 from app.db.base import Base
@@ -51,13 +51,6 @@ class User(Base):
     # 账号状态:active / disabled / deleted
     status: Mapped[str] = mapped_column(String(20), nullable=False, default="active")
 
-    # 调试链接权限:开了的用户在比价完成弹窗 + 比价记录页能看到「复制调试链接」按钮
-    # (复制 price.shaguabijia.com 的 trace 链接发给开发排障)。运营后台按用户配置;
-    # /me 与登录响应里带出给前端做条件渲染。默认 false。
-    debug_trace_enabled: Mapped[bool] = mapped_column(
-        Boolean, nullable=False, default=False, server_default=false()
-    )
-
     created_at: Mapped[datetime] = mapped_column(
         DateTime(timezone=True), server_default=func.now(), nullable=False
     )

app/models/wallet.py

@@ -10,7 +10,7 @@ from __future__ import annotations
 
 from datetime import datetime
 
-from sqlalchemy import DateTime, ForeignKey, Index, Integer, String, func, text
+from sqlalchemy import DateTime, ForeignKey, Integer, String, func
 from sqlalchemy.orm import Mapped, mapped_column
 
 from app.db.base import Base
@@ -76,15 +76,6 @@ class WithdrawOrder(Base):
     """
 
     __tablename__ = "withdraw_order"
-    __table_args__ = (
-        Index(
-            "ux_withdraw_order_user_active",
-            "user_id",
-            unique=True,
-            sqlite_where=text("status IN ('reviewing', 'pending')"),
-            postgresql_where=text("status IN ('reviewing', 'pending')"),
-        ),
-    )
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
     user_id: Mapped[int] = mapped_column(
@@ -157,15 +148,6 @@ class CashTransaction(Base):
     """现金流水(单位:分)。金币兑现金、提现都记在这里。"""
 
     __tablename__ = "cash_transaction"
-    __table_args__ = (
-        Index(
-            "ux_cash_transaction_withdraw_refund_ref",
-            "ref_id",
-            unique=True,
-            sqlite_where=text("biz_type = 'withdraw_refund' AND ref_id IS NOT NULL"),
-            postgresql_where=text("biz_type = 'withdraw_refund' AND ref_id IS NOT NULL"),
-        ),
-    )
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
     user_id: Mapped[int] = mapped_column(

app/repositories/ad_ecpm.py

@@ -7,7 +7,6 @@ user 存在(JWT),故不做 UnknownUser 校验。best-effort 上报:丢一两条
 from __future__ import annotations
 
 from sqlalchemy import func, select
-from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import Session
 
 from app.core.rewards import cn_today
@@ -20,52 +19,24 @@ def create_ecpm_record(
     *,
     ad_type: str,
     ecpm_raw: str,
-    ad_session_id: str | None = None,
     adn: str | None = None,
     slot_id: str | None = None,
 ) -> AdEcpmRecord:
     """落一条 eCPM 上报记录。report_date 用北京时间当天,供按天聚合。"""
-    if ad_session_id:
-        existing = find_by_session(db, user_id=user_id, ad_session_id=ad_session_id)
-        if existing is not None:
-            return existing
     rec = AdEcpmRecord(
         user_id=user_id,
         ad_type=ad_type,
-        ad_session_id=ad_session_id,
         adn=adn,
         slot_id=slot_id,
         ecpm_raw=ecpm_raw,
         report_date=cn_today().isoformat(),
     )
     db.add(rec)
-    try:
-        db.commit()
-    except IntegrityError:
-        db.rollback()
-        if ad_session_id:
-            existing = find_by_session(db, user_id=user_id, ad_session_id=ad_session_id)
-            if existing is not None:
-                return existing
-        raise
+    db.commit()
     db.refresh(rec)
     return rec
 
 
-def find_by_session(
-    db: Session, *, user_id: int, ad_session_id: str | None
-) -> AdEcpmRecord | None:
-    """按广告会话找 eCPM。旧客户端无 ad_session_id 时返回 None。"""
-    if not ad_session_id:
-        return None
-    return db.execute(
-        select(AdEcpmRecord).where(
-            AdEcpmRecord.user_id == user_id,
-            AdEcpmRecord.ad_session_id == ad_session_id,
-        )
-    ).scalar_one_or_none()
-
-
 def count_today(db: Session, user_id: int) -> int:
     """该用户今日(北京时间)上报的 eCPM 条数,排查/对账辅助用。"""
     return db.execute(

app/repositories/ad_feed_reward.py

@@ -63,7 +63,6 @@ def grant_feed_reward(
     client_event_id: str,
     ecpm: str,
     duration_seconds: int,
-    ad_session_id: str | None = None,
     adn: str | None = None,
     slot_id: str | None = None,
 ) -> AdFeedRewardRecord:
@@ -83,7 +82,6 @@ def grant_feed_reward(
             reward_date=today,
             duration_seconds=safe_duration,
             unit_count=unit_count,
-            ad_session_id=ad_session_id,
             ecpm_raw=ecpm,
             adn=adn,
             slot_id=slot_id,
@@ -105,7 +103,6 @@ def grant_feed_reward(
         reward_date=today,
         duration_seconds=safe_duration,
         unit_count=unit_count,
-        ad_session_id=ad_session_id,
         ecpm_raw=ecpm,
         adn=adn,
         slot_id=slot_id,

app/repositories/ad_reward.py

@@ -5,8 +5,8 @@
   2. trans_id 唯一 → 同一交易号二次回调不重复发(穿山甲会重试)。
   3. 当日发奖次数 ≥ 上限 → 记一条 status='capped' 但不发金币。
 
-普通福利页激励视频按 eCPM 公式发金币;缺 eCPM 时记 status='ecpm_missing' 但不发金币。
-签到膨胀等其他激励视频场景复用本表记录 S2S 幂等,实际发币由各自业务仓储完成。
+发金币复用 `wallet.grant_coins`(biz_type='ad_reward', ref_id=trans_id),与发奖记录同事务,
+保证"记一笔 + 加金币"原子化。单次金币 / 每日上限 / 每轮冷却 都从 app_config 读(运营后台可改)。
 """
 from __future__ import annotations
 
@@ -21,7 +21,6 @@ from app.core.ad_cooldown import compute_cooldown
 from app.core.rewards import DAILY_AD_WATCH_SECONDS_LIMIT, cn_today
 from app.models.ad_reward import AdRewardRecord
 from app.models.user import User
-from app.repositories import ad_ecpm as crud_ecpm
 from app.repositories import wallet as crud_wallet
 from app.repositories.ad_watch import watched_seconds_today
 
@@ -36,11 +35,6 @@ def _find_by_trans(db: Session, trans_id: str) -> AdRewardRecord | None:
     ).scalar_one_or_none()
 
 
-def find_by_trans(db: Session, trans_id: str) -> AdRewardRecord | None:
-    """按 S2S 交易号查询处理记录,供路由在分场景前做幂等短路。"""
-    return _find_by_trans(db, trans_id)
-
-
 def _granted_today(db: Session, user_id: int, reward_date: str) -> int:
     return db.execute(
         select(func.count())
@@ -49,7 +43,6 @@ def _granted_today(db: Session, user_id: int, reward_date: str) -> int:
             AdRewardRecord.user_id == user_id,
             AdRewardRecord.reward_date == reward_date,
             AdRewardRecord.status == "granted",
-            AdRewardRecord.reward_scene == "reward_video",
         )
     ).scalar_one()
 
@@ -59,13 +52,16 @@ def grant_ad_reward(
     user_id: int,
     trans_id: str,
     *,
-    ecpm: str | None = None,
-    ad_session_id: str | None = None,
-    reward_scene: str = "reward_video",
+    coin: int | None = None,
     reward_name: str | None = None,
     raw: str | None = None,
 ) -> AdRewardRecord:
-    """福利页激励视频发奖(幂等 + 每日限额 + eCPM 公式)。"""
+    """看广告发奖(幂等 + 每日限额)。返回发奖记录(status=granted/capped)。
+
+    coin 为本次发放金币(由调用方按穿山甲回调 reward_amount 解析,见
+    rewards.resolve_ad_reward_coin);None → 读配置 get_ad_reward_coin(test-grant / 缺省场景)。
+    user_id 不存在抛 UnknownUserError(不建账户,防伪造 user_id 刷出脏数据)。
+    """
     # #2 幂等:同 trans_id 已处理过 → 原样返回,不重复发
     existing = _find_by_trans(db, trans_id)
     if existing is not None:
@@ -87,86 +83,24 @@ def grant_ad_reward(
         rec = AdRewardRecord(
             trans_id=trans_id, user_id=user_id, coin=0, status="capped",
             reward_date=today, reward_name=reward_name, raw=raw,
-            reward_scene=reward_scene, ad_session_id=ad_session_id, ecpm_raw=ecpm,
         )
         return _commit_record(db, rec, trans_id)
 
-    ecpm_raw = ecpm
-    if not ecpm_raw and ad_session_id:
-        ecpm_rec = crud_ecpm.find_by_session(db, user_id=user_id, ad_session_id=ad_session_id)
-        ecpm_raw = ecpm_rec.ecpm_raw if ecpm_rec is not None else None
-
-    if not ecpm_raw:
-        rec = AdRewardRecord(
-            trans_id=trans_id, user_id=user_id, coin=0, status="ecpm_missing",
-            reward_date=today, reward_name=reward_name, raw=raw,
-            reward_scene=reward_scene, ad_session_id=ad_session_id, ecpm_raw=None,
-        )
-        return _commit_record(db, rec, trans_id)
-
-    coin = rewards.calculate_ad_reward_coin(ecpm_raw, _granted_today(db, user_id, today) + 1)
+    if coin is None:
+        coin = rewards.get_ad_reward_coin(db)
 
     # 发金币 + 记一笔,同事务
     crud_wallet.grant_coins(
         db, user_id, coin,
-        biz_type="reward_video", ref_id=trans_id, remark="看视频奖励金币",
+        biz_type="ad_reward", ref_id=trans_id, remark="看视频奖励金币",
     )
     rec = AdRewardRecord(
         trans_id=trans_id, user_id=user_id, coin=coin, status="granted",
         reward_date=today, reward_name=reward_name, raw=raw,
-        reward_scene=reward_scene, ad_session_id=ad_session_id, ecpm_raw=ecpm_raw,
     )
     return _commit_record(db, rec, trans_id)
 
 
-def record_external_reward(
-    db: Session,
-    user_id: int,
-    trans_id: str,
-    *,
-    coin: int,
-    reward_scene: str,
-    ad_session_id: str | None = None,
-    ecpm: str | None = None,
-    reward_name: str | None = None,
-    raw: str | None = None,
-    status: str = "granted",
-    commit: bool = True,
-) -> AdRewardRecord:
-    """记录非普通看视频场景的 S2S 回调幂等,发币由调用方业务仓储完成。"""
-    existing = _find_by_trans(db, trans_id)
-    if existing is not None:
-        return existing
-    if db.get(User, user_id) is None:
-        raise UnknownUserError
-    rec = AdRewardRecord(
-        trans_id=trans_id,
-        user_id=user_id,
-        coin=coin,
-        status=status,
-        reward_date=cn_today().isoformat(),
-        reward_name=reward_name,
-        raw=raw,
-        reward_scene=reward_scene,
-        ad_session_id=ad_session_id,
-        ecpm_raw=ecpm,
-    )
-    db.add(rec)
-    if commit:
-        try:
-            db.commit()
-        except IntegrityError:
-            db.rollback()
-            existing = _find_by_trans(db, trans_id)
-            if existing is not None:
-                return existing
-            raise
-        db.refresh(rec)
-    else:
-        db.flush()
-    return rec
-
-
 def _commit_record(db: Session, rec: AdRewardRecord, trans_id: str) -> AdRewardRecord:
     """提交发奖记录;并发下同 trans_id 撞唯一约束时回滚并返回已存在的那条(幂等兜底)。"""
     db.add(rec)
@@ -191,7 +125,6 @@ def _granted_times_today_desc(db: Session, user_id: int, reward_date: str) -> li
                 AdRewardRecord.user_id == user_id,
                 AdRewardRecord.reward_date == reward_date,
                 AdRewardRecord.status == "granted",
-                AdRewardRecord.reward_scene == "reward_video",
             )
             .order_by(AdRewardRecord.created_at.desc())
         ).scalars()
@@ -220,7 +153,7 @@ def today_status(
     return (
         len(granted_desc),
         rewards.get_ad_daily_limit(db),
-        0,
+        rewards.get_ad_reward_coin(db),
         state.round_count,
         state.cooldown_until,
         watched_seconds_today(db, user_id, today=today),

app/repositories/comparison.py

@@ -84,7 +84,6 @@ def upsert_record(
         source_package=payload.source_package,
         information=payload.information,
         best_deeplink=payload.best_deeplink,
-        trace_url=payload.trace_url,
         total_dish_count=payload.total_dish_count,
         skipped_dish_count=payload.skipped_dish_count,
         items=[it.model_dump(exclude_none=True) for it in payload.items],

app/repositories/coupon_state.py

@@ -9,7 +9,7 @@ import logging
 from datetime import date, datetime
 from zoneinfo import ZoneInfo
 
-from sqlalchemy import delete, select
+from sqlalchemy import select
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import Session
 
@@ -65,19 +65,6 @@ def mark_engagement(
         db.rollback()
 
 
-def reset_today_engagement(db: Session, device_id: str) -> int:
-    """删这台设备今天的 engagement(开发设置「重置今日领券弹窗状态」调,测频控用)。
-    删后 has_engaged_today → false,今天又能弹。返回删除行数。"""
-    result = db.execute(
-        delete(CouponPromptEngagement).where(
-            CouponPromptEngagement.device_id == device_id,
-            CouponPromptEngagement.engage_date == today_cn(),
-        )
-    )
-    db.commit()
-    return result.rowcount or 0
-
-
 # ===== 领券记录(coupon_claim_record)=====
 
 def record_claims(

app/repositories/invite.py

@@ -21,7 +21,6 @@ from sqlalchemy.orm import Session
 
 from app.core import rewards
 from app.models.invite import InviteRelation
-from app.models.invite_fingerprint import InviteFingerprint
 from app.models.user import User
 from app.repositories import wallet as crud_wallet
 
@@ -165,121 +164,3 @@ def get_stats(db: Session, inviter_id: int) -> tuple[int, int]:
         .where(InviteRelation.inviter_user_id == inviter_id)
     ).scalar_one()
     return int(count), int(coins)
-
-
-def _mask_phone(phone: str) -> str:
-    """手机号脱敏:138****8888。前端拿不到完整号,展示被邀请人时在此兜底名字。
-
-    11 位标准手机号 → 前 3 + **** + 后 4;非标准(异常/截断)→ 只露后 4 位;太短 → "新用户"。
-    """
-    p = (phone or "").strip()
-    if len(p) == 11:
-        return f"{p[:3]}****{p[-4:]}"
-    if len(p) >= 4:
-        return f"****{p[-4:]}"
-    return "新用户"
-
-
-def get_invitees(
-    db: Session, inviter_id: int, *, limit: int = 20, offset: int = 0
-) -> tuple[list[dict], int, bool]:
-    """查某邀请人的被邀请人列表(按邀请时间倒序, 分页),返回 (items, total, has_more)。
-
-    每条 item = {display_name, avatar_url, coins, invited_at}。降级兜底:
-      名字 = 昵称 → 微信昵称 → 脱敏手机号(很多被邀请人是刚注册新用户、没设资料);
-      头像 = 用户头像 → 微信头像 → None(前端画默认色块)。
-    邀请关系表 join 用户表;total 单独 count(分页时算 has_more)。
-    """
-    total = db.execute(
-        select(func.count())
-        .select_from(InviteRelation)
-        .where(InviteRelation.inviter_user_id == inviter_id)
-    ).scalar_one()
-
-    rows = db.execute(
-        select(InviteRelation, User)
-        .join(User, User.id == InviteRelation.invitee_user_id)
-        .where(InviteRelation.inviter_user_id == inviter_id)
-        .order_by(InviteRelation.created_at.desc())
-        .limit(limit)
-        .offset(offset)
-    ).all()
-
-    items: list[dict] = []
-    for rel, u in rows:
-        items.append({
-            "display_name": u.nickname or u.wechat_nickname or _mask_phone(u.phone),
-            "avatar_url": u.avatar_url or u.wechat_avatar_url or None,
-            "coins": rel.inviter_coin,
-            "invited_at": rel.created_at,
-        })
-    has_more = offset + len(rows) < int(total)
-    return items, int(total), has_more
-
-
-# ===== 指纹归因(剪贴板兜底,见 [[invite-three-tasks]] 任务 3)=====
-
-def record_fingerprint(
-    db: Session,
-    *,
-    inviter_user_id: int,
-    ip: str,
-    screen: str,
-    device_model: str,
-    user_agent: str,
-) -> InviteFingerprint:
-    """落地页 dl.html 访问时调用,写一行指纹记录。
-
-    后续被邀请人登录、剪贴板没拿到邀请码时,/bind 会按 (ip, screen, device_model) 反查本表
-    7 天内最近一条匹配 → 拿出 inviter_user_id 撞库。
-
-    本函数会 commit;调用方(/landing-track endpoint)在此之前无其它写操作。
-    """
-    fp = InviteFingerprint(
-        inviter_user_id=inviter_user_id,
-        ip=ip[:64],
-        screen=screen[:32],
-        device_model=device_model[:64],
-        user_agent=user_agent[:2000] if user_agent else "",  # 截一下防异常长 UA
-    )
-    db.add(fp)
-    db.commit()
-    db.refresh(fp)
-    return fp
-
-
-def resolve_inviter_by_fingerprint(
-    db: Session,
-    *,
-    ip: str,
-    screen: str,
-    device_model: str,
-    window_days: int,
-) -> User | None:
-    """根据指纹反查邀请人(time window 内最近一条匹配)。
-
-    匹配规则:(ip, device_model) 相等 + created_at > now - window_days。
-
-    screen 字段**只入库不反查**:浏览器算物理像素走 `CSS × devicePixelRatio` 路径、
-    Android 走 `DisplayMetrics.widthPixels` 真实硬件值,两端浮点 round 必然 ±1 像素漂移
-    (DPR 不严格是整数)→ 严格匹配注定撞不上。同 device_model 必同 screen(同型号同硬件)
-    → screen 是冗余字段,删它不损精度。撞错只有"同 IP 下同型号手机同时被邀请"才会
-    发生,中国家庭/公司 WiFi 场景概率极低。
-    """
-    if not ip:
-        return None
-    from datetime import datetime, timedelta, timezone
-    cutoff = datetime.now(timezone.utc) - timedelta(days=window_days)
-    fp = db.execute(
-        select(InviteFingerprint)
-        .where(
-            InviteFingerprint.ip == ip,
-            InviteFingerprint.device_model == device_model,
-            InviteFingerprint.created_at > cutoff,
-        )
-        .order_by(InviteFingerprint.created_at.desc())
-        .limit(1)
-    ).scalar_one_or_none()
-    if fp is None:
-        return None
-    return db.get(User, fp.inviter_user_id)

app/repositories/signin.py

@@ -32,10 +32,6 @@ class AlreadyBoostedError(Exception):
     """今天签到奖励已经膨胀过。"""
 
 
-class LastCycleDayBoostBlockedError(Exception):
-    """14 天循环最后一天不允许签到膨胀。"""
-
-
 @dataclass
 class SigninStep:
     day: int  # 1..14
@@ -152,27 +148,13 @@ def _today_record(db: Session, user_id: int) -> SigninRecord | None:
     ).scalar_one_or_none()
 
 
-def boost_by_ad_ref(
-    db: Session, user_id: int, ad_ref_id: str
-) -> SigninBoostRecord | None:
-    """按广告交易号查签到膨胀记录。S2S 发奖后客户端确认用。"""
-    return db.execute(
-        select(SigninBoostRecord).where(
-            SigninBoostRecord.user_id == user_id,
-            SigninBoostRecord.ad_ref_id == ad_ref_id,
-        )
-    ).scalar_one_or_none()
-
-
 def boost_today_signin(
-    db: Session, user_id: int, *, ad_ref_id: str | None = None, commit: bool = True
+    db: Session, user_id: int, *, ad_ref_id: str | None = None
 ) -> tuple[SigninBoostRecord, int]:
-    """签到后看广告膨胀:固定补发配置金币。返回 (膨胀记录, 补发后余额)。"""
+    """签到后看广告膨胀:补发一笔等额签到金币。返回 (膨胀记录, 补发后余额)。"""
     record = _today_record(db, user_id)
     if record is None:
         raise NotSignedTodayError
-    if record.cycle_day == SIGNIN_CYCLE_LEN:
-        raise LastCycleDayBoostBlockedError
 
     today = record.signin_date
     existing = db.execute(
@@ -187,20 +169,17 @@ def boost_today_signin(
     boost = SigninBoostRecord(
         user_id=user_id,
         signin_date=today,
-        coin_awarded=rewards.get_signin_boost_coin(db),
+        coin_awarded=record.coin_awarded,
         ad_ref_id=ad_ref_id,
     )
     db.add(boost)
     try:
         acc, _ = crud_wallet.grant_coins(
-            db, user_id, boost.coin_awarded,
-            biz_type="signin_boost", ref_id=ad_ref_id or today.isoformat(),
+            db, user_id, record.coin_awarded,
+            biz_type="signin_boost", ref_id=today.isoformat(),
             remark=f"签到膨胀 第{record.cycle_day}天",
         )
-        if commit:
-            db.commit()
-        else:
-            db.flush()
+        db.commit()
     except IntegrityError as e:
         db.rollback()
         raise AlreadyBoostedError from e

app/repositories/wallet.py

@@ -12,7 +12,6 @@ import uuid
 from datetime import datetime, timedelta, timezone
 
 from sqlalchemy import select, update
-from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import Session
 
 from app.core import rewards
@@ -32,7 +31,6 @@ from app.models.wallet import (
 _WX_STATE_SUCCESS = "SUCCESS"
 _WX_STATE_FAILED = {"FAIL", "CANCELLED", "CLOSED"}
 _WX_STATE_WAIT_CONFIRM = "WAIT_USER_CONFIRM"  # 用户还没在微信确认页确认
-_WITHDRAW_ACTIVE_STATUSES = {"reviewing", "pending"}
 # 免确认收款授权状态
 _WX_AUTH_ACTIVE = "TAKING_EFFECT"   # 已生效,可免确认转账
 _WX_AUTH_CLOSED = "CLOSED"          # 已关闭(用户/商户/风控),需重新开启
@@ -62,10 +60,6 @@ class InsufficientCashError(Exception):
     """现金余额不足。"""
 
 
-class WithdrawTooFrequentError(Exception):
-    """提现申请过于频繁,或已有未完成提现单。"""
-
-
 class WithdrawTransferError(Exception):
     """调用微信转账失败(已退回余额)。"""
 
@@ -289,18 +283,6 @@ def _refund_withdraw(
     """
     if order.status in ("failed", "rejected"):
         return  # 防重复退款(并发/对账与查单/重复拒绝同时触发)
-    refunded_txn_id = db.execute(
-        select(CashTransaction.id).where(
-            CashTransaction.user_id == order.user_id,
-            CashTransaction.biz_type == "withdraw_refund",
-            CashTransaction.ref_id == order.out_bill_no,
-        ).limit(1)
-    ).scalar_one_or_none()
-    if refunded_txn_id is not None:
-        order.status = final_status
-        order.fail_reason = reason[:256]
-        db.commit()
-        return
     bal = _add_cash(db, order.user_id, order.amount_cents)
     db.add(
         CashTransaction(
@@ -316,30 +298,7 @@ def _refund_withdraw(
     )
     order.status = final_status
     order.fail_reason = reason[:256]
-    out_bill_no = order.out_bill_no
-    user_id = order.user_id
-    try:
-        db.commit()
-    except IntegrityError:
-        # 并发退款兜底:唯一退款流水已被另一事务写入时,回滚本事务的加钱和流水,
-        # 再把订单状态补到终态。这样无论拒绝/查单/对账怎么并发,现金最多退一次。
-        db.rollback()
-        refunded_txn_id = db.execute(
-            select(CashTransaction.id).where(
-                CashTransaction.user_id == user_id,
-                CashTransaction.biz_type == "withdraw_refund",
-                CashTransaction.ref_id == out_bill_no,
-            ).limit(1)
-        ).scalar_one_or_none()
-        if refunded_txn_id is None:
-            raise
-        fresh_order = db.execute(
-            select(WithdrawOrder).where(WithdrawOrder.out_bill_no == out_bill_no)
-        ).scalar_one_or_none()
-        if fresh_order is not None and fresh_order.status not in ("failed", "rejected"):
-            fresh_order.status = final_status
-            fresh_order.fail_reason = reason[:256]
-            db.commit()
+    db.commit()
 
 
 def _wx_not_found(result: dict) -> bool:
@@ -426,15 +385,6 @@ def create_withdraw(
     else:
         out_bill_no = uuid.uuid4().hex
 
-    active_order_id = db.execute(
-        select(WithdrawOrder.id).where(
-            WithdrawOrder.user_id == user_id,
-            WithdrawOrder.status.in_(_WITHDRAW_ACTIVE_STATUSES),
-        ).limit(1)
-    ).scalar_one_or_none()
-    if active_order_id is not None:
-        raise WithdrawTooFrequentError
-
     # 账户须存在(原子扣款的 UPDATE 不会建账户)
     get_or_create_account(db, user_id, commit=True)
 
@@ -465,26 +415,7 @@ def create_withdraw(
         status="reviewing",
     )
     db.add(order)
-    try:
-        db.commit()
-    except IntegrityError:
-        db.rollback()
-        existing = db.execute(
-            select(WithdrawOrder).where(
-                WithdrawOrder.out_bill_no == out_bill_no, WithdrawOrder.user_id == user_id
-            )
-        ).scalar_one_or_none()
-        if existing is not None:
-            return existing
-        active_order_id = db.execute(
-            select(WithdrawOrder.id).where(
-                WithdrawOrder.user_id == user_id,
-                WithdrawOrder.status.in_(_WITHDRAW_ACTIVE_STATUSES),
-            ).limit(1)
-        ).scalar_one_or_none()
-        if active_order_id is not None:
-            raise WithdrawTooFrequentError from None
-        raise
+    db.commit()
     db.refresh(order)
     return order  # 待管理员审核;**不在此处打款**
 
@@ -772,15 +703,7 @@ def refresh_withdraw_status(
     if order.status != "pending":
         return order  # 已终态,不再查
 
-    try:
-        result = wxpay.query_transfer(out_bill_no)
-    except wxpay.WxPayNotConfiguredError:
-        raise
-    except Exception as exc:  # noqa: BLE001 - 查单失败不能把运营后台打成 500
-        order.fail_reason = f"微信查单异常,保持pending: {exc}"[:256]
-        db.commit()
-        db.refresh(order)
-        return order
+    result = wxpay.query_transfer(out_bill_no)
     if result["status_code"] != 200:
         if _wx_not_found(result):
             # 微信明确无此单 → 转账从未创建(如崩溃在扣款后/调用前),退款安全

app/schemas/ad.py

@@ -28,7 +28,7 @@ class AdRewardStatusOut(BaseModel):
     used_today: int = Field(..., description="今日已成功发奖次数")
     daily_limit: int = Field(..., description="每日发奖次数上限")
     remaining: int = Field(..., description="今日剩余可领次数")
-    coin_per_ad: int = Field(..., description="历史兼容字段;正式发放按 eCPM 动态计算,当前返回 0")
+    coin_per_ad: int = Field(..., description="看完一个激励视频发的金币")
     round_count: int = Field(
         ..., description="本轮已看次数,当前 round_size=1,客户端可由 cooldown_until 判断短冷却"
     )
@@ -46,15 +46,11 @@ class AdRewardStatusOut(BaseModel):
 class EcpmReportIn(BaseModel):
     """客户端上报一次广告展示的 eCPM(内部收益统计/对账)。
 
-    user_id 不在 body 里——由 JWT 取(Bearer),防伪造。ecpm 原样上报字符串,后端按元/千次展示处理。
+    user_id 不在 body 里——由 JWT 取(Bearer),防伪造。ecpm 原样上报字符串(单位待确认)。
     """
 
     ad_type: str = Field(..., description="广告类型:reward_video(激励视频) / draw(Draw 信息流) 等")
-    ecpm: str = Field(..., description="穿山甲 getShowEcpm().getEcpm() 原始字符串,按元/千次展示处理")
-    ad_session_id: str | None = Field(
-        None, min_length=8, max_length=64,
-        description="客户端生成的一次广告会话 id;激励视频 S2S extra 会透传同值",
-    )
+    ecpm: str = Field(..., description="穿山甲 getShowEcpm().getEcpm() 原始字符串,单位待确认,原样上报")
     adn: str | None = Field(None, description="实际投放 ADN(getSdkName),如 pangle")
     slot_id: str | None = Field(None, description="实际展示代码位(底层 mediation rit)")
 
@@ -82,27 +78,16 @@ class WatchReportOut(BaseModel):
     watch_seconds_remaining: int = Field(..., description="今日剩余可观看秒数")
 
 
-class TestGrantIn(BaseModel):
-    """[仅本地联调]模拟发奖入参。"""
-
-    reward_scene: str = Field(
-        "reward_video",
-        description="模拟发奖场景:reward_video(普通激励视频) / signin_boost(签到膨胀)",
-    )
-
-
 class TestGrantOut(BaseModel):
     """[仅本地联调]模拟发奖结果。带上今日进度,客户端可直接据此刷新展示。"""
 
     granted: bool = Field(..., description="本次是否真的发了金币(达每日上限则 False)")
-    status: str = Field(
-        ..., description="granted / capped / not_signed / already_boosted / last_day / unknown_scene"
-    )
+    status: str = Field(..., description="granted / capped")
     coin: int = Field(..., description="本次发放金币(capped 时为 0)")
     used_today: int = Field(..., description="今日已成功发奖次数")
     daily_limit: int = Field(..., description="每日发奖次数上限")
     remaining: int = Field(..., description="今日剩余可领次数")
-    coin_per_ad: int = Field(..., description="历史兼容字段;正式发放按 eCPM 动态计算,当前返回 0")
+    coin_per_ad: int = Field(..., description="看完一个激励视频发的金币")
     round_count: int = Field(..., description="本轮已看次数,详见 AdRewardStatusOut")
     cooldown_until: datetime | None = Field(
         None, description="本轮冷却结束时间(UTC),详见 AdRewardStatusOut"
@@ -116,9 +101,6 @@ class FeedRewardIn(BaseModel):
     """
 
     client_event_id: str = Field(..., min_length=8, max_length=64, description="客户端生成的幂等事件 id")
-    ad_session_id: str | None = Field(
-        None, min_length=8, max_length=64, description="客户端生成的一次信息流广告会话 id"
-    )
     ecpm: str = Field(..., description="本条信息流广告 eCPM,按元/千次展示处理")
     duration_seconds: int = Field(..., ge=0, description="本条广告实际展示/播放秒数")
     adn: str | None = Field(None, description="实际投放 ADN")

app/schemas/auth.py

@@ -25,8 +25,6 @@ class UserOut(BaseModel):
     status: str
     created_at: datetime
     last_login_at: datetime
-    # 调试链接权限:前端据此在比价结果弹窗/记录页显示「复制调试链接」按钮。默认 false。
-    debug_trace_enabled: bool = False
 
 
 # ===== Token 通用结构 =====

app/schemas/compare_record.py

@@ -67,9 +67,6 @@ class ComparisonRecordIn(BaseModel):
     status: str | None = Field(None, description="success / failed,可不传由服务端派生")
     # 最优平台商家/商品深链(客户端从 collectedLinks[best_index] 取);「再次比价」直达用
     best_deeplink: str | None = Field(None, description="最优平台深链,再次比价直达")
-    # pricebot done.params.trace_url 原样上报,落库供记录页「复制调试链接」(dir 名含落盘
-    # 时分秒前端拼不出,必须由后端透传)。
-    trace_url: str | None = Field(None, description="本次比价公网调试链接")
 
 
 # ===== 读取出参 =====
@@ -82,8 +79,6 @@ class ComparisonRecordOut(BaseModel):
     id: int
     business_type: str
     trace_id: str
-    # 公网调试链接;仅当 user.debug_trace_enabled 时由端点填充,否则端点层置 None(权限闸)。
-    trace_url: str | None = None
     source_platform_id: str | None = None
     source_platform_name: str | None = None
     source_package: str | None = None

app/schemas/invite.py

@@ -1,8 +1,6 @@
 """邀请相关 API 收发模型。"""
 from __future__ import annotations
 
-from datetime import datetime
-
 from pydantic import BaseModel, Field
 
 
@@ -13,61 +11,15 @@ class InviteInfoOut(BaseModel):
     coins_earned: int               # 累计从邀请获得的金币
 
 
-class LandingTrackIn(BaseModel):
-    """落地页 dl.html 访问时上报的指纹(用于剪贴板归因失败时兜底)。"""
-    ref: str = Field(..., min_length=4, max_length=16, description="邀请码(落地页 ?ref=)")
-    screen: str = Field("", max_length=32, description="屏幕分辨率,如 1080x2400")
-    # IP / UA 服务端从 HTTP 头自动拿,无需 JS 上报
-
-
-class LandingTrackOut(BaseModel):
-    status: str                     # ok / invalid_code / no_ip
-
-
-class FingerprintIn(BaseModel):
-    """客户端登录后剪贴板归因失败时上报的设备指纹。
-
-    跨端匹配字段:浏览器落地页存的同名字段 == 客户端 Build.MODEL / DisplayMetrics 算的值。
-    IP 服务端从 HTTP 头拿,不在这里。
-    """
-    screen: str = Field("", max_length=32)
-    device_model: str = Field("", max_length=64)
-
-
 class BindInviteIn(BaseModel):
-    # invite_code: 可选 — 走指纹兜底时为空(channel=fingerprint)
-    invite_code: str | None = Field(
-        None, max_length=16, description="邀请码;走指纹兜底时为空"
-    )
+    invite_code: str = Field(..., min_length=4, max_length=16, description="邀请人的邀请码")
     channel: str = Field(
         "clipboard", max_length=16,
-        description="归因来源:clipboard(首启读剪贴板自动) / manual(手动填) / fingerprint(指纹兜底)",
+        description="归因来源:clipboard(首启读剪贴板自动) / manual(用户手动填)",
     )
-    # 当 invite_code 为空、channel=fingerprint 时,后端用这组指纹反查
-    fingerprint: FingerprintIn | None = None
 
 
 class BindInviteOut(BaseModel):
-    status: str                     # success / already_bound / invalid_code / self_invite / not_eligible / fp_not_found
+    status: str                     # success / already_bound / invalid_code / self_invite / not_eligible
     coins_awarded: int              # 本次给当前用户(被邀请人)发的金币
     message: str                    # 给前端直接展示的文案
-
-
-class InviteeItem(BaseModel):
-    """被邀请人列表的一条(邀请页小窗 / 完整列表页共用)。
-
-    display_name / avatar_url 的"降级兜底"在后端算好(见 repositories/invite.get_invitees):
-    名字 = 昵称 → 微信昵称 → 脱敏手机号(前端拿不到完整号,必须后端脱敏);
-    头像 = 用户头像 → 微信头像 → null(前端拿到 null 画默认色块)。
-    """
-    display_name: str               # 已兜底好的显示名(真名/脱敏号)
-    avatar_url: str | None = None   # 头像 URL;null = 前端画默认色块
-    coins: int                      # 这次邀请给我(邀请人)发的金币
-    invited_at: datetime            # 邀请绑定时间(前端转"今天/3天前")
-
-
-class InviteeListOut(BaseModel):
-    """GET /invite/invitees 响应:被邀请人列表 + 分页。"""
-    items: list[InviteeItem]
-    total: int                      # 我邀请的总人数(用于"共 N 人")
-    has_more: bool                  # 还有下一页吗(完整列表页滚到底加载更多)

data/media/dl.html

@@ -98,27 +98,6 @@
   var isAndroid = /Android/i.test(ua);
   var ref = new URLSearchParams(location.search).get("ref");  // 邀请码(来自二维码 URL ?ref=)
 
-  // 【任务 3】指纹归因兜底:页面加载即上报访问者指纹,后端存 invite_fingerprint 表。
-  // 当 APK 首启读剪贴板失败(被覆盖)时,客户端会用 (IP+屏幕+UA 解析的手机型号) 反查
-  // 本表 7 天内最近一条匹配 → 撞库出原邀请人 → 走原 bind 流程。
-  // 任何失败都 silent(不影响下载主流程);后端 invalid_code/no_ip 也只返 200。
-  if (ref) {
-    // screen 报【物理像素】= CSS 像素 × devicePixelRatio,跟 Android dm.widthPixels(物理像素)对齐。
-    // 不同设备 DPR 不同(常见 2/2.5/3/3.5),CSS 像素直接报会跟客户端不对齐 → 撞不上库。
-    var _dpr = window.devicePixelRatio || 1;
-    var _sw = Math.round(screen.width * _dpr);
-    var _sh = Math.round(screen.height * _dpr);
-    fetch("/api/v1/invite/landing-track", {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({
-        ref: ref,
-        screen: _sw + "x" + _sh,
-        // IP / UA 服务端从 HTTP 头自动拿,无需 JS 上报
-      }),
-    }).catch(function () {});  // silent,绝不阻断下载
-  }
-
   // 把邀请码写进剪贴板,APK 首启时读出来完成归因(deferred deeplink 的关键一步)。
   // 浏览器要求:必须在用户点击手势里调用 + HTTPS 下才允许写。
   function legacyCopy(payload) {                // 老 webview / 无 clipboard API 兜底

docs/api/ad-ecpm-report.md

@@ -8,8 +8,7 @@
 | 字段 | 类型 | 必填 | 说明 |
 |---|---|---|---|
 | `ad_type` | str | 是 | 广告类型:`reward_video`(激励视频) / `draw`(Draw 信息流) 等 |
-| `ad_session_id` | str\|null | 否 | 客户端生成的广告会话 ID;需和穿山甲 `extra.ad_session_id` 一致,用于 S2S 缺 eCPM 时匹配 |
-| `ecpm` | str | 是 | 穿山甲 `getShowEcpm().getEcpm()` 原始字符串,后端按“元/千次展示”参与金币公式 |
+| `ecpm` | str | 是 | 穿山甲 `getShowEcpm().getEcpm()` 原始字符串,**单位待确认(分/元)**,原样上报 |
 | `adn` | str\|null | 否 | 实际投放 ADN(`getSdkName`),如 `pangle` |
 | `slot_id` | str\|null | 否 | 实际展示代码位(底层 mediation rit,非客户端配置位) |
 
@@ -25,8 +24,7 @@
 ## 说明
 客户端在广告**展示后**(`onAdShow` 读 `getShowEcpm()`)调用,把本次展示的 eCPM 落库做**内部收益统计/对账**。
 
-- 普通激励视频发奖会先用 S2S 回调自带 `ecpm`;若缺失,再按 `ad_session_id` 读取本接口上报的 eCPM;两边都没有则不发并记录异常。
-- **best-effort**:客户端 fire-and-forget,但普通激励视频若 S2S 缺 eCPM,这条上报会成为发奖依据。
+- **best-effort**:客户端 fire-and-forget,丢一两条不影响业务;穿山甲后台报表是结算权威兜底。
 - 落 `ad_ecpm_record` 表,`report_date` 用北京时间当天,供「按用户/按天聚合」对账。
 - **与发奖是两条独立流**:发奖走 [ad-pangle-callback](./ad-pangle-callback.md)(穿山甲 S2S,有 `trans_id`、无 ecpm),本接口客户端上报(有 ecpm、无 `trans_id`)。两者无公共键,**不逐条一一对应**,只做按用户/按天聚合口径。
 - eCPM 是**每千次展示预估**,单条展示预估收益 ≈ `ecpm / 1000`,且为客户端预估口径,非最终结算。

docs/api/ad-feed-reward.md

@@ -11,7 +11,6 @@
 | 字段 | 类型 | 必填 | 说明 |
 |---|---|---:|---|
 | `client_event_id` | string | 是 | 客户端生成的幂等事件 id，8-64 字符 |
-| `ad_session_id` | string\|null | 否 | 客户端生成的一次信息流广告会话 id，用于对账/排查 |
 | `ecpm` | string | 是 | 本条信息流广告 eCPM，按“元/千次展示”处理 |
 | `duration_seconds` | int | 是 | 实际展示/播放秒数 |
 | `adn` | string\|null | 否 | 实际投放 ADN |

docs/api/ad-pangle-callback.md

@@ -14,8 +14,8 @@ GroMore 以 GET 回调,关键参数:
 | `user_id` | string | 客户端 `setUserID` 传入的用户标识（须为数字 = 本系统 user.id） |
 | `trans_id` | string | 交易号（**幂等键** + **唯一参与签名的字段**） |
 | `reward_name` | string | 奖励名（广告位配置,入库备注） |
-| `ecpm` | string\|null | GroMore 回调携带的 eCPM。普通激励视频优先用它计算金币 |
-| `extra` / `gromoreExtra` / `gromore_extra` | string | 客户端透传 JSON。支持 `ad_session_id`、`reward_scene`;`reward_scene=signin_boost` 表示签到膨胀 |
+| `reward_amount` | int | 奖励数量（广告位配置）→ **本次发放金币**。缺/坏/≤0 回退 `AD_REWARD_COIN`,超 `MAX_AD_REWARD_COIN` 夹紧 |
+| `extra` | string | 客户端透传的 customData（可空,入库备注） |
 | `mediation_rit` | string | 代码位 ID（GroMore 带,目前仅入 raw 备查） |
 | `prime_rit` | string | 广告位 ID（同上） |
 | `adn_name` | string | 实际出广告的 ADN 名（同上,可用于收益分析） |
@@ -37,9 +37,4 @@ GroMore 以 GET 回调,关键参数:
 - `503` 回调未配置（`pangle_callback_configured=false`）
 
 ## 说明
-**发奖唯一可信入口**:验签 → 取 `user_id`/`extra` → 按 `reward_scene` 分流 → 幂等处理（按 `trans_id` 去重）。客户端不直接发奖,被破解也刷不到钱。
-
-- `reward_scene=reward_video` 或缺省:普通激励视频。金币按 `eCPM / 1000 * eCPM因子 * 当日次数因子 * 10000` 计算;若回调没有 `ecpm`,会按 `extra.ad_session_id` 查客户端 `/ad/ecpm-report` 的上报值;两边都没有 eCPM 时不发币,记录 `status=ecpm_missing`。
-- `reward_scene=signin_boost`:签到膨胀。要求用户当天已签到且不是 Day14;看完视频固定发 `2000` 金币,写 `signin_boost_record` 与 `coin_transaction.biz_type=signin_boost`。
-- 未知 `reward_scene`:不发币,记录 `status=unknown_scene`,返回 `is_verify=false/reason=1`。
-- 验签过但参数缺/坏或 user 不存在 → 不发（`is_verify=false` + `reason`）;granted / capped / ecpm_missing / 业务不满足已记录 → `is_verify=true` + `reason=0`。
+**发奖唯一可信入口**:验签 → 取 `user_id` → 按 `reward_amount` 解析金币 → 幂等发金币（按 `trans_id` 去重 + 每日上限）。客户端不参与发奖,被破解也刷不到钱。验签过但参数缺/坏或 user 不存在 → 不发（`is_verify=false` + `reason`）;granted / capped → `is_verify=true` + `reason=0`。

docs/api/ad-reward-status.md

@@ -13,7 +13,7 @@
 | `used_today` | int | 今日已成功发奖次数 |
 | `daily_limit` | int | 每日发奖次数上限 |
 | `remaining` | int | 今日剩余可领次数 |
-| `coin_per_ad` | int | 历史兼容字段;正式发放按 eCPM 动态计算,当前返回 0 |
+| `coin_per_ad` | int | 看完一个激励视频发的金币 |
 | `round_count` | int | 本轮已看次数;当前 `round_size=1`,广告关闭后进入短冷却 |
 | `cooldown_until` | datetime\|null | 3 秒短冷却结束时间(UTC ISO);null 表示不在冷却 |
 | `watched_seconds_today` | int | 今日已上报的激励视频观看秒数;当前仅兼容/排查用 |
@@ -22,7 +22,7 @@
 
 ## 说明
 福利页「看视频赚金币」用:
-- 展示「今日还能看 N 次」(`remaining`);单次金币正式按 eCPM 动态计算,不再用 `coin_per_ad` 预估
+- 展示「今日还能看 N 次」「看一次得 M 金币」(`remaining`/`coin_per_ad`)
 - 任务行 CTA 4 态推导:`adLoading` → Loading;`remaining==0` → Capped("明天再来");`cooldown_until` 在未来 → CoolingDown(显示 MM:SS 倒计时,不可点);否则 Normal("去赚取")
 - 弹窗 limit note:`used_today >= daily_limit` 显示「今日视频已到限额，明天再来」;`cooldown_until!=null` 显示「广告冷却中，3秒后再来」
 

docs/api/ad-test-grant.md

@@ -5,11 +5,7 @@
 > ⚠️ **仅本地联调**,受 `AD_REWARD_TEST_GRANT_ENABLED` 开关控制,**生产必须关闭**（默认 False → 一律 404）。
 
 ## 入参
-请求体可省略；用户由 token 确定。
-
-| 字段 | 类型 | 必填 | 默认 | 说明 |
-|---|---|---|---|---|
-| `reward_scene` | string | 否 | `reward_video` | 模拟发奖场景。`reward_video`=普通激励视频；`signin_boost`=签到膨胀 |
+无（用户由 token 确定）。
 
 ## 出参
 响应 `200`:`TestGrantOut`
@@ -17,17 +13,15 @@
 | 字段 | 类型 | 说明 |
 |---|---|---|
 | `granted` | bool | 本次是否真发了金币（达每日上限则 false） |
-| `status` | string | `granted` / `capped`（达上限） / `not_signed` / `already_boosted` / `last_day` / `unknown_scene` |
+| `status` | string | `granted` / `capped`（达上限） |
 | `coin` | int | 本次发放金币（capped 时 0） |
 | `used_today` | int | 今日已成功发奖次数 |
 | `daily_limit` | int | 每日发奖次数上限 |
 | `remaining` | int | 今日剩余可领次数 |
-| `coin_per_ad` | int | 历史兼容字段;正式发放按 eCPM 动态计算,当前返回 0 |
+| `coin_per_ad` | int | 看完一个激励视频发的金币 |
 
 ## 错误码
 - `404` 开关未开（伪装不存在） / 用户不存在
 
 ## 说明
-没公网、穿山甲 S2S 回调打不到本地时,debug 客户端看完广告后调它,直接走与 [ad-pangle-callback](./ad-pangle-callback.md) 相同的发奖逻辑（每次新 `trans_id`,幂等 + 每日上限/今日膨胀一次）。
-
-`reward_scene=signin_boost` 时复用签到膨胀业务规则:必须当天已签到、非第 14 天、当天未膨胀过,成功后写入 `signin_boost` 金币流水。它让已登录客户端能自助发奖 = 绕过反作弊,**严禁在生产开启**。
+没公网、穿山甲 S2S 回调打不到本地时,debug 客户端看完广告后调它,直接走与 [ad-pangle-callback](./ad-pangle-callback.md) 相同的发奖逻辑（每次新 `trans_id`,幂等 + 每日上限）。它让已登录客户端能自助发奖 = 绕过反作弊,**严禁在生产开启**。

docs/api/admin-stats-overview.md

@@ -31,14 +31,6 @@
 | 字段 | 类型 | 说明 |
 |---|---|---|
 | `granted_total` | int | 累计发放金币(coin_transaction 中所有 `amount > 0` 之和;负数兑换/扣减不计) |
-| `reward_video_coin_total` | int | 普通激励视频累计发放金币(`biz_type=reward_video/ad_reward`) |
-| `reward_video_watch_count` | int | 普通激励视频有效发奖视频数(`ad_reward_record.reward_scene=reward_video,status=granted`) |
-| `feed_ad_coin_total` | int | 信息流广告累计发放金币(`biz_type=feed_ad_reward`) |
-| `feed_ad_watch_count` | int | 信息流广告有效完成视频数(`ad_feed_reward_record.status=granted`) |
-| `signin_coin_total` | int | 签到累计发放金币(`biz_type=signin`) |
-| `signin_count` | int | 签到次数(`signin_record`) |
-| `signin_boost_coin_total` | int | 签到膨胀累计发放金币(`biz_type=signin_boost`) |
-| `signin_boost_watch_count` | int | 签到膨胀有效视频数(`signin_boost_record`) |
 
 **DashboardCash**
 | 字段 | 类型 | 说明 |
@@ -72,6 +64,6 @@
 ## 说明
 - 全部为全局只读聚合(count / sum / DAU / 成功率),不改任何数据。
 - `new_today` / `dau` 按**北京时区**(UTC+8)切天,其余金额/计数无时区概念。
-- 金额单位:`*_cents` 为分;金币(`*_coin_total`/`granted_total`)为个数。
+- 金额单位:`*_cents` 为分;金币(`granted_total`)为个数。
 - CPS 收入数据源未接入(referral-link 只换链接,转化/佣金未回收),`cps` 恒为 `{available:false, note:...}`,前端显示"待接入"。
 - 关联表:[user](../database/user.md) / [coin_transaction](../database/coin_transaction.md) / [withdraw_order](../database/withdraw_order.md) / [comparison_record](../database/comparison_record.md) / [feedback](../database/feedback.md)。

docs/api/signin-boost.md

@@ -1,6 +1,6 @@
 # POST /api/v1/signin/boost — 签到后看广告膨胀金币
 
-用户 Day1-Day13 当天已签到后，看完一条激励视频，由穿山甲 S2S 回调固定补发 2000 金币。本接口只用于 S2S 发奖后的确认。
+用户当天已签到后，看完一条激励视频，补发一笔等额签到金币。
 
 ## 鉴权
 
@@ -10,7 +10,7 @@
 
 | 字段 | 类型 | 必填 | 说明 |
 |---|---|---:|---|
-| `ad_ref_id` | string | 是 | 穿山甲 S2S 回调的 `trans_id`。回调需先以 `extra.reward_scene=signin_boost` 完成发奖 |
+| `ad_ref_id` | string\|null | 否 | 广告会话/交易号。当前开发期可空，后续接 S2S 后可回填 |
 
 ## 响应
 
@@ -23,11 +23,10 @@
 ## 错误
 
 - `401`: 未登录
-- `409`: 缺少/无效广告回调记录，非本人广告，回调未发奖，当天未签到，Day14，或当天已经膨胀过
+- `409`: 当天未签到，或当天已经膨胀过
 
 ## 数据写入
 
-- 本接口不直接发奖;实际写入发生在 `/ad/pangle-callback` 的 `reward_scene=signin_boost` 分支。
-- 回调写 `signin_boost_record` 新增一行，用 `(user_id, signin_date)` 唯一约束防重复。
-- 回调使 `coin_account` 增加固定 `2000` 金币。
-- 回调写入 `coin_transaction.biz_type=signin_boost`。
+- `signin_boost_record` 新增一行，用 `(user_id, signin_date)` 唯一约束防重复。
+- `coin_account` 增加余额。
+- `coin_transaction` 写入 `biz_type=signin_boost`。

docs/database/OVERVIEW.md

@@ -64,7 +64,7 @@
 | 金币兑现金 `POST /wallet/exchange` | `coin_account`(U) + `coin_transaction`(C `exchange_out` −) + `cash_transaction`(C `exchange_in` +) | 同事务 |
 | 发起提现 `POST /wallet/withdraw` | `withdraw_order`(C `reviewing`) + `coin_account`(U 扣现金) + `cash_transaction`(C `withdraw` −) | 同事务,**不打款** |
 | 查提现状态 / 用户取消 `GET /wallet/withdraw/status` | `withdraw_order`(U) + 失败→`cash_transaction`(C `withdraw_refund` +) | |
-| 穿山甲发奖 S2S 回调 `POST /ad/pangle-callback` | `ad_reward_record`(C)+ granted→`coin_account`(U)+`coin_transaction`(C `reward_video`/`signin_boost`) | `trans_id` 幂等 |
+| 穿山甲发奖 S2S 回调 `POST /ad/pangle-callback` | `ad_reward_record`(C)+ granted→`coin_account`(U)+`coin_transaction`(C `ad_reward`) | `trans_id` 幂等 |
 | 看广告时长上报 `POST /ad/watch-report` | `ad_watch_log`(C) | |
 | 广告 eCPM 上报 `POST /ad/ecpm-report` | `ad_ecpm_record`(C) | |
 | 信息流广告结算 `POST /ad/feed-reward` | `ad_feed_reward_record`(C)+ granted→`coin_account`(U)+`coin_transaction`(C `feed_ad_reward`) | `client_event_id` 幂等 |
@@ -105,7 +105,7 @@
   | `signin` | 当天日期串(= `signin_record.signin_date` 的 ISO `YYYY-MM-DD`) | + |
   | `signin_boost` | 当天日期串(= `signin_boost_record.signin_date` 的 ISO `YYYY-MM-DD`) | + |
   | `task_<key>` | `user_task.task_key` | + |
-  | `reward_video` / `ad_reward`(历史) | `ad_reward_record.trans_id` | + |
+  | `ad_reward` | `ad_reward_record.trans_id` | + |
   | `feed_ad_reward` | `ad_feed_reward_record.client_event_id` | + |
   | `exchange_out` | null(兑现金,无单据) | − |
   | `admin_grant` / `admin_deduct` | null(原因记在 `remark`=`admin:<reason>`) | + / − |
@@ -118,7 +118,7 @@
   | `exchange_in` | null | + |
 
 - **`comparison_record.store_name` ≈ `savings_record.shop_name`**:无 id 关联,按**店名字符串相等**给比价记录打「已下单」标记(瞬态,不写库)。两边店名同源 = 比价意图识别阶段的门店 query,语义=**店级**(同店比价多次会一并标已下单)。
-- **广告流会话关联**:`ad_reward_record.ad_session_id` 可与 `ad_ecpm_record.ad_session_id` 对齐;`ad_watch_log` 仍是旧版兼容统计,不逐条参与发奖。
+- **广告流互不关联**:`ad_reward_record` / `ad_watch_log` / `ad_ecpm_record` / `ad_feed_reward_record` 之间**无公共键**,各自只按 `(user_id, 日期串)` 聚合。别试图 join 它们逐条对应。
 - **里程碑解锁进度不存库**:`comparison_milestone_claim` 只记「哪几档已领」;进度 = `comparison_record` 里 `status='success'` 的 `count`。
 
 ### ER 关系(文字版)

docs/database/ad_ecpm_record.md

@@ -2,7 +2,7 @@
 
 > 模型 `app/models/ad_ecpm.py` · 仓库 `app/repositories/ad_ecpm.py` · 接口 [ad-ecpm-report](../api/ad-ecpm-report.md) · [← 索引](./README.md) · [总览](./OVERVIEW.md)
 
-每条 = 客户端一次广告展示(`onAdShow`)后读到的 eCPM。`ad_session_id` 可与 S2S 回调 `extra.ad_session_id` 对齐:当普通激励视频回调没有 `ecpm` 时,后端会用它匹配本表作为发奖 eCPM 依据。
+每条 = 客户端一次广告展示(`onAdShow`)后读到的 eCPM。看广告三条数据流之一(**收益对账**),与 `ad_reward`(发奖,有 trans_id 无 ecpm)、`ad_watch_log`(时长)并列,**无公共键**——只用于**按用户/按天聚合**估算内部广告收益,不做"这条发奖 = 这条展示"的逐条精确关联。穿山甲后台报表才是结算权威,本表是细粒度补充。
 
 ## 用在哪 / 增删改查
 - **C(插入)**:`POST /ad/ecpm-report`(`create_ecpm_record`)。每次广告展示上报一条;best-effort,丢一两条不影响业务。鉴权接口已确保 user 存在。
@@ -15,19 +15,18 @@
 | `id` | Integer | PK, autoincrement | |
 | `user_id` | Integer | FK→user.id, index, NOT NULL | 归属用户 |
 | `ad_type` | String(32) | NOT NULL | 广告类型,取值如 `reward_video`(激励视频)/ `draw`(Draw 信息流);各类型各自上报,不强行统一代码位 |
-| `ad_session_id` | String(64) | UNIQUE, index, nullable | 客户端广告会话 ID;用于普通激励视频在 S2S 缺 `ecpm` 时匹配发奖 |
 | `adn` | String(32) | nullable | 实际投放 ADN(`getShowEcpm().getSdkName()`,如 `pangle`/`gdt`) |
 | `slot_id` | String(64) | nullable | 实际展示用代码位(底层 mediation rit,非客户端配置位) |
-| `ecpm_raw` | String(32) | NOT NULL | 客户端上报的 eCPM **原始串**;后端按“元/千次展示”参与金币公式 |
+| `ecpm_raw` | String(32) | NOT NULL | 客户端上报的 eCPM **原始串**(单位待确认,原样存) |
 | `report_date` | String(10) | index, NOT NULL | 北京时间日期串 `YYYY-MM-DD`,按它做按天聚合 |
 | `created_at` | DateTime(tz) | server_default now(), index | 时间 |
 
 ## 关系 / Join Key
 - `user_id` → `user.id`(多对一)。
-- `ad_session_id` → 可关联 `ad_reward_record.ad_session_id`。
+- 与 `ad_reward_record` / `ad_watch_log` **无公共键**(独立数据流),只按 `(user_id, report_date)` 聚合。
 
 ## 索引与约束
-- PK `id`;index `user_id`、`report_date`、`created_at`、`ad_session_id`;UNIQUE `ad_session_id`。
+- PK `id`;index `user_id`、`report_date`、`created_at`。
 
 ## 注意
-- S2S 回调自带 `ecpm` 优先;缺失时才使用同 `ad_session_id` 的客户端上报值。两者都没有时普通激励视频不发币,`ad_reward_record.status=ecpm_missing`。
+- ⚠️ `ecpm_raw` 单位(分/元)截至 2026-05-31 未最终确认;确认后再加一列解析好的数值,在此之前对账按"待定单位"处理。

docs/database/ad_feed_reward_record.md

@@ -8,7 +8,6 @@
 |---|---|---|---|
 | `id` | Integer | PK | 自增主键 |
 | `client_event_id` | String(64) | UNIQUE, NOT NULL | 客户端幂等事件 id |
-| `ad_session_id` | String(64) | index, nullable | 客户端生成的一次信息流广告会话 id |
 | `user_id` | Integer | FK → `user.id`, index, NOT NULL | 用户 |
 | `reward_date` | String(10) | index, NOT NULL | 北京时间日期 `YYYY-MM-DD` |
 | `duration_seconds` | Integer | NOT NULL | 实际展示/播放秒数 |

docs/database/ad_reward_record.md

@@ -2,10 +2,10 @@
 
 > 模型 `app/models/ad_reward.py` · 仓库 `app/repositories/ad_reward.py` · 接口 [ad-pangle-callback](../api/ad-pangle-callback.md) / [ad-reward-status](../api/ad-reward-status.md) / [ad-test-grant](../api/ad-test-grant.md) · [← 索引](./README.md) · [总览](./OVERVIEW.md)
 
-每条 = 穿山甲一次**服务端激励回调**。`trans_id` 唯一做幂等键(穿山甲会重试,同号只处理一次)。`reward_scene` 区分普通激励视频、签到膨胀等场景;`reward_date`(北京时间日期串)给普通激励视频"每日上限"计数用。
+每条 = 穿山甲一次**服务端发奖回调**(用户看完激励视频)。是看广告三条数据流之一(**发奖**;另两条:`ad_watch_log` 时长、`ad_ecpm_record` 收益,三者无公共键)。`trans_id` 唯一做幂等键(穿山甲会重试,同号只发一次)。`reward_date`(北京时间日期串)给"每日上限"计数用。
 
 ## 用在哪 / 增删改查
-- **C(插入)**:`POST /ad/pangle-callback`(穿山甲 S2S,经 SHA256 验签;`grant_ad_reward` 或场景业务处理)或 `POST /ad/test-grant`(本地联调)。普通激励视频三道闸:① 验签不过 → API 层 403,不进库;② `trans_id` 已存在 → 原样返回不重复发;③ **当日发奖次数(`DAILY_AD_REWARD_LIMIT`,默认 500)到顶** → 记一行 `status='capped'`、`coin=0`、不发币。否则按 eCPM 公式发币。
+- **C(插入)**:`POST /ad/pangle-callback`(穿山甲 S2S,经 SHA256 验签;`grant_ad_reward`)或 `POST /ad/test-grant`(本地联调)。三道闸:① 验签不过 → API 层 403,不进库;② `trans_id` 已存在 → 原样返回不重复发;③ **当日发奖次数(`DAILY_AD_REWARD_LIMIT`,默认 500)到顶** → 记一行 `status='capped'`、`coin=0`、不发币。旧的观看总时长闸仅在 `DAILY_AD_WATCH_SECONDS_LIMIT > 0` 时启用,当前默认停用。否则 `granted` + `grant_coins(biz_type='ad_reward', ref_id=trans_id)` 加币,同事务。
 - **U / D**:无。
 - **R**:`GET /ad/reward-status`(看广告页:今日已发次数/上限、单次金币、本轮已看/冷却结束、今日已看时长/上限);审计/对账整表回溯。
 
@@ -13,13 +13,10 @@
 | 列 | 类型 | 约束 / 默认 | 说明(取值 / join) |
 |---|---|---|---|
 | `id` | Integer | PK, autoincrement | |
-| `trans_id` | String(64) | UNIQUE, index, NOT NULL | 穿山甲交易号(幂等键)。**被 `coin_transaction.ref_id` 引用**(biz_type=reward_video/signin_boost 等) |
+| `trans_id` | String(64) | UNIQUE, index, NOT NULL | 穿山甲交易号(幂等键)。**被 `coin_transaction.ref_id` 引用**(biz_type=ad_reward) |
 | `user_id` | Integer | FK→user.id, index, NOT NULL | 归属用户(回调 media_extra 带回;不存在抛 UnknownUserError) |
-| `reward_scene` | String(32) | NOT NULL, default `reward_video` | 奖励场景:`reward_video` 普通激励视频;`signin_boost` 签到膨胀 |
-| `ad_session_id` | String(64) | index, nullable | 客户端广告会话 ID,来自 `extra.ad_session_id`;用于匹配 `ad_ecpm_record` |
-| `ecpm_raw` | String(32) | nullable | 本次发奖采用的 eCPM 原始值;可来自 S2S `ecpm` 或客户端上报 |
-| `coin` | Integer | NOT NULL, default 0 | 实发金币;`capped`/`ecpm_missing`/业务不满足时为 0 |
-| `status` | String(16) | NOT NULL, default `granted` | 取值:`granted`(已发)/ `capped`(当日次数超限)/ `ecpm_missing`(缺 eCPM)/ `not_signed`/`already_boosted`/`last_day` |
+| `coin` | Integer | NOT NULL, default 0 | 实发金币;`capped` 时为 0 |
+| `status` | String(16) | NOT NULL, default `granted` | 取值:`granted`(已发)/ `capped`(当日次数超限,记录但不发) |
 | `reward_date` | String(10) | index, NOT NULL | 北京时间日期串 `YYYY-MM-DD`,按它等值统计当日发奖次数 |
 | `reward_name` | String(64) | nullable | 穿山甲上报奖励名(参考,不作发奖依据) |
 | `raw` | String(1024) | nullable | 回调原始参数(审计排查) |
@@ -27,13 +24,12 @@
 
 ## 关系 / Join Key
 - `user_id` → `user.id`(多对一)。
-- `trans_id` ← 被 `coin_transaction.ref_id` 引用(`granted` 那条发币流水);未发币状态无对应流水。
-- `ad_session_id` → 可关联 `ad_ecpm_record.ad_session_id`。
+- `trans_id` ← 被 `coin_transaction.ref_id` 引用(`granted` 那条发币流水);`capped` 行不发币、无对应流水。
+- 与 `ad_watch_log` / `ad_ecpm_record` **无公共键**;当前不逐条关联 eCPM 和发奖回调。
 
 ## 索引与约束
-- PK `id`;UNIQUE+index `trans_id`;index `user_id`、`reward_date`、`created_at`、`ad_session_id`。
+- PK `id`;UNIQUE+index `trans_id`;index `user_id`、`reward_date`、`created_at`。
 
 ## 注意
-- 普通激励视频按 eCPM 公式发奖;若 S2S 与客户端会话上报都缺 eCPM,记录 `status='ecpm_missing'`、`coin=0`,不发币。
-- 签到膨胀复用本表记录 S2S 幂等,实发固定 `2000` 金币由 `signin_boost_record`/`coin_transaction.biz_type=signin_boost` 承载。
+- 当前公网回调尚未接入前,激励视频精确 eCPM 绑定发奖先搁置;实发金币仍以穿山甲回调 `reward_amount` 为准(`resolve_ad_reward_coin` 解析,缺/坏回退默认、超上限夹紧),单次金币/每日上限/单次上限均从 `app_config` 读(运营后台可改)。
 - 并发同 `trans_id` 撞唯一约束 → catch IntegrityError 回滚返回已存在那条(幂等兜底)。

docs/database/coin_transaction.md

@@ -12,7 +12,7 @@
   | 签到 `POST /signin/do` | `signin` | + | 当天日期串(= `signin_record.signin_date` ISO) |
   | 签到后看广告膨胀 `POST /signin/boost` | `signin_boost` | + | 当天日期串(= `signin_boost_record.signin_date` ISO) |
   | 领任务 `POST /tasks/claim` | `task_<key>`(如 `task_enable_notification`) | + | `user_task.task_key` |
-  | 普通激励视频 S2S 回调 `POST /ad/pangle-callback` | `reward_video`(历史兼容:`ad_reward`) | + | `ad_reward_record.trans_id` |
+  | 看广告发奖回调 `POST /ad/pangle-callback` | `ad_reward` | + | `ad_reward_record.trans_id` |
   | 信息流广告结算 `POST /ad/feed-reward` | `feed_ad_reward` | + | `ad_feed_reward_record.client_event_id` |
   | 金币兑现金 `POST /wallet/exchange` | `exchange_out` | − | null(配套 `cash_transaction.exchange_in`) |
   | admin 手动加金币 | `admin_grant` | + | null(`remark`=`admin:<reason>`) |
@@ -29,14 +29,14 @@
 | `user_id` | Integer | FK→user.id, index, NOT NULL | 归属用户 |
 | `amount` | Integer | NOT NULL | 本笔变动金币;**正=入账(赚),负=出账(花/兑换)** |
 | `balance_after` | Integer | NOT NULL | 本笔后金币余额(= 当时 `coin_account.coin_balance`,对账用) |
-| `biz_type` | String(32) | NOT NULL | 取值见上表:`signin` / `signin_boost` / `task_<key>` / `reward_video` / `ad_reward`(历史) / `feed_ad_reward` / `exchange_out` / `admin_grant` / `admin_deduct`。无 DB 枚举约束,靠写入方约定 |
+| `biz_type` | String(32) | NOT NULL | 取值见上表:`signin` / `signin_boost` / `task_<key>` / `ad_reward` / `feed_ad_reward` / `exchange_out` / `admin_grant` / `admin_deduct`。无 DB 枚举约束,靠写入方约定 |
 | `ref_id` | String(64) | nullable | **关联业务键,指向随 `biz_type` 变(见上表)**;无关联时为 null |
 | `remark` | String(128) | nullable | 备注(如签到「每日签到 第N天」、admin「admin:<reason>」) |
 | `created_at` | DateTime(tz) | server_default now(), index | 时间 |
 
 ## 关系 / Join Key
 - `user_id` → `user.id`(多对一)。
-- `ref_id` 是**软关联**(无 FK),目标表随 `biz_type`:`signin`→签到日 / `signin_boost`→`ad_reward_record.trans_id` / `task_<key>`→`user_task.task_key` / `reward_video`/`ad_reward`→`ad_reward_record.trans_id` / `feed_ad_reward`→`ad_feed_reward_record.client_event_id` / 其余 null。
+- `ref_id` 是**软关联**(无 FK),目标表随 `biz_type`:`signin`→签到日 / `signin_boost`→签到日 / `task_<key>`→`user_task.task_key` / `ad_reward`→`ad_reward_record.trans_id` / `feed_ad_reward`→`ad_feed_reward_record.client_event_id` / 其余 null。
 
 ## 索引与约束
 - PK `id`;index `user_id`、`created_at`。

docs/database/signin_boost_record.md

@@ -1,6 +1,6 @@
 # signin_boost_record — 签到膨胀记录
 
-App 用户 Day1-Day13 当天签到后，看完激励视频可固定膨胀 2000 金币一次。Day14 不展示也不允许膨胀。本表记录膨胀动作，并用唯一约束防重复补发。
+App 用户当天签到后，看完激励视频可把签到奖励膨胀一次。本表记录膨胀动作，并用唯一约束防重复补发。
 
 ## 字段
 
@@ -9,8 +9,8 @@ App 用户 Day1-Day13 当天签到后，看完激励视频可固定膨胀 2000
 | `id` | Integer | PK | 自增主键 |
 | `user_id` | Integer | FK → `user.id`, index, NOT NULL | 用户 |
 | `signin_date` | Date | NOT NULL | 被膨胀的签到日期，北京时间 |
-| `coin_awarded` | Integer | NOT NULL | 本次补发金币,默认固定 2000 |
-| `ad_ref_id` | String(64) | nullable | 穿山甲 S2S 回调 `trans_id` |
+| `coin_awarded` | Integer | NOT NULL | 本次补发金币 |
+| `ad_ref_id` | String(64) | nullable | 广告会话/交易号，开发期可空 |
 | `created_at` | DateTime | NOT NULL | 创建时间 |
 
 ## 约束
@@ -19,4 +19,4 @@ App 用户 Day1-Day13 当天签到后，看完激励视频可固定膨胀 2000
 
 ## 关联
 
-- 膨胀成功时写 `coin_transaction.biz_type=signin_boost`，`ref_id=ad_ref_id`。
+- 膨胀成功时写 `coin_transaction.biz_type=signin_boost`，`ref_id=signin_date`。

docs/integrations/pangle.md

@@ -9,7 +9,7 @@
 **`sign = SHA256("{m-key}:{trans_id}")` 的十六进制串。**
 
 - 是**普通 SHA256**，不是 HMAC，也不是 RSA。
-- **只对 `m-key:trans_id` 这一个字符串**签名，`user_id` / `ecpm` / `extra` 等其余参数**不参与**签名。它们的可信度由"能算出正确 sign = 知道 m-key"间接保证——伪造者没有 m-key 连合法 sign 都造不出，自然无法注入假 `user_id`。
+- **只对 `m-key:trans_id` 这一个字符串**签名，`user_id` / `reward_amount` 等其余参数**不参与**签名。它们的可信度由"能算出正确 sign = 知道 m-key"间接保证——伪造者没有 m-key 连合法 sign 都造不出，自然无法注入假 `user_id`。
 - 这是穿山甲 **GroMore「广告位 → 服务端激励回调」官方规范**（supportcenter/26240）。我们客户端是 `useMediation(true)` 融合，回调走 **GroMore 广告位层级**，不是联盟代码位层级。
 
 ## 函数

pyproject.toml

@@ -34,9 +34,6 @@ dependencies = [
 
     # admin 后台账号密码 hash(用户侧是手机号+验证码登录,不需要密码;admin 才用)
     "bcrypt>=4.0.0",
-
-    # 邀请指纹归因:解析浏览器 UA 拿手机型号(Build.MODEL),跨端匹配用
-    "user-agents>=2.2.0",
 ]
 
 [project.optional-dependencies]

scripts/seed_invitee_avatar_test.py

@@ -1,91 +0,0 @@
-# -*- coding: utf-8 -*-
-"""造测试数据验证邀请列表"真实头像能不能连上"。
-
-A 邀请 B1(上传真实头像)/B2(无头像→色块)/B3(设昵称→色块), 然后:
-  ① 打印 A 的邀请码 + /invitees 返回(看 B1 有 avatar_url、B2 空、B3 昵称);
-  ② 直接 HTTP 访问 B1 的头像地址,确认文件能取到(后端静态托管通)。
-前端 AsyncImage 实际显示,装机后真机用 A 登录看。
-
-跑: <app-server py> scripts/seed_invitee_avatar_test.py"""
-import io
-import struct
-import sys
-import zlib
-
-import httpx
-
-sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding="utf-8")
-
-BASE = "http://127.0.0.1:8770"
-
-
-def solid_png(size: int = 96, rgb: tuple = (80, 140, 240)) -> bytes:
-    """生成一张纯色 PNG(蓝色 96x96),够真机看清、魔数是合法 PNG。"""
-    row = b"\x00" + bytes(rgb) * size
-    raw = row * size
-    comp = zlib.compress(raw)
-
-    def chunk(typ: bytes, data: bytes) -> bytes:
-        c = typ + data
-        return struct.pack(">I", len(data)) + c + struct.pack(">I", zlib.crc32(c) & 0xFFFFFFFF)
-
-    sig = b"\x89PNG\r\n\x1a\n"
-    ihdr = struct.pack(">IIBBBBB", size, size, 8, 2, 0, 0, 0)  # 8bit, RGB
-    return sig + chunk(b"IHDR", ihdr) + chunk(b"IDAT", comp) + chunk(b"IEND", b"")
-
-
-def login(c: httpx.Client, phone: str) -> str:
-    c.post(f"{BASE}/api/v1/auth/sms/send", json={"phone": phone})
-    r = c.post(f"{BASE}/api/v1/auth/sms/login", json={"phone": phone, "code": "123456"})
-    r.raise_for_status()
-    return r.json()["access_token"]
-
-
-def auth(tok: str) -> dict:
-    return {"Authorization": f"Bearer {tok}"}
-
-
-with httpx.Client(timeout=15) as c:
-    # A = 邀请人(真机用它登录看)
-    A_PHONE = "13900008001"
-    a_tok = login(c, A_PHONE)
-    a_code = c.get(f"{BASE}/api/v1/invite/me", headers=auth(a_tok)).json()["invite_code"]
-    print(f"邀请人 A: 手机号={A_PHONE} 验证码=123456 邀请码={a_code}")
-
-    # B1: 绑 A 码 + 上传真实头像
-    b1 = login(c, "13900008002")
-    c.post(f"{BASE}/api/v1/invite/bind", json={"invite_code": a_code}, headers=auth(b1))
-    r = c.post(
-        f"{BASE}/api/v1/user/avatar",
-        headers=auth(b1),
-        files={"file": ("avatar.png", io.BytesIO(solid_png()), "image/png")},
-    )
-    print(f"B1 绑定 + 上传头像 -> HTTP {r.status_code}, avatar_url={r.json().get('avatar_url')!r}")
-
-    # B2: 绑 A 码, 不传头像(测色块兜底)
-    b2 = login(c, "13900008003")
-    c.post(f"{BASE}/api/v1/invite/bind", json={"invite_code": a_code}, headers=auth(b2))
-    print("B2 绑定, 无头像(测色块)")
-
-    # B3: 绑 A 码 + 设昵称(测昵称优先 + 色块)
-    b3 = login(c, "13900008004")
-    c.post(f"{BASE}/api/v1/invite/bind", json={"invite_code": a_code}, headers=auth(b3))
-    c.patch(f"{BASE}/api/v1/user/profile", json={"nickname": "测试昵称"}, headers=auth(b3))
-    print("B3 绑定 + 昵称='测试昵称'")
-
-    # A 的邀请列表
-    inv = c.get(f"{BASE}/api/v1/invite/invitees", headers=auth(a_tok)).json()
-    print(f"\n=== A 的 /invitees (共 {inv['total']} 人) ===")
-    for it in inv["items"]:
-        print(f"  name={it['display_name']!r}  avatar={it['avatar_url']!r}  coins={it['coins']}  time={it['invited_at']}")
-
-    # 关键: 直接 HTTP 取 B1 的头像文件, 确认后端静态托管能 serve(= 前端拿这地址也能加载)
-    b1_avatar = next((it["avatar_url"] for it in inv["items"] if it["avatar_url"]), None)
-    print("\n=== 头像文件 HTTP 可访问性(后端静态托管) ===")
-    if b1_avatar:
-        rr = c.get(f"{BASE}{b1_avatar}")
-        ok = rr.status_code == 200 and (rr.headers.get("content-type", "").startswith("image"))
-        print(f"  GET {BASE}{b1_avatar}")
-        print(f"  -> HTTP {rr.status_code}, content-type={rr.headers.get('content-type')}, {len(rr.content)} bytes  {'✅ 能取到' if ok else '✗ 取不到'}")
-    else:
-        print("  没有带头像的被邀请人?!")

tests/test_ad_reward.py

@@ -10,7 +10,9 @@ from sqlalchemy import select
 from app.core.config import settings
 from app.integrations import pangle
 from app.core.rewards import (
+    AD_REWARD_COIN,
     DAILY_AD_REWARD_LIMIT,
+    MAX_AD_REWARD_COIN,
     VIDEO_ROUND_COOLDOWN_SECONDS,
     VIDEO_ROUND_REQUIRED_COUNT,
     calculate_ad_reward_coin,
@@ -55,34 +57,41 @@ def _coin_balance(client, token: str) -> int:
 
 
 def test_callback_grants_coins(client) -> None:
-    """验签通过且带 eCPM → 按数值公式发金币到账 + 计数 +1。"""
+    """验签通过的回调(无 reward_amount → 回退 AD_REWARD_COIN)→ 发金币到账 + 计数 +1。"""
     phone = "13800003001"
     token = _login(client, phone)
     uid = _user_id(phone)
 
-    r = _callback(client, _signed(uid, "trans_a1", reward_name="金币", ecpm="200"))
+    r = _callback(client, _signed(uid, "trans_a1", reward_name="金币"))
     assert r.status_code == 200, r.text
     assert r.json() == {"is_verify": True, "reason": 0}
 
-    assert _coin_balance(client, token) == calculate_ad_reward_coin("200", 1)
+    assert _coin_balance(client, token) == AD_REWARD_COIN
 
     st = client.get("/api/v1/ad/reward-status", headers=_auth(token)).json()
     assert st["used_today"] == 1
     assert st["daily_limit"] == DAILY_AD_REWARD_LIMIT
     assert st["remaining"] == DAILY_AD_REWARD_LIMIT - 1
-    assert st["coin_per_ad"] == 0
+    assert st["coin_per_ad"] == AD_REWARD_COIN
 
 
-def test_callback_without_ecpm_records_exception(client) -> None:
-    """S2S 和客户端会话都没有 eCPM → 不发金币,只记录异常状态。"""
+def test_callback_uses_reward_amount(client) -> None:
+    """带合法 reward_amount → 按它发金币(而非常量);异常值回退/夹紧。"""
     phone = "13800003011"
     token = _login(client, phone)
     uid = _user_id(phone)
 
-    assert _callback(client, _signed(uid, "ecpm_missing")).status_code == 200
-    assert _coin_balance(client, token) == 0
-    st = client.get("/api/v1/ad/reward-status", headers=_auth(token)).json()
-    assert st["used_today"] == 0
+    # 合法值:发 250
+    assert _callback(client, _signed(uid, "ra_ok", reward_amount="250")).status_code == 200
+    assert _coin_balance(client, token) == 250
+
+    # ≤0 / 非数字 → 回退 AD_REWARD_COIN(累加 AD_REWARD_COIN,当前 666)
+    assert _callback(client, _signed(uid, "ra_zero", reward_amount="0")).status_code == 200
+    assert _coin_balance(client, token) == 250 + AD_REWARD_COIN
+
+    # 超上限 → 夹紧到 MAX_AD_REWARD_COIN
+    assert _callback(client, _signed(uid, "ra_big", reward_amount="999999")).status_code == 200
+    assert _coin_balance(client, token) == 250 + AD_REWARD_COIN + MAX_AD_REWARD_COIN
 
 
 def test_callback_idempotent(client) -> None:
@@ -91,11 +100,11 @@ def test_callback_idempotent(client) -> None:
     token = _login(client, phone)
     uid = _user_id(phone)
 
-    p = _signed(uid, "trans_dup", ecpm="200")
+    p = _signed(uid, "trans_dup")
     assert _callback(client, p).status_code == 200
     assert _callback(client, p).status_code == 200  # 重试
 
-    assert _coin_balance(client, token) == calculate_ad_reward_coin("200", 1)  # 没翻倍
+    assert _coin_balance(client, token) == AD_REWARD_COIN  # 没翻倍
     st = client.get("/api/v1/ad/reward-status", headers=_auth(token)).json()
     assert st["used_today"] == 1
 
@@ -125,15 +134,15 @@ def test_daily_count_cap(client, monkeypatch) -> None:
     uid = _user_id(phone)
 
     for i in range(3):
-        r = _callback(client, _signed(uid, f"trans_cap_{i}", ecpm="200"))
+        r = _callback(client, _signed(uid, f"trans_cap_{i}"))
         assert r.status_code == 200, r.text
 
     # 第 4 次:capped,仍 is_verify(不让穿山甲重试),但不加币
-    r = _callback(client, _signed(uid, "trans_cap_over", ecpm="200"))
+    r = _callback(client, _signed(uid, "trans_cap_over"))
     assert r.status_code == 200
     assert r.json() == {"is_verify": True, "reason": 0}
 
-    assert _coin_balance(client, token) == sum(calculate_ad_reward_coin("200", i) for i in range(1, 4))
+    assert _coin_balance(client, token) == 3 * AD_REWARD_COIN
     st = client.get("/api/v1/ad/reward-status", headers=_auth(token)).json()
     assert st["used_today"] == 3
     assert st["remaining"] == 0
@@ -160,7 +169,7 @@ def test_daily_watch_time_cap(client, monkeypatch) -> None:
 
     # 此时回调发奖 → 时长闸命中 → capped(is_verify 仍 true,不让重试),不加金币
     before = _coin_balance(client, token)
-    r = _callback(client, _signed(uid, "trans_time_cap", ecpm="200"))
+    r = _callback(client, _signed(uid, "trans_time_cap"))
     assert r.status_code == 200
     assert r.json() == {"is_verify": True, "reason": 0}
     assert _coin_balance(client, token) == before  # 未加币
@@ -200,7 +209,7 @@ def test_reward_status_mid_round(client) -> None:
     phone = "13800003102"
     token = _login(client, phone)
     uid = _user_id(phone)
-    _callback(client, _signed(uid, "trans_mid_1", ecpm="200"))
+    _callback(client, _signed(uid, "trans_mid_1"))
     st = client.get("/api/v1/ad/reward-status", headers=_auth(token)).json()
     assert st["used_today"] == 1
     assert st["round_count"] == 0
@@ -215,7 +224,7 @@ def test_reward_status_round_complete_enters_cooldown(client) -> None:
     token = _login(client, phone)
     uid = _user_id(phone)
     for i in range(VIDEO_ROUND_REQUIRED_COUNT):
-        _callback(client, _signed(uid, f"trans_rc_{i}", ecpm="200"))
+        _callback(client, _signed(uid, f"trans_rc_{i}"))
 
     st = client.get("/api/v1/ad/reward-status", headers=_auth(token)).json()
     assert st["used_today"] == VIDEO_ROUND_REQUIRED_COUNT
@@ -239,7 +248,7 @@ def test_reward_status_cooldown_expired(client) -> None:
     token = _login(client, phone)
     uid = _user_id(phone)
     for i in range(VIDEO_ROUND_REQUIRED_COUNT):
-        _callback(client, _signed(uid, f"trans_exp_{i}", ecpm="200"))
+        _callback(client, _signed(uid, f"trans_exp_{i}"))
 
     # 把当日所有 granted 记录的 created_at 推到 11 分钟前(覆盖冷却末尾那条)
     db = SessionLocal()

tests/test_invite.py

@@ -1,4 +1,4 @@
-"""好友邀请测试:邀请码、绑定、双方发金币、幂等、自邀/无效码屏蔽、指纹兜底归因。
+"""好友邀请测试:邀请码、绑定、双方发金币、幂等、自邀/无效码屏蔽。
 
 用 sms mock 登录拿 token(同 test_welfare),再跑邀请闭环。
 """
@@ -6,16 +6,12 @@ from __future__ import annotations
 
 from datetime import datetime, timedelta, timezone
 
-from sqlalchemy import select
-
 from app.core.rewards import (
-    INVITE_FP_WINDOW_DAYS,
     INVITE_INVITEE_COINS,
     INVITE_INVITER_COINS,
     INVITE_NEW_USER_WINDOW_HOURS,
 )
 from app.db.session import SessionLocal
-from app.models.invite_fingerprint import InviteFingerprint
 from app.repositories.user import get_user_by_phone
 
 
@@ -162,216 +158,3 @@ def test_old_user_not_eligible(client) -> None:
     assert r.json()["coins_awarded"] == 0
     assert _coin_balance(client, b) == 0
     assert _coin_balance(client, a) == 0
-
-
-# =====================================================================
-# 任务 3:指纹归因(剪贴板兜底,见 brain [[invite-three-tasks]])
-# =====================================================================
-
-def test_landing_track_records_fingerprint(client) -> None:
-    """落地页 POST /landing-track 成功存指纹(无需鉴权)。"""
-    a = _login(client, "13800002040")
-    a_code = _my_code(client, a)
-    # 浏览器无 token 调
-    r = client.post(
-        "/api/v1/invite/landing-track",
-        json={"ref": a_code, "screen": "1080x2400"},
-    )
-    assert r.status_code == 200, r.text
-    assert r.json()["status"] == "ok"
-
-
-def test_landing_track_invalid_code(client) -> None:
-    """无效邀请码 → invalid_code(silent 返,不影响落地页下载流程)。"""
-    r = client.post(
-        "/api/v1/invite/landing-track",
-        json={"ref": "ZZZZZZ", "screen": "1080x2400"},
-    )
-    assert r.status_code == 200, r.text
-    assert r.json()["status"] == "invalid_code"
-
-
-def test_bind_by_fingerprint_success(client) -> None:
-    """B 落地页存指纹 → B 登录后用指纹兜底绑定成功(模拟剪贴板被覆盖丢失)。"""
-    a = _login(client, "13800002041")
-    a_code = _my_code(client, a)
-
-    # 1. B 浏览器(无 token)访问落地页 → 存指纹
-    r1 = client.post(
-        "/api/v1/invite/landing-track",
-        json={"ref": a_code, "screen": "1234x5678"},  # 用独特 screen 避免跟其它测试撞
-    )
-    assert r1.json()["status"] == "ok"
-
-    # 2. B 注册登录(剪贴板被覆盖,没拿到邀请码)
-    b = _login(client, "13800002042")
-
-    # 3. B 不带 invite_code,只带 fingerprint 走兜底
-    r2 = client.post(
-        "/api/v1/invite/bind",
-        json={
-            "channel": "fingerprint",
-            "fingerprint": {"screen": "1234x5678", "device_model": ""},
-        },
-        headers=_auth(b),
-    )
-    assert r2.status_code == 200, r2.text
-    assert r2.json()["status"] == "success"
-    # 双方各发金币
-    assert _coin_balance(client, a) == INVITE_INVITER_COINS
-    assert _coin_balance(client, b) == INVITE_INVITEE_COINS
-
-
-def test_bind_by_fingerprint_not_found(client) -> None:
-    """没有匹配的指纹记录 → fp_not_found,不发奖。"""
-    b = _login(client, "13800002043")
-    r = client.post(
-        "/api/v1/invite/bind",
-        json={
-            "channel": "fingerprint",
-            "fingerprint": {"screen": "0000x9999", "device_model": "no_such_model"},
-        },
-        headers=_auth(b),
-    )
-    assert r.status_code == 200, r.text
-    assert r.json()["status"] == "fp_not_found"
-    assert r.json()["coins_awarded"] == 0
-    assert _coin_balance(client, b) == 0
-
-
-def test_bind_by_fingerprint_outside_window(client) -> None:
-    """指纹记录超出 INVITE_FP_WINDOW_DAYS 窗口 → fp_not_found。
-
-    用独特设备型号隔离:测试环境所有请求 IP 都是 testclient、落地页默认无 UA(解析出的
-    型号="")，而指纹反查按 (IP, 型号) 匹配 → 会串到别的测试残留的、没过期的 model=""
-    指纹上(误判 success)。这里给落地页传一个独特 UA(解析出独特型号 OUTWIN9X),反查只可能
-    命中本测试自己的指纹,"过期就反查不到"才验得准。
-    """
-    a = _login(client, "13800002044")
-    a_code = _my_code(client, a)
-
-    # 落地页存指纹(独特 UA → 独特型号 OUTWIN9X),再手动把 created_at 改到窗口外
-    unique_screen = "2222x3333"
-    unique_ua = "Mozilla/5.0 (Linux; Android 13; OUTWIN9X Build/TQ) AppleWebKit/537.36"
-    r1 = client.post(
-        "/api/v1/invite/landing-track",
-        json={"ref": a_code, "screen": unique_screen},
-        headers={"user-agent": unique_ua},
-    )
-    assert r1.json()["status"] == "ok"
-
-    with SessionLocal() as db:
-        fp = db.execute(
-            select(InviteFingerprint).where(InviteFingerprint.screen == unique_screen)
-        ).scalar_one()
-        fp.created_at = datetime.now(timezone.utc) - timedelta(days=INVITE_FP_WINDOW_DAYS + 1)
-        db.commit()
-
-    b = _login(client, "13800002045")
-    r = client.post(
-        "/api/v1/invite/bind",
-        json={
-            "channel": "fingerprint",
-            "fingerprint": {"screen": unique_screen, "device_model": "OUTWIN9X"},
-        },
-        headers=_auth(b),
-    )
-    assert r.status_code == 200, r.text
-    assert r.json()["status"] == "fp_not_found"
-    assert _coin_balance(client, a) == 0
-    assert _coin_balance(client, b) == 0
-
-
-def test_bind_no_code_no_fingerprint(client) -> None:
-    """既没邀请码也没指纹 → invalid_code(无效请求)。"""
-    b = _login(client, "13800002046")
-    r = client.post(
-        "/api/v1/invite/bind",
-        json={"channel": "fingerprint"},  # 没 invite_code、没 fingerprint
-        headers=_auth(b),
-    )
-    assert r.status_code == 200, r.text
-    assert r.json()["status"] == "invalid_code"
-    assert _coin_balance(client, b) == 0
-
-
-# =====================================================================
-# 被邀请人列表 GET /invitees(邀请页小窗 + 完整列表页共用)
-# =====================================================================
-
-def test_invitees_basic(client) -> None:
-    """A 邀 B、C → 列表返 2 条、total=2、没设资料的名字=脱敏手机号、头像 null、金币对。"""
-    a = _login(client, "13800002050")
-    a_code = _my_code(client, a)
-    for phone in ("13800002051", "13800002052"):
-        u = _login(client, phone)
-        client.post("/api/v1/invite/bind", json={"invite_code": a_code}, headers=_auth(u))
-
-    r = client.get("/api/v1/invite/invitees", headers=_auth(a))
-    assert r.status_code == 200, r.text
-    body = r.json()
-    assert body["total"] == 2
-    assert body["has_more"] is False
-    assert len(body["items"]) == 2
-    # 没设昵称头像 → 名字脱敏手机号、头像 null(不依赖顺序用 set)
-    names = {it["display_name"] for it in body["items"]}
-    assert names == {"138****2051", "138****2052"}
-    assert all(it["avatar_url"] is None for it in body["items"])
-    assert all(it["coins"] == INVITE_INVITER_COINS for it in body["items"])
-
-
-def test_invitees_order_desc(client) -> None:
-    """按邀请时间倒序:最近邀请的在最前(手动拉开时间,避开 SQLite 秒级精度)。"""
-    from app.models.invite import InviteRelation
-    a = _login(client, "13800002060")
-    a_code = _my_code(client, a)
-    b = _login(client, "13800002061")
-    c = _login(client, "13800002062")
-    client.post("/api/v1/invite/bind", json={"invite_code": a_code}, headers=_auth(b))
-    client.post("/api/v1/invite/bind", json={"invite_code": a_code}, headers=_auth(c))
-    with SessionLocal() as db:
-        ub = get_user_by_phone(db, "13800002061")
-        rel_b = db.execute(
-            select(InviteRelation).where(InviteRelation.invitee_user_id == ub.id)
-        ).scalar_one()
-        rel_b.created_at = datetime.now(timezone.utc) - timedelta(hours=2)
-        db.commit()
-    items = client.get("/api/v1/invite/invitees", headers=_auth(a)).json()["items"]
-    assert items[0]["display_name"] == "138****2062"  # C 刚邀,在前
-    assert items[1]["display_name"] == "138****2061"  # B 2 小时前,在后
-
-
-def test_invitees_nickname_priority(client) -> None:
-    """设了昵称的被邀请人 → 名字用昵称(优先于脱敏手机号)。"""
-    a = _login(client, "13800002070")
-    a_code = _my_code(client, a)
-    b = _login(client, "13800002071")
-    client.post("/api/v1/invite/bind", json={"invite_code": a_code}, headers=_auth(b))
-    with SessionLocal() as db:
-        u = get_user_by_phone(db, "13800002071")
-        u.nickname = "小明"
-        db.commit()
-    items = client.get("/api/v1/invite/invitees", headers=_auth(a)).json()["items"]
-    assert items[0]["display_name"] == "小明"
-
-
-def test_invitees_pagination(client) -> None:
-    """分页:limit=1 → 1 条 + has_more=True;offset=1 → 第 2 条 + has_more=False。"""
-    a = _login(client, "13800002080")
-    a_code = _my_code(client, a)
-    for phone in ("13800002081", "13800002082"):
-        u = _login(client, phone)
-        client.post("/api/v1/invite/bind", json={"invite_code": a_code}, headers=_auth(u))
-
-    p1 = client.get("/api/v1/invite/invitees?limit=1&offset=0", headers=_auth(a)).json()
-    assert len(p1["items"]) == 1 and p1["total"] == 2 and p1["has_more"] is True
-    p2 = client.get("/api/v1/invite/invitees?limit=1&offset=1", headers=_auth(a)).json()
-    assert len(p2["items"]) == 1 and p2["has_more"] is False
-
-
-def test_invitees_empty_and_auth(client) -> None:
-    """没邀请人 → 空列表;不带 token → 401。"""
-    a = _login(client, "13800002090")
-    body = client.get("/api/v1/invite/invitees", headers=_auth(a)).json()
-    assert body["total"] == 0 and body["items"] == [] and body["has_more"] is False
-    assert client.get("/api/v1/invite/invitees").status_code == 401

tests/test_welfare.py

@@ -4,20 +4,15 @@
 """
 from __future__ import annotations
 
-import json
-
-from app.core.config import settings
 from app.core.rewards import (
     COIN_PER_CENT,
     COIN_PER_YUAN,
     MIN_EXCHANGE_COIN,
-    SIGNIN_BOOST_COIN,
     SIGNIN_REWARDS,
     TASK_ENABLE_NOTIFICATION,
     TASK_REWARDS,
 )
 from app.db.session import SessionLocal
-from app.integrations import pangle
 from app.repositories import wallet as crud_wallet
 from app.repositories.user import get_user_by_phone
 
@@ -34,12 +29,6 @@ def _auth(token: str) -> dict[str, str]:
     return {"Authorization": f"Bearer {token}"}
 
 
-def _signed_ad_callback(user_id: int, trans_id: str, **params: str) -> dict[str, str]:
-    body = {"user_id": str(user_id), "trans_id": trans_id, **params}
-    body["sign"] = pangle.build_sign(trans_id, settings.PANGLE_REWARD_SECRET)
-    return body
-
-
 def test_account_auto_created_empty(client) -> None:
     """首次访问账户:自动建空账户,余额全 0。"""
     token = _login(client, "13800001001")
@@ -102,9 +91,8 @@ def test_signin_flow(client) -> None:
 
 
 def test_signin_boost_flow(client) -> None:
-    """签到后看广告膨胀 → S2S 固定补发 2000 金币,每天只能膨胀一次。"""
-    phone = "13800001011"
-    token = _login(client, phone)
+    """签到后看广告膨胀 → 补发一笔等额签到金币,每天只能膨胀一次。"""
+    token = _login(client, "13800001011")
 
     r = client.post("/api/v1/signin/boost", json={}, headers=_auth(token))
     assert r.status_code == 409
@@ -113,30 +101,14 @@ def test_signin_boost_flow(client) -> None:
     assert r.status_code == 200, r.text
     first_coin = r.json()["coin_awarded"]
 
-    with SessionLocal() as db:
-        user = get_user_by_phone(db, phone)
-        assert user is not None
-        uid = user.id
-
-    extra = json.dumps({"reward_scene": "signin_boost", "ad_session_id": "signin-session-1"})
-    r = client.get(
-        "/api/v1/ad/pangle-callback",
-        params=_signed_ad_callback(uid, "signin-boost-trans-1", extra=extra, ecpm="200"),
-    )
-    assert r.status_code == 200, r.text
-    assert r.json() == {"is_verify": True, "reason": 0}
-
-    r = client.post("/api/v1/signin/boost", json={"ad_ref_id": "signin-boost-trans-1"}, headers=_auth(token))
+    r = client.post("/api/v1/signin/boost", json={"ad_ref_id": "ad-session-1"}, headers=_auth(token))
     assert r.status_code == 200, r.text
     body = r.json()
-    assert body["coin_awarded"] == SIGNIN_BOOST_COIN
-    assert body["coin_balance"] == first_coin + SIGNIN_BOOST_COIN
+    assert body["coin_awarded"] == first_coin
+    assert body["coin_balance"] == first_coin * 2
 
-    r = client.get(
-        "/api/v1/ad/pangle-callback",
-        params=_signed_ad_callback(uid, "signin-boost-trans-2", extra=extra, ecpm="200"),
-    )
-    assert r.status_code == 200, r.text
+    r = client.post("/api/v1/signin/boost", json={"ad_ref_id": "ad-session-1"}, headers=_auth(token))
+    assert r.status_code == 409
 
     r = client.get("/api/v1/wallet/coin-transactions", headers=_auth(token))
     types = [t["biz_type"] for t in r.json()["items"]]