Merge branch 'main' into fix-homelist

merge origin/main 后 coupon_claim_event(main)与 guide_video_user_seq_uq(本分支)
成两个 head,加 no-op merge 节点 d8dd2106e438 收敛为单 head。已在全新库上
alembic upgrade heads 验证整条链可应用。

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

.env.example

@@ -27,7 +27,55 @@ JG_PRIVATE_KEY_PATH=./secrets/jverify_rsa_private.pem
 JG_VERIFY_ENDPOINT=https://api.verification.jpush.cn/v1/web/loginTokenVerify
 JG_REQUEST_TIMEOUT_SEC=15
 
-# ===== 无障碍保护存活监控(pull 后置检测;本期不接推送)=====
+# ===== 厂商直推(无障碍保护存活告警 + 消息中心 13 类通知)=====
+# 敏感密钥只放 .env / 服务器环境变量,不要提交到 git。
+# 各厂商配置状态可随时 GET /api/v1/push/vendors 查看(缺哪些键一目了然)。
+ANDROID_PACKAGE_NAME=com.jishisongfu.shaguabijia
+PUSH_REQUEST_TIMEOUT_SEC=15
+PUSH_TIME_TO_LIVE_SEC=86400
+
+HONOR_PUSH_APP_ID=
+HONOR_PUSH_CLIENT_ID=
+HONOR_PUSH_CLIENT_SECRET=
+HONOR_PUSH_TOKEN_ENDPOINT=https://iam.developer.honor.com/auth/token
+HONOR_PUSH_SEND_ENDPOINT_TEMPLATE=https://push-api.cloud.honor.com/api/v1/{app_id}/sendMessage
+
+# 华为 Push Kit:AGC 控制台 → 项目设置 → 常规 → 应用,AppId + AppSecret
+HUAWEI_PUSH_APP_ID=
+HUAWEI_PUSH_APP_SECRET=
+HUAWEI_PUSH_TOKEN_ENDPOINT=https://oauth-login.cloud.huawei.com/oauth2/v3/token
+HUAWEI_PUSH_SEND_ENDPOINT_TEMPLATE=https://push-api.cloud.huawei.com/v1/{app_id}/messages:send
+
+VIVO_PUSH_APP_ID=
+VIVO_PUSH_APP_KEY=
+VIVO_PUSH_APP_SECRET=
+VIVO_PUSH_AUTH_ENDPOINT=https://api-push.vivo.com.cn/message/auth
+VIVO_PUSH_SEND_ENDPOINT=https://api-push.vivo.com.cn/message/send
+# vivo 未上架测试时可用 push_mode=1; 上架正式推送改为 0。
+VIVO_PUSH_MODE=1
+VIVO_PUSH_NOTIFY_TYPE=4
+VIVO_PUSH_CATEGORY=DEVICE_REMINDER
+
+XIAOMI_PUSH_APP_SECRET=
+XIAOMI_PUSH_SEND_ENDPOINT=https://api.xmpush.xiaomi.com/v3/message/regid
+XIAOMI_PUSH_CHANNEL_ID=
+XIAOMI_PUSH_TEMPLATE_ID=
+XIAOMI_PUSH_TEMPLATE_TITLE=
+XIAOMI_PUSH_TEMPLATE_DESCRIPTION=
+# 可选: JSON 字符串，支持 {title}/{alert} 占位符，例如 {"title":"{title}","content":"{alert}"}
+XIAOMI_PUSH_TEMPLATE_PARAM_JSON=
+
+OPPO_PUSH_APP_KEY=
+OPPO_PUSH_MASTER_SECRET=
+OPPO_PUSH_AUTH_ENDPOINT=https://api.push.oppomobile.com/server/v1/auth
+OPPO_PUSH_SEND_ENDPOINT=https://api.push.oppomobile.com/server/v1/message/notification/unicast
+# OPPO 新消息分类(2024-11-20 后创建的应用必须携带 category;channel_id 为后台「通道ID」;
+# notify_level 0=不传走默认,内容营销类仅支持 1/2)
+OPPO_PUSH_CHANNEL_ID=
+OPPO_PUSH_CATEGORY=
+OPPO_PUSH_NOTIFY_LEVEL=0
+
+# ===== 无障碍保护存活监控(推送 + pull 后置兜底)=====
 HEARTBEAT_MONITOR_ENABLED=true
 HEARTBEAT_TIMEOUT_MINUTES=60
 HEARTBEAT_SCAN_INTERVAL_SEC=60
@@ -65,6 +113,13 @@ JD_UNION_APP_SECRET=
 JD_UNION_SITE_ID=
 JD_UNION_AUTH_KEY=
 
+# 美团 + 京东订单每天北京时间 05:00 自动对账；按更新时间回拉近 3 天，重叠防漏单并刷新状态。
+# 手动对账按钮不受该开关影响。通常保持开启；临时停自动任务时设为 false。
+CPS_AUTO_RECONCILE_ENABLED=true
+CPS_AUTO_RECONCILE_RUN_HOUR=5
+CPS_AUTO_RECONCILE_LOOKBACK_DAYS=3
+CPS_AUTO_RECONCILE_CHECK_INTERVAL_SEC=60
+
 # ===== Pricebot 上游 (领券/比价业务透传目标) =====
 # 客户端调本服务的 /api/v1/coupon/step 等,我们透传到 pricebot-backend。
 # 本地开发用 localhost:8000。生产部署改成内网地址(如 http://pricebot.internal:8000)。
@@ -138,14 +193,18 @@ PANGLE_REPORT_SECURITY_KEY=
 PANGLE_REPORT_SITE_ID_PROD=5830519
 PANGLE_REPORT_SITE_ID_TEST=5832303
 
-# ===== 客户端运行日志上报(POST /api/v1/applog/batch)=====
-# 客户端批量上报的 App 运行日志逐条落到独立滚动文件 logs/app-client.log,供阿里云 Logtail
-# 采进【独立 SLS logstore】(与服务日志 app-server.log 分开;滚动机制相同,trace_id 可跨层检索)。
-# 全部有默认值,不填即用默认(定义见 app/core/client_log.py 与 app/api/v1/applog.py)。
-# CLIENT_LOG_FILE=logs/app-client.log      # 落盘路径
-# CLIENT_LOG_MAX_BYTES=20971520            # 单文件 20MB 滚动
-# CLIENT_LOG_BACKUP_COUNT=10               # 保留 10 个 → ~200MB 缓冲(给 Logtail 断线留余量)
-# CLIENT_LOG_SERVICE_NAME=app-client       # 输出行 service 字段
-# APPLOG_MAX_BATCH=500                      # 单批最大条数(超 → 422;导入期常量,改需重启)
-# APPLOG_MAX_BODY_BYTES=2097152            # 请求体上限 2MB(超 → 413;运行期可调)
-# APPLOG_MAX_MSG_BYTES=8192                # 单条 msg 超此字节数截断
+# ===== 可观测(OpenObserve 接口指标)=====
+# 采集每个接口 QPS + 耗时 + 错误率,批量直采到 OpenObserve(本地 Docker,见 deploy/openobserve/)。
+# 默认关;开启需 ENABLED=true 且填 USER/PASSWORD(与 docker-compose 里 root 账号一致)。
+# 未开/缺凭证 → 中间件透传、worker 不启动,整套 no-op,不影响业务。
+OBSERVE_ENABLED=false
+OBSERVE_ENDPOINT=http://localhost:5080
+OBSERVE_ORG=default
+OBSERVE_STREAM=app_requests
+OBSERVE_USER=admin@shaguabijia.local
+OBSERVE_PASSWORD=Complexpass#123
+# 进阶(一般不用改):攒批间隔秒 / 单批最大条数 / 有界队列上限(满则丢) / 上报超时秒
+OBSERVE_FLUSH_INTERVAL_SEC=5
+OBSERVE_BATCH_MAX=200
+OBSERVE_QUEUE_MAX=10000
+OBSERVE_TIMEOUT_SEC=5

alembic/versions/coupon_claim_event.py

@@ -69,11 +69,7 @@ def upgrade() -> None:
         unique=False,
     )
 
-    # 旧表按 (device, coupon, 自然日) 去重，trace_id 可空且不在唯一键里：同一
-    # (trace_id, coupon_id) 可能散落在多行（如一次会话的 /step 帧跨零点，把同一张券
-    # 写进相邻两天）。新表按 (trace_id, coupon_id) 唯一，整表 1:1 复制会撞
-    # uq_coupon_claim_event_trace_coupon。回填时按 (trace_id, coupon_id) 只取 id 最大
-    # （最近写入）的一行。历史上已被每日去重覆盖的关联仍无法恢复。
+    # 旧表只能回填当前仍保留的 trace；历史上已被每日去重覆盖的关联无法恢复。
     op.execute(
         """
         INSERT INTO coupon_claim_event (
@@ -85,12 +81,6 @@ def upgrade() -> None:
             vendor, coupon_name, claimed_count, reason, extra, created_at, updated_at
         FROM coupon_claim_record
         WHERE trace_id IS NOT NULL
-          AND id IN (
-              SELECT MAX(id)
-              FROM coupon_claim_record
-              WHERE trace_id IS NOT NULL
-              GROUP BY trace_id, coupon_id
-          )
         """
     )
 

alembic/versions/drop_withdraw_active_uniq_idx.py

@@ -1,37 +0,0 @@
-"""drop withdraw active-order partial unique index (allow multiple in-flight withdrawals)
-
-Revision ID: drop_withdraw_active_uniq_idx
-Revises: d8dd2106e438
-Create Date: 2026-07-24 00:00:00.000000
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = "drop_withdraw_active_uniq_idx"
-down_revision: Union[str, Sequence[str], None] = "d8dd2106e438"
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    # 取消「同一用户同一时刻仅一笔在途提现」:允许 reviewing/pending 并存。
-    # 仅删本索引;姊妹索引 ux_cash_transaction_withdraw_refund_ref(退款幂等)保持不动。
-    op.drop_index("ux_withdraw_order_user_active", table_name="withdraw_order")
-
-
-def downgrade() -> None:
-    # 回滚重建分区唯一索引。注意:若届时某用户已有 ≥2 张在途单,重建会因唯一冲突失败——
-    # 属预期的回滚代价(取消限制后本就允许多单),需先人工收敛在途单再回滚。
-    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')"),
-    )

alembic/versions/risk_monitor_generic_tables.py

@@ -1,210 +0,0 @@
-"""add generic behavior, risk incident and subject restriction tables
-
-Revision ID: risk_monitor_generic
-Revises: drop_withdraw_active_uniq_idx
-"""
-from __future__ import annotations
-
-from collections.abc import Sequence
-
-import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
-from alembic import op
-
-revision: str = "risk_monitor_generic"
-down_revision: str | None = "drop_withdraw_active_uniq_idx"
-branch_labels: str | Sequence[str] | None = None
-depends_on: str | Sequence[str] | None = None
-
-_JSON = sa.JSON().with_variant(postgresql.JSONB(), "postgresql")
-_RISK_MONITOR_PAGE = "risk-monitor"
-_DEFAULT_RISK_MONITOR_ROLES = ("operator", "tech")
-
-
-def _role_table() -> sa.TableClause:
-    return sa.table(
-        "admin_role",
-        sa.column("name", sa.String),
-        sa.column("pages", _JSON),
-    )
-
-
-def _add_default_role_permissions() -> None:
-    """Grant the new page without replacing any existing role customisation."""
-    role = _role_table()
-    conn = op.get_bind()
-    rows = conn.execute(
-        sa.select(role.c.name, role.c.pages).where(
-            role.c.name.in_(_DEFAULT_RISK_MONITOR_ROLES)
-        )
-    ).all()
-    for name, pages in rows:
-        current_pages = list(pages or [])
-        if _RISK_MONITOR_PAGE not in current_pages:
-            conn.execute(
-                role.update()
-                .where(role.c.name == name)
-                .values(pages=[*current_pages, _RISK_MONITOR_PAGE])
-            )
-
-
-def _remove_default_role_permissions() -> None:
-    role = _role_table()
-    conn = op.get_bind()
-    rows = conn.execute(
-        sa.select(role.c.name, role.c.pages).where(
-            role.c.name.in_(_DEFAULT_RISK_MONITOR_ROLES)
-        )
-    ).all()
-    for name, pages in rows:
-        current_pages = list(pages or [])
-        if _RISK_MONITOR_PAGE in current_pages:
-            conn.execute(
-                role.update()
-                .where(role.c.name == name)
-                .values(
-                    pages=[
-                        page
-                        for page in current_pages
-                        if page != _RISK_MONITOR_PAGE
-                    ]
-                )
-            )
-
-
-def upgrade() -> None:
-    op.create_table(
-        "behavior_event",
-        sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
-        sa.Column("event_type", sa.String(length=64), nullable=False),
-        sa.Column("subject_type", sa.String(length=32), nullable=False),
-        sa.Column("subject_id", sa.String(length=128), nullable=False),
-        sa.Column("user_id", sa.Integer(), nullable=True),
-        sa.Column("device_id", sa.String(length=128), nullable=True),
-        sa.Column("device_model", sa.String(length=128), nullable=True),
-        sa.Column("phone", sa.String(length=20), nullable=True),
-        sa.Column("client_ip", sa.String(length=64), nullable=True),
-        sa.Column("outcome", sa.String(length=24), nullable=False),
-        sa.Column("reason", sa.String(length=256), nullable=True),
-        sa.Column("details", sa.JSON(), nullable=True),
-        sa.Column("occurred_at", sa.DateTime(timezone=True), nullable=False),
-        sa.Column(
-            "created_at",
-            sa.DateTime(timezone=True),
-            server_default=sa.text("(CURRENT_TIMESTAMP)"),
-            nullable=False,
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_index("ix_behavior_event_occurred_at", "behavior_event", ["occurred_at"])
-    op.create_index(
-        "ix_behavior_event_type_time", "behavior_event", ["event_type", "occurred_at"]
-    )
-    op.create_index(
-        "ix_behavior_event_subject_time",
-        "behavior_event",
-        ["subject_type", "subject_id", "occurred_at"],
-    )
-    op.create_index(
-        "ix_behavior_event_user_time", "behavior_event", ["user_id", "occurred_at"]
-    )
-
-    op.create_table(
-        "risk_incident",
-        sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
-        sa.Column("rule_code", sa.String(length=64), nullable=False),
-        sa.Column("event_type", sa.String(length=64), nullable=False),
-        sa.Column("subject_type", sa.String(length=32), nullable=False),
-        sa.Column("subject_id", sa.String(length=128), nullable=False),
-        sa.Column("window_key", sa.String(length=64), nullable=False),
-        sa.Column("window_start", sa.DateTime(timezone=True), nullable=False),
-        sa.Column("window_end", sa.DateTime(timezone=True), nullable=False),
-        sa.Column("first_event_at", sa.DateTime(timezone=True), nullable=False),
-        sa.Column("triggered_at", sa.DateTime(timezone=True), nullable=False),
-        sa.Column("last_event_at", sa.DateTime(timezone=True), nullable=False),
-        sa.Column("event_count", sa.Integer(), nullable=False),
-        sa.Column("status", sa.String(length=24), nullable=False),
-        sa.Column("action_reason", sa.String(length=256), nullable=True),
-        sa.Column("handled_by", sa.Integer(), nullable=True),
-        sa.Column("handled_at", sa.DateTime(timezone=True), nullable=True),
-        sa.Column("details", sa.JSON(), nullable=True),
-        sa.Column(
-            "created_at",
-            sa.DateTime(timezone=True),
-            server_default=sa.text("(CURRENT_TIMESTAMP)"),
-            nullable=False,
-        ),
-        sa.Column(
-            "updated_at",
-            sa.DateTime(timezone=True),
-            server_default=sa.text("(CURRENT_TIMESTAMP)"),
-            nullable=False,
-        ),
-        sa.PrimaryKeyConstraint("id"),
-        sa.UniqueConstraint(
-            "rule_code",
-            "subject_type",
-            "subject_id",
-            "window_key",
-            name="uq_risk_incident_rule_subject_window",
-        ),
-    )
-    op.create_index(
-        "ix_risk_incident_rule_status",
-        "risk_incident",
-        ["rule_code", "status", "triggered_at"],
-    )
-    op.create_index(
-        "ix_risk_incident_subject",
-        "risk_incident",
-        ["subject_type", "subject_id", "triggered_at"],
-    )
-
-    op.create_table(
-        "subject_restriction",
-        sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
-        sa.Column("subject_type", sa.String(length=32), nullable=False),
-        sa.Column("subject_id", sa.String(length=128), nullable=False),
-        sa.Column("scope", sa.String(length=32), nullable=False),
-        sa.Column("active", sa.Boolean(), server_default=sa.true(), nullable=False),
-        sa.Column("reason", sa.String(length=256), nullable=True),
-        sa.Column("incident_id", sa.Integer(), nullable=True),
-        sa.Column("created_by", sa.Integer(), nullable=True),
-        sa.Column(
-            "created_at",
-            sa.DateTime(timezone=True),
-            server_default=sa.text("(CURRENT_TIMESTAMP)"),
-            nullable=False,
-        ),
-        sa.Column("revoked_by", sa.Integer(), nullable=True),
-        sa.Column("revoked_at", sa.DateTime(timezone=True), nullable=True),
-        sa.Column("details", sa.JSON(), nullable=True),
-        sa.PrimaryKeyConstraint("id"),
-        sa.UniqueConstraint(
-            "subject_type",
-            "subject_id",
-            "scope",
-            name="uq_subject_restriction_subject_scope",
-        ),
-    )
-    op.create_index(
-        "ix_subject_restriction_lookup",
-        "subject_restriction",
-        ["subject_type", "subject_id", "scope", "active"],
-    )
-    _add_default_role_permissions()
-
-
-def downgrade() -> None:
-    _remove_default_role_permissions()
-    op.drop_index("ix_subject_restriction_lookup", table_name="subject_restriction")
-    op.drop_table("subject_restriction")
-    op.drop_index("ix_risk_incident_subject", table_name="risk_incident")
-    op.drop_index("ix_risk_incident_rule_status", table_name="risk_incident")
-    op.drop_table("risk_incident")
-    op.drop_index("ix_behavior_event_user_time", table_name="behavior_event")
-    op.drop_index("ix_behavior_event_subject_time", table_name="behavior_event")
-    op.drop_index("ix_behavior_event_type_time", table_name="behavior_event")
-    op.drop_index("ix_behavior_event_occurred_at", table_name="behavior_event")
-    op.drop_table("behavior_event")

alembic/versions/user_manual_risk_fields.py

@@ -1,76 +0,0 @@
-"""add manual high-risk flag and note to user
-
-Revision ID: user_manual_risk_fields
-Revises: risk_monitor_generic
-"""
-from __future__ import annotations
-
-from collections.abc import Sequence
-
-import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
-from alembic import op
-
-revision: str = "user_manual_risk_fields"
-down_revision: str | None = "risk_monitor_generic"
-branch_labels: str | Sequence[str] | None = None
-depends_on: str | Sequence[str] | None = None
-
-_JSON = sa.JSON().with_variant(postgresql.JSONB(), "postgresql")
-_INVITE_WITHDRAW_PAGE = "invite-withdraws"
-
-
-def _finance_role() -> sa.TableClause:
-    return sa.table(
-        "admin_role",
-        sa.column("name", sa.String),
-        sa.column("pages", _JSON),
-    )
-
-
-def upgrade() -> None:
-    with op.batch_alter_table("user") as batch_op:
-        batch_op.add_column(
-            sa.Column(
-                "is_high_risk",
-                sa.Boolean(),
-                server_default=sa.false(),
-                nullable=False,
-            )
-        )
-        batch_op.add_column(sa.Column("high_risk_note", sa.Text(), nullable=True))
-        batch_op.create_index("ix_user_is_high_risk", ["is_high_risk"], unique=False)
-    role = _finance_role()
-    conn = op.get_bind()
-    row = conn.execute(
-        sa.select(role.c.pages).where(role.c.name == "finance")
-    ).scalar_one_or_none()
-    if row is not None and _INVITE_WITHDRAW_PAGE not in (row or []):
-        conn.execute(
-            role.update()
-            .where(role.c.name == "finance")
-            .values(pages=[*(row or []), _INVITE_WITHDRAW_PAGE])
-        )
-
-
-def downgrade() -> None:
-    role = _finance_role()
-    conn = op.get_bind()
-    row = conn.execute(
-        sa.select(role.c.pages).where(role.c.name == "finance")
-    ).scalar_one_or_none()
-    if row is not None:
-        conn.execute(
-            role.update()
-            .where(role.c.name == "finance")
-            .values(
-                pages=[
-                    page for page in (row or []) if page != _INVITE_WITHDRAW_PAGE
-                ]
-            )
-        )
-    with op.batch_alter_table("user") as batch_op:
-        batch_op.drop_index("ix_user_is_high_risk")
-        batch_op.drop_column("high_risk_note")
-        batch_op.drop_column("is_high_risk")

app/admin/main.py

@@ -17,7 +17,6 @@ from app.admin.routers.ad_audit import router as ad_audit_router
 from app.admin.routers.ad_config import router as ad_config_router
 from app.admin.routers.ad_revenue import router as ad_revenue_router
 from app.admin.routers.admins import router as admins_router
-from app.admin.routers.analytics_health import router as analytics_health_router
 from app.admin.routers.audit import router as audit_router
 from app.admin.routers.auth import router as auth_router
 from app.admin.routers.comparison import router as comparison_router
@@ -26,6 +25,8 @@ from app.admin.routers.coupon_data import router as coupon_data_router
 from app.admin.routers.cps import router as cps_router
 from app.admin.routers.dashboard import router as dashboard_router
 from app.admin.routers.device_liveness import router as device_liveness_router
+from app.admin.routers.ops_stat_config import router as ops_stat_config_router
+from app.admin.routers.analytics_health import router as analytics_health_router
 from app.admin.routers.event_logs import router as event_logs_router
 from app.admin.routers.feedback import router as feedback_router
 from app.admin.routers.feedback_qr import router as feedback_qr_router
@@ -33,9 +34,7 @@ from app.admin.routers.guide_video import router as guide_video_router
 from app.admin.routers.huawei_review import router as huawei_review_router
 from app.admin.routers.onboarding import router as onboarding_router
 from app.admin.routers.ops_marquee_seed import router as ops_marquee_seed_router
-from app.admin.routers.ops_stat_config import router as ops_stat_config_router
 from app.admin.routers.price_report import router as price_report_router
-from app.admin.routers.risk_monitor import router as risk_monitor_router
 from app.admin.routers.roles import router as roles_router
 from app.admin.routers.users import router as users_router
 from app.admin.routers.wallet import router as wallet_router
@@ -102,7 +101,6 @@ admin_app.include_router(onboarding_router)
 admin_app.include_router(wallet_router)
 admin_app.include_router(withdraw_router)
 admin_app.include_router(price_report_router)
-admin_app.include_router(risk_monitor_router)
 admin_app.include_router(feedback_router)
 admin_app.include_router(event_logs_router)
 admin_app.include_router(analytics_health_router)

app/admin/permissions.py

@@ -23,8 +23,7 @@ PERMISSION_CATALOG: list[dict] = [
         {"key": "cps", "label": "CPS收益"},
     ]},
     {"group": "奖励审核", "pages": [
-        {"key": "invite-withdraws", "label": "邀请提现审核"},
-        {"key": "withdraws", "label": "其他提现审核"},
+        {"key": "withdraws", "label": "提现审核"},
         {"key": "price-reports", "label": "低价审核"},
         {"key": "feedbacks", "label": "用户反馈"},
     ]},
@@ -35,7 +34,6 @@ PERMISSION_CATALOG: list[dict] = [
         {"key": "users", "label": "用户管理"},
     ]},
     {"group": "监控审计", "pages": [
-        {"key": "risk-monitor", "label": "风控监控"},
         {"key": "device-liveness", "label": "设备存活"},
         {"key": "analytics-health", "label": "埋点成功率"},
         {"key": "event-logs", "label": "埋点日志"},
@@ -57,13 +55,13 @@ BUILTIN_ROLES: list[dict] = [
     {"name": SUPER_ADMIN_ROLE, "label": "管理员", "pages": []},
     {"name": "operator", "label": "运营", "pages": [
         "dashboard", "coupon-data", "ad-revenue-report", "comparison-records",
-        "cps", "risk-monitor", "device-liveness", "price-reports", "feedbacks", "huawei-review",
+        "cps", "device-liveness", "price-reports", "feedbacks", "huawei-review",
     ]},
     {"name": "finance", "label": "财务", "pages": [
-        "dashboard", "ad-revenue-report", "cps", "invite-withdraws", "withdraws",
+        "dashboard", "ad-revenue-report", "cps", "withdraws",
     ]},
     {"name": "tech", "label": "技术", "pages": [
-        "dashboard", "risk-monitor", "device-liveness", "analytics-health", "config", "ad-revenue", "huawei-review",
+        "dashboard", "device-liveness", "analytics-health", "config", "ad-revenue", "huawei-review",
         "event-logs", "audit-logs",
     ]},
 ]

app/admin/repositories/ad_audit.py

@@ -12,11 +12,10 @@
 """
 from __future__ import annotations
 
-from sqlalchemy import func, or_, select
+from sqlalchemy import func, select
 from sqlalchemy.orm import Session
 
 from app.core import rewards
-from app.models.ad_ecpm import AdEcpmRecord
 from app.models.ad_feed_reward import AdFeedRewardRecord
 from app.models.ad_reward import AdRewardRecord
 from app.repositories.ad_feed_reward import FEED_REWARD_UNIT_SECONDS
@@ -56,21 +55,10 @@ def _reward_video_rows(
     if user_id is not None:
         stmt = stmt.where(AdRewardRecord.user_id == user_id)
 
-    records = list(db.execute(stmt).scalars())
-    # S2S 发奖回调不携带实际填充 ADN；用相同用户和 ad_session_id 的展示记录回填。
-    session_ids = {record.ad_session_id for record in records if record.ad_session_id}
-    impression_by_session = {
-        (record.user_id, record.ad_session_id): record
-        for record in db.execute(
-            select(AdEcpmRecord).where(AdEcpmRecord.ad_session_id.in_(session_ids))
-        ).scalars()
-    } if session_ids else {}
-
     # 用本日之前的累计份数做起点,当日 granted 在其上继续递增 → 与 _granted_cumulative+1 对齐
     granted_n: dict[int, int] = _prior_granted_counts(db, date=date, user_id=user_id)
     rows: list[dict] = []
-    for rec in records:
-        impression = impression_by_session.get((rec.user_id, rec.ad_session_id))
+    for rec in db.execute(stmt).scalars():
         if rec.status == "granted":
             nth = granted_n.get(rec.user_id, 0) + 1
             granted_n[rec.user_id] = nth
@@ -80,8 +68,6 @@ def _reward_video_rows(
                 "record_id": rec.id,
                 "user_id": rec.user_id,
                 "ad_session_id": rec.ad_session_id,
-                "adn": impression.adn if impression is not None else None,
-                "slot_id": impression.slot_id if impression is not None else None,
                 "app_env": rec.app_env,
                 "our_code_id": rec.our_code_id,
                 "created_at": rec.created_at,
@@ -104,8 +90,6 @@ def _reward_video_rows(
                 "record_id": rec.id,
                 "user_id": rec.user_id,
                 "ad_session_id": rec.ad_session_id,
-                "adn": impression.adn if impression is not None else None,
-                "slot_id": impression.slot_id if impression is not None else None,
                 "app_env": rec.app_env,
                 "our_code_id": rec.our_code_id,
                 "created_at": rec.created_at,
@@ -165,78 +149,6 @@ def _feed_scene_matches(rec: AdFeedRewardRecord, scene: str | None) -> bool:
     return True
 
 
-def _nonblank(value: str | None) -> str | None:
-    value = value.strip() if value else None
-    return value or None
-
-
-def _unique_ad_source(records: list[AdEcpmRecord]) -> tuple[str | None, str | None]:
-    """仅在候选展示记录指向唯一 ADN 时回填来源，避免错误归因。"""
-    adns = {_nonblank(record.adn) for record in records}
-    adns.discard(None)
-    if len(adns) != 1:
-        return None, None
-
-    slots = {_nonblank(record.slot_id) for record in records}
-    slots.discard(None)
-    return next(iter(adns)), next(iter(slots)) if len(slots) == 1 else None
-
-
-def _feed_source_fallbacks(
-    db: Session, records: list[AdFeedRewardRecord]
-) -> tuple[
-    dict[tuple[int, str], tuple[str | None, str | None]],
-    dict[tuple[int, str, str], tuple[str | None, str | None]],
-]:
-    """为旧信息流发奖记录构建安全来源索引。"""
-    session_ids = {record.ad_session_id for record in records if record.ad_session_id}
-    trace_ids = {record.trace_id for record in records if record.trace_id}
-    if not session_ids and not trace_ids:
-        return {}, {}
-
-    filters = []
-    if session_ids:
-        filters.append(AdEcpmRecord.ad_session_id.in_(session_ids))
-    if trace_ids:
-        filters.append(AdEcpmRecord.trace_id.in_(trace_ids))
-    impressions = list(db.execute(select(AdEcpmRecord).where(or_(*filters))).scalars())
-
-    by_session: dict[tuple[int, str], list[AdEcpmRecord]] = {}
-    by_trace_ecpm: dict[tuple[int, str, str], list[AdEcpmRecord]] = {}
-    for impression in impressions:
-        if impression.ad_session_id:
-            by_session.setdefault((impression.user_id, impression.ad_session_id), []).append(impression)
-        if impression.trace_id:
-            by_trace_ecpm.setdefault(
-                (impression.user_id, impression.trace_id, impression.ecpm_raw), []
-            ).append(impression)
-
-    return (
-        {key: _unique_ad_source(value) for key, value in by_session.items()},
-        {key: _unique_ad_source(value) for key, value in by_trace_ecpm.items()},
-    )
-
-
-def _feed_source(
-    record: AdFeedRewardRecord,
-    *,
-    by_session: dict[tuple[int, str], tuple[str | None, str | None]],
-    by_trace_ecpm: dict[tuple[int, str, str], tuple[str | None, str | None]],
-) -> tuple[str | None, str | None]:
-    """返回本条发奖广告的来源；无唯一证据时保留原始空值。"""
-    adn, slot_id = _nonblank(record.adn), _nonblank(record.slot_id)
-    if adn and slot_id:
-        return adn, slot_id
-
-    candidate = by_session.get((record.user_id, record.ad_session_id or ""))
-    if candidate is None and record.trace_id:
-        candidate = by_trace_ecpm.get((record.user_id, record.trace_id, record.ecpm_raw))
-    if candidate is None:
-        return adn, slot_id
-    candidate_adn, candidate_slot_id = candidate
-    return adn or candidate_adn, slot_id or candidate_slot_id
-
-
 def _feed_rows(
     db: Session, *, date: str, user_id: int | None, scene: str | None = None
 ) -> list[dict]:
@@ -255,17 +167,11 @@ def _feed_rows(
     if user_id is not None:
         stmt = stmt.where(AdFeedRewardRecord.user_id == user_id)
 
-    records = list(db.execute(stmt).scalars())
-    by_session, by_trace_ecpm = _feed_source_fallbacks(db, records)
-
     # 本日之前的累计**条数**做起点,与发奖侧 granted_unit_total(COUNT granted)对齐
     granted_count: dict[int, int] = _feed_prior_granted_count(db, date=date, user_id=user_id)
     rows: list[dict] = []
-    for rec in records:
+    for rec in db.execute(stmt).scalars():
         keep = _feed_scene_matches(rec, scene)  # 累计照常推进,这里只决定是否展示本行
-        adn, slot_id = _feed_source(
-            rec, by_session=by_session, by_trace_ecpm=by_trace_ecpm
-        )
         if rec.status == "granted":
             # 一条广告 = 1 份(与 grant_feed_reward 同口径:看满一份即发该条满额,不按 unit_count 累加)。
             # nth = 账号累计第几**条**(含本日之前),与发奖侧 granted_unit_total+1 对齐;累计照常推进
@@ -282,8 +188,6 @@ def _feed_rows(
                 "record_id": rec.id,
                 "user_id": rec.user_id,
                 "ad_session_id": rec.ad_session_id,
-                "adn": adn,
-                "slot_id": slot_id,
                 "trace_id": rec.trace_id,
                 "app_env": rec.app_env,
                 "our_code_id": rec.our_code_id,
@@ -310,8 +214,6 @@ def _feed_rows(
                 "record_id": rec.id,
                 "user_id": rec.user_id,
                 "ad_session_id": rec.ad_session_id,
-                "adn": adn,
-                "slot_id": slot_id,
                 "trace_id": rec.trace_id,
                 "app_env": rec.app_env,
                 "our_code_id": rec.our_code_id,

app/admin/repositories/ad_revenue.py

@@ -96,11 +96,7 @@ _REWARD_DETAIL_KEYS = (
 
 def _reward_detail(row: dict) -> dict:
     """从 audit 行抽出发奖复算明细(给前端展开行渲染因子1/因子2/份数/LT/应发实发)。"""
-    detail = {key: row[key] for key in _REWARD_DETAIL_KEYS}
-    # 聚合父行可能包含多个 ADN，来源必须保留在每一条发奖明细上。
-    detail["adn"] = row.get("adn")
-    detail["slot_id"] = row.get("slot_id")
-    return detail
+    return {k: row[k] for k in _REWARD_DETAIL_KEYS}
 
 
 def ad_revenue_report(
@@ -248,8 +244,8 @@ def ad_revenue_report(
                 "impressions": 0,
                 "ecpm": row["ecpm"],
                 "revenue_yuan": 0.0,
-                "adn": row.get("adn"),
-                "slot_id": row.get("slot_id"),
+                "adn": None,
+                "slot_id": None,
                 "has_reward": True,
                 "status": row["status"],
                 "expected_coin": int(row["expected_coin"]),
@@ -431,38 +427,6 @@ def ad_revenue_report(
         for k, v in type_map.items()
     }
 
-    # 经营看板的两类 eCPM 必须按真实展示的 SDK eCPM 加权，不能用发奖状态修正后的
-    # 收益反推。Draw 包含新 draw 与历史 feed；看视频包含福利与提现视频。
-    category_map: dict[str, dict] = {}
-    for event in events:
-        category = (
-            "draw" if event["ad_type"] in {"draw", "feed"}
-            else "video" if event["ad_type"] in {"reward_video", "withdrawal_video"}
-            else None
-        )
-        if category is None:
-            continue
-        stat = category_map.setdefault(category, {
-            "impressions": 0,
-            "revenue_yuan": 0.0,
-            "ecpm_fen_sum": 0.0,
-        })
-        impressions = int(event["impressions"])
-        stat["impressions"] += impressions
-        stat["revenue_yuan"] += event["revenue_yuan"]
-        stat["ecpm_fen_sum"] += rewards.parse_ecpm_fen(event["ecpm"]) * impressions
-    category_stats = {
-        key: {
-            "impressions": value["impressions"],
-            "revenue_yuan": round(value["revenue_yuan"], 6),
-            "ecpm_yuan": round(
-                value["ecpm_fen_sum"] / value["impressions"] / 100.0,
-                6,
-            ) if value["impressions"] else 0.0,
-        }
-        for key, value in category_map.items()
-    }
-
     # 分场景小计(按 feed_scene:展示条数 + 预估收益),同 type_stats 基于全量 events——
     # 供数据大盘「领券广告 / 比价广告」卡用。此前大盘是在分页 items 里按 feed_scene 现算,
     # 2026-07-02 起信息流逐条展示行(唯一带收益 + 场景的行)不再进主表 items,现算恒为 0;
@@ -517,7 +481,6 @@ def ad_revenue_report(
         "daily": daily,
         "hourly": hourly,
         "type_stats": type_stats,
-        "category_stats": category_stats,
         "scene_stats": scene_stats,
         "dau": dau,
         "items": main_rows[offset:offset + limit],

app/admin/repositories/mutations.py

@@ -44,25 +44,6 @@ def set_user_debug_trace(
     return user
 
 
-def set_user_risk(
-    db: Session,
-    user: User,
-    *,
-    is_high_risk: bool,
-    note: str | None,
-    commit: bool = True,
-) -> User:
-    """设置人工风险结论和备注，支持与审计日志共用同一事务。"""
-    user.is_high_risk = is_high_risk
-    user.high_risk_note = note.strip() if is_high_risk and note else None
-    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:

app/admin/repositories/queries.py

@@ -9,7 +9,7 @@ from datetime import date, datetime, time, timedelta, timezone
 from decimal import ROUND_HALF_UP, Decimal
 from zoneinfo import ZoneInfo
 
-from sqlalchemy import Select, and_, asc, case, desc, func, or_, select
+from sqlalchemy import Select, asc, case, desc, func, or_, select
 from sqlalchemy.orm import Session
 
 from app.core import rewards
@@ -22,15 +22,14 @@ from app.models.comparison import ComparisonRecord
 from app.models.coupon_state import CouponPromptEngagement
 from app.models.device import DeviceLiveness
 from app.models.feedback import Feedback
-from app.models.invite import InviteRelation
 from app.models.onboarding import OnboardingCompletion
 from app.models.price_report import PriceReport
-from app.models.savings import SavingsRecord
 from app.models.user import User
 from app.models.wallet import (
     CashTransaction,
     CoinAccount,
     CoinTransaction,
+    InviteCashTransaction,
     WithdrawOrder,
 )
 from app.repositories import activity, ad_ecpm
@@ -46,106 +45,6 @@ _FEED_SCENE_LABEL = {
 }
 
 
-_DEVICE_MARKETING_NAMES = {
-    "23078RKD5C": "Redmi K60 至尊版",
-    "M2012K11AC": "Redmi K40",
-    "PJA110": "一加 Ace 2 Pro",
-    "PPG-AN00": "荣耀 GT Pro",
-    "V2166BA": "vivo Y77e",
-    "V2309A": "vivo X100",
-}
-
-
-def _device_marketing_name(model: str | None) -> str | None:
-    """把线上已知 Build.MODEL 编码转成用户可识别的商品名。"""
-    if not model:
-        return None
-    return _DEVICE_MARKETING_NAMES.get(model.strip().upper())
-
-
-def _attach_comparison_order_status(db: Session, items: list[ComparisonRecord]) -> None:
-    """按 C 端既有口径给比价记录批量补充是否真实下单。"""
-    user_ids = {item.user_id for item in items if item.user_id is not None}
-    shop_names = {item.store_name for item in items if item.store_name}
-    ordered_pairs: set[tuple[int, str]] = set()
-    if user_ids and shop_names:
-        rows = db.execute(
-            select(SavingsRecord.user_id, SavingsRecord.shop_name)
-            .where(
-                SavingsRecord.user_id.in_(user_ids),
-                SavingsRecord.source == "compare",
-                SavingsRecord.shop_name.in_(shop_names),
-            )
-            .distinct()
-        ).all()
-        ordered_pairs = {
-            (row.user_id, row.shop_name)
-            for row in rows
-            if row.shop_name is not None
-        }
-    for item in items:
-        item.ordered = bool(
-            item.user_id is not None
-            and item.store_name
-            and (item.user_id, item.store_name) in ordered_pairs
-        )
-
-
-def _attach_comparison_device_details(items: list[ComparisonRecord]) -> None:
-    """给比价记录补充可读机型名，同时保留原始设备编码。"""
-    for item in items:
-        item.device_model_name = _device_marketing_name(item.device_model)
-
-
-def _attach_feedback_device_details(db: Session, feedbacks: list[Feedback]) -> None:
-    """按同一用户、同一设备编码及提交时间补齐厂商和 ROM 大版本。"""
-    candidates = [
-        item for item in feedbacks if item.device_model and item.device_model.strip()
-    ]
-    for item in candidates:
-        item.device_model_name = _device_marketing_name(item.device_model)
-        item.device_manufacturer = None
-        item.rom_version = None
-    if not candidates:
-        return
-
-    ranked = (
-        select(
-            Feedback.id.label("feedback_id"),
-            ComparisonRecord.device_manufacturer.label("device_manufacturer"),
-            ComparisonRecord.rom_version.label("rom_version"),
-            func.row_number()
-            .over(
-                partition_by=Feedback.id,
-                order_by=(
-                    ComparisonRecord.created_at.desc(),
-                    ComparisonRecord.id.desc(),
-                ),
-            )
-            .label("row_num"),
-        )
-        .join(
-            ComparisonRecord,
-            and_(
-                ComparisonRecord.user_id == Feedback.user_id,
-                ComparisonRecord.device_model == Feedback.device_model,
-                ComparisonRecord.created_at <= Feedback.created_at,
-            ),
-        )
-        .where(Feedback.id.in_([item.id for item in candidates]))
-        .subquery()
-    )
-    details = {
-        row.feedback_id: row
-        for row in db.execute(select(ranked).where(ranked.c.row_num == 1)).all()
-    }
-
-    for item in candidates:
-        detail = details.get(item.id)
-        item.device_manufacturer = detail.device_manufacturer if detail else None
-        item.rom_version = detail.rom_version if detail else None
-
-
 def cursor_paginate(
     db: Session, stmt: Select, id_col, *, limit: int, cursor: int | None
 ) -> tuple[list, int | None]:
@@ -378,8 +277,6 @@ def list_comparison_records(
         limit=limit, cursor=cursor,
     )
     _attach_user_info(db, items)
-    _attach_comparison_order_status(db, items)
-    _attach_comparison_device_details(items)
     # 「本次比价看广告的预估收益」:按本页 trace_id 一次性聚合(同 _attach_user_info 逐页范式)。
     # ad_revenue_yuan 非 ORM 列,仅瞬态挂实例上供 AdminComparisonListItem(from_attributes)读出。
     rev = ad_ecpm.revenue_yuan_by_trace(db, [it.trace_id for it in items])
@@ -526,8 +423,6 @@ def get_comparison_record(db: Session, record_id: int) -> ComparisonRecord | Non
     rec = db.get(ComparisonRecord, record_id)
     if rec is not None:
         _attach_user_info(db, [rec])
-        _attach_comparison_order_status(db, [rec])
-        _attach_comparison_device_details([rec])
     return rec
 
 
@@ -815,7 +710,16 @@ def list_all_withdraw_orders(
     elif quick_filter == "today":
         stmt = stmt.where(WithdrawOrder.created_at >= today_start)
     elif quick_filter == "high_risk":
-        stmt = stmt.where(User.is_high_risk.is_(True))
+        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,
@@ -841,9 +745,7 @@ def _as_utc(value: datetime) -> datetime:
     return value.astimezone(timezone.utc)
 
 
-def withdraw_list_enrichment(
-    db: Session, user_ids: list[int], *, source: str | None = None
-) -> dict[int, dict]:
+def withdraw_list_enrichment(db: Session, user_ids: list[int]) -> dict[int, dict]:
     """批量富化提现单列表:按本页 user_id 取 手机号/昵称 + 各自累计成功提现金额(分)。
 
     两条聚合查询搞定(避免逐行 N+1)。累计口径与 get_user_overview 的 withdraw_success_cents
@@ -853,32 +755,25 @@ def withdraw_list_enrichment(
     uniq = list(set(user_ids))
     if not uniq:
         return {}
-    success_stmt = select(
-        WithdrawOrder.user_id,
-        func.coalesce(func.sum(WithdrawOrder.amount_cents), 0),
-    ).where(WithdrawOrder.user_id.in_(uniq), WithdrawOrder.status == "success")
-    if source:
-        success_stmt = success_stmt.where(WithdrawOrder.source == source)
-    success_rows = db.execute(success_stmt.group_by(WithdrawOrder.user_id)).all()
+    success_rows = db.execute(
+        select(
+            WithdrawOrder.user_id,
+            func.coalesce(func.sum(WithdrawOrder.amount_cents), 0),
+        )
+        .where(WithdrawOrder.user_id.in_(uniq), WithdrawOrder.status == "success")
+        .group_by(WithdrawOrder.user_id)
+    ).all()
     success_map = {uid: int(total) for uid, total in success_rows}
     users = db.execute(
-        select(
-            User.id,
-            User.phone,
-            User.nickname,
-            User.is_high_risk,
-            User.high_risk_note,
-        ).where(User.id.in_(uniq))
+        select(User.id, User.phone, User.nickname).where(User.id.in_(uniq))
     ).all()
     return {
         uid: {
             "phone": phone,
             "nickname": nickname,
-            "is_high_risk": is_high_risk,
-            "high_risk_note": high_risk_note,
             "cumulative_success_cents": success_map.get(uid, 0),
         }
-        for uid, phone, nickname, is_high_risk, high_risk_note in users
+        for uid, phone, nickname in users
     }
 
 
@@ -922,7 +817,6 @@ def list_feedbacks(
         db, stmt, (order_fn(sort_col), id_order), limit=limit, cursor=cursor
     )
     _attach_user_info(db, items)  # 列表展示完整手机号(点手机号查该用户全部反馈)
-    _attach_feedback_device_details(db, items)
     return items, next_cursor, total
 
 
@@ -985,16 +879,15 @@ def get_withdraw_by_out_bill_no(db: Session, out_bill_no: str) -> WithdrawOrder
     ).scalar_one_or_none()
 
 
-def withdraw_summary(db: Session, *, source: str | None = None) -> dict:
-    """提现审核台顶部统计。金额单位:分；口径与列表的 source 筛选一致。"""
-    summary_stmt = select(
-        WithdrawOrder.status,
-        func.count(WithdrawOrder.id),
-        func.coalesce(func.sum(WithdrawOrder.amount_cents), 0),
-    )
-    if source:
-        summary_stmt = summary_stmt.where(WithdrawOrder.source == source)
-    rows = db.execute(summary_stmt.group_by(WithdrawOrder.status)).all()
+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
@@ -1007,154 +900,31 @@ def withdraw_summary(db: Session, *, source: str | None = None) -> dict:
     )
 
     def _today_count(status: str) -> int:
-        stmt = select(func.count(WithdrawOrder.id)).where(
-            WithdrawOrder.status == status,
+        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,
         )
-        if source:
-            stmt = stmt.where(WithdrawOrder.source == source)
-        return db.execute(stmt).scalar_one()
-
-    today_success_amount_stmt = select(
-        func.coalesce(func.sum(WithdrawOrder.amount_cents), 0)
-    ).where(
-        WithdrawOrder.status == "success",
-        WithdrawOrder.updated_at >= today_start,
-    )
-    if source:
-        today_success_amount_stmt = today_success_amount_stmt.where(
-            WithdrawOrder.source == source
-        )
-    today_success_amount = db.execute(today_success_amount_stmt).scalar_one()
-
-    def _status_count(status: str) -> int:
-        return by_status.get(status, {}).get("count", 0)
+    ).scalar_one()
 
     return {
-        "reviewing_count": _status_count("reviewing"),
+        "reviewing_count": by_status.get("reviewing", {}).get("count", 0),
         "reviewing_amount_cents": by_status.get("reviewing", {}).get("amount_cents", 0),
-        "pending_count": _status_count("pending"),
-        "success_count": _status_count("success"),
-        "rejected_count": _status_count("rejected"),
-        "failed_count": _status_count("failed"),
-        "total_count": sum(item["count"] for item in by_status.values()),
+        "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 invite_overview(
-    db: Session,
-    inviter_user_id: int,
-    *,
-    date_from: datetime | None = None,
-    date_to: datetime | None = None,
-) -> dict:
-    """邀请提现详情：邀请关系统计及受邀用户首次比价/首单信息。
-
-    首次记录按自增 id 取最早一条，批量查询避免按受邀用户逐行查询。
-    邀请成功口径为完成首次比价并已发邀请奖励(compare_reward_granted)。
-    """
-    relation_stmt = (
-        select(InviteRelation, User)
-        .join(User, User.id == InviteRelation.invitee_user_id)
-        .where(InviteRelation.inviter_user_id == inviter_user_id)
-        .order_by(InviteRelation.created_at.asc(), InviteRelation.id.asc())
-    )
-    if date_from is not None:
-        relation_stmt = relation_stmt.where(User.created_at >= _as_utc_naive(date_from))
-    if date_to is not None:
-        relation_stmt = relation_stmt.where(User.created_at <= _as_utc_naive(date_to))
-    relation_rows = db.execute(relation_stmt).all()
-    invitee_ids = [relation.invitee_user_id for relation, _ in relation_rows]
-    if not invitee_ids:
-        return {"invite_total": 0, "invite_success_total": 0, "items": []}
-
-    first_compare_ids = list(
-        db.execute(
-            select(func.min(ComparisonRecord.id))
-            .where(
-                ComparisonRecord.user_id.in_(invitee_ids),
-                ComparisonRecord.status == "success",
-            )
-            .group_by(ComparisonRecord.user_id)
-        ).scalars()
-    )
-    comparisons = (
-        db.execute(
-            select(
-                ComparisonRecord.user_id,
-                ComparisonRecord.store_name,
-                ComparisonRecord.product_names,
-            ).where(ComparisonRecord.id.in_(first_compare_ids))
-        ).all()
-        if first_compare_ids
-        else []
-    )
-    comparison_map = {
-        user_id: (store_name, product_names)
-        for user_id, store_name, product_names in comparisons
-    }
-
-    first_order_ids = list(
-        db.execute(
-            select(func.min(SavingsRecord.id))
-            .where(
-                SavingsRecord.user_id.in_(invitee_ids),
-                SavingsRecord.source == "compare",
-            )
-            .group_by(SavingsRecord.user_id)
-        ).scalars()
-    )
-    orders = (
-        db.execute(
-            select(
-                SavingsRecord.user_id,
-                SavingsRecord.shop_name,
-                SavingsRecord.title,
-                SavingsRecord.dishes,
-                SavingsRecord.order_amount_cents,
-            ).where(SavingsRecord.id.in_(first_order_ids))
-        ).all()
-        if first_order_ids
-        else []
-    )
-    order_map = {
-        user_id: (
-            shop_name,
-            title or "、".join(dishes or []),
-            order_amount_cents,
-        )
-        for user_id, shop_name, title, dishes, order_amount_cents in orders
-    }
-
-    items = []
-    for relation, user in relation_rows:
-        compare_store, compare_products = comparison_map.get(user.id, (None, None))
-        order_store, order_products, order_amount = order_map.get(
-            user.id, (None, None, None)
-        )
-        items.append(
-            {
-                "user_id": user.id,
-                "phone": user.phone,
-                "registered_at": user.created_at,
-                "invite_success": bool(relation.compare_reward_granted),
-                "first_compare_store": compare_store,
-                "first_compare_products": compare_products,
-                "first_order_store": order_store,
-                "first_order_products": order_products,
-                "first_order_amount_cents": order_amount,
-            }
-        )
-    return {
-        "invite_total": len(items),
-        "invite_success_total": sum(1 for item in items if item["invite_success"]),
-        "items": items,
-    }
-
-
 def list_withdraw_audit_logs(
     db: Session, out_bill_no: str, *, limit: int = 20
 ) -> list[AdminAuditLog]:
@@ -1175,6 +945,8 @@ def withdraw_risk_flags(
     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:
@@ -1197,6 +969,125 @@ def withdraw_risk_flags(
     return flags, score
 
 
+def _check_withdraw_ledger_side(
+    orders: list[WithdrawOrder], txns: list, *, withdraw_biz: str, refund_biz: str
+) -> dict:
+    """对某一本账(普通现金 / 邀请奖励金)做提现单 ↔ 流水的交叉校验。
+
+    orders 已按 source 过滤到本账;txns 是本账流水表里 withdraw_biz/refund_biz 两类流水。
+    规则:每单发起应有一条扣款流水(ref_id=out_bill_no);失败/拒绝单应有且仅一条退款流水;
+    非退款终态不应出现退款流水。四个计数全为 0 即本账自洽。
+    """
+    withdraw_refs = {txn.ref_id for txn in txns if txn.biz_type == withdraw_biz}
+    refund_counts: dict[str, int] = {}
+    for txn in txns:
+        if txn.biz_type == refund_biz 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
+
+    return {
+        "missing_withdraw": missing_withdraw,
+        "missing_refund": missing_refund,
+        "duplicate_refund": sum(1 for count in refund_counts.values() if count > 1),
+        "refund_on_non_terminal": refund_on_non_terminal,
+    }
+
+
+def withdraw_ledger_check(db: Session) -> dict:
+    """现金账本校验:两本物理隔离的账各自对账(产品红线:coin_cash / invite_cash 不串)。
+
+    普通现金:CoinAccount.cash_balance_cents ↔ cash_transaction(withdraw/withdraw_refund);
+    邀请奖励金:CoinAccount.invite_cash_balance_cents ↔ invite_cash_transaction
+              (invite_withdraw/invite_withdraw_refund)。
+    提现单按 source 分流到对应账核对——邀请提现的流水写在 invite_cash_transaction 表,
+    绝不能拿去和普通现金流水比(否则每笔邀请提现单都会被误报「缺扣款/缺退款流水」)。
+    分流口径与 create_withdraw 一致:仅 source==invite_cash 走邀请账,其余(含历史空值)归普通现金。
+    """
+    orders = list(db.execute(select(WithdrawOrder)).scalars().all())
+    coin_orders = [o for o in orders if o.source != "invite_cash"]
+    invite_orders = [o for o in orders if o.source == "invite_cash"]
+
+    # —— 普通现金账(coin_cash) ——
+    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()
+    )
+    cash_txns = list(
+        db.execute(
+            select(CashTransaction).where(
+                CashTransaction.biz_type.in_(("withdraw", "withdraw_refund"))
+            )
+        ).scalars().all()
+    )
+    coin = _check_withdraw_ledger_side(
+        coin_orders, cash_txns, withdraw_biz="withdraw", refund_biz="withdraw_refund"
+    )
+    cash_diff = cash_balance_total - cash_txn_total
+
+    # —— 邀请奖励金账(invite_cash,独立账户 + 独立流水表) ——
+    invite_balance_total = int(
+        db.execute(
+            select(func.coalesce(func.sum(CoinAccount.invite_cash_balance_cents), 0))
+        ).scalar_one()
+    )
+    invite_txn_total = int(
+        db.execute(
+            select(func.coalesce(func.sum(InviteCashTransaction.amount_cents), 0))
+        ).scalar_one()
+    )
+    invite_txns = list(
+        db.execute(
+            select(InviteCashTransaction).where(
+                InviteCashTransaction.biz_type.in_(("invite_withdraw", "invite_withdraw_refund"))
+            )
+        ).scalars().all()
+    )
+    invite = _check_withdraw_ledger_side(
+        invite_orders, invite_txns,
+        withdraw_biz="invite_withdraw", refund_biz="invite_withdraw_refund",
+    )
+    invite_diff = invite_balance_total - invite_txn_total
+
+    ok = (
+        cash_diff == 0
+        and invite_diff == 0
+        and all(v == 0 for v in coin.values())
+        and all(v == 0 for v in invite.values())
+    )
+    return {
+        "ok": ok,
+        # 普通现金账(coin_cash:金币兑换的现金)
+        "cash_balance_total_cents": cash_balance_total,
+        "cash_transaction_total_cents": cash_txn_total,
+        "balance_diff_cents": cash_diff,
+        "missing_withdraw_txn_count": coin["missing_withdraw"],
+        "missing_refund_txn_count": coin["missing_refund"],
+        "duplicate_refund_txn_count": coin["duplicate_refund"],
+        "refund_txn_on_non_terminal_count": coin["refund_on_non_terminal"],
+        # 邀请奖励金账(invite_cash:与普通现金物理隔离,各自对账)
+        "invite_cash_balance_total_cents": invite_balance_total,
+        "invite_cash_transaction_total_cents": invite_txn_total,
+        "invite_balance_diff_cents": invite_diff,
+        "invite_missing_withdraw_txn_count": invite["missing_withdraw"],
+        "invite_missing_refund_txn_count": invite["missing_refund"],
+        "invite_duplicate_refund_txn_count": invite["duplicate_refund"],
+        "invite_refund_txn_on_non_terminal_count": invite["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)
@@ -1256,7 +1147,6 @@ def user_reward_stats(
     *,
     date_from: datetime | None = None,
     date_to: datetime | None = None,
-    withdraw_source: str | None = None,
 ) -> dict:
     """提现详情「用户统计区」10 项。窗口作用于除「现金余额」外的所有项(余额是当前快照)。
 
@@ -1264,35 +1154,22 @@ def user_reward_stats(
     平均 eCPM 用原始分值(分/千次)按记录取算术平均;各「提现」= 该来源累计金币折现。
     传统任务 = 窗口内正向金币中,排除广告(reward_video/feed_ad_reward)与人工调整后的折现。
     """
-    withdraw_source_conds = (
-        [WithdrawOrder.source == withdraw_source] if withdraw_source else []
-    )
     wd_success = db.execute(
         select(func.coalesce(func.sum(WithdrawOrder.amount_cents), 0)).where(
             WithdrawOrder.user_id == user_id,
             WithdrawOrder.status == "success",
-            *withdraw_source_conds,
             *_window_conds(WithdrawOrder.created_at, date_from, date_to),
         )
     ).scalar_one()
     wd_total = db.execute(
         select(func.count(WithdrawOrder.id)).where(
             WithdrawOrder.user_id == user_id,
-            *withdraw_source_conds,
             *_window_conds(WithdrawOrder.created_at, date_from, date_to),
         )
     ).scalar_one()
 
     acc = db.get(CoinAccount, user_id)  # 现金余额:当前快照,不随窗口
-    cash_balance = (
-        (
-            acc.invite_cash_balance_cents
-            if withdraw_source == "invite_cash"
-            else acc.cash_balance_cents
-        )
-        if acc
-        else 0
-    )
+    cash_balance = acc.cash_balance_cents if acc else 0
 
     # 只投影本统计实际使用的列。避免滚动发布或旧本地库尚未补齐无关新列时，
     # SQLAlchemy 因 select(ORM) 自动展开整表字段而让提现详情整体 500。
@@ -1351,11 +1228,6 @@ def _cn_wall_to_utc(dt: datetime) -> datetime:
     return dt.replace(tzinfo=rewards.CN_TZ).astimezone(timezone.utc).replace(tzinfo=None)
 
 
-def _coin_record_sort_key(row: dict) -> datetime:
-    """金币明细跨数据源排序键：兼容 SQLite naive 与 PostgreSQL aware 时间。"""
-    return _as_utc(row["created_at"])
-
-
 def user_coin_records(
     db: Session,
     user_id: int,
@@ -1447,10 +1319,7 @@ def user_coin_records(
             "coin": rec.amount,
         })
 
-    # SQLite 常返回 naive datetime，PostgreSQL timestamptz 返回 aware datetime；
-    # 统一成 aware UTC 排序，避免线上合并广告记录与签到记录时抛
-    # “can't compare offset-naive and offset-aware datetimes”。
-    rows.sort(key=_coin_record_sort_key, reverse=True)
+    rows.sort(key=lambda r: r["created_at"], reverse=True)
     has_more = len(rows) > offset + limit
 
     # 总数 = 三源在窗口内 granted 计数之和(供前端页码分页渲染页码/共 N 条)

app/admin/repositories/risk_monitor.py

@@ -1,545 +0,0 @@
-"""风控监控读模型：聚合通用行为流水、风险事件与比价记录。"""
-from __future__ import annotations
-
-from datetime import UTC, datetime, timedelta
-
-from sqlalchemy import desc, func, select
-from sqlalchemy.orm import Session
-
-from app.core.config import settings
-from app.models.comparison import ComparisonRecord
-from app.models.device import DeviceLiveness
-from app.models.risk import BehaviorEvent, RiskIncident
-from app.models.user import User
-from app.repositories import risk as risk_repo
-
-KIND_TO_RULE = {
-    "sms": risk_repo.RULE_SMS_HOURLY,
-    "oneclick": risk_repo.RULE_ONECLICK_DAILY,
-    "compare": risk_repo.RULE_COMPARE_DAILY,
-}
-RULE_TO_KIND = {rule: kind for kind, rule in KIND_TO_RULE.items()}
-
-
-def _day_bounds(now: datetime | None = None) -> tuple[str, datetime, datetime]:
-    current = (now or datetime.now(UTC)).astimezone(risk_repo.CN_TZ)
-    start = current.replace(hour=0, minute=0, second=0, microsecond=0)
-    end = start + timedelta(days=1)
-    return (
-        start.strftime("%Y-%m-%d"),
-        start.astimezone(UTC),
-        end.astimezone(UTC),
-    )
-
-
-def _compare_day_bounds(now: datetime | None = None) -> tuple[datetime, datetime]:
-    current = (now or datetime.now(UTC)).astimezone(risk_repo.CN_TZ).replace(
-        tzinfo=None
-    )
-    start = current.replace(hour=0, minute=0, second=0, microsecond=0)
-    return start, start + timedelta(days=1)
-
-
-def sync_today_compare_incidents(db: Session, now: datetime | None = None) -> None:
-    risk_repo.reconcile_compare_rule(db, at=now)
-
-
-def reset_open_alerts(
-    db: Session, *, admin_id: int, reset_at: datetime
-) -> dict[str, int]:
-    """将三类待处理报警归零，并从 reset_at 开始重新累计。"""
-    rule_codes = tuple(KIND_TO_RULE.values())
-    incidents = list(
-        db.scalars(
-            select(RiskIncident).where(
-                RiskIncident.rule_code.in_(rule_codes),
-                RiskIncident.status == "open",
-            )
-        ).all()
-    )
-    counts = {kind: 0 for kind in KIND_TO_RULE}
-    for incident in incidents:
-        incident.status = "resolved"
-        incident.action_reason = risk_repo.MANUAL_RESET_REASON
-        incident.handled_by = admin_id
-        incident.handled_at = reset_at
-        counts[RULE_TO_KIND[incident.rule_code]] += 1
-    risk_repo.reset_rule_baselines(
-        db,
-        rule_codes=rule_codes,
-        reset_at=reset_at,
-        admin_id=admin_id,
-    )
-    return counts
-
-
-def summary(db: Session, now: datetime | None = None) -> dict:
-    date_key, start, end = _day_bounds(now)
-    compare_start, compare_end = _compare_day_bounds(now)
-    current = now or datetime.now(UTC)
-    risk_repo.reconcile_behavior_rule(
-        db, rule_code=risk_repo.RULE_SMS_HOURLY, at=current, commit=False
-    )
-    risk_repo.reconcile_behavior_rule(
-        db, rule_code=risk_repo.RULE_ONECLICK_DAILY, at=current, commit=False
-    )
-    risk_repo.reconcile_compare_rule(db, at=current, commit=False)
-    db.commit()
-    sms_threshold = risk_repo.get_rule_threshold(db, risk_repo.RULE_SMS_HOURLY)
-    oneclick_threshold = risk_repo.get_rule_threshold(
-        db, risk_repo.RULE_ONECLICK_DAILY
-    )
-    compare_threshold = risk_repo.get_rule_threshold(db, risk_repo.RULE_COMPARE_DAILY)
-
-    def _behavior_total(event_type: str, outcomes: tuple[str, ...]) -> int:
-        return int(
-            db.scalar(
-                select(func.count(BehaviorEvent.id)).where(
-                    BehaviorEvent.event_type == event_type,
-                    BehaviorEvent.outcome.in_(outcomes),
-                    BehaviorEvent.occurred_at >= start,
-                    BehaviorEvent.occurred_at < end,
-                )
-            )
-            or 0
-        )
-
-    compare_total = int(
-        db.scalar(
-            select(func.count(ComparisonRecord.id)).where(
-                ComparisonRecord.created_at >= compare_start,
-                ComparisonRecord.created_at < compare_end,
-            )
-        )
-        or 0
-    )
-
-    def _open_count(rule_code: str) -> int:
-        return int(
-            db.scalar(
-                select(func.count(RiskIncident.id)).where(
-                    RiskIncident.rule_code == rule_code,
-                    RiskIncident.status == "open",
-                    RiskIncident.window_key.like(f"{date_key}%"),
-                )
-            )
-            or 0
-        )
-
-    return {
-        "date": date_key,
-        "updated_at": now or datetime.now(UTC),
-        "cards": [
-            {
-                "kind": "sms",
-                "alert_subject_count": _open_count(risk_repo.RULE_SMS_HOURLY),
-                "today_total": _behavior_total(risk_repo.EVENT_SMS_SEND, ("success",)),
-                "threshold": sms_threshold,
-                "rule_text": f"单设备 1 小时 ≥ {sms_threshold} 次",
-            },
-            {
-                "kind": "oneclick",
-                "alert_subject_count": _open_count(risk_repo.RULE_ONECLICK_DAILY),
-                "today_total": _behavior_total(
-                    risk_repo.EVENT_ONECLICK_LOGIN, ("success", "failed")
-                ),
-                "threshold": oneclick_threshold,
-                "rule_text": f"单设备当日 ≥ {oneclick_threshold} 次",
-            },
-            {
-                "kind": "compare",
-                "alert_subject_count": _open_count(risk_repo.RULE_COMPARE_DAILY),
-                "today_total": compare_total,
-                "threshold": compare_threshold,
-                "rule_text": f"单账户当日 ≥ {compare_threshold} 次",
-            },
-        ],
-    }
-
-
-def _latest_device_model(db: Session, subject_id: str) -> str | None:
-    return db.execute(
-        select(BehaviorEvent.device_model)
-        .where(
-            BehaviorEvent.subject_type == "device",
-            BehaviorEvent.subject_id == subject_id,
-            BehaviorEvent.device_model.is_not(None),
-            BehaviorEvent.device_model != "",
-        )
-        .order_by(BehaviorEvent.occurred_at.desc(), BehaviorEvent.id.desc())
-        .limit(1)
-    ).scalar_one_or_none()
-
-
-def _first_used_at(db: Session, subject_id: str) -> datetime | None:
-    behavior_first = db.scalar(
-        select(func.min(BehaviorEvent.occurred_at)).where(
-            BehaviorEvent.subject_type == "device",
-            BehaviorEvent.subject_id == subject_id,
-        )
-    )
-    registered_first = db.scalar(
-        select(func.min(DeviceLiveness.created_at)).where(
-            DeviceLiveness.device_id == subject_id
-        )
-    )
-    observed = [value for value in (behavior_first, registered_first) if value is not None]
-    if not observed:
-        return None
-
-    def _utc(value: datetime) -> datetime:
-        return value.replace(tzinfo=UTC) if value.tzinfo is None else value.astimezone(UTC)
-
-    return min(observed, key=_utc)
-
-
-def _common_device(db: Session, user_id: int, start: datetime, end: datetime) -> str | None:
-    return db.execute(
-        select(ComparisonRecord.device_id)
-        .where(
-            ComparisonRecord.user_id == user_id,
-            ComparisonRecord.device_id.is_not(None),
-            ComparisonRecord.created_at >= start,
-            ComparisonRecord.created_at < end,
-        )
-        .group_by(ComparisonRecord.device_id)
-        .order_by(func.count(ComparisonRecord.id).desc(), ComparisonRecord.device_id.asc())
-        .limit(1)
-    ).scalar_one_or_none()
-
-
-def list_incidents(
-    db: Session,
-    *,
-    kind: str,
-    status: str = "open",
-    limit: int = 20,
-    cursor: int = 0,
-) -> tuple[list[dict], int | None, int]:
-    rule_code = KIND_TO_RULE[kind]
-    stmt = select(RiskIncident).where(RiskIncident.rule_code == rule_code)
-    count_stmt = select(func.count(RiskIncident.id)).where(
-        RiskIncident.rule_code == rule_code
-    )
-    if status != "all":
-        stmt = stmt.where(RiskIncident.status == status)
-        count_stmt = count_stmt.where(RiskIncident.status == status)
-    total = int(db.scalar(count_stmt) or 0)
-    incidents = list(
-        db.scalars(
-            stmt.order_by(desc(RiskIncident.triggered_at), desc(RiskIncident.id))
-            .offset(cursor)
-            .limit(limit)
-        ).all()
-    )
-
-    user_ids = [int(i.subject_id) for i in incidents if i.subject_type == "user"]
-    users = {
-        u.id: u
-        for u in db.scalars(select(User).where(User.id.in_(user_ids))).all()
-    } if user_ids else {}
-
-    items: list[dict] = []
-    for incident in incidents:
-        item = {
-            "incident_id": incident.id,
-            "kind": kind,
-            "subject_type": incident.subject_type,
-            "subject_id": incident.subject_id,
-            "window_start": incident.window_start,
-            "window_end": incident.window_end,
-            "first_event_at": incident.first_event_at,
-            "triggered_at": incident.triggered_at,
-            "last_event_at": incident.last_event_at,
-            "event_count": incident.event_count,
-            "status": incident.status,
-        }
-        if incident.subject_type == "device":
-            restriction = risk_repo.get_active_restriction(
-                db,
-                subject_type="device",
-                subject_id=incident.subject_id,
-                scope=risk_repo.SCOPE_AUTH_DEVICE,
-            )
-            item["device_model"] = _latest_device_model(db, incident.subject_id)
-            item["first_used_at"] = _first_used_at(db, incident.subject_id)
-            item["restricted"] = restriction is not None
-            item["restriction_id"] = restriction.id if restriction else None
-        else:
-            uid = int(incident.subject_id)
-            user = users.get(uid)
-            restriction = risk_repo.get_active_restriction(
-                db,
-                subject_type="user",
-                subject_id=incident.subject_id,
-                scope=risk_repo.SCOPE_ECONOMIC_ACCOUNT,
-            )
-            item.update(
-                {
-                    "user_id": uid,
-                    "phone": user.phone if user else None,
-                    "registered_at": user.created_at if user else None,
-                    "common_device_id": _common_device(
-                        db, uid, incident.window_start, incident.window_end
-                    ),
-                    "restricted": restriction is not None,
-                    "restriction_id": restriction.id if restriction else None,
-                }
-            )
-        items.append(item)
-    next_cursor = cursor + len(items) if cursor + len(items) < total else None
-    return items, next_cursor, total
-
-
-def _page_events(
-    db: Session,
-    incident: RiskIncident,
-    *,
-    event_type: str,
-    outcomes: tuple[str, ...] | None,
-    limit: int,
-    cursor: int,
-) -> tuple[list[BehaviorEvent], int]:
-    filters = [
-        BehaviorEvent.event_type == event_type,
-        BehaviorEvent.subject_type == incident.subject_type,
-        BehaviorEvent.subject_id == incident.subject_id,
-        BehaviorEvent.occurred_at >= incident.window_start,
-        BehaviorEvent.occurred_at < incident.window_end,
-    ]
-    if outcomes:
-        filters.append(BehaviorEvent.outcome.in_(outcomes))
-    total = int(db.scalar(select(func.count(BehaviorEvent.id)).where(*filters)) or 0)
-    rows = list(
-        db.scalars(
-            select(BehaviorEvent)
-            .where(*filters)
-            .order_by(BehaviorEvent.occurred_at.desc(), BehaviorEvent.id.desc())
-            .offset(cursor)
-            .limit(limit)
-        ).all()
-    )
-    return rows, total
-
-
-def _user_map(db: Session, user_ids: set[int]) -> dict[int, User]:
-    if not user_ids:
-        return {}
-    return {u.id: u for u in db.scalars(select(User).where(User.id.in_(user_ids))).all()}
-
-
-def _distinct_event_users(
-    db: Session,
-    incident: RiskIncident,
-    *,
-    event_type: str,
-    outcomes: tuple[str, ...],
-) -> int:
-    return int(
-        db.scalar(
-            select(func.count(func.distinct(BehaviorEvent.user_id))).where(
-                BehaviorEvent.event_type == event_type,
-                BehaviorEvent.subject_type == incident.subject_type,
-                BehaviorEvent.subject_id == incident.subject_id,
-                BehaviorEvent.outcome.in_(outcomes),
-                BehaviorEvent.user_id.is_not(None),
-                BehaviorEvent.occurred_at >= incident.window_start,
-                BehaviorEvent.occurred_at < incident.window_end,
-            )
-        )
-        or 0
-    )
-
-
-def _sms_distinct_accounts(db: Session, incident: RiskIncident) -> int:
-    """统计整个告警窗口内，确实完成本设备短信验证的不同账号数。"""
-    send_rows = db.execute(
-        select(BehaviorEvent.phone, BehaviorEvent.occurred_at).where(
-            BehaviorEvent.event_type == risk_repo.EVENT_SMS_SEND,
-            BehaviorEvent.subject_type == incident.subject_type,
-            BehaviorEvent.subject_id == incident.subject_id,
-            BehaviorEvent.outcome == "success",
-            BehaviorEvent.phone.is_not(None),
-            BehaviorEvent.occurred_at >= incident.window_start,
-            BehaviorEvent.occurred_at < incident.window_end,
-        )
-    ).all()
-    phones = {phone for phone, _ in send_rows}
-    if not phones:
-        return 0
-    login_rows = db.execute(
-        select(
-            BehaviorEvent.user_id,
-            BehaviorEvent.phone,
-            BehaviorEvent.occurred_at,
-        )
-        .where(
-            BehaviorEvent.event_type == risk_repo.EVENT_SMS_LOGIN,
-            BehaviorEvent.subject_id == incident.subject_id,
-            BehaviorEvent.phone.in_(phones),
-            BehaviorEvent.user_id.is_not(None),
-            BehaviorEvent.outcome == "success",
-            BehaviorEvent.occurred_at >= incident.window_start,
-            BehaviorEvent.occurred_at
-            < incident.window_end + timedelta(seconds=settings.SMS_CODE_TTL_SEC),
-        )
-        .order_by(BehaviorEvent.occurred_at.asc(), BehaviorEvent.id.asc())
-    ).all()
-    matched_users = {
-        user_id
-        for user_id, phone, login_at in login_rows
-        if any(
-            sent_phone == phone
-            and sent_at <= login_at
-            and login_at
-            <= sent_at + timedelta(seconds=settings.SMS_CODE_TTL_SEC)
-            for sent_phone, sent_at in send_rows
-        )
-    }
-    return len(matched_users)
-
-
-def incident_details(
-    db: Session,
-    *,
-    incident: RiskIncident,
-    kind: str,
-    limit: int,
-    cursor: int,
-) -> dict:
-    if kind == "sms":
-        rows, total = _page_events(
-            db,
-            incident,
-            event_type=risk_repo.EVENT_SMS_SEND,
-            outcomes=("success",),
-            limit=limit,
-            cursor=cursor,
-        )
-        phone_values = {r.phone for r in rows if r.phone}
-        login_rows = list(
-            db.scalars(
-                select(BehaviorEvent)
-                .where(
-                    BehaviorEvent.event_type == risk_repo.EVENT_SMS_LOGIN,
-                    BehaviorEvent.subject_id == incident.subject_id,
-                    BehaviorEvent.phone.in_(phone_values),
-                    BehaviorEvent.outcome == "success",
-                    BehaviorEvent.occurred_at >= incident.window_start,
-                    BehaviorEvent.occurred_at
-                    < incident.window_end + timedelta(seconds=settings.SMS_CODE_TTL_SEC),
-                )
-                .order_by(BehaviorEvent.occurred_at.asc(), BehaviorEvent.id.asc())
-            ).all()
-        ) if phone_values else []
-        users = _user_map(db, {r.user_id for r in login_rows if r.user_id is not None})
-        items = []
-        for row in rows:
-            match = next(
-                (
-                    login
-                    for login in login_rows
-                    if login.phone == row.phone
-                    and login.occurred_at >= row.occurred_at
-                    and login.occurred_at
-                    <= row.occurred_at + timedelta(seconds=settings.SMS_CODE_TTL_SEC)
-                ),
-                None,
-            )
-            user = users.get(match.user_id) if match and match.user_id else None
-            items.append(
-                {
-                    "id": row.id,
-                    "occurred_at": row.occurred_at,
-                    "outcome": row.outcome,
-                    "phone": row.phone,
-                    "user_id": user.id if user else None,
-                    "username": user.username if user else None,
-                    "account_registered_at": user.created_at if user else None,
-                    "verified": match is not None,
-                }
-            )
-        distinct_accounts = _sms_distinct_accounts(db, incident)
-    elif kind == "oneclick":
-        rows, total = _page_events(
-            db,
-            incident,
-            event_type=risk_repo.EVENT_ONECLICK_LOGIN,
-            outcomes=("success", "failed"),
-            limit=limit,
-            cursor=cursor,
-        )
-        users = _user_map(db, {r.user_id for r in rows if r.user_id is not None})
-        items = []
-        for row in rows:
-            user = users.get(row.user_id) if row.user_id else None
-            items.append(
-                {
-                    "id": row.id,
-                    "occurred_at": row.occurred_at,
-                    "outcome": row.outcome,
-                    "phone": row.phone,
-                    "user_id": row.user_id,
-                    "username": user.username if user else None,
-                    "account_registered_at": user.created_at if user else None,
-                    "reason": row.reason,
-                }
-            )
-        distinct_accounts = _distinct_event_users(
-            db,
-            incident,
-            event_type=risk_repo.EVENT_ONECLICK_LOGIN,
-            outcomes=("success", "failed"),
-        )
-    else:
-        user_id = int(incident.subject_id)
-        filters = (
-            ComparisonRecord.user_id == user_id,
-            ComparisonRecord.created_at >= incident.window_start,
-            ComparisonRecord.created_at < incident.window_end,
-        )
-        total = int(db.scalar(select(func.count(ComparisonRecord.id)).where(*filters)) or 0)
-        rows = list(
-            db.scalars(
-                select(ComparisonRecord)
-                .where(*filters)
-                .order_by(ComparisonRecord.created_at.desc(), ComparisonRecord.id.desc())
-                .offset(cursor)
-                .limit(limit)
-            ).all()
-        )
-        items = []
-        for row in rows:
-            prices = {
-                str(result.get("platform_name") or result.get("platform_id") or "未知平台"): (
-                    float(result["price"]) if result.get("price") is not None else None
-                )
-                for result in (row.comparison_results or [])
-            }
-            items.append(
-                {
-                    "id": row.id,
-                    "occurred_at": row.created_at,
-                    "outcome": row.status,
-                    "store_name": row.store_name,
-                    "product_names": row.product_names,
-                    "prices": prices,
-                    "saved_amount_yuan": (
-                        row.saved_amount_cents / 100
-                        if row.saved_amount_cents is not None
-                        else None
-                    ),
-                    "status": row.status,
-                }
-            )
-        distinct_accounts = None
-    next_cursor = cursor + len(items) if cursor + len(items) < total else None
-    return {
-        "kind": kind,
-        "incident_id": incident.id,
-        "event_count": incident.event_count,
-        "distinct_accounts": distinct_accounts,
-        "items": items,
-        "next_cursor": next_cursor,
-        "total": total,
-    }

app/admin/routers/config.py

@@ -30,12 +30,6 @@ def _validate(key: str, value: Any) -> None:
     if t == "int":
         if not isinstance(value, int) or isinstance(value, bool) or value < 0:
             raise ValueError("需为非负整数")
-        minimum = CONFIG_DEFS[key].get("min")
-        maximum = CONFIG_DEFS[key].get("max")
-        if minimum is not None and value < minimum:
-            raise ValueError(f"不能小于 {minimum}")
-        if maximum is not None and value > maximum:
-            raise ValueError(f"不能大于 {maximum}")
     elif t == "int_list":
         if not isinstance(value, list) or not value:
             raise ValueError("需为非空整数列表")

app/admin/routers/risk_monitor.py

@@ -1,331 +0,0 @@
-"""风控监控：统计、风险事件列表/详情及忽略、封禁、解封。"""
-from __future__ import annotations
-
-from typing import Annotated, Literal
-
-from fastapi import APIRouter, Depends, HTTPException, Query, Request, status
-
-from app.admin.audit import write_audit
-from app.admin.deps import (
-    AdminDb,
-    get_client_ip,
-    require_page,
-    require_role,
-)
-from app.admin.repositories import risk_monitor as repo
-from app.admin.schemas.risk_monitor import (
-    RestrictionRevokeResponse,
-    RiskActionRequest,
-    RiskActionResponse,
-    RiskDetailPage,
-    RiskIncidentPage,
-    RiskMonitorSummary,
-    RiskResetResponse,
-    RiskRuleConfig,
-)
-from app.core.config_schema import (
-    RISK_COMPARE_DAILY_THRESHOLD_KEY,
-    RISK_ONECLICK_DAILY_THRESHOLD_KEY,
-    RISK_SMS_HOURLY_THRESHOLD_KEY,
-)
-from app.models.risk import RiskIncident, SubjectRestriction
-from app.repositories import app_config
-from app.repositories import risk as risk_repo
-
-router = APIRouter(
-    prefix="/admin/api/risk-monitor",
-    tags=["admin-risk-monitor"],
-    dependencies=[Depends(require_page("risk-monitor"))],
-)
-
-RiskKind = Literal["sms", "oneclick", "compare"]
-
-
-def _rule_config(db) -> RiskRuleConfig:
-    return RiskRuleConfig(
-        sms_hourly_threshold=risk_repo.get_rule_threshold(
-            db, risk_repo.RULE_SMS_HOURLY
-        ),
-        oneclick_daily_threshold=risk_repo.get_rule_threshold(
-            db, risk_repo.RULE_ONECLICK_DAILY
-        ),
-        compare_daily_threshold=risk_repo.get_rule_threshold(
-            db, risk_repo.RULE_COMPARE_DAILY
-        ),
-    )
-
-
-def _incident_or_404(db, incident_id: int, kind: RiskKind | None = None) -> RiskIncident:
-    incident = db.get(RiskIncident, incident_id)
-    if incident is None:
-        raise HTTPException(status_code=404, detail="风险事件不存在")
-    if kind and incident.rule_code != repo.KIND_TO_RULE[kind]:
-        raise HTTPException(status_code=404, detail="风险事件类型不匹配")
-    return incident
-
-
-@router.get("/summary", response_model=RiskMonitorSummary, summary="风控监控顶部卡片")
-def get_summary(db: AdminDb) -> RiskMonitorSummary:
-    return RiskMonitorSummary(**repo.summary(db))
-
-
-@router.get("/rules", response_model=RiskRuleConfig, summary="读取风控规则阈值")
-def get_rules(db: AdminDb) -> RiskRuleConfig:
-    return _rule_config(db)
-
-
-@router.patch("/rules", response_model=RiskRuleConfig, summary="修改风控规则并即时重算")
-def update_rules(
-    body: RiskRuleConfig,
-    request: Request,
-    admin: Annotated[object, Depends(require_role("operator", "tech"))],
-    db: AdminDb,
-) -> RiskRuleConfig:
-    before = _rule_config(db).model_dump()
-    after = body.model_dump()
-    values = (
-        (RISK_SMS_HOURLY_THRESHOLD_KEY, body.sms_hourly_threshold),
-        (RISK_ONECLICK_DAILY_THRESHOLD_KEY, body.oneclick_daily_threshold),
-        (RISK_COMPARE_DAILY_THRESHOLD_KEY, body.compare_daily_threshold),
-    )
-    for key, value in values:
-        app_config.set_value(
-            db, key, value, admin_id=admin.id, commit=False
-        )
-
-    now = risk_repo.utcnow()
-    risk_repo.reconcile_behavior_rule(
-        db, rule_code=risk_repo.RULE_SMS_HOURLY, at=now, commit=False
-    )
-    risk_repo.reconcile_behavior_rule(
-        db, rule_code=risk_repo.RULE_ONECLICK_DAILY, at=now, commit=False
-    )
-    risk_repo.reconcile_compare_rule(db, at=now, commit=False)
-    write_audit(
-        db,
-        admin,
-        action="risk.rules.update",
-        target_type="risk_rule",
-        target_id="all",
-        detail={"before": before, "after": after},
-        ip=get_client_ip(request),
-        commit=False,
-    )
-    db.commit()
-    return _rule_config(db)
-
-
-@router.post(
-    "/reset",
-    response_model=RiskResetResponse,
-    summary="重置三类待处理报警并从零重新累计",
-)
-def reset_alerts(
-    request: Request,
-    admin: Annotated[object, Depends(require_role("operator", "tech"))],
-    db: AdminDb,
-) -> RiskResetResponse:
-    reset_at = risk_repo.utcnow()
-    counts = repo.reset_open_alerts(db, admin_id=admin.id, reset_at=reset_at)
-    total = sum(counts.values())
-    write_audit(
-        db,
-        admin,
-        action="risk.alerts.reset",
-        target_type="risk_monitor",
-        target_id="all",
-        detail={
-            "reset_at": reset_at.isoformat(),
-            "reset_incident_count": total,
-            "reset_counts": counts,
-            "restrictions_changed": False,
-        },
-        ip=get_client_ip(request),
-        commit=False,
-    )
-    db.commit()
-    return RiskResetResponse(
-        reset_at=reset_at,
-        reset_incident_count=total,
-        reset_counts=counts,
-    )
-
-
-@router.get(
-    "/incidents/{kind}",
-    response_model=RiskIncidentPage,
-    summary="按短信/一键登录/比价读取风险事件",
-)
-def get_incidents(
-    kind: RiskKind,
-    db: AdminDb,
-    incident_status: Annotated[
-        Literal["open", "ignored", "blocked", "resolved", "all"], Query(alias="status")
-    ] = "open",
-    limit: Annotated[int, Query(ge=1, le=100)] = 20,
-    cursor: Annotated[int, Query(ge=0)] = 0,
-) -> RiskIncidentPage:
-    if kind == "compare":
-        repo.sync_today_compare_incidents(db)
-    items, next_cursor, total = repo.list_incidents(
-        db, kind=kind, status=incident_status, limit=limit, cursor=cursor
-    )
-    return RiskIncidentPage(items=items, next_cursor=next_cursor, total=total)
-
-
-@router.get(
-    "/incidents/{kind}/{incident_id}/details",
-    response_model=RiskDetailPage,
-    summary="风险事件当期事实明细",
-)
-def get_incident_details(
-    kind: RiskKind,
-    incident_id: int,
-    db: AdminDb,
-    limit: Annotated[int, Query(ge=1, le=100)] = 20,
-    cursor: Annotated[int, Query(ge=0)] = 0,
-) -> RiskDetailPage:
-    incident = _incident_or_404(db, incident_id, kind)
-    return RiskDetailPage(
-        **repo.incident_details(
-            db, incident=incident, kind=kind, limit=limit, cursor=cursor
-        )
-    )
-
-
-@router.post(
-    "/incidents/{incident_id}/ignore",
-    response_model=RiskActionResponse,
-    summary="忽略风险事件",
-)
-def ignore_incident(
-    incident_id: int,
-    body: RiskActionRequest,
-    request: Request,
-    admin: Annotated[object, Depends(require_role("operator", "tech"))],
-    db: AdminDb,
-) -> RiskActionResponse:
-    incident = _incident_or_404(db, incident_id)
-    if incident.status != "open":
-        raise HTTPException(status_code=409, detail="该风险事件已处理")
-    incident.status = "ignored"
-    incident.action_reason = body.reason.strip() or "管理员确认忽略"
-    incident.handled_by = admin.id
-    incident.handled_at = risk_repo.utcnow()
-    write_audit(
-        db,
-        admin,
-        action="risk.incident.ignore",
-        target_type="risk_incident",
-        target_id=incident.id,
-        detail={
-            "rule_code": incident.rule_code,
-            "subject_type": incident.subject_type,
-            "subject_id": incident.subject_id,
-            "reason": incident.action_reason,
-        },
-        ip=get_client_ip(request),
-        commit=False,
-    )
-    db.commit()
-    return RiskActionResponse(incident_id=incident.id, status=incident.status)
-
-
-@router.post(
-    "/incidents/{incident_id}/block",
-    response_model=RiskActionResponse,
-    summary="封禁风险主体",
-)
-def block_incident(
-    incident_id: int,
-    body: RiskActionRequest,
-    request: Request,
-    admin: Annotated[object, Depends(require_role("operator", "tech"))],
-    db: AdminDb,
-) -> RiskActionResponse:
-    incident = _incident_or_404(db, incident_id)
-    if incident.status not in ("open", "blocked"):
-        raise HTTPException(status_code=409, detail="该风险事件已处理")
-    if incident.subject_type == "device":
-        if incident.subject_id.startswith("legacy-ip:"):
-            raise HTTPException(
-                status_code=status.HTTP_400_BAD_REQUEST,
-                detail="旧客户端未上报设备ID，不能执行设备封禁",
-            )
-        scope = risk_repo.SCOPE_AUTH_DEVICE
-    elif incident.subject_type == "user":
-        scope = risk_repo.SCOPE_ECONOMIC_ACCOUNT
-    else:  # pragma: no cover - 当前三条规则只会生成 device/user
-        raise HTTPException(status_code=400, detail="该主体类型暂不支持封禁")
-
-    reason = body.reason.strip() or "风控规则命中"
-    restriction = risk_repo.activate_restriction(
-        db,
-        subject_type=incident.subject_type,
-        subject_id=incident.subject_id,
-        scope=scope,
-        reason=reason,
-        incident_id=incident.id,
-        admin_id=admin.id,
-    )
-    incident.status = "blocked"
-    incident.action_reason = reason
-    incident.handled_by = admin.id
-    incident.handled_at = risk_repo.utcnow()
-    write_audit(
-        db,
-        admin,
-        action="risk.subject.block",
-        target_type=incident.subject_type,
-        target_id=incident.subject_id,
-        detail={
-            "incident_id": incident.id,
-            "rule_code": incident.rule_code,
-            "scope": scope,
-            "reason": reason,
-        },
-        ip=get_client_ip(request),
-        commit=False,
-    )
-    db.commit()
-    return RiskActionResponse(
-        incident_id=incident.id,
-        status=incident.status,
-        restriction_id=restriction.id,
-    )
-
-
-@router.post(
-    "/restrictions/{restriction_id}/revoke",
-    response_model=RestrictionRevokeResponse,
-    summary="解除主体限制",
-)
-def revoke_restriction(
-    restriction_id: int,
-    request: Request,
-    admin: Annotated[object, Depends(require_role("operator", "tech"))],
-    db: AdminDb,
-) -> RestrictionRevokeResponse:
-    restriction = db.get(SubjectRestriction, restriction_id)
-    if restriction is None:
-        raise HTTPException(status_code=404, detail="限制记录不存在")
-    if restriction.active:
-        risk_repo.revoke_restriction(db, restriction=restriction, admin_id=admin.id)
-        if restriction.incident_id:
-            incident = db.get(RiskIncident, restriction.incident_id)
-            if incident and incident.status == "blocked":
-                incident.status = "resolved"
-                incident.handled_by = admin.id
-                incident.handled_at = risk_repo.utcnow()
-        write_audit(
-            db,
-            admin,
-            action="risk.subject.unblock",
-            target_type=restriction.subject_type,
-            target_id=restriction.subject_id,
-            detail={"restriction_id": restriction.id, "scope": restriction.scope},
-            ip=get_client_ip(request),
-            commit=False,
-        )
-        db.commit()
-    return RestrictionRevokeResponse(restriction_id=restriction.id)

app/admin/routers/users.py

@@ -16,7 +16,6 @@ from app.admin.schemas.user import (
     GrantCashRequest,
     GrantCoinsRequest,
     SetDebugTraceRequest,
-    SetUserRiskRequest,
     SetUserStatusRequest,
     UserCoinRecord,
     UserRewardStats,
@@ -85,21 +84,12 @@ def get_user_reward_stats(
     db: AdminDb,
     date_from: Annotated[datetime | None, Query()] = None,
     date_to: Annotated[datetime | None, Query()] = None,
-    withdraw_source: Annotated[
-        str | None, Query(pattern="^(coin_cash|invite_cash)$")
-    ] = None,
 ) -> UserRewardStats:
     """提现详情抽屉「用户统计区」。date_from/date_to 都不传 = 注册至今(全量)。"""
-    if not user_repo.user_exists(db, user_id):
+    if user_repo.get_user_by_id(db, user_id) is None:
         raise HTTPException(status_code=404, detail="用户不存在")
     return UserRewardStats(
-        **queries.user_reward_stats(
-            db,
-            user_id,
-            date_from=date_from,
-            date_to=date_to,
-            withdraw_source=withdraw_source,
-        )
+        **queries.user_reward_stats(db, user_id, date_from=date_from, date_to=date_to)
     )
 
 
@@ -148,50 +138,6 @@ def set_user_status(
     return OkResponse()
 
 
-@router.post("/{user_id}/risk", response_model=OkResponse, summary="设置人工高风险标记与备注")
-def set_user_risk(
-    user_id: int,
-    body: SetUserRiskRequest,
-    request: Request,
-    admin: Annotated[
-        AdminUser, Depends(require_role("operator", "finance"))
-    ],
-    db: AdminDb,
-) -> OkResponse:
-    user = user_repo.get_user_by_id(db, user_id)
-    if user is None:
-        raise HTTPException(status_code=404, detail="用户不存在")
-    before = {
-        "is_high_risk": user.is_high_risk,
-        "high_risk_note": user.high_risk_note,
-    }
-    mutations.set_user_risk(
-        db,
-        user,
-        is_high_risk=body.is_high_risk,
-        note=body.note,
-        commit=False,
-    )
-    write_audit(
-        db,
-        admin,
-        action="user.risk.set",
-        target_type="user",
-        target_id=user_id,
-        detail={
-            "before": before,
-            "after": {
-                "is_high_risk": user.is_high_risk,
-                "high_risk_note": user.high_risk_note,
-            },
-        },
-        ip=get_client_ip(request),
-        commit=False,
-    )
-    db.commit()
-    return OkResponse()
-
-
 @router.post("/{user_id}/debug-trace", response_model=OkResponse, summary="开关调试链接权限")
 def set_user_debug_trace(
     user_id: int,

app/admin/routers/withdraw.py

@@ -1,4 +1,4 @@
-"""admin 提现:列表(读)+ 单笔/批量查单与审核操作(写,带审计)。
+"""admin 提现:列表(读)+ 单笔重试查单 + 批量对账(写,带审计)。
 
 提现的钱逻辑(查微信/退款/撤单/幂等)全部复用 app.repositories.wallet,admin 只触发 + 记审计。
 这些 wallet 函数内部各自 commit(涉及微信调用),审计在其后单独 commit:操作本身幂等,
@@ -14,16 +14,17 @@ 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 queries
-from app.admin.schemas.admin import AdminAuditLogOut
 from app.admin.schemas.common import CursorPage
+from app.admin.schemas.admin import AdminAuditLogOut
 from app.admin.schemas.wallet import (
     CashTxnOut,
-    InviteOverviewOut,
-    WithdrawBulkItemResult,
+    ReconcileResult,
     WithdrawBulkRejectRequest,
     WithdrawBulkRequest,
     WithdrawBulkResult,
+    WithdrawBulkItemResult,
     WithdrawDetailOut,
+    WithdrawLedgerCheckOut,
     WithdrawListItemOut,
     WithdrawOrderOut,
     WithdrawRejectRequest,
@@ -82,16 +83,8 @@ def list_withdraws(
         cursor=cursor,
     )
     # 联表带出手机号/昵称 + 累计成功提现(本页 user_id 批量富化,2 条聚合查询,无 N+1)。
-    enrichment = queries.withdraw_list_enrichment(
-        db, [o.user_id for o in items], source=source
-    )
-    _empty = {
-        "phone": None,
-        "nickname": None,
-        "is_high_risk": False,
-        "high_risk_note": None,
-        "cumulative_success_cents": 0,
-    }
+    enrichment = queries.withdraw_list_enrichment(db, [o.user_id for o in items])
+    _empty = {"phone": None, "nickname": None, "cumulative_success_cents": 0}
     out_items = [
         WithdrawListItemOut.model_validate(o).model_copy(
             update=enrichment.get(o.user_id, _empty)
@@ -102,13 +95,8 @@ def list_withdraws(
 
 
 @router.get("/summary", response_model=WithdrawSummaryOut, summary="提现审核台统计")
-def withdraws_summary(
-    db: AdminDb,
-    source: Annotated[
-        str | None, Query(pattern="^(coin_cash|invite_cash)$")
-    ] = None,
-) -> WithdrawSummaryOut:
-    return WithdrawSummaryOut(**queries.withdraw_summary(db, source=source))
+def withdraws_summary(db: AdminDb) -> WithdrawSummaryOut:
+    return WithdrawSummaryOut(**queries.withdraw_summary(db))
 
 
 @router.get(
@@ -141,11 +129,13 @@ def withdraw_health_check(db: AdminDb) -> WxpayHealthCheckOut:
         issues.append("免确认授权回调地址未配置")
 
     # 实际是否自动对账 = env 部署总闸(worker 起没起)AND 运营后台 DB 开关(本轮跑不跑)。
-    # 自动查单属于非阻断运维能力:状态继续返回给调用方,但关闭时不计入微信提现配置 issues,
-    # 避免把“没有自动扫单”误报成“无法打款”。
     worker_running = settings.WITHDRAW_AUTO_RECONCILE_ENABLED
     daily_on = bool(app_config.get_value(db, "withdraw_auto_reconcile_enabled"))
     auto_reconcile_enabled = worker_running and daily_on
+    if not worker_running:
+        issues.append("自动对账 worker 未启动(部署侧 env WITHDRAW_AUTO_RECONCILE_ENABLED=false)")
+    elif not daily_on:
+        issues.append("自动对账运营开关已关闭(系统配置页可开)")
 
     return WxpayHealthCheckOut(
         ok=not issues,
@@ -165,13 +155,13 @@ def withdraw_health_check(db: AdminDb) -> WxpayHealthCheckOut:
     )
 
 
+@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,
-    date_from: Annotated[datetime | None, Query()] = None,
-    date_to: Annotated[datetime | None, Query()] = None,
-) -> WithdrawDetailOut:
+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="提现单不存在")
@@ -184,8 +174,6 @@ def withdraw_detail(
             id=user.id,
             phone=user.phone,
             nickname=user.nickname,
-            is_high_risk=user.is_high_risk,
-            high_risk_note=user.high_risk_note,
             status=user.status,
             wechat_nickname=user.wechat_nickname,
             wechat_avatar_url=user.wechat_avatar_url,
@@ -209,36 +197,37 @@ def withdraw_detail(
         recent_withdraws,
         overview["cash_balance_cents"] if overview else 0,
     )
-    detail_enrichment = queries.withdraw_list_enrichment(
-        db, [order.user_id], source=order.source
-    ).get(order.user_id, {})
 
     return WithdrawDetailOut(
         order=WithdrawOrderOut.model_validate(order),
         user=user_snapshot,
-        cumulative_success_cents=int(
-            detail_enrichment.get("cumulative_success_cents", 0)
-        ),
         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],
-        invite_overview=(
-            InviteOverviewOut(
-                **queries.invite_overview(
-                    db,
-                    order.user_id,
-                    date_from=date_from,
-                    date_to=date_to,
-                )
-            )
-            if order.source == "invite_cash"
-            else None
-        ),
     )
 
 
+# 注意:/reconcile 必须在 /{out_bill_no}/refresh 之前声明(静态路径优先于路径参数)
+@router.post("/reconcile", response_model=ReconcileResult, summary="批量对账(扫超时 pending 单)")
+def reconcile(
+    request: Request,
+    admin: Annotated[AdminUser, Depends(require_role("finance"))],
+    db: AdminDb,
+    older_than_minutes: Annotated[int, Query(ge=0)] = 15,
+) -> ReconcileResult:
+    try:
+        result = wallet_repo.reconcile_pending_withdraws(db, older_than_minutes=older_than_minutes)
+    except wxpay.WxPayNotConfiguredError as e:
+        raise HTTPException(status_code=503, detail="微信支付未配置") from e
+    write_audit(
+        db, admin, action="withdraw.reconcile", target_type="withdraw", target_id=None,
+        detail=result, ip=get_client_ip(request), commit=True,
+    )
+    return ReconcileResult(**result)
+
+
 def _bulk_result(items: list[WithdrawBulkItemResult]) -> WithdrawBulkResult:
     success = sum(1 for item in items if item.ok)
     return WithdrawBulkResult(

app/admin/schemas/ad_revenue.py

@@ -40,8 +40,6 @@ class AdRevenueRecord(BaseModel):
     expected_coin: int = Field(..., description="按公式复算应发金币")
     actual_coin: int = Field(..., description="实际入账金币")
     matched: bool = Field(..., description="复算与实发是否一致")
-    adn: str | None = Field(None, description="本条发奖对应的实际填充 ADN 子渠道")
-    slot_id: str | None = Field(None, description="本条发奖对应的底层 mediation rit")
 
 
 class AdRevenueDaily(BaseModel):
@@ -75,7 +73,6 @@ class AdRevenueTypeStat(BaseModel):
 
     impressions: int = Field(..., description="该类型展示条数合计")
     revenue_yuan: float = Field(..., description="该类型预估收益合计(元)")
-    ecpm_yuan: float | None = Field(None, description="按真实展示次数加权的 SDK eCPM(元/千次)")
 
 
 class AdRevenueRow(BaseModel):
@@ -145,10 +142,6 @@ class AdRevenueReportOut(BaseModel):
         default_factory=dict,
         description="按广告类型(ad_type)小计 {ad_type: {impressions, revenue_yuan}};前端取 draw / reward_video 做分类大盘",
     )
-    category_stats: dict[str, AdRevenueTypeStat] = Field(
-        default_factory=dict,
-        description="按经营分类小计：draw=draw+历史 feed，video=reward_video+withdrawal_video",
-    )
     scene_stats: dict[str, AdRevenueTypeStat] = Field(
         default_factory=dict,
         description="按信息流场景(feed_scene)小计 {comparison/coupon/welfare: {impressions, revenue_yuan}};"

app/admin/schemas/comparison.py

@@ -29,7 +29,6 @@ class AdminComparisonListItem(BaseModel):
     source_price_cents: int | None = None
     best_price_cents: int | None = None
     saved_amount_cents: int | None = None
-    ordered: bool = False
     # debug 概览
     total_ms: int | None = None
     step_count: int | None = None
@@ -40,10 +39,8 @@ class AdminComparisonListItem(BaseModel):
     # 本次比价 LLM 总成本(元,按当时价冻结);旧记录/未回填为 None → 前端「成本」列回退估算。见 services/llm_cost.py。
     llm_cost_yuan: float | None = None
     device_model: str | None = None
-    device_model_name: str | None = None
     rom_vendor: str | None = None
     rom_name: str | None = None
-    rom_version: int | None = None
     android_version: str | None = None
     app_version: str | None = None
     ad_revenue_yuan: float = 0.0   # 本次比价看的信息流广告预估收益(元),queries 瞬态挂 ORM 实例上
@@ -87,6 +84,7 @@ class AdminComparisonDetail(AdminComparisonListItem):
     skipped_dish_names: list = []
     # 全量环境
     device_manufacturer: str | None = None
+    rom_version: int | None = None
     android_sdk: int | None = None
     app_version_code: int | None = None
     source_app_version: str | None = None

app/admin/schemas/feedback.py

@@ -32,10 +32,7 @@ class FeedbackOut(BaseModel):
     # 提交端环境快照(feedback 表列):提交版本号 / 机型OS版本;改版前的历史反馈为 None
     app_version: str | None = None
     device_model: str | None = None
-    device_model_name: str | None = None
-    device_manufacturer: str | None = None
     rom_name: str | None = None
-    rom_version: int | None = None
     android_version: str | None = None
     # 联表瞬态字段(queries._attach_user_info 挂):列表展示完整手机号,点手机号查该用户全部反馈
     phone: str | None = None

app/admin/schemas/risk_monitor.py

@@ -1,104 +0,0 @@
-"""风控监控后台接口 schema。"""
-from __future__ import annotations
-
-from datetime import datetime
-
-from pydantic import BaseModel, Field
-
-
-class RiskSummaryCard(BaseModel):
-    kind: str
-    alert_subject_count: int
-    today_total: int
-    threshold: int
-    rule_text: str
-
-
-class RiskMonitorSummary(BaseModel):
-    date: str
-    updated_at: datetime
-    cards: list[RiskSummaryCard]
-
-
-class RiskRuleConfig(BaseModel):
-    sms_hourly_threshold: int = Field(ge=1, le=5)
-    oneclick_daily_threshold: int = Field(ge=1, le=100_000)
-    compare_daily_threshold: int = Field(ge=1, le=100)
-
-
-class RiskIncidentItem(BaseModel):
-    incident_id: int
-    kind: str
-    subject_type: str
-    subject_id: str
-    device_model: str | None = None
-    first_used_at: datetime | None = None
-    phone: str | None = None
-    user_id: int | None = None
-    registered_at: datetime | None = None
-    common_device_id: str | None = None
-    window_start: datetime
-    window_end: datetime
-    first_event_at: datetime
-    triggered_at: datetime
-    last_event_at: datetime
-    event_count: int
-    status: str
-    restricted: bool = False
-    restriction_id: int | None = None
-
-
-class RiskIncidentPage(BaseModel):
-    items: list[RiskIncidentItem]
-    next_cursor: int | None = None
-    total: int
-
-
-class RiskDetailItem(BaseModel):
-    id: int
-    occurred_at: datetime
-    outcome: str
-    phone: str | None = None
-    user_id: int | None = None
-    username: str | None = None
-    account_registered_at: datetime | None = None
-    verified: bool | None = None
-    reason: str | None = None
-    store_name: str | None = None
-    product_names: str | None = None
-    prices: dict[str, float | None] | None = None
-    saved_amount_yuan: float | None = None
-    status: str | None = None
-
-
-class RiskDetailPage(BaseModel):
-    kind: str
-    incident_id: int
-    event_count: int
-    distinct_accounts: int | None = None
-    items: list[RiskDetailItem]
-    next_cursor: int | None = None
-    total: int
-
-
-class RiskActionRequest(BaseModel):
-    reason: str = Field("", max_length=256)
-
-
-class RiskActionResponse(BaseModel):
-    ok: bool = True
-    incident_id: int
-    status: str
-    restriction_id: int | None = None
-
-
-class RiskResetResponse(BaseModel):
-    ok: bool = True
-    reset_at: datetime
-    reset_incident_count: int
-    reset_counts: dict[str, int]
-
-
-class RestrictionRevokeResponse(BaseModel):
-    ok: bool = True
-    restriction_id: int

app/admin/schemas/user.py

@@ -16,8 +16,6 @@ class AdminUserListItem(BaseModel):
     register_channel: str
     status: str
     debug_trace_enabled: bool = False
-    is_high_risk: bool = False
-    high_risk_note: str | None = None
     wechat_openid: str | None = None
     wechat_nickname: str | None = None
     created_at: datetime
@@ -120,19 +118,3 @@ class SetUserStatusRequest(BaseModel):
 
 class SetDebugTraceRequest(BaseModel):
     enabled: bool = Field(..., description="是否给该用户开「复制调试链接」权限")
-
-
-class SetUserRiskRequest(BaseModel):
-    is_high_risk: bool = Field(..., description="是否标记为高风险用户")
-    note: str | None = Field(
-        None,
-        max_length=500,
-        description="高风险备注；标记高风险时必填，解除后清空",
-    )
-
-    @field_validator("note")
-    @classmethod
-    def validate_note(cls, value: str | None, info):
-        if info.data.get("is_high_risk") and not (value or "").strip():
-            raise ValueError("标记高风险时必须填写原因")
-        return value.strip() if value and value.strip() else None

app/admin/schemas/wallet.py

@@ -60,8 +60,6 @@ class WithdrawListItemOut(WithdrawOrderOut):
 
     phone: str | None = None
     nickname: str | None = None
-    is_high_risk: bool = False
-    high_risk_note: str | None = None
     cumulative_success_cents: int = 0  # 累计成功提现 = SUM(amount_cents) WHERE status='success'
 
 
@@ -69,10 +67,7 @@ class WithdrawSummaryOut(BaseModel):
     reviewing_count: int
     reviewing_amount_cents: int
     pending_count: int
-    success_count: int
-    rejected_count: int
     failed_count: int
-    total_count: int
     today_success_count: int
     today_success_amount_cents: int
     today_rejected_count: int
@@ -82,8 +77,6 @@ class WithdrawUserSnapshot(BaseModel):
     id: int
     phone: str
     nickname: str | None = None
-    is_high_risk: bool = False
-    high_risk_note: str | None = None
     status: str
     wechat_nickname: str | None = None
     wechat_avatar_url: str | None = None
@@ -94,34 +87,19 @@ class WithdrawUserSnapshot(BaseModel):
     withdraw_success_cents: int
 
 
-class InviteeDetailOut(BaseModel):
-    user_id: int
-    phone: str
-    registered_at: datetime
-    invite_success: bool
-    first_compare_store: str | None = None
-    first_compare_products: str | None = None
-    first_order_store: str | None = None
-    first_order_products: str | None = None
-    first_order_amount_cents: int | None = None
-
-
-class InviteOverviewOut(BaseModel):
-    invite_total: int
-    invite_success_total: int
-    items: list[InviteeDetailOut]
-
-
 class WithdrawDetailOut(BaseModel):
     order: WithdrawOrderOut
     user: WithdrawUserSnapshot | None = None
-    cumulative_success_cents: int = 0
     risk_flags: list[str]
     risk_score: int
     recent_withdraws: list[WithdrawOrderOut]
     recent_cash_transactions: list[CashTxnOut]
     audit_logs: list[AdminAuditLogOut]
-    invite_overview: InviteOverviewOut | None = None
+
+
+class ReconcileResult(BaseModel):
+    checked: int
+    resolved: int
 
 
 class WithdrawBulkRequest(BaseModel):
@@ -150,6 +128,26 @@ class WithdrawBulkResult(BaseModel):
     items: list[WithdrawBulkItemResult]
 
 
+class WithdrawLedgerCheckOut(BaseModel):
+    ok: bool
+    # 普通现金账(coin_cash:金币兑换的现金)
+    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
+    # 邀请奖励金账(invite_cash:与普通现金物理隔离,各自对账)。默认 0 向后兼容。
+    invite_cash_balance_total_cents: int = 0
+    invite_cash_transaction_total_cents: int = 0
+    invite_balance_diff_cents: int = 0
+    invite_missing_withdraw_txn_count: int = 0
+    invite_missing_refund_txn_count: int = 0
+    invite_duplicate_refund_txn_count: int = 0
+    invite_refund_txn_on_non_terminal_count: int = 0
+
+
 class WxpayHealthCheckOut(BaseModel):
     ok: bool
     wxpay_configured: bool

app/api/deps.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 import logging
 from typing import Annotated
 
-from fastapi import Depends, HTTPException, Request, status
+from fastapi import Depends, HTTPException, status
 from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
 from sqlalchemy.orm import Session
 
@@ -77,18 +77,6 @@ def get_current_user_optional(
     return user
 
 
-def get_client_ip(request: Request) -> str:
-    """客户端真实 IP:生产经 nginx 反代优先 X-Forwarded-For 首段,否则直连 IP。
-
-    路由层取 IP 的规范实现(analytics / applog 等共用);core 层(ratelimit)因不能
-    反向依赖 app.api,自留一份私有副本。
-    """
-    xff = request.headers.get("x-forwarded-for")
-    if xff:
-        return xff.split(",")[0].strip()
-    return request.client.host if request.client else ""
-
-
 CurrentUser = Annotated[User, Depends(get_current_user)]
 OptionalUser = Annotated[User | None, Depends(get_current_user_optional)]
 DbSession = Annotated[Session, Depends(get_db)]

app/api/v1/analytics.py

@@ -10,7 +10,7 @@ import logging
 
 from fastapi import APIRouter, HTTPException, Request
 
-from app.api.deps import DbSession, get_client_ip
+from app.api.deps import DbSession
 from app.repositories import analytics as analytics_repo
 from app.repositories import analytics_selfstat as selfstat_repo
 from app.schemas.analytics import AnalyticsBatchIn, AnalyticsIngestOut
@@ -20,11 +20,19 @@ router = APIRouter(prefix="/api/v1/analytics", tags=["analytics"])
 logger = logging.getLogger("shagua.analytics")
 
 
+def _client_ip(request: Request) -> str:
+    """取客户端 IP:生产经 nginx 反代优先 X-Forwarded-For 第一段,否则直连 IP(同 admin get_client_ip)。"""
+    xff = request.headers.get("x-forwarded-for")
+    if xff:
+        return xff.split(",")[0].strip()
+    return request.client.host if request.client else ""
+
+
 @router.post("/events", response_model=AnalyticsIngestOut, summary="批量上报埋点事件")
 def ingest_events(
     batch: AnalyticsBatchIn, request: Request, db: DbSession
 ) -> AnalyticsIngestOut:
-    n = analytics_repo.record_batch(db, batch, client_ip=get_client_ip(request))
+    n = analytics_repo.record_batch(db, batch, client_ip=_client_ip(request))
     return AnalyticsIngestOut(received=n)
 
 

app/api/v1/applog.py

@@ -1,50 +0,0 @@
-"""客户端运行日志批量上报接口。
-
-POST /api/v1/applog/batch — 批量接收客户端运行日志,逐条写专用滚动文件 logs/app-client.log
-(供 Logtail 采进独立 SLS logstore)。鉴权同 analytics(不强制登录,user_id 可选在 body)。
-fire-and-forget:写失败也不 500(避免客户端重试风暴);超批 422、超体积 413、msg 超限截断。
-"""
-from __future__ import annotations
-
-import os
-
-from fastapi import APIRouter, Depends, HTTPException, Request
-
-from app.api.deps import get_client_ip
-from app.core.client_log import write_records
-from app.core.ratelimit import rate_limit
-from app.schemas.applog import AppLogBatchIn, AppLogIngestOut
-
-router = APIRouter(prefix="/api/v1/applog", tags=["applog"])
-
-
-def _enforce_body_limit(request: Request) -> None:
-    """依赖:body 声明过大直接 413(在 body 校验前拦截)。缺 Content-Length 由 nginx 兜底。"""
-    max_bytes = int(os.getenv("APPLOG_MAX_BODY_BYTES", str(1024 * 1024 * 2)))
-    cl = request.headers.get("content-length")
-    if cl is not None and cl.isdigit() and int(cl) > max_bytes:
-        raise HTTPException(status_code=413, detail="日志批量过大")
-
-
-@router.post(
-    "/batch",
-    response_model=AppLogIngestOut,
-    summary="批量上报客户端运行日志",
-    dependencies=[
-        Depends(rate_limit(120, 60, "applog-batch")),
-        Depends(_enforce_body_limit),
-    ],
-)
-def ingest_logs(batch: AppLogBatchIn, request: Request) -> AppLogIngestOut:
-    received, dropped = write_records(
-        batch.logs,
-        meta={
-            "device_id": batch.device_id,
-            "user_id": batch.user_id,
-            "app_ver": batch.app_ver,
-            "platform": batch.platform,
-            "sent_at": batch.sent_at,
-        },
-        client_ip=get_client_ip(request),
-    )
-    return AppLogIngestOut(received=received, dropped=dropped)

app/api/v1/auth.py

@@ -37,7 +37,6 @@ from app.integrations.jiguang import JiguangError, mask_phone, verify_and_get_ph
 from app.integrations.sms import SmsError, send_code, verify_code
 from app.repositories import onboarding as onboarding_repo
 from app.repositories import phone_rebind as rebind_repo
-from app.repositories import risk as risk_repo
 from app.repositories import user as user_repo
 from app.schemas.auth import (
     JverifyLoginRequest,
@@ -71,18 +70,6 @@ SMS_SEND_MAX_PER_HOUR_PER_DEVICE = 5     # 每小时上限
 SMS_SEND_MAX_PER_DAY_PER_DEVICE = 20     # 每天上限(再叠一层日封顶,挡低频长时间轰炸)
 
 
-def _client_ip(request: Request) -> str:
-    xff = request.headers.get("x-forwarded-for")
-    if xff:
-        return xff.split(",")[0].strip()
-    return request.client.host if request.client else ""
-
-
-def _device_subject(device_id: str, request: Request) -> str:
-    # 兼容旧客户端空 device_id；新客户端均上传稳定硬件标识。
-    return device_id or f"legacy-ip:{_client_ip(request)}"
-
-
 def _login_response(
     user, *, onboarding_completed: bool, force_onboarding: bool = False
 ) -> TokenWithUser:
@@ -100,15 +87,7 @@ def _login_response(
 # ===================== 极光一键登录 =====================
 
 @router.post("/jverify-login", response_model=TokenWithUser, summary="极光一键登录")
-def jverify_login(req: JverifyLoginRequest, request: Request, db: DbSession) -> TokenWithUser:
-    subject_id = _device_subject(req.device_id, request)
-    if req.device_id and risk_repo.is_restricted(
-        db,
-        subject_type="device",
-        subject_id=req.device_id,
-        scope=risk_repo.SCOPE_AUTH_DEVICE,
-    ):
-        raise HTTPException(status_code=403, detail="当前设备环境异常，暂无法登录")
+def jverify_login(req: JverifyLoginRequest, db: DbSession) -> TokenWithUser:
     logger.info(
         "jverify_login operator=%s token_len=%d",
         req.operator or "-",
@@ -118,37 +97,10 @@ def jverify_login(req: JverifyLoginRequest, request: Request, db: DbSession) ->
     try:
         phone = verify_and_get_phone(req.login_token)
     except JiguangError as e:
-        risk_repo.record_behavior_event(
-            db,
-            event_type=risk_repo.EVENT_ONECLICK_LOGIN,
-            subject_type="device",
-            subject_id=subject_id,
-            device_id=req.device_id or None,
-            device_model=req.device_model or None,
-            client_ip=_client_ip(request),
-            outcome="failed",
-            reason=str(e),
-            details={"operator": req.operator or None},
-            evaluate_rule=risk_repo.RULE_ONECLICK_DAILY,
-        )
         logger.error("[JG] verify+decrypt failed: %s", e, exc_info=True)
         raise HTTPException(status_code=502, detail=f"jiguang verify failed: {e}") from e
 
     user = user_repo.upsert_user_for_login(db, phone=phone, register_channel="jverify")
-    risk_repo.record_behavior_event(
-        db,
-        event_type=risk_repo.EVENT_ONECLICK_LOGIN,
-        subject_type="device",
-        subject_id=subject_id,
-        user_id=user.id,
-        device_id=req.device_id or None,
-        device_model=req.device_model or None,
-        phone=phone,
-        client_ip=_client_ip(request),
-        outcome="success",
-        details={"operator": req.operator or None},
-        evaluate_rule=risk_repo.RULE_ONECLICK_DAILY,
-    )
     if user.status != "active":
         raise HTTPException(status_code=403, detail="account disabled")
 
@@ -164,34 +116,12 @@ def jverify_login(req: JverifyLoginRequest, request: Request, db: DbSession) ->
     response_model=SmsSendResponse,
     summary="发送短信验证码",
 )
-def sms_send(req: SmsSendRequest, request: Request, db: DbSession) -> SmsSendResponse:
-    subject_id = _device_subject(req.device_id, request)
-    if req.device_id and risk_repo.is_restricted(
-        db,
-        subject_type="device",
-        subject_id=req.device_id,
-        scope=risk_repo.SCOPE_AUTH_DEVICE,
-    ):
-        raise HTTPException(status_code=403, detail="当前设备环境异常，暂无法发送验证码")
+def sms_send(req: SmsSendRequest, request: Request) -> SmsSendResponse:
     # 测试账号:不真发短信(号码非真实手机号,真发会失败/浪费),直接放行让客户端进入填码界面。
     # 真正的"免验证码"在 /sms/login 跳过校验;每日上限也在 login 处算(send 不耗额度)。
     # (也不受下面设备发码限流约束:QA 联调要反复发码。)
     if test_account.is_test_account(req.phone):
         logger.info("test_account sms_send short-circuit (不真发)")
-        risk_repo.record_behavior_event(
-            db,
-            event_type=risk_repo.EVENT_SMS_SEND,
-            subject_type="device",
-            subject_id=subject_id,
-            device_id=req.device_id or None,
-            device_model=req.device_model or None,
-            phone=req.phone,
-            client_ip=_client_ip(request),
-            # 测试号不真发短信，也豁免正式频控；保留流水供排查，但不能污染
-            # “今日短信下发”与短信风控报警。
-            outcome="test",
-            details={"mock": True, "test_account": True},
-        )
         return SmsSendResponse(sent=True, mock=True, cooldown_sec=0)
 
     # 发码防刷:同一设备(device_id) + 同一 IP,每小时 / 每天两道闸,**均只按成功发码计数**。
@@ -209,18 +139,6 @@ def sms_send(req: SmsSendRequest, request: Request, db: DbSession) -> SmsSendRes
     try:
         cooldown = send_code(req.phone)
     except SmsError as e:
-        risk_repo.record_behavior_event(
-            db,
-            event_type=risk_repo.EVENT_SMS_SEND,
-            subject_type="device",
-            subject_id=subject_id,
-            device_id=req.device_id or None,
-            device_model=req.device_model or None,
-            phone=req.phone,
-            client_ip=_client_ip(request),
-            outcome="failed",
-            reason=str(e),
-        )
         raise HTTPException(status_code=e.status_code, detail=str(e)) from e
 
     # 发码成功 → 两道闸各 +1(被单号冷却挡下的重发走不到这里,故不占额度)
@@ -228,20 +146,6 @@ def sms_send(req: SmsSendRequest, request: Request, db: DbSession) -> SmsSendRes
 
     from app.core.config import settings  # 局部 import 避免循环
 
-    risk_repo.record_behavior_event(
-        db,
-        event_type=risk_repo.EVENT_SMS_SEND,
-        subject_type="device",
-        subject_id=subject_id,
-        device_id=req.device_id or None,
-        device_model=req.device_model or None,
-        phone=req.phone,
-        client_ip=_client_ip(request),
-        outcome="success",
-        details={"mock": settings.SMS_MOCK},
-        evaluate_rule=risk_repo.RULE_SMS_HOURLY,
-    )
-
     return SmsSendResponse(sent=True, mock=settings.SMS_MOCK, cooldown_sec=cooldown)
 
 
@@ -251,7 +155,6 @@ def sms_send(req: SmsSendRequest, request: Request, db: DbSession) -> SmsSendRes
     summary="手机号+验证码登录",
 )
 def sms_login(req: SmsLoginRequest, request: Request, db: DbSession) -> TokenWithUser:
-    subject_id = _device_subject(req.device_id, request)
     # 测试账号:免验证码登录 + 每日上限 + 每次都走新手引导(详见 app/core/test_account.py)。
     # 放在最前面:命中即不校验验证码;先扣当日额度,超限直接拒,挡住有人猜到号后脚本刷。
     # 测试账号走自己的每日额度、不受下面 (设备+IP) 每小时限流约束(QA 需在一小时内反复登录联调)。
@@ -259,19 +162,6 @@ def sms_login(req: SmsLoginRequest, request: Request, db: DbSession) -> TokenWit
         if not test_account.try_consume_quota():
             raise HTTPException(status_code=429, detail="测试账号今日使用次数已达上限,请明天再试")
         user = user_repo.upsert_user_for_login(db, phone=req.phone, register_channel="sms")
-        risk_repo.record_behavior_event(
-            db,
-            event_type=risk_repo.EVENT_SMS_LOGIN,
-            subject_type="device",
-            subject_id=subject_id,
-            user_id=user.id,
-            device_id=req.device_id or None,
-            device_model=req.device_model or None,
-            phone=req.phone,
-            client_ip=_client_ip(request),
-            outcome="success",
-            details={"test_account": True},
-        )
         if user.status != "active":
             raise HTTPException(status_code=403, detail="account disabled")
         logger.info("sms_login test_account ok user_id=%d phone=%s", user.id, mask_phone(req.phone))
@@ -293,33 +183,9 @@ def sms_login(req: SmsLoginRequest, request: Request, db: DbSession) -> TokenWit
     )
 
     if not verify_code(req.phone, req.code):
-        risk_repo.record_behavior_event(
-            db,
-            event_type=risk_repo.EVENT_SMS_LOGIN,
-            subject_type="device",
-            subject_id=subject_id,
-            device_id=req.device_id or None,
-            device_model=req.device_model or None,
-            phone=req.phone,
-            client_ip=_client_ip(request),
-            outcome="failed",
-            reason="invalid sms code",
-        )
         raise HTTPException(status_code=400, detail="invalid sms code")
 
     user = user_repo.upsert_user_for_login(db, phone=req.phone, register_channel="sms")
-    risk_repo.record_behavior_event(
-        db,
-        event_type=risk_repo.EVENT_SMS_LOGIN,
-        subject_type="device",
-        subject_id=subject_id,
-        user_id=user.id,
-        device_id=req.device_id or None,
-        device_model=req.device_model or None,
-        phone=req.phone,
-        client_ip=_client_ip(request),
-        outcome="success",
-    )
     if user.status != "active":
         raise HTTPException(status_code=403, detail="account disabled")
 

app/api/v1/compare.py

@@ -25,34 +25,22 @@ import uuid
 from typing import Any
 
 import httpx
-from fastapi import APIRouter, BackgroundTasks, HTTPException, Request, status
+from fastapi import APIRouter, HTTPException, Request, status
 from fastapi.concurrency import run_in_threadpool
 
-from app.api.deps import DbSession, OptionalUser
+from app.api.deps import OptionalUser
 from app.core.config import settings
 from app.core.logging import trace_id_ctx
 from app.core.pricebot_client import get_pricebot_client
 from app.core.pricebot_router import pick_pricebot
 from app.db.session import SessionLocal
 from app.repositories import comparison as crud_compare
-from app.repositories import risk as risk_repo
-from app.services.comparison_llm_backfill import backfill_comparison_llm_cost
 
 logger = logging.getLogger("shagua.compare")
 
 router = APIRouter(prefix="/api/v1", tags=["compare"])
 
 
-def _ensure_compare_allowed(user, db) -> None:
-    if user and risk_repo.is_restricted(
-        db,
-        subject_type="user",
-        subject_id=str(user.id),
-        scope=risk_repo.SCOPE_ECONOMIC_ACCOUNT,
-    ):
-        raise HTTPException(status_code=403, detail="账号存在异常，该功能暂不可用")
-
-
 # ============================================================
 # harvest 落库(阻塞 SQLAlchemy → run_in_threadpool,独立 SessionLocal,不阻塞事件循环;
 # 任何写库异常都吞掉、绝不连累比价透传返回 —— 同 coupon.py 现有 best-effort 写法)。
@@ -64,14 +52,10 @@ def _harvest_running_blocking(
     device_id: str | None, device_info: dict | None, trace_url: str | None,
 ) -> None:
     with SessionLocal() as db:
-        rec = crud_compare.harvest_running(
+        crud_compare.harvest_running(
             db, trace_id=trace_id, user_id=user_id, business_type=business_type,
             device_id=device_id, device_info=device_info, trace_url=trace_url,
         )
-        if rec.user_id is not None:
-            risk_repo.sync_compare_incident(
-                db, user_id=rec.user_id, at=rec.created_at
-            )
     logger.info(
         "harvest running row (user=%s)", user_id,
         extra={"phase": "harvest_running", "status": "running", "user_id": user_id},
@@ -81,17 +65,13 @@ def _harvest_running_blocking(
 def _harvest_done_blocking(
     trace_id: str, user_id: int | None, done_params: dict, business_type: str,
     device_id: str | None, device_info: dict | None, trace_url: str | None,
-) -> int:
+) -> None:
     with SessionLocal() as db:
         rec, newly_success = crud_compare.harvest_done(
             db, trace_id=trace_id, user_id=user_id, done_params=done_params,
             business_type=business_type, device_id=device_id,
             device_info=device_info, trace_url=trace_url,
         )
-        if rec.user_id is not None:
-            risk_repo.sync_compare_incident(
-                db, user_id=rec.user_id, at=rec.created_at
-            )
         logger.info(
             "harvest done → %s saved=%s newly=%s", rec.status,
             rec.saved_amount_cents, newly_success,
@@ -103,7 +83,6 @@ def _harvest_done_blocking(
         # 不在此处发邀请奖:#113 已把发奖口径从「比价」移到「实际下单」(order.py),harvest
         # 只记录比价、不发奖。否则比价先于下单 + try_reward 幂等闸会让奖落在「比价」这步,
         # 架空 #113 的「下单才发奖」防刷意图(newly_success 仅留作日志观测)。
-        return rec.id
 
 
 def _harvest_abort_blocking(
@@ -220,38 +199,25 @@ async def _forward(
 
 
 @router.post("/intent/recognize", summary="外卖比价 Phase 1 意图识别 (透传 + 建 running 行)")
-async def intent_recognize(
-    request: Request, user: OptionalUser, db: DbSession
-) -> dict[str, Any]:
-    _ensure_compare_allowed(user, db)
+async def intent_recognize(request: Request, user: OptionalUser) -> dict[str, Any]:
     resp, _, _ = await _forward(request, "/api/intent/recognize", user)
     return resp
 
 
 @router.post("/intent/step", summary="外卖比价 Phase 1 多帧意图识别 (透传, 仅淘宝源)")
-async def intent_step(request: Request, user: OptionalUser, db: DbSession) -> dict[str, Any]:
-    _ensure_compare_allowed(user, db)
+async def intent_step(request: Request, user: OptionalUser) -> dict[str, Any]:
     resp, _, _ = await _forward(request, "/api/intent/step", user)
     return resp
 
 
 @router.post("/intent/precoupon/step", summary="外卖比价 Phase 0 识别前先用券 (透传, 仅美团源)")
-async def intent_precoupon_step(
-    request: Request, user: OptionalUser, db: DbSession
-) -> dict[str, Any]:
-    _ensure_compare_allowed(user, db)
+async def intent_precoupon_step(request: Request, user: OptionalUser) -> dict[str, Any]:
     resp, _, _ = await _forward(request, "/api/intent/precoupon/step", user)
     return resp
 
 
 @router.post("/price/step", summary="外卖比价 Phase 2 步进 (透传 + done 落库)")
-async def price_step(
-    request: Request,
-    background_tasks: BackgroundTasks,
-    user: OptionalUser,
-    db: DbSession,
-) -> dict[str, Any]:
-    _ensure_compare_allowed(user, db)
+async def price_step(request: Request, user: OptionalUser) -> dict[str, Any]:
     resp, trace_id, meta = await _forward(request, "/api/price/step", user)
     # 最终 done 帧(command=done 且 continue=false)→ harvest 更新成终态。
     # (单平台中途 done 被 pricebot 改写成 wait+continue=true,不会命中这里,同 coupon 语义。)
@@ -259,25 +225,19 @@ async def price_step(
     if action.get("command") == "done" and not resp.get("continue", True):
         done_params = action.get("params") or {}
         try:
-            record_id = await run_in_threadpool(
+            await run_in_threadpool(
                 _harvest_done_blocking, trace_id, (user.id if user else None),
                 done_params, "food",
                 meta.get("device_id"), meta.get("device_info"),
                 resp.get("trace_url") or done_params.get("trace_url"),
             )
-            background_tasks.add_task(
-                backfill_comparison_llm_cost, record_id, trace_id
-            )
         except Exception as e:  # noqa: BLE001
             logger.warning("harvest_done failed trace=%s: %s", trace_id, e)
     return resp
 
 
 @router.post("/trace/epilogue", summary="比价结果页尾声帧 (透传到 pricebot, 用户视角截图入 trace)")
-async def trace_epilogue(
-    request: Request, user: OptionalUser, db: DbSession
-) -> dict[str, Any]:
-    _ensure_compare_allowed(user, db)
+async def trace_epilogue(request: Request, user: OptionalUser) -> dict[str, Any]:
     # App 收到 done、渲染完结果页后,把自己页面的截图(base64)传给 pricebot 存进 trace
     # 目录并触发重传 —— trace 里补上"用户实际看到的汇总页"(步骤帧只有目标 App 画面)。
     # body ~几百 KB(截图 base64), 纯透传壳(harvest_first_frame=False:不建行/不落库,
@@ -290,10 +250,7 @@ async def trace_epilogue(
 
 
 @router.post("/trace/finalize", summary="比价 trace 收尾上云 (透传 + 夭折落库)")
-async def trace_finalize(
-    request: Request, user: OptionalUser, db: DbSession
-) -> dict[str, Any]:
-    _ensure_compare_allowed(user, db)
+async def trace_finalize(request: Request, user: OptionalUser) -> dict[str, Any]:
     # 用户终止 / Phase1 未识别没到 done 帧: pricebot 打包半截上云返回 {trace_url};
     # app-server 顺手把该 trace 的 running 行更新成夭折终态(**不降级 success**)。
     # 客户端 finalize body 带 status(cancelled/failed)+ reason;老客户端只带 trace_id →

app/api/v1/compare_record.py

@@ -16,8 +16,9 @@ import logging
 from fastapi import APIRouter, BackgroundTasks, HTTPException, Query, status
 
 from app.api.deps import CurrentUser, DbSession
+from app.db.session import SessionLocal
+from app.models.comparison import ComparisonRecord
 from app.repositories import comparison as crud_compare
-from app.repositories import risk as risk_repo
 from app.schemas.compare_record import (
     CompareStartReserveIn,
     CompareStartReserveOut,
@@ -28,7 +29,8 @@ from app.schemas.compare_record import (
     ComparisonRecordOut,
     ComparisonRecordPage,
 )
-from app.services.comparison_llm_backfill import backfill_comparison_llm_cost
+from app.services.llm_cost import compute_llm_cost, get_llm_prices
+from app.services.pricebot_llm_calls import fetch_llm_calls
 
 logger = logging.getLogger("shagua.compare_record")
 
@@ -45,15 +47,8 @@ def reserve_compare_start(
     user: CurrentUser,
     db: DbSession,
 ) -> CompareStartReserveOut:
-    if risk_repo.is_restricted(
-        db,
-        subject_type="user",
-        subject_id=str(user.id),
-        scope=risk_repo.SCOPE_ECONOMIC_ACCOUNT,
-    ):
-        raise HTTPException(status_code=403, detail="账号存在异常，该功能暂不可用")
     try:
-        rec, used = crud_compare.reserve_daily_start(
+        _, used = crud_compare.reserve_daily_start(
             db,
             user_id=user.id,
             trace_id=payload.trace_id,
@@ -70,8 +65,6 @@ def reserve_compare_start(
             status_code=status.HTTP_409_CONFLICT,
             detail="比价任务标识冲突，请重新发起",
         ) from None
-    # 风控阈值由后台动态配置，不能再只在固定的 100 次业务上限处同步。
-    risk_repo.sync_compare_incident(db, user_id=user.id, at=rec.created_at)
     return CompareStartReserveOut(
         limit=crud_compare.DAILY_COMPARE_START_LIMIT,
         used=used,
@@ -90,13 +83,6 @@ def report_record(
     db: DbSession,
     background_tasks: BackgroundTasks,
 ) -> ComparisonRecordCreatedOut:
-    if risk_repo.is_restricted(
-        db,
-        subject_type="user",
-        subject_id=str(user.id),
-        scope=risk_repo.SCOPE_ECONOMIC_ACCOUNT,
-    ):
-        raise HTTPException(status_code=403, detail="账号存在异常，该功能暂不可用")
     rec = crud_compare.upsert_record(db, user_id=user.id, payload=payload)
     # LLM 调用明细异步回填:同机拉 pricebot llm_calls 最长 5s 且是 best-effort,放后台
     # 任务做,不阻塞上报响应(顺带给 pricebot 落盘留足余量)。upsert 已 commit,后台用
@@ -118,7 +104,32 @@ def report_record(
 def _backfill_llm_calls(record_id: int, trace_id: str) -> None:
     """后台回填本次比价的 LLM 调用明细 + 派生 llm_call_count/retry_count。
     独立 DB session(请求 session 此时已关);拉取/写库失败只 log,绝不影响已落库的上报。"""
-    backfill_comparison_llm_cost(record_id, trace_id)
+    calls = fetch_llm_calls(trace_id)
+    if not calls:
+        return
+    db = SessionLocal()
+    try:
+        rec = db.get(ComparisonRecord, record_id)
+        if rec is None:
+            return
+        rec.llm_calls = calls
+        rec.llm_call_count = len(calls)
+        rec.retry_count = sum(1 for c in calls if c.get("error"))
+        # token 累加(usage 已被 pricebot llm_client 归一为 prompt/completion_tokens;
+        # error 的调用 usage 可能为 None,or {} 兜底)
+        rec.input_tokens = sum((c.get("usage") or {}).get("prompt_tokens") or 0 for c in calls)
+        rec.output_tokens = sum((c.get("usage") or {}).get("completion_tokens") or 0 for c in calls)
+        # 本次比价 LLM 成本(元)+ 当时单价快照:按 app_config 现价逐模型算好冻结(services/llm_cost.py)。
+        rec.llm_cost_yuan, rec.llm_price_snapshot = compute_llm_cost(calls, get_llm_prices(db))
+        db.commit()
+        logger.info(
+            "backfill llm_calls trace=%s n=%d in_tok=%d out_tok=%d",
+            trace_id, len(calls), rec.input_tokens, rec.output_tokens,
+        )
+    except Exception as e:  # noqa: BLE001 best-effort
+        logger.warning("backfill llm_calls failed trace=%s: %s", trace_id, e)
+    finally:
+        db.close()
 
 
 @router.get(

app/api/v1/tasks.py

@@ -11,7 +11,6 @@ import logging
 from fastapi import APIRouter, HTTPException, status
 
 from app.api.deps import CurrentUser, DbSession
-from app.repositories import risk as risk_repo
 from app.repositories import task as crud_task
 from app.schemas.welfare import TaskClaimResultOut, TaskListOut, TaskOut
 
@@ -37,13 +36,6 @@ def list_tasks(user: CurrentUser, db: DbSession) -> TaskListOut:
     summary="领取任务奖励",
 )
 def claim_task(task_key: str, user: CurrentUser, db: DbSession) -> TaskClaimResultOut:
-    if risk_repo.is_restricted(
-        db,
-        subject_type="user",
-        subject_id=str(user.id),
-        scope=risk_repo.SCOPE_ECONOMIC_ACCOUNT,
-    ):
-        raise HTTPException(status_code=403, detail="账号存在异常，该功能暂不可用")
     try:
         coin, balance = crud_task.claim_task(db, user.id, task_key)
     except crud_task.UnknownTaskError as e:

app/api/v1/wallet.py

@@ -20,9 +20,8 @@ from app.core.rewards import (
     WITHDRAW_MAX_CENTS,
     WITHDRAW_MIN_CENTS,
 )
-from app.models.user import User
-from app.repositories import risk as risk_repo
 from app.repositories import wallet as crud_wallet
+from app.models.user import User
 from app.schemas.welfare import (
     BindWechatRequest,
     BindWechatResultOut,
@@ -205,13 +204,6 @@ def withdraw_info(
     dependencies=[Depends(rate_limit(5, 60, "withdraw"))],  # IP 级粗限流;用户级未完成单限制在仓库层
 )
 def withdraw(req: WithdrawRequest, user: CurrentUser, db: DbSession) -> WithdrawResultOut:
-    if risk_repo.is_restricted(
-        db,
-        subject_type="user",
-        subject_id=str(user.id),
-        scope=risk_repo.SCOPE_ECONOMIC_ACCOUNT,
-    ):
-        raise HTTPException(status_code=403, detail="账号存在异常，该功能暂不可用")
     # 提现发起本身不调微信(打款在审核通过后),但仍要求微信支付已配置——否则审核通过也打不了款,提前拦
     if not settings.wxpay_configured:
         raise HTTPException(status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail="wechat pay not configured")
@@ -230,6 +222,11 @@ def withdraw(req: WithdrawRequest, user: CurrentUser, db: DbSession) -> Withdraw
         ) 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
     except crud_wallet.WithdrawTierUnavailableError as e:
         # 福利页档位闸(7-9):次数满/已选其他额度。正常客户端已按 tiers 预拦,此处兜底防绕过。
         raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail="今日额度已达上限") from e

app/core/client_log.py

@@ -1,157 +0,0 @@
-"""客户端运行日志专用落盘 writer(独立于服务端 app-server.log)。
-
-- 独占 logger "shagua.client_log" + 自己的 RotatingFileHandler,propagate=False → 不污染 app-server.log。
-- 每条按「白名单键(client_ts/level/trace_id/tag/msg)提顶层 + 其余并入 data」封装,再
-  json.dumps 成一行写出(钉死 SLS 索引列;见 spec §5)。formatter 用 %(message)s——行本身
-  已是 JSON,不能再过 JsonFormatter 二次编码。
-- 滚动 20MB×10(env 可调),与服务日志同机制。
-  ⚠️ 依赖 --workers 1:RotatingFileHandler 多进程并发 doRollover 会损坏/丢日志;扩 worker
-  前换 QueueHandler→单写入者 / 外部 logrotate(copytruncate) / 写 stdout 交 journald。
-
-服务端补的字段(time/source/service/client_ip/device_id/...)是「事实」,与客户端自述分开。
-`time` 用服务端接收时间作 SLS 主时间(客户端时钟不可信),client_ts 另存为可查字段。
-"""
-from __future__ import annotations
-
-import json
-import logging
-import os
-from datetime import datetime
-from logging.handlers import RotatingFileHandler
-from pathlib import Path
-
-# 仅这些客户端键提到输出行顶层;其余(含客户端自带 data)一律并入 data,防 SLS 索引列爆炸
-_TOP_LEVEL_KEYS = ("client_ts", "level", "trace_id", "tag", "msg")
-
-# trace_id/tag/level 是 SLS 索引字段(spec §8):给长度上限,防客户端塞超大值撑爆索引/抬升成本。
-# (msg 另有字节截断;data 内的值不限,留待后续「服务端脱敏」knob。)
-_MAX_LEVEL_LEN = 16
-_MAX_TRACE_ID_LEN = 256
-_MAX_TAG_LEN = 128
-
-_logger: logging.Logger | None = None
-
-
-def _max_msg_bytes() -> int:
-    # 每次调用现读 env(不设模块级常量):便于运行期调整 / 测试 monkeypatch,开销可忽略。
-    return int(os.getenv("APPLOG_MAX_MSG_BYTES", "8192"))
-
-
-def _build_logger() -> logging.Logger:
-    lg = logging.getLogger("shagua.client_log")  # 与仓库 shagua.* 业务 logger 命名一致
-    lg.setLevel(logging.INFO)
-    lg.propagate = False  # 不冒泡到 root → 不写进 app-server.log
-    log_file = os.getenv("CLIENT_LOG_FILE") or str(
-        Path(os.getenv("LOG_DIR", "logs")) / "app-client.log"
-    )
-    Path(log_file).parent.mkdir(parents=True, exist_ok=True)
-    handler = RotatingFileHandler(
-        log_file,
-        maxBytes=int(os.getenv("CLIENT_LOG_MAX_BYTES", str(20 * 1024 * 1024))),
-        backupCount=int(os.getenv("CLIENT_LOG_BACKUP_COUNT", "10")),
-        encoding="utf-8",
-    )
-    handler.setFormatter(logging.Formatter("%(message)s"))  # 行已是 JSON,不再包装
-    lg.handlers = [handler]
-    return lg
-
-
-def get_logger() -> logging.Logger:
-    global _logger
-    if _logger is None:
-        _logger = _build_logger()
-    return _logger
-
-
-def reset_client_logger() -> None:
-    """测试用:关闭并丢弃当前 logger,使下次 get_logger 按当时 env 重建(切临时文件)。"""
-    global _logger
-    if _logger is not None:
-        for h in list(_logger.handlers):
-            h.close()
-        _logger.handlers = []
-    _logger = None
-
-
-def _truncate_msg(msg: str) -> tuple[str, bool]:
-    raw = msg.encode("utf-8")
-    limit = _max_msg_bytes()
-    if len(raw) <= limit:
-        return msg, False
-    # 按字节截断后解码,忽略截断处半个多字节字符
-    return raw[:limit].decode("utf-8", "ignore") + "…[truncated]", True
-
-
-def _build_line(
-    record: dict, *, meta: dict, client_ip: str, service: str, now_iso: str
-) -> str:
-    out: dict = {
-        "time": now_iso,
-        "source": "client",
-        "service": service,
-        "client_ip": client_ip,
-    }
-    # 批级公共字段(非空才带)
-    for k in ("device_id", "user_id", "app_ver", "platform", "sent_at"):
-        v = meta.get(k)
-        if v is not None:
-            out[k] = v
-    # 白名单键提顶层(索引字段做长度上限 + 统一转 str,保证 SLS 里类型/大小可控)
-    if record.get("level") is not None:
-        out["level"] = str(record["level"])[:_MAX_LEVEL_LEN].upper()
-    if record.get("trace_id"):
-        out["trace_id"] = str(record["trace_id"])[:_MAX_TRACE_ID_LEN]
-    if record.get("tag"):
-        out["tag"] = str(record["tag"])[:_MAX_TAG_LEN]
-    if record.get("client_ts") is not None:
-        out["client_ts"] = record["client_ts"]
-    if record.get("msg") is not None:
-        msg, truncated = _truncate_msg(str(record["msg"]))
-        out["msg"] = msg
-        if truncated:
-            out["msg_truncated"] = True
-    # 其余键并入 data:先收白名单外的散键(兜底),再让客户端显式的 data 覆盖同名散键
-    # —— 显式 data 为准,不静默丢客户端明确给的值(保真)。
-    data: dict = {}
-    for k, v in record.items():
-        if k in _TOP_LEVEL_KEYS or k == "data":
-            continue
-        data[k] = v
-    client_data = record.get("data")
-    if isinstance(client_data, dict):
-        data.update(client_data)
-    if data:
-        out["data"] = data
-    return json.dumps(out, ensure_ascii=False, default=str)
-
-
-def write_records(
-    records: list[dict], *, meta: dict, client_ip: str
-) -> tuple[int, int]:
-    """把一批客户端日志逐条写入专用文件。返回 (received, dropped)。
-
-    尽力而为(fire-and-forget):logger 初始化或单条写入失败只跳过并计 dropped,
-    不抛给上层——端点因此永不因写日志而 500。
-    """
-    try:
-        lg = get_logger()
-    except Exception:  # noqa: BLE001 — 初始化失败也不能让端点 500
-        logging.getLogger("shagua.applog").exception("client log writer init failed")
-        return 0, len(records)
-    service = os.getenv("CLIENT_LOG_SERVICE_NAME", "app-client")
-    # 一批共用同一「服务端接收时间」:降开销,且语义上是服务端「收到」而非逐条「处理」时间。
-    now_iso = datetime.now().strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3]
-    received = dropped = 0
-    for rec in records:
-        try:
-            line = _build_line(
-                rec, meta=meta, client_ip=client_ip, service=service, now_iso=now_iso
-            )
-            lg.info(line)
-            received += 1
-        except Exception:  # noqa: BLE001 — 坏条跳过,不影响其余
-            logging.getLogger("shagua.applog").exception(
-                "client log record dropped client_ip=%s", client_ip
-            )
-            dropped += 1
-    return received, dropped

app/core/config.py

@@ -377,12 +377,6 @@ class Settings(BaseSettings):
     # 靠这个共享密钥头(X-Internal-Secret)校验,与 pricebot 侧 INTERNAL_API_SECRET 同值。
     # 默认空 = 内部写端点关闭(返 503),启用前两边都要配上同一高熵串。
     INTERNAL_API_SECRET: str = ""
-    # Current compare clients are persisted by server-side harvest. Repair any
-    # recent terminal rows left without LLM usage by transient upstream/auth failures.
-    LLM_COST_BACKFILL_ENABLED: bool = True
-    LLM_COST_BACKFILL_INTERVAL_SEC: int = 300
-    LLM_COST_BACKFILL_BATCH_SIZE: int = 100
-    LLM_COST_BACKFILL_LOOKBACK_DAYS: int = 30
 
     # ===== 媒体文件(用户头像上传)=====
     # 落盘根目录(data/ 已 gitignore,上传不进库);对外经 StaticFiles 挂在 MEDIA_URL_PREFIX。

app/core/config_schema.py

@@ -11,10 +11,6 @@ from typing import Any
 
 from app.core import rewards as r
 
-RISK_SMS_HOURLY_THRESHOLD_KEY = "risk_sms_hourly_threshold"
-RISK_ONECLICK_DAILY_THRESHOLD_KEY = "risk_oneclick_daily_threshold"
-RISK_COMPARE_DAILY_THRESHOLD_KEY = "risk_compare_daily_threshold"
-
 # type 约定(给前端渲染编辑控件用):int / int_list / dict_str_int / bool / enum
 # hidden=True:仍是合法可配项(业务照常 get_value / admin 可经专用端点读写),但**不在通用
 #   「系统配置」页渲染**(admin/routers/config.py:list_config 按此过滤)。用于把已下线/已改由
@@ -110,36 +106,4 @@ CONFIG_DEFS: dict[str, dict[str, Any]] = {
             "default 兜底未登记的模型。改价只影响之后回填的新记录,历史记录用当时价格快照。"
         ),
     },
-    # 风控监控页专用配置。复用 app_config 持久化，但不在通用「系统配置」页重复展示；
-    # 由 /admin/api/risk-monitor/rules 专用接口整组校验、审计和即时重算当前窗口。
-    RISK_SMS_HOURLY_THRESHOLD_KEY: {
-        "default": 5,
-        "label": "短信设备每小时告警阈值",
-        "group": "风控",
-        "type": "int",
-        "min": 1,
-        "max": 5,
-        "hidden": True,
-        "help": "同一设备在北京时间同一自然小时内成功下发短信达到该次数时告警；不得高于现有每小时 5 次的发送上限。",
-    },
-    RISK_ONECLICK_DAILY_THRESHOLD_KEY: {
-        "default": 20,
-        "label": "一键登录设备每日告警阈值",
-        "group": "风控",
-        "type": "int",
-        "min": 1,
-        "max": 100_000,
-        "hidden": True,
-        "help": "同一设备在北京时间同一自然日内一键登录成功和失败合计达到该次数时告警。",
-    },
-    RISK_COMPARE_DAILY_THRESHOLD_KEY: {
-        "default": 100,
-        "label": "比价账户每日告警阈值",
-        "group": "风控",
-        "type": "int",
-        "min": 1,
-        "max": 100,
-        "hidden": True,
-        "help": "同一账户在北京时间同一自然日内发起比价达到该次数时告警。",
-    },
 }

app/core/llm_cost_backfill_worker.py

@@ -1,63 +0,0 @@
-"""Periodic repair worker for comparison records with missing LLM token cost."""
-from __future__ import annotations
-
-import asyncio
-import contextlib
-import logging
-
-from app.core.config import settings
-from app.services.comparison_llm_backfill import repair_missing_comparison_llm_costs
-from app.services.pricebot_llm_calls import pricebot_llm_auth_ready
-
-logger = logging.getLogger("shagua.llm_cost_backfill_worker")
-
-
-async def _run_loop() -> None:
-    interval = max(60, int(settings.LLM_COST_BACKFILL_INTERVAL_SEC))
-    logger.info(
-        "LLM cost backfill worker started interval=%ss batch=%s lookback_days=%s",
-        interval,
-        settings.LLM_COST_BACKFILL_BATCH_SIZE,
-        settings.LLM_COST_BACKFILL_LOOKBACK_DAYS,
-    )
-    try:
-        while True:
-            try:
-                auth_ready = await asyncio.to_thread(pricebot_llm_auth_ready)
-                if auth_ready:
-                    result = await asyncio.to_thread(
-                        repair_missing_comparison_llm_costs,
-                        limit=settings.LLM_COST_BACKFILL_BATCH_SIZE,
-                        lookback_days=settings.LLM_COST_BACKFILL_LOOKBACK_DAYS,
-                    )
-                    logger.info("LLM cost backfill batch result=%s", result)
-                else:
-                    logger.error(
-                        "LLM cost backfill skipped: PriceBot internal auth is not ready"
-                    )
-            except Exception:  # noqa: BLE001
-                logger.exception("LLM cost backfill batch failed")
-            await asyncio.sleep(interval)
-    except asyncio.CancelledError:
-        logger.info("LLM cost backfill worker stopped")
-        raise
-
-
-def start_llm_cost_backfill_worker() -> asyncio.Task | None:
-    if not settings.LLM_COST_BACKFILL_ENABLED:
-        logger.info("LLM cost backfill worker disabled")
-        return None
-    if not settings.INTERNAL_API_SECRET:
-        logger.warning(
-            "LLM cost backfill worker not started: INTERNAL_API_SECRET is empty"
-        )
-        return None
-    return asyncio.create_task(_run_loop(), name="llm-cost-backfill")
-
-
-async def stop_llm_cost_backfill_worker(task: asyncio.Task | None) -> None:
-    if task is None:
-        return
-    task.cancel()
-    with contextlib.suppress(asyncio.CancelledError):
-        await task

app/main.py

@@ -21,7 +21,6 @@ from app.api.internal.price import router as internal_price_router
 from app.api.internal.store import router as internal_store_router
 from app.api.v1.ad import router as ad_router
 from app.api.v1.analytics import router as analytics_router
-from app.api.v1.applog import router as applog_router
 from app.api.v1.auth import router as auth_router
 from app.api.v1.compare import router as compare_router
 from app.api.v1.compare_milestone import router as compare_milestone_router
@@ -61,10 +60,6 @@ from app.core.inactivity_reset_worker import (
     start_inactivity_reset_worker,
     stop_inactivity_reset_worker,
 )
-from app.core.llm_cost_backfill_worker import (
-    start_llm_cost_backfill_worker,
-    stop_llm_cost_backfill_worker,
-)
 from app.core.logging import setup_logging
 from app.core.observe import RequestMetricsMiddleware
 from app.core.observe_worker import (
@@ -108,7 +103,6 @@ async def lifespan(_: FastAPI) -> AsyncIterator[None]:
     daily_exchange_task = start_daily_exchange_worker()
     observe_task = start_observe_worker()
     inactivity_task = start_inactivity_reset_worker()
-    llm_cost_backfill_task = start_llm_cost_backfill_worker()
     try:
         yield
     finally:
@@ -118,7 +112,6 @@ async def lifespan(_: FastAPI) -> AsyncIterator[None]:
         await stop_daily_exchange_worker(daily_exchange_task)
         await stop_observe_worker(observe_task)
         await stop_inactivity_reset_worker(inactivity_task)
-        await stop_llm_cost_backfill_worker(llm_cost_backfill_task)
         await aclose_pricebot_client()
         mt_meituan.close_client()
         logger.info("shutting down")
@@ -154,7 +147,6 @@ app.include_router(auth_router)
 app.include_router(user_router)
 app.include_router(feedback_router)
 app.include_router(analytics_router)
-app.include_router(applog_router)
 app.include_router(invite_router)
 app.include_router(coupon_router)
 app.include_router(device_router)

app/models/__init__.py

@@ -13,7 +13,13 @@ from app.models.analytics_selfstat import (  # noqa: F401
 )
 from app.models.app_config import AppConfig  # noqa: F401
 from app.models.comparison import ComparisonRecord  # noqa: F401
+from app.models.cps_activity import CpsActivity  # noqa: F401
+from app.models.cps_group import CpsGroup  # noqa: F401
+from app.models.cps_link import CpsClick, CpsLink  # noqa: F401
+from app.models.cps_order import CpsOrder  # noqa: F401
+from app.models.cps_wx_user import CpsWxUser  # noqa: F401
 from app.models.comparison_milestone import ComparisonMilestoneClaim  # noqa: F401
+from app.models.device import DeviceLiveness  # noqa: F401
 from app.models.coupon_state import (  # noqa: F401
     CouponClaimEvent,
     CouponClaimRecord,
@@ -21,12 +27,6 @@ from app.models.coupon_state import (  # noqa: F401
     CouponPromptEngagement,
     CouponSession,
 )
-from app.models.cps_activity import CpsActivity  # noqa: F401
-from app.models.cps_group import CpsGroup  # noqa: F401
-from app.models.cps_link import CpsClick, CpsLink  # noqa: F401
-from app.models.cps_order import CpsOrder  # noqa: F401
-from app.models.cps_wx_user import CpsWxUser  # noqa: F401
-from app.models.device import DeviceLiveness  # noqa: F401
 from app.models.feedback import Feedback  # noqa: F401
 from app.models.guide_video import GuideVideoPlay  # noqa: F401
 from app.models.inactivity import (  # noqa: F401
@@ -39,12 +39,11 @@ from app.models.launch_confirm_sample import LaunchConfirmSample  # noqa: F401
 from app.models.meituan_coupon import MeituanCoupon  # noqa: F401
 from app.models.notification import Notification  # noqa: F401
 from app.models.onboarding import OnboardingCompletion  # noqa: F401
+from app.models.phone_rebind_log import PhoneRebindLog  # noqa: F401
 from app.models.ops_marquee_seed import OpsMarqueeSeed  # noqa: F401
 from app.models.ops_stat_config import OpsStatConfig  # noqa: F401
-from app.models.phone_rebind_log import PhoneRebindLog  # noqa: F401
 from app.models.price_observation import PriceObservation  # noqa: F401
 from app.models.price_report import PriceReport  # noqa: F401
-from app.models.risk import BehaviorEvent, RiskIncident, SubjectRestriction  # noqa: F401
 from app.models.savings import SavingsRecord  # noqa: F401
 from app.models.signin import SigninRecord  # noqa: F401
 from app.models.store_mapping import StoreMapping  # noqa: F401

app/models/risk.py

@@ -1,163 +0,0 @@
-"""通用行为事件、风险事件与主体限制。
-
-这三张表不是“风控监控页面专用表”：
-
-- ``behavior_event`` 保存服务端权威的关键行为流水，后续可复用于安全审计、
-  漏斗核查和客诉排查；
-- ``risk_incident`` 保存规则命中后的可处置事件，负责“待处理/忽略/封禁/解除”
-  生命周期；
-- ``subject_restriction`` 保存当前生效的主体限制，统一承载设备、账号等主体的
-  业务拦截状态。
-"""
-from __future__ import annotations
-
-from datetime import datetime
-
-from sqlalchemy import (
-    JSON,
-    Boolean,
-    DateTime,
-    Index,
-    Integer,
-    String,
-    UniqueConstraint,
-    func,
-    true,
-)
-from sqlalchemy.dialects.postgresql import JSONB
-from sqlalchemy.orm import Mapped, mapped_column
-
-from app.db.base import Base
-
-_JSON = JSON().with_variant(JSONB(), "postgresql")
-
-
-class BehaviorEvent(Base):
-    """服务端权威行为流水；只增不改。"""
-
-    __tablename__ = "behavior_event"
-    __table_args__ = (
-        Index("ix_behavior_event_type_time", "event_type", "occurred_at"),
-        Index(
-            "ix_behavior_event_subject_time",
-            "subject_type",
-            "subject_id",
-            "occurred_at",
-        ),
-        Index("ix_behavior_event_user_time", "user_id", "occurred_at"),
-    )
-
-    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
-    event_type: Mapped[str] = mapped_column(String(64), nullable=False)
-    subject_type: Mapped[str] = mapped_column(String(32), nullable=False)
-    subject_id: Mapped[str] = mapped_column(String(128), nullable=False)
-
-    user_id: Mapped[int | None] = mapped_column(Integer, nullable=True)
-    device_id: Mapped[str | None] = mapped_column(String(128), nullable=True)
-    device_model: Mapped[str | None] = mapped_column(String(128), nullable=True)
-    phone: Mapped[str | None] = mapped_column(String(20), nullable=True)
-    client_ip: Mapped[str | None] = mapped_column(String(64), nullable=True)
-
-    # success / failed / rejected / attempted
-    outcome: Mapped[str] = mapped_column(String(24), nullable=False, default="success")
-    reason: Mapped[str | None] = mapped_column(String(256), nullable=True)
-    details: Mapped[dict | None] = mapped_column(_JSON, nullable=True)
-
-    occurred_at: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), nullable=False, index=True
-    )
-    created_at: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), server_default=func.now(), nullable=False
-    )
-
-
-class RiskIncident(Base):
-    """规则命中后形成的可处置风险事件。"""
-
-    __tablename__ = "risk_incident"
-    __table_args__ = (
-        UniqueConstraint(
-            "rule_code",
-            "subject_type",
-            "subject_id",
-            "window_key",
-            name="uq_risk_incident_rule_subject_window",
-        ),
-        Index("ix_risk_incident_rule_status", "rule_code", "status", "triggered_at"),
-        Index(
-            "ix_risk_incident_subject",
-            "subject_type",
-            "subject_id",
-            "triggered_at",
-        ),
-    )
-
-    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
-    rule_code: Mapped[str] = mapped_column(String(64), nullable=False)
-    event_type: Mapped[str] = mapped_column(String(64), nullable=False)
-    subject_type: Mapped[str] = mapped_column(String(32), nullable=False)
-    subject_id: Mapped[str] = mapped_column(String(128), nullable=False)
-    window_key: Mapped[str] = mapped_column(String(64), nullable=False)
-
-    window_start: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
-    window_end: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
-    first_event_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
-    triggered_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
-    last_event_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
-    event_count: Mapped[int] = mapped_column(Integer, nullable=False)
-
-    # open / ignored / blocked / resolved
-    status: Mapped[str] = mapped_column(String(24), nullable=False, default="open")
-    action_reason: Mapped[str | None] = mapped_column(String(256), nullable=True)
-    handled_by: Mapped[int | None] = mapped_column(Integer, nullable=True)
-    handled_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
-    details: Mapped[dict | None] = mapped_column(_JSON, nullable=True)
-
-    created_at: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), server_default=func.now(), nullable=False
-    )
-    updated_at: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True),
-        server_default=func.now(),
-        onupdate=func.now(),
-        nullable=False,
-    )
-
-
-class SubjectRestriction(Base):
-    """主体当前限制状态；同一主体同一作用域只有一条，可封禁后再解除/重启。"""
-
-    __tablename__ = "subject_restriction"
-    __table_args__ = (
-        UniqueConstraint(
-            "subject_type",
-            "subject_id",
-            "scope",
-            name="uq_subject_restriction_subject_scope",
-        ),
-        Index(
-            "ix_subject_restriction_lookup",
-            "subject_type",
-            "subject_id",
-            "scope",
-            "active",
-        ),
-    )
-
-    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
-    subject_type: Mapped[str] = mapped_column(String(32), nullable=False)
-    subject_id: Mapped[str] = mapped_column(String(128), nullable=False)
-    # auth_device / economic_account / all
-    scope: Mapped[str] = mapped_column(String(32), nullable=False)
-    active: Mapped[bool] = mapped_column(
-        Boolean, nullable=False, default=True, server_default=true()
-    )
-    reason: Mapped[str | None] = mapped_column(String(256), nullable=True)
-    incident_id: Mapped[int | None] = mapped_column(Integer, nullable=True)
-    created_by: Mapped[int | None] = mapped_column(Integer, nullable=True)
-    created_at: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), server_default=func.now(), nullable=False
-    )
-    revoked_by: Mapped[int | None] = mapped_column(Integer, nullable=True)
-    revoked_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
-    details: Mapped[dict | None] = mapped_column(_JSON, nullable=True)

app/models/user.py

@@ -11,7 +11,7 @@ from __future__ import annotations
 
 from datetime import datetime, timezone
 
-from sqlalchemy import Boolean, DateTime, Integer, String, Text, false, func
+from sqlalchemy import Boolean, DateTime, Integer, String, false, func
 from sqlalchemy.orm import Mapped, mapped_column
 
 from app.db.base import Base
@@ -62,13 +62,6 @@ class User(Base):
         Boolean, nullable=False, default=False, server_default=false()
     )
 
-    # 运营人工风险标记。与自动风控分值分开：这里表达人工复核结论，并保留可编辑备注，
-    # 供邀请提现、其他提现和用户管理三个页面统一展示。
-    is_high_risk: Mapped[bool] = mapped_column(
-        Boolean, nullable=False, default=False, server_default=false(), index=True
-    )
-    high_risk_note: Mapped[str | None] = mapped_column(Text, nullable=True)
-
     created_at: Mapped[datetime] = mapped_column(
         DateTime(timezone=True), server_default=func.now(), nullable=False
     )

app/models/wallet.py

@@ -96,6 +96,15 @@ 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(

app/repositories/comparison.py

@@ -55,22 +55,13 @@ def _product_names_from_items(items: list | None) -> str | None:
 def _derive(payload: ComparisonRecordIn) -> dict:
     """从上报 payload 派生结构化列(best/saved/is_source_best/status)。"""
     results = payload.comparison_results
-    _pr = payload.platform_results or {}
 
-    def _is_short(r) -> bool:
-        # 缺菜(漏菜)店: 少买了菜总价虚低, 不参与最优评选。逐平台 skipped 在 platform_results, 行里没有。
-        # platform_results 内层结构宽松(pricebot/老客户端透传, 可伪造), 值非 dict 时按"不缺菜"处理, 不崩。
-        info = _pr.get(r.platform_id) if r.platform_id else None
-        return isinstance(info, dict) and (info.get("skipped_dish_count") or 0) > 0
-
-    # 最优 = 非缺菜里 rank 最小(=最便宜)的一条;协议已升序,但不信顺序,显式按 rank/price 取。
-    # 源平台永远全菜, 故全目标缺菜时回落到源(is_source_best、saved=0), 不把虚低价当最低。
-    priced = [r for r in results if r.price is not None]
-    clean = [r for r in priced if not _is_short(r)]
+    # 最优 = rank 最小的一条;协议已升序,但不信顺序,显式按 rank/price 兜底取最小价。
     best = None
-    if clean:
+    priced = [r for r in results if r.price is not None]
+    if priced:
         best = min(
-            clean,
+            priced,
             key=lambda r: (r.rank if r.rank is not None else 10**9, r.price),
         )
 
@@ -205,29 +196,14 @@ def upsert_record(
 # ============================================================
 
 
-def _derive_from_results(
-    results: list[dict], platform_results: dict | None = None
-) -> dict:
+def _derive_from_results(results: list[dict]) -> dict:
     """从 done 帧 comparison_results(pricebot 原始 dict 列表)派生结构化列。
-    等价 _derive,但吃原始字段(is_source/price/rank/platform_id/store_name...)而非 pydantic 对象。
-
-    platform_results(done.params.platform_results): 逐平台 skipped_dish_count 在这里(行里没有)。
-    传入则派生 best 时排除缺菜(漏菜)店 —— 少买了菜总价虚低, 不能当记录级"最低价"/算虚假省额;
-    源平台永远全菜, 故全目标缺菜时 best 回落到源(is_source_best、不虚报省)。不传→纯 rank/price, 行为不变。"""
-    _pr = platform_results or {}
-
-    def _is_short(r: dict) -> bool:
-        # platform_results 内层结构宽松(pricebot/客户端透传), 值非 dict 时按"不缺菜"处理, 不崩。
-        pid = r.get("platform_id")
-        info = _pr.get(pid) if pid else None
-        return isinstance(info, dict) and (info.get("skipped_dish_count") or 0) > 0
-
+    等价 _derive,但吃原始字段(is_source/price/rank/platform_id/store_name...)而非 pydantic 对象。"""
     priced = [r for r in results if r.get("price") is not None]
-    clean = [r for r in priced if not _is_short(r)]  # 缺菜店排除出最优评选
     best = None
-    if clean:
+    if priced:
         best = min(
-            clean,
+            priced,
             key=lambda r: (r.get("rank") if r.get("rank") is not None else 10**9, r["price"]),
         )
     src_row = next((r for r in results if r.get("is_source")), None)
@@ -413,7 +389,7 @@ def harvest_done(
     返回 (记录, 是否本次**新**落成 success)——供调用方据此幂等发一次邀请奖。
     行不存在(理论上帧0已建;防御)则新建。"""
     results = done_params.get("comparison_results") or []
-    derived = _derive_from_results(results, done_params.get("platform_results"))
+    derived = _derive_from_results(results)
     # 菜品:pricebot 已把源单菜品塞进 comparison_results[源行].items
     items = next((r.get("items") or [] for r in results if r.get("is_source")), [])
     fields = dict(

app/repositories/risk.py

@@ -1,569 +0,0 @@
-"""通用行为事件、风险规则与主体限制仓库。"""
-from __future__ import annotations
-
-from dataclasses import dataclass
-from datetime import UTC, datetime, timedelta
-from zoneinfo import ZoneInfo
-
-from sqlalchemy import func, select
-from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm import Session
-
-from app.core.config_schema import (
-    RISK_COMPARE_DAILY_THRESHOLD_KEY,
-    RISK_ONECLICK_DAILY_THRESHOLD_KEY,
-    RISK_SMS_HOURLY_THRESHOLD_KEY,
-)
-from app.models.app_config import AppConfig
-from app.models.comparison import ComparisonRecord
-from app.models.risk import BehaviorEvent, RiskIncident, SubjectRestriction
-from app.repositories import app_config
-
-CN_TZ = ZoneInfo("Asia/Shanghai")
-
-RULE_SMS_HOURLY = "sms_device_hourly_5"
-RULE_ONECLICK_DAILY = "oneclick_device_daily_20"
-RULE_COMPARE_DAILY = "compare_account_daily_100"
-
-EVENT_SMS_SEND = "sms_send"
-EVENT_SMS_LOGIN = "sms_login"
-EVENT_ONECLICK_LOGIN = "oneclick_login"
-
-SCOPE_AUTH_DEVICE = "auth_device"
-SCOPE_ECONOMIC_ACCOUNT = "economic_account"
-AUTO_RESOLVED_REASON = "规则阈值调整后不再命中"
-MANUAL_RESET_REASON = "管理员重置报警计数"
-RISK_RESET_BASELINES_KEY = "risk_monitor_reset_baselines"
-
-
-@dataclass(frozen=True)
-class RuleSpec:
-    code: str
-    event_type: str
-    subject_type: str
-    threshold_key: str
-    window: str
-    count_outcomes: tuple[str, ...]
-
-
-RULES: dict[str, RuleSpec] = {
-    RULE_SMS_HOURLY: RuleSpec(
-        code=RULE_SMS_HOURLY,
-        event_type=EVENT_SMS_SEND,
-        subject_type="device",
-        threshold_key=RISK_SMS_HOURLY_THRESHOLD_KEY,
-        window="hour",
-        count_outcomes=("success",),
-    ),
-    RULE_ONECLICK_DAILY: RuleSpec(
-        code=RULE_ONECLICK_DAILY,
-        event_type=EVENT_ONECLICK_LOGIN,
-        subject_type="device",
-        threshold_key=RISK_ONECLICK_DAILY_THRESHOLD_KEY,
-        window="day",
-        count_outcomes=("success", "failed"),
-    ),
-}
-
-RULE_THRESHOLD_KEYS: dict[str, str] = {
-    RULE_SMS_HOURLY: RISK_SMS_HOURLY_THRESHOLD_KEY,
-    RULE_ONECLICK_DAILY: RISK_ONECLICK_DAILY_THRESHOLD_KEY,
-    RULE_COMPARE_DAILY: RISK_COMPARE_DAILY_THRESHOLD_KEY,
-}
-
-
-def get_rule_threshold(db: Session, rule_code: str) -> int:
-    """读取规则当前阈值；配置表为空时回退上线前的 5/20/100 默认值。"""
-    return int(app_config.get_value(db, RULE_THRESHOLD_KEYS[rule_code]))
-
-
-def utcnow() -> datetime:
-    return datetime.now(UTC)
-
-
-def _ensure_aware(value: datetime) -> datetime:
-    return value.replace(tzinfo=UTC) if value.tzinfo is None else value
-
-
-def get_rule_reset_at(db: Session, rule_code: str) -> datetime | None:
-    """返回规则最近一次全局重置时间；异常旧值按未重置处理。"""
-    row = db.get(AppConfig, RISK_RESET_BASELINES_KEY)
-    if row is None or not isinstance(row.value, dict):
-        return None
-    raw = row.value.get(rule_code)
-    if not isinstance(raw, str):
-        return None
-    try:
-        parsed = datetime.fromisoformat(raw.replace("Z", "+00:00"))
-    except ValueError:
-        return None
-    return _ensure_aware(parsed).astimezone(UTC)
-
-
-def reset_rule_baselines(
-    db: Session,
-    *,
-    rule_codes: tuple[str, ...],
-    reset_at: datetime,
-    admin_id: int,
-) -> None:
-    """持久化全局重置基线；不删除任何行为或比价流水。"""
-    row = db.get(AppConfig, RISK_RESET_BASELINES_KEY)
-    value = dict(row.value) if row and isinstance(row.value, dict) else {}
-    timestamp = _ensure_aware(reset_at).astimezone(UTC).isoformat()
-    value.update({rule_code: timestamp for rule_code in rule_codes})
-    if row is None:
-        db.add(
-            AppConfig(
-                key=RISK_RESET_BASELINES_KEY,
-                value=value,
-                updated_by_admin_id=admin_id,
-            )
-        )
-    else:
-        row.value = value
-        row.updated_by_admin_id = admin_id
-    db.flush()
-
-
-def _window_bounds(at: datetime, window: str) -> tuple[str, datetime, datetime]:
-    local = _ensure_aware(at).astimezone(CN_TZ)
-    if window == "hour":
-        start_local = local.replace(minute=0, second=0, microsecond=0)
-        key = start_local.strftime("%Y-%m-%dT%H")
-        end_local = start_local + timedelta(hours=1)
-    elif window == "day":
-        start_local = local.replace(hour=0, minute=0, second=0, microsecond=0)
-        key = start_local.strftime("%Y-%m-%d")
-        end_local = start_local + timedelta(days=1)
-    else:  # pragma: no cover - 规则声明错误应尽早暴露
-        raise ValueError(f"unsupported risk window: {window}")
-    return key, start_local.astimezone(UTC), end_local.astimezone(UTC)
-
-
-def _event_stats(
-    db: Session,
-    spec: RuleSpec,
-    *,
-    subject_id: str,
-    start: datetime,
-    end: datetime,
-    threshold: int,
-) -> tuple[int, datetime | None, datetime | None, datetime | None]:
-    filters = (
-        BehaviorEvent.event_type == spec.event_type,
-        BehaviorEvent.subject_type == spec.subject_type,
-        BehaviorEvent.subject_id == subject_id,
-        BehaviorEvent.outcome.in_(spec.count_outcomes),
-        BehaviorEvent.occurred_at >= start,
-        BehaviorEvent.occurred_at < end,
-    )
-    count, first_at, last_at = db.execute(
-        select(
-            func.count(BehaviorEvent.id),
-            func.min(BehaviorEvent.occurred_at),
-            func.max(BehaviorEvent.occurred_at),
-        ).where(*filters)
-    ).one()
-    triggered_at = None
-    if int(count or 0) >= threshold:
-        triggered_at = db.execute(
-            select(BehaviorEvent.occurred_at)
-            .where(*filters)
-            .order_by(BehaviorEvent.occurred_at.asc(), BehaviorEvent.id.asc())
-            .offset(threshold - 1)
-            .limit(1)
-        ).scalar_one()
-    return int(count or 0), first_at, last_at, triggered_at
-
-
-def _upsert_incident(
-    db: Session,
-    *,
-    rule_code: str,
-    event_type: str,
-    subject_type: str,
-    subject_id: str,
-    window_key: str,
-    window_start: datetime,
-    window_end: datetime,
-    first_event_at: datetime,
-    triggered_at: datetime,
-    last_event_at: datetime,
-    event_count: int,
-    details: dict | None = None,
-) -> RiskIncident:
-    incident = db.execute(
-        select(RiskIncident).where(
-            RiskIncident.rule_code == rule_code,
-            RiskIncident.subject_type == subject_type,
-            RiskIncident.subject_id == subject_id,
-            RiskIncident.window_key == window_key,
-        )
-    ).scalar_one_or_none()
-    if incident is None:
-        incident = RiskIncident(
-            rule_code=rule_code,
-            event_type=event_type,
-            subject_type=subject_type,
-            subject_id=subject_id,
-            window_key=window_key,
-            window_start=window_start,
-            window_end=window_end,
-            first_event_at=first_event_at,
-            triggered_at=triggered_at,
-            last_event_at=last_event_at,
-            event_count=event_count,
-            status="open",
-            details=details,
-        )
-        # 并发首次命中可能同时插入；保存点只回滚重复 incident，不丢行为流水。
-        try:
-            with db.begin_nested():
-                db.add(incident)
-                db.flush()
-        except IntegrityError:
-            incident = db.execute(
-                select(RiskIncident).where(
-                    RiskIncident.rule_code == rule_code,
-                    RiskIncident.subject_type == subject_type,
-                    RiskIncident.subject_id == subject_id,
-                    RiskIncident.window_key == window_key,
-                )
-            ).scalar_one()
-    else:
-        reopened = incident.status == "resolved" and incident.action_reason in (
-            AUTO_RESOLVED_REASON,
-            MANUAL_RESET_REASON,
-        )
-        if reopened:
-            incident.status = "open"
-            incident.action_reason = None
-            incident.handled_by = None
-            incident.handled_at = None
-            # 同一自然窗口内重置后会复用唯一 incident；明细窗口必须同步切到新基线，
-            # 否则展开时会把重置前的旧流水也混进来。
-            incident.window_start = window_start
-            incident.window_end = window_end
-        incident.first_event_at = first_event_at
-        if incident.status == "open":
-            incident.triggered_at = triggered_at
-        incident.last_event_at = last_event_at
-        incident.event_count = event_count
-        # 已忽略/封禁的事件只更新事实数据，不重新打开。
-        if details:
-            incident.details = {**(incident.details or {}), **details}
-    return incident
-
-
-def evaluate_behavior_rule(
-    db: Session, *, rule_code: str, subject_id: str, at: datetime
-) -> RiskIncident | None:
-    spec = RULES[rule_code]
-    threshold = get_rule_threshold(db, rule_code)
-    window_key, window_start, end = _window_bounds(at, spec.window)
-    reset_at = get_rule_reset_at(db, rule_code)
-    start = max(window_start, reset_at) if reset_at else window_start
-    count, first_at, last_at, triggered_at = _event_stats(
-        db,
-        spec,
-        subject_id=subject_id,
-        start=start,
-        end=end,
-        threshold=threshold,
-    )
-    if count < threshold or first_at is None or last_at is None or triggered_at is None:
-        return None
-    return _upsert_incident(
-        db,
-        rule_code=spec.code,
-        event_type=spec.event_type,
-        subject_type=spec.subject_type,
-        subject_id=subject_id,
-        window_key=window_key,
-        window_start=start,
-        window_end=end,
-        first_event_at=first_at,
-        triggered_at=triggered_at,
-        last_event_at=last_at,
-        event_count=count,
-    )
-
-
-def reconcile_behavior_rule(
-    db: Session,
-    *,
-    rule_code: str,
-    at: datetime | None = None,
-    commit: bool = True,
-) -> int:
-    """按当前阈值重算短信/一键登录当前窗口，并收起已不再命中的待处理告警。"""
-    spec = RULES[rule_code]
-    current = at or utcnow()
-    threshold = get_rule_threshold(db, rule_code)
-    window_key, window_start, end = _window_bounds(current, spec.window)
-    reset_at = get_rule_reset_at(db, rule_code)
-    start = max(window_start, reset_at) if reset_at else window_start
-    filters = (
-        BehaviorEvent.event_type == spec.event_type,
-        BehaviorEvent.subject_type == spec.subject_type,
-        BehaviorEvent.outcome.in_(spec.count_outcomes),
-        BehaviorEvent.occurred_at >= start,
-        BehaviorEvent.occurred_at < end,
-    )
-    qualifying_rows = db.execute(
-        select(
-            BehaviorEvent.subject_id,
-            func.max(BehaviorEvent.occurred_at),
-        )
-        .where(*filters)
-        .group_by(BehaviorEvent.subject_id)
-        .having(func.count(BehaviorEvent.id) >= threshold)
-    ).all()
-    qualifying = {str(subject_id) for subject_id, _ in qualifying_rows}
-    for subject_id, last_at in qualifying_rows:
-        evaluate_behavior_rule(
-            db,
-            rule_code=rule_code,
-            subject_id=str(subject_id),
-            at=last_at or current,
-        )
-
-    open_incidents = db.scalars(
-        select(RiskIncident).where(
-            RiskIncident.rule_code == rule_code,
-            RiskIncident.window_key == window_key,
-            RiskIncident.status == "open",
-        )
-    ).all()
-    for incident in open_incidents:
-        if incident.subject_id not in qualifying:
-            incident.status = "resolved"
-            incident.action_reason = AUTO_RESOLVED_REASON
-            incident.handled_by = None
-            incident.handled_at = utcnow()
-    if commit:
-        db.commit()
-    return len(qualifying)
-
-
-def record_behavior_event(
-    db: Session,
-    *,
-    event_type: str,
-    subject_type: str,
-    subject_id: str,
-    user_id: int | None = None,
-    device_id: str | None = None,
-    device_model: str | None = None,
-    phone: str | None = None,
-    client_ip: str | None = None,
-    outcome: str = "success",
-    reason: str | None = None,
-    details: dict | None = None,
-    occurred_at: datetime | None = None,
-    evaluate_rule: str | None = None,
-    commit: bool = True,
-) -> BehaviorEvent:
-    at = occurred_at or utcnow()
-    event = BehaviorEvent(
-        event_type=event_type,
-        subject_type=subject_type,
-        subject_id=subject_id,
-        user_id=user_id,
-        device_id=device_id,
-        device_model=device_model,
-        phone=phone,
-        client_ip=client_ip,
-        outcome=outcome,
-        reason=reason,
-        details=details,
-        occurred_at=at,
-    )
-    db.add(event)
-    db.flush()
-    if evaluate_rule:
-        evaluate_behavior_rule(db, rule_code=evaluate_rule, subject_id=subject_id, at=at)
-    if commit:
-        db.commit()
-        db.refresh(event)
-    return event
-
-
-def sync_compare_incident(
-    db: Session,
-    *,
-    user_id: int,
-    at: datetime,
-    threshold: int | None = None,
-    commit: bool = True,
-) -> RiskIncident | None:
-    effective_threshold = threshold or get_rule_threshold(db, RULE_COMPARE_DAILY)
-    # comparison_record 的既有写入口统一落“北京时间 naive”时间；这里必须沿用同一
-    # 口径，否则 SQLite/PG session timezone 不同时会把凌晨记录算到前一天。
-    local = at.astimezone(CN_TZ).replace(tzinfo=None) if at.tzinfo else at
-    window_start = local.replace(hour=0, minute=0, second=0, microsecond=0)
-    end = window_start + timedelta(days=1)
-    window_key = window_start.strftime("%Y-%m-%d")
-    reset_at = get_rule_reset_at(db, RULE_COMPARE_DAILY)
-    reset_local = (
-        reset_at.astimezone(CN_TZ).replace(tzinfo=None) if reset_at else None
-    )
-    start = max(window_start, reset_local) if reset_local else window_start
-    filters = (
-        ComparisonRecord.user_id == user_id,
-        ComparisonRecord.created_at >= start,
-        ComparisonRecord.created_at < end,
-    )
-    count, first_at, last_at = db.execute(
-        select(
-            func.count(ComparisonRecord.id),
-            func.min(ComparisonRecord.created_at),
-            func.max(ComparisonRecord.created_at),
-        ).where(*filters)
-    ).one()
-    if int(count or 0) < effective_threshold or first_at is None or last_at is None:
-        return None
-    triggered_at = db.execute(
-        select(ComparisonRecord.created_at)
-        .where(*filters)
-        .order_by(ComparisonRecord.created_at.asc(), ComparisonRecord.id.asc())
-        .offset(effective_threshold - 1)
-        .limit(1)
-    ).scalar_one()
-    incident = _upsert_incident(
-        db,
-        rule_code=RULE_COMPARE_DAILY,
-        event_type="compare_start",
-        subject_type="user",
-        subject_id=str(user_id),
-        window_key=window_key,
-        window_start=start,
-        window_end=end,
-        first_event_at=first_at,
-        triggered_at=triggered_at,
-        last_event_at=last_at,
-        event_count=int(count),
-    )
-    if commit:
-        db.commit()
-        db.refresh(incident)
-    return incident
-
-
-def reconcile_compare_rule(
-    db: Session, *, at: datetime | None = None, commit: bool = True
-) -> int:
-    """按当前阈值重算北京时间当日比价告警，并收起不再命中的待处理告警。"""
-    current = (at or utcnow()).astimezone(CN_TZ).replace(tzinfo=None)
-    window_start = current.replace(hour=0, minute=0, second=0, microsecond=0)
-    end = window_start + timedelta(days=1)
-    window_key = window_start.strftime("%Y-%m-%d")
-    reset_at = get_rule_reset_at(db, RULE_COMPARE_DAILY)
-    reset_local = (
-        reset_at.astimezone(CN_TZ).replace(tzinfo=None) if reset_at else None
-    )
-    start = max(window_start, reset_local) if reset_local else window_start
-    threshold = get_rule_threshold(db, RULE_COMPARE_DAILY)
-    rows = db.execute(
-        select(
-            ComparisonRecord.user_id,
-            func.max(ComparisonRecord.created_at),
-        )
-        .where(
-            ComparisonRecord.user_id.is_not(None),
-            ComparisonRecord.created_at >= start,
-            ComparisonRecord.created_at < end,
-        )
-        .group_by(ComparisonRecord.user_id)
-        .having(func.count(ComparisonRecord.id) >= threshold)
-    ).all()
-    qualifying = {str(user_id) for user_id, _ in rows}
-    for user_id, last_at in rows:
-        sync_compare_incident(
-            db,
-            user_id=int(user_id),
-            at=last_at or current,
-            threshold=threshold,
-            commit=False,
-        )
-
-    open_incidents = db.scalars(
-        select(RiskIncident).where(
-            RiskIncident.rule_code == RULE_COMPARE_DAILY,
-            RiskIncident.window_key == window_key,
-            RiskIncident.status == "open",
-        )
-    ).all()
-    for incident in open_incidents:
-        if incident.subject_id not in qualifying:
-            incident.status = "resolved"
-            incident.action_reason = AUTO_RESOLVED_REASON
-            incident.handled_by = None
-            incident.handled_at = utcnow()
-    if commit:
-        db.commit()
-    return len(qualifying)
-
-
-def get_active_restriction(
-    db: Session, *, subject_type: str, subject_id: str, scope: str
-) -> SubjectRestriction | None:
-    return db.execute(
-        select(SubjectRestriction).where(
-            SubjectRestriction.subject_type == subject_type,
-            SubjectRestriction.subject_id == subject_id,
-            SubjectRestriction.scope.in_((scope, "all")),
-            SubjectRestriction.active.is_(True),
-        )
-    ).scalar_one_or_none()
-
-
-def is_restricted(db: Session, *, subject_type: str, subject_id: str, scope: str) -> bool:
-    return get_active_restriction(
-        db, subject_type=subject_type, subject_id=subject_id, scope=scope
-    ) is not None
-
-
-def activate_restriction(
-    db: Session,
-    *,
-    subject_type: str,
-    subject_id: str,
-    scope: str,
-    reason: str,
-    incident_id: int | None,
-    admin_id: int,
-) -> SubjectRestriction:
-    restriction = db.execute(
-        select(SubjectRestriction).where(
-            SubjectRestriction.subject_type == subject_type,
-            SubjectRestriction.subject_id == subject_id,
-            SubjectRestriction.scope == scope,
-        )
-    ).scalar_one_or_none()
-    if restriction is None:
-        restriction = SubjectRestriction(
-            subject_type=subject_type,
-            subject_id=subject_id,
-            scope=scope,
-        )
-        db.add(restriction)
-    restriction.active = True
-    restriction.reason = reason
-    restriction.incident_id = incident_id
-    restriction.created_by = admin_id
-    restriction.created_at = utcnow()
-    restriction.revoked_by = None
-    restriction.revoked_at = None
-    db.flush()
-    return restriction
-
-
-def revoke_restriction(
-    db: Session, *, restriction: SubjectRestriction, admin_id: int
-) -> None:
-    restriction.active = False
-    restriction.revoked_by = admin_id
-    restriction.revoked_at = utcnow()
-    db.flush()

app/repositories/user.py

@@ -93,11 +93,6 @@ def get_user_by_id(db: Session, user_id: int) -> User | None:
     return db.get(User, user_id)
 
 
-def user_exists(db: Session, user_id: int) -> bool:
-    """只查主键判断用户是否存在，避免只读统计接口依赖完整用户表结构。"""
-    return db.scalar(select(User.id).where(User.id == user_id)) is not None
-
-
 def get_user_by_phone(db: Session, phone: str) -> User | None:
     stmt = select(User).where(User.phone == phone)
     return db.execute(stmt).scalar_one_or_none()

app/repositories/wallet.py

@@ -6,7 +6,6 @@
 """
 from __future__ import annotations
 
-import logging
 import re
 import unicodedata
 import uuid
@@ -21,6 +20,7 @@ from app.core.config import settings
 from app.core.rewards import COIN_PER_CENT, coins_to_cents
 from app.integrations import wxpay
 from app.models.user import User
+from app.repositories.user import apply_wechat_display_identity
 from app.models.wallet import (
     CashTransaction,
     CoinAccount,
@@ -29,55 +29,13 @@ from app.models.wallet import (
     WechatTransferAuthorization,
     WithdrawOrder,
 )
-from app.repositories.user import apply_wechat_display_identity
 from app.services import notification_events
 
-logger = logging.getLogger(__name__)
-
 # 微信转账终态:成功 / 失败(失败/取消/关闭都退款)
 _WX_STATE_SUCCESS = "SUCCESS"
 _WX_STATE_FAILED = {"FAIL", "CANCELLED", "CLOSED"}
 _WX_STATE_WAIT_CONFIRM = "WAIT_USER_CONFIRM"  # 用户还没在微信确认页确认
-_WX_FAIL_REASON_LABELS = {
-    "ACCOUNT_FROZEN": "用户微信账户被冻结",
-    "ACCOUNT_NOT_EXIST": "用户微信账户不存在",
-    "BANK_CARD_ACCOUNT_ABNORMAL": "用户银行卡已销户、冻结、作废或挂失",
-    "BANK_CARD_BANK_INFO_WRONG": "用户登记的银行或分支行信息有误",
-    "BANK_CARD_CARD_INFO_WRONG": "用户银行卡户名或卡号有误",
-    "BANK_CARD_COLLECTIONS_ABOVE_QUOTA": "用户银行卡收款达到限额",
-    "BANK_CARD_PARAM_ERROR": "用户收款银行卡信息错误",
-    "BANK_CARD_STATUS_ABNORMAL": "用户银行卡状态异常",
-    "BLOCK_B2C_USERLIMITAMOUNT_BSRULE_MONTH": "用户本月转账收款已达限额",
-    "BLOCK_B2C_USERLIMITAMOUNT_MONTH": "用户账户存在风险，本月收款受限",
-    "DAY_RECEIVED_COUNT_EXCEED": "用户当日收款次数已达上限",
-    "DAY_RECEIVED_QUOTA_EXCEED": "用户当日收款额度已达上限",
-    "EXCEEDED_ESTIMATED_AMOUNT": "转账金额超过预约金额范围",
-    "ID_CARD_NOT_CORRECT": "收款人身份证校验不通过",
-    "MCH_CANCEL": "商户已撤销付款",
-    "MERCHANT_REJECT": "商户转账验密人已驳回",
-    "MERCHANT_NOT_CONFIRM": "商户转账验密人超时未确认",
-    "NAME_NOT_CORRECT": "收款人姓名校验不通过",
-    "OPENID_INVALID": "用户 OpenID 无效或不属于当前 AppID",
-    "OTHER_FAIL_REASON_TYPE": "微信返回其他失败原因",
-    "OVERDUE_CLOSE": "超过微信系统重试期，订单自动关闭",
-    "PAYEE_ACCOUNT_ABNORMAL": "用户微信账户收款异常",
-    "PAYER_ACCOUNT_ABNORMAL": "商户账户付款受限",
-    "PRODUCT_AUTH_CHECK_FAIL": "商户未开通转账权限或权限已冻结",
-    "REALNAME_ACCOUNT_RECEIVED_QUOTA_EXCEED": "用户微信实名账户收款受限",
-    "REAL_NAME_CHECK_FAIL": "用户未完成微信实名认证",
-    "RECEIVE_ACCOUNT_NOT_CONFIGURE": "商户未配置收款用户列表",
-    "RESERVATION_INFO_NOT_MATCH": "转账信息与预约信息不一致",
-    "RESERVATION_SCENE_NOT_MATCH": "转账场景与预约场景不一致",
-    "RESERVATION_STATE_INVALID": "预约转账单状态异常",
-    "TRANSFER_QUOTA_EXCEED": "用户单笔收款额度已达上限",
-    "TRANSFER_REMARK_SET_FAIL": "微信转账备注设置失败",
-    "TRANSFER_RISK": "该笔转账存在风险，已被微信拦截",
-    "TRANSFER_SCENE_INVALID": "商户未获取当前转账场景",
-    "TRANSFER_SCENE_UNAVAILABLE": "当前转账场景暂不可用",
-    "RELATED_ORDER_TRANSFER_AMOUNT_EXCEED": "关联订单累计付款金额超过上限",
-    "RELATED_ORDER_TRANSFER_COUNT_EXCEED": "关联订单累计付款次数超过上限",
-    "BUDGET_NOT_ENOUGH": "商户预算资金不足",
-}
+_WITHDRAW_ACTIVE_STATUSES = {"reviewing", "pending"}
 # 占用新人档「一次性」资格的提现状态:进行中(reviewing/pending)或成功打款(success)。
 # 被拒/转账失败/解绑退回(rejected/failed,均已退款、钱没到手)不在此列 → 新人档恢复可提
 # (2026-07-16 修正:此前判定不看状态,解绑微信退回后 0.1 被误判已用、资格永久锁死)。
@@ -111,6 +69,10 @@ class InsufficientCashError(Exception):
     """现金余额不足。"""
 
 
+class WithdrawTooFrequentError(Exception):
+    """提现申请过于频繁,或已有未完成提现单。"""
+
+
 class WithdrawTierUnavailableError(Exception):
     """该档位今日不可提:次数已满,或今天已选了其他额度(7-9 福利页档位规则)。"""
 
@@ -522,19 +484,6 @@ def _try_deduct_cash(db: Session, user_id: int, amount_cents: int, source: str =
 
 def _add_cash(db: Session, user_id: int, amount_cents: int, source: str = "coin_cash") -> int:
     """原子增加指定账户余额(退款用),返回加后余额。source 决定退回哪个账户(两账户隔离)。"""
-    # Normal withdrawals always create the account before deducting funds. This
-    # fallback covers legacy rows, hand-written fixtures, and broken migrations:
-    # a missing balance snapshot must not make a legitimate refund fail with 500.
-    if db.get(CoinAccount, user_id) is None:
-        logger.error(
-            "withdraw refund found missing coin_account; recreating empty account: "
-            "user_id=%s source=%s amount_cents=%s",
-            user_id,
-            source,
-            amount_cents,
-        )
-        get_or_create_account(db, user_id, commit=False)
-
     col = _balance_col(source)
     db.execute(
         update(CoinAccount)
@@ -638,32 +587,6 @@ def _wx_not_found(result: dict) -> bool:
     return "NOT_FOUND" in str(code)
 
 
-def _wechat_api_error_reason(data: object) -> str:
-    """Format a non-200 WeChat API response for operator display."""
-    if not isinstance(data, dict):
-        return f"微信发起转账失败：{data}"
-    code = str(data.get("code") or "").strip()
-    message = str(data.get("message") or "").strip()
-    if code and message:
-        return f"微信发起转账失败：{message}（{code}）"
-    return f"微信发起转账失败：{message or code or '未知错误'}"
-
-
-def _wechat_terminal_failure_reason(data: dict, state: str) -> str:
-    """Translate WeChat query ``fail_reason`` while preserving unknown codes."""
-    code = str(data.get("fail_reason") or "").strip()
-    if code:
-        label = _WX_FAIL_REASON_LABELS.get(code)
-        if label:
-            return f"微信转账失败：{label}（{code}）"
-        return f"微信转账失败：{code}"
-    if state == "CANCELLED":
-        return "微信转账已撤销（CANCELLED）"
-    if state == "CLOSED":
-        return "微信转账已关闭（CLOSED）"
-    return f"微信转账失败（状态：{state or 'FAIL'}）"
-
-
 def _settle_after_ambiguous(db: Session, order: WithdrawOrder, reason: str) -> None:
     """转账调用结果不明(超时/异常/非200)时,**先查单再决定**,绝不盲目退款(防退款后又到账)。
       - 微信查到 SUCCESS        → 钱已出,置 success,不退款
@@ -689,17 +612,13 @@ def _settle_after_ambiguous(db: Session, order: WithdrawOrder, reason: str) -> N
 
     state = q["data"].get("state", "")
     order.wechat_state = state
-    order.transfer_bill_no = q["data"].get("transfer_bill_no") or order.transfer_bill_no
     if state == _WX_STATE_SUCCESS:
         order.status = "success"
+        order.transfer_bill_no = q["data"].get("transfer_bill_no")
         db.commit()
         notification_events.notify_withdraw_success(db, order)  # PRD #3 提现到账
     elif state in _WX_STATE_FAILED:
-        _refund_withdraw(
-            db,
-            order,
-            reason=_wechat_terminal_failure_reason(q["data"], state),
-        )
+        _refund_withdraw(db, order, reason=reason)
     else:
         order.package_info = q["data"].get("package_info") or order.package_info
         db.commit()
@@ -836,8 +755,17 @@ 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
+
     # 福利页档位闸(7-9):coin_cash 只能提预设档位,且该档今日可提(服务端权威口径,防绕过
-    # 客户端刷)。放在幂等返回之后:同号重试仍原样返回旧单,不被档位闸误杀。
+    # 客户端刷)。放在幂等返回/在途互斥之后:同号重试仍原样返回旧单,不被档位闸误杀。
     # allow_sub_min(0.01 调试直发)保持原样放行,不受档位约束;invite_cash 本轮无档位概念不校验。
     if source == "coin_cash" and not allow_sub_min:
         tier_state = next(
@@ -887,7 +815,6 @@ def create_withdraw(
         db.commit()
     except IntegrityError:
         db.rollback()
-        # 唯一冲突只可能来自 out_bill_no 幂等键并发重试:原样返回既有单;否则未知冲突,上抛。
         existing = db.execute(
             select(WithdrawOrder).where(
                 WithdrawOrder.out_bill_no == out_bill_no, WithdrawOrder.user_id == user_id
@@ -895,6 +822,14 @@ def create_withdraw(
         ).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.refresh(order)
     return order  # 待管理员审核;**不在此处打款**
@@ -1053,14 +988,6 @@ def _apply_transfer_result(db: Session, order: WithdrawOrder, data: dict) -> Wit
     order.package_info = data.get("package_info")  # 免确认转账无此字段(None);确认模式带它供拉确认页
     if data.get("state") == _WX_STATE_SUCCESS:
         order.status = "success"
-    elif data.get("state") in _WX_STATE_FAILED:
-        _refund_withdraw(
-            db,
-            order,
-            reason=_wechat_terminal_failure_reason(data, str(data.get("state") or "")),
-        )
-        db.refresh(order)
-        return order
     db.commit()
     db.refresh(order)
     if order.status == "success":  # 免确认转账直接到账 → PRD #3 提现到账
@@ -1105,11 +1032,7 @@ def execute_withdraw_transfer(db: Session, order: WithdrawOrder) -> WithdrawOrde
             return order
         if result["status_code"] != 200:
             # 金额安全:查转账单后定夺,绝不盲退(未创建→退款,已创建→按真实状态)
-            _settle_after_ambiguous(
-                db,
-                order,
-                reason=_wechat_api_error_reason(result["data"]),
-            )
+            _settle_after_ambiguous(db, order, reason=str(result["data"].get("message") or result["data"]))
             # 授权有效性:回查授权单,微信侧已失效(用户关闭/风控)→标 closed,下次提现自动回退方式一重新授权
             _refresh_active_auth(db, order.user_id)
             db.refresh(order)
@@ -1137,11 +1060,7 @@ def execute_withdraw_transfer(db: Session, order: WithdrawOrder) -> WithdrawOrde
         return order
 
     if result["status_code"] != 200:
-        _settle_after_ambiguous(
-            db,
-            order,
-            reason=_wechat_api_error_reason(result["data"]),
-        )
+        _settle_after_ambiguous(db, order, reason=str(result["data"].get("message") or result["data"]))
         db.refresh(order)
         return order
 
@@ -1198,24 +1117,19 @@ def refresh_withdraw_status(
     ).scalar_one_or_none()
     if order is None:
         raise WithdrawOrderNotFound
-    if order.status not in {"pending", "failed"}:
-        return order
-    enrich_failed_order = order.status == "failed"
+    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
-        if enrich_failed_order:
-            return order
         order.fail_reason = f"微信查单异常,保持pending: {exc}"[:256]
         db.commit()
         db.refresh(order)
         return order
     if result["status_code"] != 200:
-        if enrich_failed_order:
-            return order
         if _wx_not_found(result):
             # 微信明确无此单 → 转账从未创建(如崩溃在扣款后/调用前),退款安全
             _refund_withdraw(db, order, reason="微信无此单,已退回")
@@ -1224,32 +1138,12 @@ def refresh_withdraw_status(
 
     state = result["data"].get("state", "")
     order.wechat_state = state
-    order.transfer_bill_no = (
-        result["data"].get("transfer_bill_no") or order.transfer_bill_no
-    )
-    if enrich_failed_order:
-        if state in _WX_STATE_FAILED:
-            order.fail_reason = _wechat_terminal_failure_reason(
-                result["data"], state
-            )[:256]
-        elif state == _WX_STATE_SUCCESS:
-            order.fail_reason = (
-                "资金状态异常：本地已退款，但微信查单显示已到账，请人工核查"
-            )
-        db.commit()
-        db.refresh(order)
-        return order
-
     if state == _WX_STATE_SUCCESS:
         order.status = "success"
         db.commit()
         notification_events.notify_withdraw_success(db, order)  # PRD #3 提现到账
     elif state in _WX_STATE_FAILED:
-        _refund_withdraw(
-            db,
-            order,
-            reason=_wechat_terminal_failure_reason(result["data"], state),
-        )
+        _refund_withdraw(db, order, reason=f"微信转账状态 {state}")
     elif state == _WX_STATE_WAIT_CONFIRM and cancel_if_unconfirmed:
         # 用户从确认页回来了却仍未确认 → 视为放弃:撤销微信单(防事后确认导致重复打款)后退款。
         # 撤单失败(可能已被确认进 ACCEPTED 的竞态)则保持 pending,等下次查询。

app/schemas/applog.py

@@ -1,31 +0,0 @@
-"""客户端运行日志批量上报 schema。
-
-批级公共字段(device_id/user_id/app_ver/platform/sent_at)发一次;logs 为原始 dict 列表,
-**不强类型**——尽力而为的日志链路,单条内容异常不该让整批 422。每条的「白名单键 + data
-兜底」拆分在写入层 [app.core.client_log] 做(见 spec §4/§5)。
-"""
-from __future__ import annotations
-
-import os
-from typing import Any
-
-from pydantic import BaseModel, Field
-
-# 单批条数上限。注意:这是**导入期**常量(Pydantic Field(max_length=) 在类定义时求值),
-# 改它需重启进程;要运行期可调的上限用 APPLOG_MAX_BODY_BYTES(端点里 call-time 读)。
-_MAX_BATCH = int(os.getenv("APPLOG_MAX_BATCH", "500"))
-
-
-class AppLogBatchIn(BaseModel):
-    device_id: str = Field(max_length=64)
-    user_id: int | None = None
-    app_ver: str | None = Field(default=None, max_length=32)
-    platform: str | None = Field(default=None, max_length=16)
-    sent_at: int | None = None
-    logs: list[dict[str, Any]] = Field(min_length=1, max_length=_MAX_BATCH)
-
-
-class AppLogIngestOut(BaseModel):
-    ok: bool = True
-    received: int
-    dropped: int = 0

app/schemas/auth.py

@@ -11,6 +11,7 @@ from datetime import datetime
 
 from pydantic import BaseModel, ConfigDict, Field
 
+
 # ===== 用户对外信息 =====
 
 class UserOut(BaseModel):
@@ -64,9 +65,6 @@ class JverifyLoginRequest(BaseModel):
         "", max_length=64,
         description="硬件级设备标识(Android ANDROID_ID),用于新手引导按 设备+账号 去重;空=按未完成处理",
     )
-    device_model: str = Field(
-        "", max_length=128, description="客户端设备型号快照,用于登录安全审计"
-    )
 
 
 # ===== 短信验证码 =====
@@ -77,9 +75,6 @@ class SmsSendRequest(BaseModel):
         "", max_length=64,
         description="硬件级设备标识(Android ANDROID_ID),用于发码防刷按 设备+IP 限流;空=按 IP 聚一桶",
     )
-    device_model: str = Field(
-        "", max_length=128, description="客户端设备型号快照,用于短信安全审计"
-    )
 
 
 class SmsSendResponse(BaseModel):
@@ -95,9 +90,6 @@ class SmsLoginRequest(BaseModel):
         "", max_length=64,
         description="硬件级设备标识(Android ANDROID_ID),用于新手引导按 设备+账号 去重;空=按未完成处理",
     )
-    device_model: str = Field(
-        "", max_length=128, description="客户端设备型号快照,用于短信验证安全审计"
-    )
 
 
 # ===== Refresh =====

app/schemas/compare_record.py

@@ -85,10 +85,6 @@ class ComparisonResultIn(BaseModel):
     status: str | None = None
     # 门店打烊原因(price 为 None 时带): 与 status="store_closed" 等价的更早信号, 一并落库供前端兜底判打烊。
     store_closed: str | None = None
-    # 该平台缺菜(漏菜)数量(pricebot 冗余进 comparison_results 行): 有价但少买了菜时 >0。
-    # 记录页三平台网格据此逐格标"缺少 X 个菜品"(网格只拿 comparison_results, 拿不到 platform_results)。
-    # 必须显式声明: 落库走 model_dump(), 不声明会被 pydantic 静默丢弃 → 记录页拿不到数量。
-    skipped_dish_count: int | None = None
 
 
 class ComparisonRecordIn(BaseModel):

app/services/comparison_llm_backfill.py

@@ -1,156 +0,0 @@
-"""Persist and repair comparison-record LLM token costs."""
-from __future__ import annotations
-
-import logging
-import time
-from datetime import UTC, datetime, timedelta
-
-from sqlalchemy import select
-
-from app.core.config import settings
-from app.core.rewards import CN_TZ
-from app.db.session import SessionLocal
-from app.models.app_config import AppConfig
-from app.models.comparison import ComparisonRecord
-from app.services.llm_cost import compute_llm_cost, get_llm_prices
-from app.services.pricebot_llm_calls import fetch_llm_calls
-
-logger = logging.getLogger("shagua.comparison_llm_backfill")
-
-
-def _utc_to_beijing_naive(value: datetime) -> datetime:
-    """Convert a DB UTC timestamp to comparison_record's Beijing wall-clock."""
-    if value.tzinfo is None:
-        value = value.replace(tzinfo=UTC)
-    return value.astimezone(CN_TZ).replace(tzinfo=None)
-
-
-def _store_calls(record_id: int, trace_id: str, calls: list[dict]) -> bool:
-    """Store calls and all derived fields atomically."""
-    with SessionLocal() as db:
-        rec = db.get(ComparisonRecord, record_id)
-        if rec is None or rec.trace_id != trace_id:
-            logger.warning(
-                "LLM cost backfill record mismatch record_id=%s trace=%s",
-                record_id,
-                trace_id,
-            )
-            return False
-
-        # Never recalculate a frozen historical cost with a newer price config.
-        if rec.llm_cost_yuan is not None and rec.llm_calls:
-            return False
-
-        rec.llm_calls = calls
-        rec.llm_call_count = len(calls)
-        rec.retry_count = sum(1 for call in calls if call.get("error"))
-        rec.input_tokens = sum(
-            (call.get("usage") or {}).get("prompt_tokens") or 0 for call in calls
-        )
-        rec.output_tokens = sum(
-            (call.get("usage") or {}).get("completion_tokens") or 0 for call in calls
-        )
-        rec.llm_cost_yuan, rec.llm_price_snapshot = compute_llm_cost(
-            calls, get_llm_prices(db)
-        )
-        db.commit()
-        logger.info(
-            "LLM cost backfilled trace=%s calls=%d input_tokens=%d "
-            "output_tokens=%d cost=%s",
-            trace_id,
-            len(calls),
-            rec.input_tokens,
-            rec.output_tokens,
-            rec.llm_cost_yuan,
-        )
-        return True
-
-
-def backfill_comparison_llm_cost(
-    record_id: int,
-    trace_id: str,
-    *,
-    attempts: int = 3,
-    retry_delays: tuple[float, ...] = (1.0, 3.0),
-) -> bool:
-    """Fetch and persist one record, retrying short-lived upstream races."""
-    if not settings.INTERNAL_API_SECRET or not trace_id:
-        logger.warning(
-            "LLM cost backfill skipped trace=%s: INTERNAL_API_SECRET is not configured",
-            trace_id,
-        )
-        return False
-    total_attempts = max(1, attempts)
-    for attempt in range(total_attempts):
-        calls = fetch_llm_calls(trace_id)
-        if calls:
-            try:
-                return _store_calls(record_id, trace_id, calls)
-            except Exception:  # noqa: BLE001 - background repair must stay alive
-                logger.exception(
-                    "LLM cost store failed trace=%s record_id=%s",
-                    trace_id,
-                    record_id,
-                )
-                return False
-
-        if attempt + 1 < total_attempts:
-            delay = retry_delays[min(attempt, len(retry_delays) - 1)] if retry_delays else 0
-            if delay > 0:
-                time.sleep(delay)
-
-    logger.warning(
-        "LLM cost backfill has no calls trace=%s record_id=%s attempts=%d",
-        trace_id,
-        record_id,
-        total_attempts,
-    )
-    return False
-
-
-def repair_missing_comparison_llm_costs(
-    *,
-    limit: int = 100,
-    lookback_days: int = 30,
-) -> dict[str, int]:
-    """Repair a bounded batch of recent terminal records with missing cost."""
-    cutoff = datetime.now(CN_TZ).replace(tzinfo=None) - timedelta(
-        days=max(1, lookback_days)
-    )
-    with SessionLocal() as db:
-        # app_config has no price history. Repricing a record from before the
-        # current config became effective would fabricate a historical cost, so
-        # only repair records at/after that timestamp.
-        price_config_updated_at = db.execute(
-            select(AppConfig.updated_at).where(AppConfig.key == "llm_token_price")
-        ).scalar_one_or_none()
-        date_conditions = [ComparisonRecord.created_at >= cutoff]
-        if price_config_updated_at is not None:
-            date_conditions.append(
-                ComparisonRecord.created_at
-                >= _utc_to_beijing_naive(price_config_updated_at)
-            )
-        candidates = list(
-            db.execute(
-                select(ComparisonRecord.id, ComparisonRecord.trace_id)
-                .where(
-                    *date_conditions,
-                    ComparisonRecord.status.in_(("success", "failed")),
-                    ComparisonRecord.llm_cost_yuan.is_(None),
-                )
-                .order_by(ComparisonRecord.created_at.desc(), ComparisonRecord.id.desc())
-                .limit(max(1, limit))
-            ).all()
-        )
-
-    repaired = 0
-    for record_id, trace_id in candidates:
-        if backfill_comparison_llm_cost(
-            record_id, trace_id, attempts=1, retry_delays=()
-        ):
-            repaired += 1
-    return {
-        "candidates": len(candidates),
-        "repaired": repaired,
-        "unresolved": len(candidates) - repaired,
-    }

app/services/pricebot_llm_calls.py

@@ -20,67 +20,19 @@ from app.core.pricebot_router import pick_pricebot
 logger = logging.getLogger("shagua.pricebot_llm")
 
 
-def pricebot_llm_auth_ready() -> bool:
-    """Verify every configured PriceBot instance accepts the shared secret."""
-    secret = settings.INTERNAL_API_SECRET
-    if not secret:
-        logger.error("PriceBot LLM auth check failed: INTERNAL_API_SECRET is empty")
-        return False
-    for base in settings.pricebot_instances:
-        url = f"{base.rstrip('/')}/api/internal/llm_calls/__auth_probe__"
-        try:
-            resp = httpx.get(
-                url, headers={"X-Internal-Secret": secret}, timeout=3.0
-            )
-        except Exception as exc:  # noqa: BLE001
-            logger.error("PriceBot LLM auth check unavailable base=%s: %s", base, exc)
-            return False
-        if resp.status_code != 200:
-            logger.error(
-                "PriceBot LLM auth check rejected base=%s status=%s; "
-                "verify both services use the same INTERNAL_API_SECRET",
-                base,
-                resp.status_code,
-            )
-            return False
-    return True
-
-
 def fetch_llm_calls(trace_id: str) -> list[dict]:
     """返回该次比价的 LLM 调用明细列表(每条 {scene,model,input_messages,output,usage,latency_ms,error});
     未配密钥 / 无 trace_id / 拉取失败 → []。"""
     secret = settings.INTERNAL_API_SECRET
     if not secret or not trace_id:
         return []
-    preferred = pick_pricebot(trace_id)
-    # LLM JSONL is instance-local. If the cluster topology changed after a
-    # historical trace was created, consistent hashing may now point elsewhere;
-    # probe the remaining configured instances only when the preferred one is empty.
-    bases = [preferred, *(base for base in settings.pricebot_instances if base != preferred)]
-    for base in bases:
-        url = f"{base.rstrip('/')}/api/internal/llm_calls/{trace_id}"
-        try:
-            resp = httpx.get(url, headers={"X-Internal-Secret": secret}, timeout=5.0)
-            if resp.status_code == 200:
-                calls = resp.json().get("calls", []) or []
-                if calls:
-                    return calls
-                continue
-            if resp.status_code in (401, 403):
-                logger.error(
-                    "fetch_llm_calls rejected trace=%s base=%s status=%s; "
-                    "INTERNAL_API_SECRET differs between app-server and PriceBot",
-                    trace_id,
-                    base,
-                    resp.status_code,
-                )
-            else:
-                logger.warning(
-                    "fetch_llm_calls trace=%s base=%s status=%s",
-                    trace_id,
-                    base,
-                    resp.status_code,
-                )
-        except Exception as e:  # noqa: BLE001 — best-effort
-            logger.warning("fetch_llm_calls trace=%s base=%s failed: %s", trace_id, base, e)
+    base = pick_pricebot(trace_id).rstrip("/")
+    url = f"{base}/api/internal/llm_calls/{trace_id}"
+    try:
+        resp = httpx.get(url, headers={"X-Internal-Secret": secret}, timeout=5.0)
+        if resp.status_code == 200:
+            return resp.json().get("calls", []) or []
+        logger.warning("fetch_llm_calls trace=%s status=%s", trace_id, resp.status_code)
+    except Exception as e:  # noqa: BLE001 — best-effort,任何异常都不该影响上报
+        logger.warning("fetch_llm_calls trace=%s failed: %s", trace_id, e)
     return []

deploy/comparison-llm-cost.md

@@ -1,40 +0,0 @@
-# 比价 TOKEN 成本采集与补偿
-
-## 部署前置
-
-App Server 与 PriceBot 使用各自独立的 `.env`，但下面的值必须完全一致：
-
-- `/opt/shaguabijia-app-server/.env`
-- `/opt/pricebot-backend/.env`
-- 配置项：`INTERNAL_API_SECRET`
-
-不要把密钥原文写入日志、命令历史或 Git。修改后同时重启两个服务。
-
-App Server 启动后会逐个探测 `PRICEBOT_INSTANCES` 的内部读取接口。鉴权不一致时会记录
-`PriceBot LLM auth check rejected`，并跳过本轮补偿，避免对所有缺失记录重复发送失败请求。
-
-## 数据链路
-
-1. 当前客户端由 App Server 在 PriceBot 最终 `done` 帧到达时 harvest 比价记录。
-2. harvest 成功后立即异步读取同一 `trace_id` 的 LLM 调用，冻结 Token、成本和单价快照。
-3. 周期 worker 扫描近期 `success/failed` 且 `llm_cost_yuan IS NULL` 的记录进行补偿；
-   为避免用现价伪造历史成本，只处理当前单价配置生效时间之后的记录。
-4. 管理后台顶部“平均 TOKEN 成本”使用筛选范围内已冻结成本的数据库平均值。
-
-## 上线验收（只读 SQL）
-
-```sql
-SELECT
-  (created_at AT TIME ZONE 'Asia/Shanghai')::date AS day,
-  count(*) AS records,
-  count(llm_cost_yuan) AS cost_records,
-  round(avg(llm_cost_yuan)::numeric, 6) AS avg_token_cost
-FROM comparison_record
-WHERE created_at >= now() - interval '3 days'
-GROUP BY 1
-ORDER BY 1 DESC;
-```
-
-新产生的正常终态比价记录应在短时间内写入 `input_tokens`、`output_tokens` 和
-`llm_cost_yuan`。历史记录只有在 PriceBot 的对应 trace JSONL 仍保留时才能准确回填；
-原始调用已经清理的记录不能用估算值冒充真实成本。

docs/api/README.md

@@ -1,9 +1,13 @@
 # 傻瓜比价 App 后端 — API 接口文档（索引）
 
 > Base URL:生产 `https://app-api.shaguabijia.com`;本地联调 `http://<开发机>:8770`
-> 协议:HTTP / JSON,请求与响应体均 `application/json`,字段统一 **snake_case**
+> 协议:HTTP / JSON,请求与响应体均 `application/json`,字段统一 **snake_case**(⚠️ 例外:消息通知中心 `notifications` 族与厂商推送 `push` 族按 PRD 前端契约用 **camelCase**,见各自文档)
 > 鉴权:需鉴权的接口在请求头带 `Authorization: Bearer <access_token>`
+<<<<<<< HEAD
+> 最后更新:2026-07-14（新增 **消息通知中心** 3 端点(M1-M3,虚拟数据阶段)与 **厂商推送测试** 3 端点(P1-P3,荣耀/华为/小米/OPPO/vivo);上一次 2026-06-23 补全 device/internal/CPS 短链等整族端点）
+=======
 > 最后更新:2026-07-09（① 比价透传改「软鉴权 + trace_id 签发 + harvest 落库」(#112 尾声帧 `trace/epilogue` 一并补录);② 新端点:`user/onboarding/reset`(#114)、`GET /internal/launch-confirm-samples`(#91);③ 参数更新:提现族 `source` 分账(#82/#121)、`wallet/account` 邀请奖励金余额、美团 feed/top-sales 按城市过滤(#116)、admin 调现金 `account` 目标账户(#95);④ **Admin 索引补全到当前全量**:新家族 roles(#117/#126)/coupon-data(#99)/device-liveness(#80)/event-logs(#83)/price-reports(#94)/CPS 运营台/提现审核族,及 feedbacks 采纳拒绝(#94/#105)、marquee 模式与真实条浏览(#122/#123)等。上一次 2026-07-03）
+>>>>>>> origin/main
 > 架构:`app/api/v1/` 只放很轻的接口层;穿山甲/微信支付/极光/短信/美团等 SDK 集成的重逻辑在 `app/integrations/`,实现细节见 [docs/integrations/](../integrations/README.md)。
 
 ---
@@ -78,7 +82,6 @@
 | **签到**（前缀 `/api/v1/signin`） |||
 | 25 | `GET /api/v1/signin/status` | Bearer | [详情](./signin/signin-status.md) |
 | 26 | `POST /api/v1/signin` | Bearer | [详情](./signin/signin-do.md) |
-| 26a | `POST /api/v1/signin/boost` | Bearer | [详情](./signin/signin-boost.md) |
 | **任务**（前缀 `/api/v1/tasks`） |||
 | 27 | `GET /api/v1/tasks` | Bearer | [详情](./tasks/tasks-list.md) |
 | 28 | `POST /api/v1/tasks/{task_key}/claim` | Bearer | [详情](./tasks/tasks-claim.md) |
@@ -89,6 +92,7 @@
 | **看广告发奖**（前缀 `/api/v1/ad`） |||
 | 32 | `GET /api/v1/ad/pangle-callback` | 验签 | [详情](./ad/ad-pangle-callback.md) |
 | 33 | `GET /api/v1/ad/reward-status` | Bearer | [详情](./ad/ad-reward-status.md) |
+| 33a | `GET /api/v1/ad/reward-result/{ad_session_id}` | Bearer | [详情](./ad/ad-reward-result.md)（本次实发金币 + 本轮膨胀累计 `round_coin`,弹窗数字用它） |
 | 34 | `POST /api/v1/ad/test-grant` | Bearer | [详情](./ad/ad-test-grant.md) |
 | 35 | `POST /api/v1/ad/ecpm-report` | Bearer | [详情](./ad/ad-ecpm-report.md) |
 | 35a | `POST /api/v1/ad/feed-reward` | Bearer | [详情](./ad/ad-feed-reward.md) |
@@ -103,19 +107,33 @@
 | 36c | `POST /api/v1/user/onboarding/reset` | Bearer | [详情](./user/user-onboarding.md)（重置本设备引导标记,下次登录重走,#114） |
 | 37 | `DELETE /api/v1/user` | Bearer | [详情](./user/user-delete.md) |
 | **帮助与反馈**（前缀 `/api/v1/feedback`） |||
+<<<<<<< HEAD
+| 38 | `POST /api/v1/feedback` | Bearer | [详情](./feedback.md) |
+| 38a | `GET /api/v1/feedback/config` | Bearer | 反馈页「加群二维码」卡配置（开关 + 二维码图 + 三行文案）(无单独文档) |
+| 38b | `GET /api/v1/feedback/records` | Bearer | 我的反馈历史（pending/adopted/rejected）(无单独文档) |
+| **消息通知中心**（前缀 `/api/v1/notifications`;⚠️ 本族对外 **camelCase**;虚拟数据阶段:内存 mock,重启复位） |||
+| M1 | `GET /api/v1/notifications` | Bearer | [详情](./notifications.md)（消息列表,分页;13 类型卡片字段 + sentAt/isRead;服务端已按时间倒序排好,不分组） |
+| M2 | `GET /api/v1/notifications/unread-count` | Bearer | [详情](./notifications.md)（未读总数,首页铃铛角标;>99 → "99+",0 → null 隐藏） |
+| M3 | `POST /api/v1/notifications/read` | Bearer | [详情](./notifications.md)（标记已读:`{ids:[...]}` 单条/多条 或 `{all:true}` 进通知中心全量清零;幂等） |
+| **厂商推送测试**（前缀 `/api/v1/push`;荣耀/华为/小米/OPPO/vivo 五通道联调三件套,同为 camelCase） |||
+| P1 | `GET /api/v1/push/vendors` | Bearer | [详情](./push-vendor-test.md)（5 厂商服务端凭据配置状态,缺哪些 .env 键一目了然） |
+| P2 | `GET /api/v1/push/templates` | Bearer | [详情](./push-vendor-test.md)（13 类通知的 push 标题/正文模板 + PRD 示例渲染效果） |
+| P3 | `POST /api/v1/push/test` | Bearer | [详情](./push-vendor-test.md)（测试发送:默认 mock 不真发;mock=false 真发;可联动插一条站内 mock 通知闭环验证已读） |
+=======
 | 38 | `POST /api/v1/feedback` | Bearer | [详情](./other/feedback.md) |
 | 38a | `GET /api/v1/feedback/config` | Bearer | [详情](./other/feedback-config.md)（反馈页「加群二维码」卡配置:开关+二维码图+三行文案） |
 | 38b | `GET /api/v1/feedback/records` | Bearer | [详情](./other/feedback-records.md)（我的反馈历史,pending/adopted/rejected） |
-| **埋点 & 订单上报 / 客户端日志**（前缀分散;全部 Bearer 除 analytics/events、applog/batch 不强制登录） |||
+| **埋点 & 订单上报**（前缀分散;全部 Bearer 除 analytics/events 不强制登录） |||
 | E1 | `POST /api/v1/analytics/events` | 无 | [详情](./other/analytics-events.md)（批量上报埋点事件,不强制登录,每批最多200条） |
 | E2 | `POST /api/v1/order/report` | Bearer | [详情](./other/order-report.md)（上报归因订单,比价后5分钟内点链接+支付金额与比价价相差≤1元） |
-| E3 | `POST /api/v1/applog/batch` | 无 | [详情](./other/applog-batch.md)（批量上报客户端运行日志,逐条落独立文件供 Logtail 采进 SLS,不强制登录,每批≤500条） |
+>>>>>>> origin/main
 | **首页门面数据 / 客户端配置**（前缀 `/api/v1/platform`；全平台展示数字 + 运营开关,**全部不鉴权**,登录前可读） |||
 | 39 | `GET /api/v1/platform/stats` | 无 | [详情](./platform/platform-stats.md) |
 | 40 | `GET /api/v1/platform/savings-feed` | 无 | [详情](./savings/platform-savings-feed.md) |
 | 40a | `GET /api/v1/platform/flags` | 无 | [详情](./platform/platform-flags.md)（客户端运营 feature flag,比价/领券期广告开关等,拉取后缓存） |
 | 40b | `GET /api/v1/platform/ad-config` | 无 | [详情](./platform/platform-ad-config.md)（客户端拉广告配置:穿山甲 app_id+各位ID+各场景开关;不含验签密钥） |
 | 40c | `GET /api/v1/platform/app-version` | 无 | [详情](./platform/platform-app-version.md)（最新 App 版本,OTA 检查更新;与本机 versionCode 比） |
+| 40d | `GET /api/v1/platform/huawei-review` | 无 | [详情](./platform/platform-huawei-review.md)（华为审核开关:快速设置权限步能否被用户关闭;仅华为 ROM 客户端拉） |
 | **微信支付回调**（前缀 `/api/v1/wxpay`） |||
 | W1 | `POST /api/v1/wxpay/transfer-auth-notify` | 无 | 免确认收款授权结果通知（一期 stub:仅应答 200 不验签不改账,授权状态靠主动查询兜底)(无单独文档) |
 | **CPS 群发短链落地**（**无前缀**,挂域名根;公网不鉴权） |||
@@ -154,6 +172,7 @@
 | A12 | `GET /admin/api/ad-revenue-report` | admin | [详情](./admin/ad/admin-ad-revenue-report.md)(广告收益报表:分页/场景/`app_env` 筛 + **DAU/ARPU** #120;真实收益侧接穿山甲日表 #92) |
 | A13 | `GET / PATCH /admin/api/ad-config` | operator/finance | 广告配置(穿山甲 ID/验签密钥/各场景开关;C 端只读版见 40b)(无单独文档,见 `app/admin/routers/ad_config.py`) |
 | A14 | `GET /admin/api/config`、`PATCH /config/{key}` | operator/finance | 运营可配置项([app_config](../database/app_config.md):奖励常量/提现地板价等;#117 修系统配置下发)(无单独文档,见 `app/admin/routers/config.py`) |
+| A16 | `GET / PATCH /admin/api/huawei-review` | operator/tech | 华为审核开关(快速设置权限步能否被用户关闭,落 `app_config.huawei_review`;C 端只读版见 40d)(无单独文档,见 `app/admin/routers/huawei_review.py`) |
 | **A·管理员与角色**(super_admin):`GET`/`POST` `/admins`、`PATCH`/`DELETE` `/admins/{id}`(#126 删除+`pages_override`)、`GET`/`POST` `/roles`、`GET /roles/catalog`、`PATCH`/`DELETE` `/roles/{id}`(#117/#126 自定义角色) ||| [列表](./admin/admins/admin-admins-list.md) / [建](./admin/admins/admin-admin-create.md) / [改+删](./admin/admins/admin-admin-update.md) / [角色](./admin/admin-roles.md) |
 | A15 | `GET /admin/api/audit-logs` | admin | [详情](./admin/admin-audit-logs.md) |
 | **A·CPS 运营台**:群/活动 CRUD、`POST /referral-links`、`POST /orders/reconcile`(美团+京东 #90)、`GET /orders`、`/stats`、群 `timeseries`/`daily`/`wx-users`/`day-users`(#79) ||| [详情](./admin/admin-cps.md) |

docs/api/other/applog-batch.md

@@ -1,87 +0,0 @@
-# POST /api/v1/applog/batch — 批量上报客户端运行日志
-
-> 所属:客户端日志组（前缀 `/api/v1/applog`） | 鉴权:无（不强制登录，`user_id` 可选带上） | [← 返回 API 索引](../README.md)
-
-批量接收客户端 App 运行日志（自动化步骤 / 网络 / 崩溃 / 调试等），**逐条**封装成单行 JSON 写入独立滚动文件 `logs/app-client.log`（与服务日志 `app-server.log` 分开），由阿里云 Logtail 采进**独立 SLS logstore**，**不落库**。服务端补 `client_ip`（X-Forwarded-For）与 `time`（接收时间，SLS 主时间）。`trace_id` 提到输出行顶层，便于在 SLS 里跨「客户端 / 服务端」两个 logstore 按 trace 拼出端到端链路。**fire-and-forget**:写失败也返回 2xx，不 500。
-
-## 入参
-
-批级公共字段发一次;`logs` 里每条只带日志本身。**每条只有 `client_ts/level/trace_id/tag/msg` 会提到输出顶层，其余自定义字段一律并入输出的 `data`**（防 SLS 索引列爆炸）。
-
-| 字段 | 类型 | 必填 | 说明 |
-|---|---|---|---|
-| `device_id` | string | ✅（≤64） | 设备 ID（限流 / 分组键） |
-| `user_id` | int \| null | ❌ | 登录用户 ID（未登录可空） |
-| `app_ver` | string \| null | ❌（≤32） | App 版本 |
-| `platform` | string \| null | ❌（≤16） | 平台（`android` / `ios` / `harmony`） |
-| `sent_at` | int \| null | ❌ | 批次发送时间（epoch ms） |
-| `logs` | list[object] | ✅（1-500 条） | 日志数组（每条为对象，内部字段**不强类型**） |
-| `logs[].client_ts` | int | ❌ | 端侧日志时间（epoch ms） |
-| `logs[].level` | string | ❌ | 级别（服务端归一化大写，截断 ≤16） |
-| `logs[].trace_id` | string \| null | ❌ | 关联服务端比价链路的 trace（有服务端交互的日志带上，截断 ≤256） |
-| `logs[].tag` | string \| null | ❌ | 模块 / 分类（截断 ≤128） |
-| `logs[].msg` | string | ❌ | 消息主体（超 8KB **字节**截断，加 `msg_truncated` 标记） |
-| `logs[].*` | any | ❌ | 其余任意自定义字段 → 一律并入输出的 `data`（客户端自带的 `data` 对象会被合并进来） |
-
-Mock 入参:
-```json
-{
-  "device_id": "android_abc123def456",
-  "user_id": 42,
-  "app_ver": "0.1.5",
-  "platform": "android",
-  "sent_at": 1719993700000,
-  "logs": [
-    {
-      "client_ts": 1719993600000,
-      "level": "info",
-      "tag": "automation",
-      "msg": "compare flow start",
-      "trace_id": "t_ab12cd34"
-    },
-    {
-      "client_ts": 1719993615000,
-      "level": "error",
-      "tag": "network",
-      "msg": "timeout calling /price/step",
-      "trace_id": "t_ab12cd34",
-      "http_status": 504,
-      "retry": 2
-    }
-  ]
-}
-```
-> 上例第二条的 `http_status` / `retry` 不在白名单 → 会被并入落盘行的 `data`:`{"http_status":504,"retry":2}`。
-
-## 出参
-
-响应 `200`:`AppLogIngestOut`
-
-| 字段 | 类型 | 说明 |
-|---|---|---|
-| `ok` | bool | 固定 `true` |
-| `received` | int | 成功写入文件的条数 |
-| `dropped` | int | 跳过的条数（服务端处理 / 序列化失败;正常为 `0`） |
-
-Mock 出参:
-```json
-{
-  "ok": true,
-  "received": 2,
-  "dropped": 0
-}
-```
-
-## 错误码
-- `413` 请求体超过上限（默认 2MB;服务端查 `Content-Length`，在 body 校验前拦截。缺该头时由 nginx `client_max_body_size` 兜底）
-- `422` `logs` 为空或超过 500 条 / `device_id` 缺失 / 字段类型不符
-- `429` 触发限流（同 IP 每分钟 > 120 次）
-
-## 说明
-- **落盘 → SLS**:逐条写独立文件 `logs/app-client.log`（单行 JSON，`propagate=False` 不污染 `app-server.log`），由 Logtail JSON 模式采进**独立 logstore**;不进数据库。落盘行除白名单字段外，服务端另补 `time`（接收时间）、`source="client"`、`service`、`client_ip` 及批级 `device_id/user_id/app_ver/platform/sent_at`。
-- **`trace_id` 跨层检索**:字段名与服务端日志一致。客户端应给**有服务端交互**的日志带上当初 API 返回的 `trace_id`（如 `/api/v1/price/step` 等透传族返回的 trace），即可在 SLS 里 `trace_id: "xxx"` 一查拼出「客户端视角 + 服务端比价链路」;纯客户端日志不带即可。
-- **白名单 + `data` 兜底**:只有 `client_ts/level/trace_id/tag/msg` 上顶层，其余键并入 `data`，把 SLS 索引列钉死在固定集合，防客户端任意 key 撑爆索引。索引字段另有长度上限（`level`≤16 / `trace_id`≤256 / `tag`≤128 / `msg`≤8KB）。
-- **fire-and-forget**:写文件失败也返回 2xx（避免客户端重试风暴）;网络重试可能在 SLS 造成重复条目，可接受。
-- **量级建议**:客户端做等级过滤 / 采样，攒到一定量再批量上报;单批 ≤500 条、body ≤2MB。
-- `client_ts` 是端侧时间（客户端时钟不可信），`time` 由服务端补（可靠时间轴）。
-- `user_id` 不靠 JWT:未登录态也要采日志;带上便于按用户排查。

docs/superpowers/plans/2026-07-19-client-applog-ingest.md

@@ -1,561 +0,0 @@
-# 客户端运行日志批量上报 Implementation Plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** 新增 `POST /api/v1/applog/batch`，把客户端批量上报的运行日志逐条写进独立滚动文件 `logs/app-client.log`，供 Aliyun Logtail 采进独立 SLS logstore。
-
-**Architecture:** 复用两个现成范式——analytics 的「批量入口 + 服务端补 IP」+ `app-server.log` 的「单行 JSON + RotatingFileHandler + Logtail」。核心逻辑在写入层 `app/core/client_log.py`：专用 `client` logger（`propagate=False`，不污染服务日志），每条按「白名单键提顶层 + 其余并入 `data`」封装成一行 JSON，`trace_id` 提到顶层以便跨层检索。端点瘦、fire-and-forget（写失败不 500）。
-
-**Tech Stack:** FastAPI、Pydantic v2、Python `logging.handlers.RotatingFileHandler`、pytest + `TestClient`。
-
-**Spec:** [docs/superpowers/specs/2026-07-19-client-applog-ingest-design.md](../specs/2026-07-19-client-applog-ingest-design.md)
-
----
-
-## File Structure
-
-| 文件 | 职责 | 动作 |
-|---|---|---|
-| `app/core/client_log.py` | 专用 logger/handler、滚动配置、白名单+`data` 兜底与信封拼装、`write_records()` | Create |
-| `app/schemas/applog.py` | `AppLogBatchIn`（`logs: list[dict]`）/ `AppLogIngestOut` | Create |
-| `app/api/v1/applog.py` | 瘦路由：body 上限依赖 → 调 writer → 返回计数 | Create |
-| `app/main.py` | 注册 `applog_router` | Modify |
-| `tests/test_applog.py` | writer 单测 + 端点集成测试 | Create |
-
-前置约束（写进代码注释）：`RotatingFileHandler` 多进程并发 `doRollover()` 会损坏/丢日志；本方案依赖生产 `--workers 1`（与限流器/SMS 码/SQLite 同一既有假设）。扩 worker 前必须换 `QueueHandler`→单写入者 / 外部 logrotate / 写 stdout 交 journald。
-
----
-
-## Task 1: 专用落盘 writer `app/core/client_log.py`
-
-**Files:**
-- Create: `app/core/client_log.py`
-- Test: `tests/test_applog.py`
-
-- [ ] **Step 1: 写失败测试（writer 层）**
-
-创建 `tests/test_applog.py`：
-
-```python
-"""客户端运行日志上报:writer 单测 + 端点集成测试。"""
-from __future__ import annotations
-
-import json
-from pathlib import Path
-
-import pytest
-
-from app.core import client_log
-
-
-@pytest.fixture()
-def client_log_file(tmp_path, monkeypatch):
-    """把客户端日志切到临时文件,并重置 writer 单例使其按当时 env 重建。"""
-    p = tmp_path / "app-client.log"
-    monkeypatch.setenv("CLIENT_LOG_FILE", str(p))
-    client_log.reset_client_logger()
-    yield p
-    client_log.reset_client_logger()
-
-
-def _read_lines(p: Path) -> list[dict]:
-    text = p.read_text(encoding="utf-8").strip()
-    return [json.loads(ln) for ln in text.splitlines() if ln]
-
-
-# ---------------- writer 层 ----------------
-
-def _meta(**kw) -> dict:
-    base = {"device_id": "d-1", "user_id": None, "app_ver": None,
-            "platform": None, "sent_at": None}
-    base.update(kw)
-    return base
-
-
-def test_writer_writes_one_line_per_record(client_log_file):
-    recs = [
-        {"client_ts": 1737000000000, "level": "info", "msg": "hello"},
-        {"client_ts": 1737000000001, "level": "error", "msg": "boom", "tag": "net"},
-    ]
-    received, dropped = client_log.write_records(
-        recs, meta=_meta(user_id=42, app_ver="1.2.3", platform="android"),
-        client_ip="1.2.3.4",
-    )
-    assert (received, dropped) == (2, 0)
-    lines = _read_lines(client_log_file)
-    assert len(lines) == 2
-    assert lines[0]["source"] == "client"
-    assert lines[0]["service"] == "app-client"
-    assert lines[0]["device_id"] == "d-1"
-    assert lines[0]["user_id"] == 42
-    assert lines[0]["app_ver"] == "1.2.3"
-    assert lines[0]["client_ip"] == "1.2.3.4"
-    assert lines[0]["level"] == "INFO"  # 归一化大写
-    assert lines[0]["msg"] == "hello"
-    assert lines[0]["client_ts"] == 1737000000000
-    assert lines[1]["tag"] == "net"
-
-
-def test_writer_hoists_trace_id_to_top_level(client_log_file):
-    client_log.write_records(
-        [{"client_ts": 1, "level": "info", "msg": "x", "trace_id": "abc123"}],
-        meta=_meta(), client_ip="",
-    )
-    assert _read_lines(client_log_file)[0]["trace_id"] == "abc123"
-
-
-def test_writer_sweeps_unknown_keys_into_data(client_log_file):
-    client_log.write_records(
-        [{"client_ts": 1, "level": "info", "msg": "x",
-          "foo": 123, "data": {"bar": "baz"}}],
-        meta=_meta(), client_ip="",
-    )
-    line = _read_lines(client_log_file)[0]
-    assert "foo" not in line               # 白名单外不进顶层
-    assert line["data"]["foo"] == 123      # 兜底进 data
-    assert line["data"]["bar"] == "baz"    # 客户端自带 data 合并进来
-
-
-def test_writer_truncates_oversize_msg(client_log_file, monkeypatch):
-    monkeypatch.setenv("APPLOG_MAX_MSG_BYTES", "10")
-    received, dropped = client_log.write_records(
-        [{"client_ts": 1, "level": "info", "msg": "x" * 100}],
-        meta=_meta(), client_ip="",
-    )
-    assert (received, dropped) == (1, 0)   # 截断而非丢弃
-    line = _read_lines(client_log_file)[0]
-    assert line["msg_truncated"] is True
-    assert line["msg"].endswith("…[truncated]")
-
-
-def test_writer_logger_does_not_propagate(client_log_file):
-    lg = client_log.get_logger()
-    assert lg.name == "client"
-    assert lg.propagate is False           # 不冒泡到 root → 不写 app-server.log
-```
-
-- [ ] **Step 2: 跑测试确认失败**
-
-Run: `pytest tests/test_applog.py -q`
-Expected: FAIL —— `AttributeError: module 'app.core.client_log' has no attribute 'reset_client_logger'`（模块尚不存在）。
-
-- [ ] **Step 3: 实现 `app/core/client_log.py`**
-
-```python
-"""客户端运行日志专用落盘 writer(独立于服务端 app-server.log)。
-
-- 独占 logger "client" + 自己的 RotatingFileHandler,propagate=False → 不污染 app-server.log。
-- 每条按「白名单键(client_ts/level/trace_id/tag/msg)提顶层 + 其余并入 data」封装,再
-  json.dumps 成一行写出(钉死 SLS 索引列;见 spec §5)。formatter 用 %(message)s——行本身
-  已是 JSON,不能再过 JsonFormatter 二次编码。
-- 滚动 20MB×10(env 可调),与服务日志同机制。
-  ⚠️ 依赖 --workers 1:RotatingFileHandler 多进程并发 doRollover 会损坏/丢日志;扩 worker
-  前换 QueueHandler→单写入者 / 外部 logrotate(copytruncate) / 写 stdout 交 journald。
-
-服务端补的字段(time/source/service/client_ip/device_id/...)是「事实」,与客户端自述分开。
-`time` 用服务端接收时间作 SLS 主时间(客户端时钟不可信),client_ts 另存为可查字段。
-"""
-from __future__ import annotations
-
-import json
-import logging
-import os
-from datetime import datetime
-from logging.handlers import RotatingFileHandler
-from pathlib import Path
-
-# 仅这些客户端键提到输出行顶层;其余(含客户端自带 data)一律并入 data,防 SLS 索引列爆炸
-_TOP_LEVEL_KEYS = ("client_ts", "level", "trace_id", "tag", "msg")
-
-_logger: logging.Logger | None = None
-
-
-def _max_msg_bytes() -> int:
-    return int(os.getenv("APPLOG_MAX_MSG_BYTES", "8192"))
-
-
-def _build_logger() -> logging.Logger:
-    lg = logging.getLogger("client")
-    lg.setLevel(logging.INFO)
-    lg.propagate = False  # 不冒泡到 root → 不写进 app-server.log
-    log_file = os.getenv("CLIENT_LOG_FILE") or str(
-        Path(os.getenv("LOG_DIR", "logs")) / "app-client.log"
-    )
-    Path(log_file).parent.mkdir(parents=True, exist_ok=True)
-    handler = RotatingFileHandler(
-        log_file,
-        maxBytes=int(os.getenv("CLIENT_LOG_MAX_BYTES", str(20 * 1024 * 1024))),
-        backupCount=int(os.getenv("CLIENT_LOG_BACKUP_COUNT", "10")),
-        encoding="utf-8",
-    )
-    handler.setFormatter(logging.Formatter("%(message)s"))  # 行已是 JSON,不再包装
-    lg.handlers = [handler]
-    return lg
-
-
-def get_logger() -> logging.Logger:
-    global _logger
-    if _logger is None:
-        _logger = _build_logger()
-    return _logger
-
-
-def reset_client_logger() -> None:
-    """测试用:关闭并丢弃当前 logger,使下次 get_logger 按当时 env 重建(切临时文件)。"""
-    global _logger
-    if _logger is not None:
-        for h in list(_logger.handlers):
-            h.close()
-        _logger.handlers = []
-    _logger = None
-
-
-def _truncate_msg(msg: str) -> tuple[str, bool]:
-    raw = msg.encode("utf-8")
-    limit = _max_msg_bytes()
-    if len(raw) <= limit:
-        return msg, False
-    # 按字节截断后解码,忽略截断处半个多字节字符
-    return raw[:limit].decode("utf-8", "ignore") + "…[truncated]", True
-
-
-def _build_line(
-    record: dict, *, meta: dict, client_ip: str, service: str, now_iso: str
-) -> str:
-    out: dict = {
-        "time": now_iso,
-        "source": "client",
-        "service": service,
-        "client_ip": client_ip,
-    }
-    # 批级公共字段(非空才带)
-    for k in ("device_id", "user_id", "app_ver", "platform", "sent_at"):
-        v = meta.get(k)
-        if v is not None:
-            out[k] = v
-    # 白名单键提顶层
-    if record.get("level") is not None:
-        out["level"] = str(record["level"]).upper()
-    if record.get("trace_id"):
-        out["trace_id"] = record["trace_id"]
-    if record.get("tag"):
-        out["tag"] = record["tag"]
-    if record.get("client_ts") is not None:
-        out["client_ts"] = record["client_ts"]
-    if record.get("msg") is not None:
-        msg, truncated = _truncate_msg(str(record["msg"]))
-        out["msg"] = msg
-        if truncated:
-            out["msg_truncated"] = True
-    # 其余键(含客户端自带 data)并入 data
-    data: dict = {}
-    client_data = record.get("data")
-    if isinstance(client_data, dict):
-        data.update(client_data)
-    for k, v in record.items():
-        if k in _TOP_LEVEL_KEYS or k == "data":
-            continue
-        data[k] = v
-    if data:
-        out["data"] = data
-    return json.dumps(out, ensure_ascii=False, default=str)
-
-
-def write_records(
-    records: list[dict], *, meta: dict, client_ip: str
-) -> tuple[int, int]:
-    """把一批客户端日志逐条写入专用文件。返回 (received, dropped)。
-
-    尽力而为(fire-and-forget):logger 初始化或单条写入失败只跳过并计 dropped,
-    不抛给上层——端点因此永不因写日志而 500。
-    """
-    try:
-        lg = get_logger()
-    except Exception:  # noqa: BLE001 — 初始化失败也不能让端点 500
-        logging.getLogger("shagua.applog").exception("client log writer init failed")
-        return 0, len(records)
-    service = os.getenv("CLIENT_LOG_SERVICE_NAME", "app-client")
-    now_iso = datetime.now().strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3]
-    received = dropped = 0
-    for rec in records:
-        try:
-            line = _build_line(
-                rec, meta=meta, client_ip=client_ip, service=service, now_iso=now_iso
-            )
-            lg.info(line)
-            received += 1
-        except Exception:  # noqa: BLE001 — 坏条跳过,不影响其余
-            dropped += 1
-    return received, dropped
-```
-
-- [ ] **Step 4: 跑测试确认通过**
-
-Run: `pytest tests/test_applog.py -q`
-Expected: PASS（5 个 writer 测试全绿）。
-
-- [ ] **Step 5: ruff**
-
-Run: `ruff check app/core/client_log.py tests/test_applog.py`
-Expected: 无错误（如有 import 排序等自动可修问题：`ruff check --fix`）。
-
-- [ ] **Step 6: 提交**
-
-```bash
-git add app/core/client_log.py tests/test_applog.py
-git commit -m "feat(applog): 客户端日志专用落盘 writer(白名单+data 兜底, propagate=False)"
-```
-
----
-
-## Task 2: 端点 + schema + 注册
-
-**Files:**
-- Create: `app/schemas/applog.py`
-- Create: `app/api/v1/applog.py`
-- Modify: `app/main.py`（import + `include_router`）
-- Test: `tests/test_applog.py`（追加端点用例）
-
-- [ ] **Step 1: 追加失败测试（端点层）**
-
-在 `tests/test_applog.py` 末尾追加：
-
-```python
-# ---------------- 端点层 ----------------
-
-def _post(client, body):
-    return client.post("/api/v1/applog/batch", json=body)
-
-
-def test_endpoint_happy_path(client, client_log_file):
-    body = {
-        "device_id": "d-1", "user_id": 42, "app_ver": "1.2.3", "platform": "android",
-        "logs": [
-            {"client_ts": 1, "level": "info", "msg": "a", "trace_id": "t1"},
-            {"client_ts": 2, "level": "warn", "msg": "b"},
-        ],
-    }
-    resp = _post(client, body)
-    assert resp.status_code == 200
-    assert resp.json() == {"ok": True, "received": 2, "dropped": 0}
-    lines = _read_lines(client_log_file)
-    assert len(lines) == 2
-    assert lines[0]["trace_id"] == "t1"       # 端到端:trace_id 落到文件顶层
-    assert lines[0]["client_ip"]              # 服务端补了 IP
-
-
-def test_endpoint_rejects_batch_over_max(client, client_log_file):
-    body = {"device_id": "d-1",
-            "logs": [{"client_ts": i, "level": "info", "msg": str(i)} for i in range(501)]}
-    resp = _post(client, body)
-    assert resp.status_code == 422           # Pydantic max_length=500
-
-
-def test_endpoint_rejects_body_over_limit(client, client_log_file, monkeypatch):
-    monkeypatch.setenv("APPLOG_MAX_BODY_BYTES", "50")
-    body = {"device_id": "d-1", "logs": [{"client_ts": 1, "level": "info", "msg": "x" * 500}]}
-    resp = _post(client, body)
-    assert resp.status_code == 413           # 依赖查 Content-Length,body 校验前拦截
-
-
-def test_endpoint_returns_200_on_write_failure(client, client_log_file, monkeypatch):
-    class _BoomLogger:
-        name = "client"
-        propagate = False
-        handlers: list = []
-
-        def info(self, *a, **k):
-            raise RuntimeError("disk full")
-
-    monkeypatch.setattr(client_log, "get_logger", lambda: _BoomLogger())
-    body = {"device_id": "d-1", "logs": [
-        {"client_ts": 1, "level": "info", "msg": "a"},
-        {"client_ts": 2, "level": "info", "msg": "b"}]}
-    resp = _post(client, body)
-    assert resp.status_code == 200           # fire-and-forget:写失败不 500
-    assert resp.json() == {"ok": True, "received": 0, "dropped": 2}
-
-
-def test_endpoint_missing_device_id_is_422(client, client_log_file):
-    resp = _post(client, {"logs": [{"client_ts": 1, "level": "info", "msg": "a"}]})
-    assert resp.status_code == 422           # device_id 必填
-```
-
-- [ ] **Step 2: 跑测试确认失败**
-
-Run: `pytest tests/test_applog.py -q`
-Expected: FAIL —— 端点未注册，`POST /api/v1/applog/batch` 返回 404（happy-path 断言 200 失败）。
-
-- [ ] **Step 3: 实现 schema `app/schemas/applog.py`**
-
-```python
-"""客户端运行日志批量上报 schema。
-
-批级公共字段(device_id/user_id/app_ver/platform/sent_at)发一次;logs 为原始 dict 列表,
-**不强类型**——尽力而为的日志链路,单条内容异常不该让整批 422。每条的「白名单键 + data
-兜底」拆分在写入层 [app.core.client_log] 做(见 spec §4/§5)。
-"""
-from __future__ import annotations
-
-import os
-from typing import Any
-
-from pydantic import BaseModel, Field
-
-_MAX_BATCH = int(os.getenv("APPLOG_MAX_BATCH", "500"))
-
-
-class AppLogBatchIn(BaseModel):
-    device_id: str = Field(max_length=64)
-    user_id: int | None = None
-    app_ver: str | None = Field(default=None, max_length=32)
-    platform: str | None = Field(default=None, max_length=16)
-    sent_at: int | None = None
-    logs: list[dict[str, Any]] = Field(min_length=1, max_length=_MAX_BATCH)
-
-
-class AppLogIngestOut(BaseModel):
-    ok: bool = True
-    received: int
-    dropped: int = 0
-```
-
-- [ ] **Step 4: 实现端点 `app/api/v1/applog.py`**
-
-```python
-"""客户端运行日志批量上报接口。
-
-POST /api/v1/applog/batch — 批量接收客户端运行日志,逐条写专用滚动文件 logs/app-client.log
-(供 Logtail 采进独立 SLS logstore)。鉴权同 analytics(不强制登录,user_id 可选在 body)。
-fire-and-forget:写失败也不 500(避免客户端重试风暴);超批 422、超体积 413、msg 超限截断。
-"""
-from __future__ import annotations
-
-import os
-
-from fastapi import APIRouter, Depends, HTTPException, Request
-
-from app.core.client_log import write_records
-from app.core.ratelimit import rate_limit
-from app.schemas.applog import AppLogBatchIn, AppLogIngestOut
-
-router = APIRouter(prefix="/api/v1/applog", tags=["applog"])
-
-
-def _client_ip(request: Request) -> str:
-    """取客户端 IP:生产经 nginx 反代优先 X-Forwarded-For 首段,否则直连 IP(同 analytics)。"""
-    xff = request.headers.get("x-forwarded-for")
-    if xff:
-        return xff.split(",")[0].strip()
-    return request.client.host if request.client else ""
-
-
-def _enforce_body_limit(request: Request) -> None:
-    """依赖:body 声明过大直接 413(在 body 校验前拦截)。缺 Content-Length 由 nginx 兜底。"""
-    max_bytes = int(os.getenv("APPLOG_MAX_BODY_BYTES", str(1024 * 1024 * 2)))
-    cl = request.headers.get("content-length")
-    if cl is not None and cl.isdigit() and int(cl) > max_bytes:
-        raise HTTPException(status_code=413, detail="日志批量过大")
-
-
-@router.post(
-    "/batch",
-    response_model=AppLogIngestOut,
-    summary="批量上报客户端运行日志",
-    dependencies=[
-        Depends(rate_limit(120, 60, "applog-batch")),
-        Depends(_enforce_body_limit),
-    ],
-)
-def ingest_logs(batch: AppLogBatchIn, request: Request) -> AppLogIngestOut:
-    received, dropped = write_records(
-        batch.logs,
-        meta={
-            "device_id": batch.device_id,
-            "user_id": batch.user_id,
-            "app_ver": batch.app_ver,
-            "platform": batch.platform,
-            "sent_at": batch.sent_at,
-        },
-        client_ip=_client_ip(request),
-    )
-    return AppLogIngestOut(received=received, dropped=dropped)
-```
-
-- [ ] **Step 5: 注册路由 `app/main.py`**
-
-在 import 区（analytics_router 之后，约 [app/main.py:23](../../../app/main.py#L23)）加：
-
-```python
-from app.api.v1.applog import router as applog_router
-```
-
-在 `include_router` 区（`app.include_router(analytics_router)` 之后，约 [app/main.py:125](../../../app/main.py#L125)）加：
-
-```python
-app.include_router(applog_router)
-```
-
-- [ ] **Step 6: 跑测试确认通过**
-
-Run: `pytest tests/test_applog.py -q`
-Expected: PASS（writer 5 + 端点 5，共 10 个）。
-
-- [ ] **Step 7: 全量测试 + ruff**
-
-Run: `pytest -q && ruff check app/api/v1/applog.py app/schemas/applog.py app/main.py`
-Expected: 全绿、无 lint 错误。
-
-- [ ] **Step 8: 提交**
-
-```bash
-git add app/api/v1/applog.py app/schemas/applog.py app/main.py tests/test_applog.py
-git commit -m "feat(applog): POST /api/v1/applog/batch 批量上报端点(限流+体积上限+fire-and-forget)"
-```
-
----
-
-## Task 3: `.env.example` 文档化新 env（可选但推荐）
-
-**Files:**
-- Modify: `.env.example`
-
-- [ ] **Step 1: 追加 env 说明**
-
-在 `.env.example` 末尾（或日志相关区块）追加，让运维知道可调项：
-
-```bash
-# 客户端运行日志上报(POST /api/v1/applog/batch)→ 落 logs/app-client.log 供 Logtail 采集
-# 独立于服务日志 app-server.log;滚动机制同服务日志。默认值见 app/core/client_log.py。
-# CLIENT_LOG_FILE=logs/app-client.log
-# CLIENT_LOG_MAX_BYTES=20971520      # 单文件 20MB 滚动
-# CLIENT_LOG_BACKUP_COUNT=10         # 保留 10 个 → ~200MB 缓冲
-# CLIENT_LOG_SERVICE_NAME=app-client # 输出行 service 字段
-# APPLOG_MAX_BATCH=500               # 单批最大条数(超 → 422)
-# APPLOG_MAX_BODY_BYTES=2097152      # 请求体上限 2MB(超 → 413)
-# APPLOG_MAX_MSG_BYTES=8192          # 单条 msg 超限截断
-```
-
-- [ ] **Step 2: 提交**
-
-```bash
-git add .env.example
-git commit -m "docs(applog): .env.example 补充客户端日志上报可调 env"
-```
-
-> 若仓库无 `.env.example`（以 `git ls-files .env.example` 确认），跳过本任务。
-
----
-
-## Definition of Done
-
-- [ ] `pytest -q` 全绿（含新增 `tests/test_applog.py` 10 用例）。
-- [ ] `ruff check .` 无错误。
-- [ ] `POST /api/v1/applog/batch` 手动冒烟：发一批含 `trace_id` 的日志，确认 `logs/app-client.log` 出现对应单行 JSON、`trace_id` 在顶层、未知键落在 `data`，且 `logs/app-server.log` **未**被写入客户端记录。
-- [ ] Spec 的运维项（独立 logstore、Logtail JSON 模式采 `app-client.log`、给 `trace_id` 建索引、nginx `client_max_body_size` 对齐）已同步给运维（不在本仓代码内，见 spec §8）。
-
-## Self-Review 结论（作者已核对）
-
-- **Spec 覆盖**：§4 端点/限额 → Task 2；§5 白名单+data 兜底 → Task 1 `_build_line`；§6 落盘/滚动/单 worker 注释 → Task 1；§7 trace_id 顶层 → Task 1 + 端点测试；§9 fire-and-forget → Task 1 `write_records` + 端点测试；§13 env → Task 1/2 读取 + Task 3 文档化。§8 为纯运维配置，列入 Definition of Done。
-- **无占位符**：所有步骤含完整代码/命令/预期。
-- **类型/命名一致**：`write_records(records, *, meta, client_ip) -> (received, dropped)`、`get_logger()`、`reset_client_logger()`、`_TOP_LEVEL_KEYS`、`AppLogBatchIn/AppLogIngestOut` 在 Task 1/2 间一致引用。

docs/superpowers/plans/2026-07-24-withdraw-allow-concurrent.md

@@ -1,323 +0,0 @@
-# 允许在途提现时继续提交新申请 Implementation Plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** 取消「同一用户同一时刻仅一笔在途提现」限制,已有 `reviewing`/`pending` 单时允许继续提交新的提现申请。
-
-**Architecture:** 该限制由两道闸共同强制——应用层 `create_withdraw` 的在途单检查(`WithdrawTooFrequentError`)与数据库分区唯一索引 `ux_withdraw_order_user_active`。彻底移除两者 + 清理随之失效的死代码;既有约束(建单先扣款、`coin_cash` 每日档位次数、`out_bill_no` 幂等)天然保留,无需改动。测试库由 `Base.metadata.create_all()` 依模型建表,故删模型内索引定义即让测试反映新 schema;另配一条 Alembic 迁移让真实库(dev/prod)落地同一变更。
-
-**Tech Stack:** FastAPI · SQLAlchemy 2.0 · Alembic · pytest · ruff
-
-规格来源:[docs/superpowers/specs/2026-07-24-withdraw-allow-concurrent-design.md](../specs/2026-07-24-withdraw-allow-concurrent-design.md)
-
----
-
-## 关键事实(实现依据)
-
-- 当前 Alembic head:`d8dd2106e438`(新迁移的 `down_revision`)。
-- 索引出处:[`alembic/versions/withdraw_safety_indexes.py`](../../../alembic/versions/withdraw_safety_indexes.py) 同时建了两个索引——本次**只删** `ux_withdraw_order_user_active`,**保留**姊妹索引 `ux_cash_transaction_withdraw_refund_ref`(退款幂等)。
-- 档位:`WithdrawTier(50, "0.5", None, 3, False)`——50 分(0.5 元)是**常规档**,每日 3 次,非新人档;测试用它来造多笔在途。
-- 测试库走 `create_all`(见 `tests/conftest.py`),**不跑 Alembic**;故迁移的正确性由本计划单独的 upgrade/downgrade 回环验证,不由 pytest 覆盖。
-- `app/models/wallet.py` 的 `Index`/`text` 仍被其它表(行 54/186/224)使用,删本表 `__table_args__` 后**无需**清理 import。
-
----
-
-## Task 1: 允许多笔在途提现并存(TDD:模型 + 应用层 + 端点 + 迁移,单次提交)
-
-本变更是一次原子的 schema+行为改动:模型内索引、应用层检查、Alembic 迁移相互依赖,任一缺失都会让"多笔在途"在测试库或真实库其一不成立。故作为**一个任务、一次提交**完成,内部按 TDD 分步。
-
-**Files:**
-- Test: `tests/test_withdraw.py`(新增 2 个用例)
-- Modify: `app/repositories/wallet.py`(删在途单检查 + IntegrityError 兜底瘦身 + 删死常量/异常)
-- Modify: `app/api/v1/wallet.py:225-229`(删失效的 409 处理)
-- Modify: `app/models/wallet.py:99-107`(删分区唯一索引)
-- Create: `alembic/versions/drop_withdraw_active_unique_index.py`(真实库删索引)
-
----
-
-- [ ] **Step 1: 写两个失败测试**
-
-在 `tests/test_withdraw.py` 末尾追加(复用文件内既有 helper `_login`/`_auth`/`_seed_cash`/`_patch_userinfo`):
-
-```python
-def test_withdraw_multiple_in_flight_allowed(client, monkeypatch) -> None:
-    """取消「同时仅一单」:已有在途(reviewing)时,不同 out_bill_no 可继续提交,两单并存。"""
-    _patch_userinfo(monkeypatch, "openid_multi_inflight")
-    token = _login(client, "13800002020")
-    _seed_cash(client, token, "13800002020", 100)  # 够两笔 0.5
-    client.post("/api/v1/wallet/bind-wechat", json={"code": "c"}, headers=_auth(token))
-
-    r1 = client.post(
-        "/api/v1/wallet/withdraw",
-        json={"amount_cents": 50, "out_bill_no": "billmulti00000001"},
-        headers=_auth(token),
-    )
-    assert r1.status_code == 200, r1.text
-    assert r1.json()["status"] == "reviewing"
-
-    r2 = client.post(
-        "/api/v1/wallet/withdraw",
-        json={"amount_cents": 50, "out_bill_no": "billmulti00000002"},
-        headers=_auth(token),
-    )
-    assert r2.status_code == 200, r2.text
-    assert r2.json()["status"] == "reviewing"
-
-    # 两张在途单并存
-    r = client.get("/api/v1/wallet/withdraw-orders", headers=_auth(token))
-    reviewing = [o for o in r.json()["items"] if o["status"] == "reviewing"]
-    assert len(reviewing) == 2, r.text
-    # 余额扣两次:100-50-50=0
-    r = client.get("/api/v1/wallet/account", headers=_auth(token))
-    assert r.json()["cash_balance_cents"] == 0
-
-
-def test_withdraw_second_blocked_only_by_insufficient_cash(client, monkeypatch) -> None:
-    """并行放开后第二笔仅受余额约束:余额不足返 409「现金余额不足」,而非旧的「已有提现」拦截。"""
-    _patch_userinfo(monkeypatch, "openid_multi_insuff")
-    token = _login(client, "13800002021")
-    _seed_cash(client, token, "13800002021", 50)  # 仅够一笔 0.5
-    client.post("/api/v1/wallet/bind-wechat", json={"code": "c"}, headers=_auth(token))
-
-    r1 = client.post(
-        "/api/v1/wallet/withdraw",
-        json={"amount_cents": 50, "out_bill_no": "billinsuff0000001"},
-        headers=_auth(token),
-    )
-    assert r1.status_code == 200, r1.text
-
-    r2 = client.post(
-        "/api/v1/wallet/withdraw",
-        json={"amount_cents": 50, "out_bill_no": "billinsuff0000002"},
-        headers=_auth(token),
-    )
-    assert r2.status_code == 409, r2.text
-    assert "现金余额不足" in r2.json()["detail"]
-```
-
-- [ ] **Step 2: 运行新测试,确认失败**
-
-Run: `pytest tests/test_withdraw.py::test_withdraw_multiple_in_flight_allowed tests/test_withdraw.py::test_withdraw_second_blocked_only_by_insufficient_cash -q`
-Expected: 两条 FAIL —— `multiple_in_flight` 因第二笔被拦返回 409(期望 200);`second_blocked` 因返回的 409 detail 是「已有提现申请正在审核或打款中」而非「现金余额不足」。
-
-- [ ] **Step 3: 应用层删在途单互斥检查**(`app/repositories/wallet.py` · `create_withdraw`)
-
-删掉在途单预检查(它紧邻档位闸注释之前):
-
-old:
-```python
-    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
-
-    # 福利页档位闸(7-9):coin_cash 只能提预设档位,且该档今日可提(服务端权威口径,防绕过
-```
-new:
-```python
-    # 福利页档位闸(7-9):coin_cash 只能提预设档位,且该档今日可提(服务端权威口径,防绕过
-```
-
-- [ ] **Step 4: 应用层给 IntegrityError 兜底瘦身**(同函数末尾 commit 处)
-
-索引移除后不会再因在途单触发唯一冲突,只保留 `out_bill_no` 幂等重试分支:
-
-old:
-```python
-    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
-```
-new:
-```python
-    except IntegrityError:
-        db.rollback()
-        # 唯一冲突只可能来自 out_bill_no 幂等键并发重试:原样返回既有单;否则未知冲突,上抛。
-        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
-        raise
-```
-
-- [ ] **Step 5: 删死常量 `_WITHDRAW_ACTIVE_STATUSES`**(`app/repositories/wallet.py` 模块顶部)
-
-只删常量行,保留其后属于 `_NEWBIE_TIER_HELD_STATUSES` 的注释:
-
-old:
-```python
-_WITHDRAW_ACTIVE_STATUSES = {"reviewing", "pending"}
-# 占用新人档「一次性」资格的提现状态:进行中(reviewing/pending)或成功打款(success)。
-```
-new:
-```python
-# 占用新人档「一次性」资格的提现状态:进行中(reviewing/pending)或成功打款(success)。
-```
-
-- [ ] **Step 6: 删死异常类 `WithdrawTooFrequentError`**(`app/repositories/wallet.py`)
-
-old:
-```python
-class WithdrawTooFrequentError(Exception):
-    """提现申请过于频繁,或已有未完成提现单。"""
-
-
-class WithdrawTierUnavailableError(Exception):
-```
-new:
-```python
-class WithdrawTierUnavailableError(Exception):
-```
-
-- [ ] **Step 7: 删端点内失效的 409 处理**(`app/api/v1/wallet.py` · `withdraw`)
-
-old:
-```python
-    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
-    except crud_wallet.WithdrawTierUnavailableError as e:
-```
-new:
-```python
-    except crud_wallet.WechatNotBoundError as e:
-        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="请先绑定微信") from e
-    except crud_wallet.WithdrawTierUnavailableError as e:
-```
-
-- [ ] **Step 8: 删模型内分区唯一索引**(`app/models/wallet.py` · `WithdrawOrder`)
-
-old:
-```python
-    __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')"),
-        ),
-    )
-```
-new:
-```python
-    __tablename__ = "withdraw_order"
-```
-
-- [ ] **Step 9: 运行新测试,确认通过**
-
-Run: `pytest tests/test_withdraw.py::test_withdraw_multiple_in_flight_allowed tests/test_withdraw.py::test_withdraw_second_blocked_only_by_insufficient_cash -q`
-Expected: 2 passed。
-
-- [ ] **Step 10: 建 Alembic 迁移(真实库删索引)**
-
-创建 `alembic/versions/drop_withdraw_active_unique_index.py`:
-
-```python
-"""drop withdraw active-order partial unique index (allow multiple in-flight withdrawals)
-
-Revision ID: drop_withdraw_active_unique_index
-Revises: d8dd2106e438
-Create Date: 2026-07-24 00:00:00.000000
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = "drop_withdraw_active_unique_index"
-down_revision: Union[str, Sequence[str], None] = "d8dd2106e438"
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    # 取消「同一用户同一时刻仅一笔在途提现」:允许 reviewing/pending 并存。
-    # 仅删本索引;姊妹索引 ux_cash_transaction_withdraw_refund_ref(退款幂等)保持不动。
-    op.drop_index("ux_withdraw_order_user_active", table_name="withdraw_order")
-
-
-def downgrade() -> None:
-    # 回滚重建分区唯一索引。注意:若届时某用户已有 ≥2 张在途单,重建会因唯一冲突失败——
-    # 属预期的回滚代价(取消限制后本就允许多单),需先人工收敛在途单再回滚。
-    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')"),
-    )
-```
-
-- [ ] **Step 11: 验证迁移 upgrade + 回环 downgrade/upgrade**
-
-Run: `alembic upgrade head`
-Expected: 输出应用 `drop_withdraw_active_unique_index`,无报错。
-
-Run: `alembic downgrade -1 && alembic upgrade head`
-Expected: downgrade 重建索引、upgrade 再次删除,均成功(dev 库每用户在途单 ≤1,不会触发唯一冲突)。
-
-- [ ] **Step 12: 全量测试 + Lint**
-
-Run: `pytest -q`
-Expected: 全绿(既有 `test_withdraw_idempotent_same_bill_no`、`tests/test_withdraw_tiers.py`、`tests/test_invite_cash_withdraw.py` 均不受影响)。
-
-Run: `ruff check .`
-Expected: 无新增告警(死常量/异常已连同引用一并删除)。
-
-- [ ] **Step 13: 提交**
-
-```bash
-git add tests/test_withdraw.py app/repositories/wallet.py app/api/v1/wallet.py app/models/wallet.py alembic/versions/drop_withdraw_active_unique_index.py
-git commit -m "feat(withdraw): 允许在途提现时继续提交新申请
-
-取消「同一用户同时仅一笔在途提现」限制:删应用层在途单检查 +
-删 DB 分区唯一索引 ux_withdraw_order_user_active + 清理死代码
-(_WITHDRAW_ACTIVE_STATUSES / WithdrawTooFrequentError)。
-先扣款、coin_cash 每日档位次数、out_bill_no 幂等等既有约束不变。
-
-Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>"
-```
-
----
-
-## 自审(spec 覆盖核对)
-
-- **R1 已有 reviewing/pending 可再提** → Step 3/4(应用层)+ Step 8/10(模型 + 迁移);`test_withdraw_multiple_in_flight_allowed` 证明。✓
-- **R2 不加硬上限** → 无新增限制;`coin_cash` 天然封顶由既有档位次数(`tests/test_withdraw_tiers.py`)保障,不改。✓
-- **R3 幂等/限额/退款/对账不回退** → `test_withdraw_idempotent_same_bill_no` 与档位/邀请现金测试留绿(Step 12);解绑退款、对账按单号维度,未触碰。✓
-- **spec §4 四处改动** → Step 3/4/5/6(repo)、Step 7(api)、Step 8(model)、Step 10(迁移)一一对应。✓
-- **spec §6 客户端注意点** → 属跨仓 App 事项,文档已记,本计划无对应代码任务(有意为之)。✓
-- **占位符扫描**:迁移 `revision` / `down_revision`(`d8dd2106e438`)均为具体值,无 TBD。✓
-- **命名一致性**:`WithdrawTooFrequentError`/`_WITHDRAW_ACTIVE_STATUSES` 的删除点与引用点全覆盖(全仓仅这 4 处);`ux_withdraw_order_user_active` 在模型/迁移中拼写一致。✓

docs/superpowers/specs/2026-07-19-client-applog-ingest-design.md

@@ -1,200 +0,0 @@
-# 客户端运行日志批量上报 → 落专用文件 → SLS 采集 设计
-
-- 日期：2026-07-19
-- 状态：设计已评审，待写实现计划
-- 相关代码：[app/core/logging.py](../../../app/core/logging.py)（服务端日志落盘范式）、[app/api/v1/analytics.py](../../../app/api/v1/analytics.py)（批量上报入口范式）、[deploy/shaguabijia-app-server.service](../../../deploy/shaguabijia-app-server.service)（`--workers 1`）
-
-## 1. 背景与目标
-
-Android 客户端会在本地攒一批 App 运行日志（自动化步骤 / 网络 / 崩溃 / 调试等），批量以 JSON 数组发给后端。后端把这些日志**逐条**写进一个**专用滚动日志文件**，文件滚动规则与服务日志一致；再由阿里云 SLS 的 Logtail 采集该文件、进独立 logstore。
-
-目标：
-
-1. 新增 `POST /api/v1/applog/batch` 接收批量客户端日志。
-2. 逐条落进 `logs/app-client.log`（**独立于** `app-server.log`），单行 JSON、大小滚动、供 Logtail JSON 模式零正则采集。
-3. 客户端日志进**独立 logstore**，但 **可按 `trace_id` 检索**，以便和服务端比价链路跨层对齐。
-4. 入口安全：鉴权同 analytics（不强制 Bearer），加体积/条数上限、限流，防撑盘与日志注入。
-
-本方案是两个**已验证范式的组合**：analytics 的「批量入口 + 服务端补 IP/接收时间」+ `app-server.log` 的「单行 JSON + RotatingFileHandler + Logtail」。不是新架构。
-
-## 2. 非目标（本期不做，YAGNI）
-
-- **异步队列 / 后台 writer**：`<10 万条/天` ≈ 均值 1.2 条/秒，10× 突发 ~12/秒，请求路径同步写文件足矣。
-- **去重**：网络重试会在 SLS 产生重复条目。本期**接受重复**并在文档写明；后续如需，加客户端 `batch_id` 短窗口去重。
-- **服务端脱敏**：本期靠**客户端侧**控制等级/采样与不打 PII；服务端只做体积截断。脱敏留作后续 knob。
-- **多 worker 支持**：见 §5 的单 worker 约束。
-- **入库 / admin 查询界面**：日志的归宿是 SLS，不落 DB。
-
-## 3. 方案总览与备选取舍
-
-**采用 A**：客户端 → 后端接口 → 专用滚动文件 → Logtail → SLS。
-
-| 方案 | 说明 | 为何不选 |
-|---|---|---|
-| **A（选定）** | 后端中转落文件，Logtail 采集 | — 代码最少、完全复用现成文件→Logtail 管线；AK/SK 不进 APK；Logtail 天然提供落盘缓冲+断点续传 |
-| B | 客户端直连 SLS（Producer SDK / Web-Tracking） | 要么把凭证埋进 APK，要么额外跑 STS 换 token 服务；服务端难做鉴权/富化/脱敏 |
-| C | 后端调 SLS PutLogs API（不落文件） | 请求路径硬依赖 SLS 可用性，需自建缓冲/背压/重试——等于重造 Logtail |
-
-## 4. 端点契约
-
-`POST /api/v1/applog/batch`
-
-- 新路由 `app/api/v1/applog.py`，在 [app/main.py](../../../app/main.py) `import ... as applog_router` 并 `app.include_router(applog_router)`（紧挨 analytics）。
-- 鉴权同 analytics：**不强制 Bearer**，`user_id` 可选放 body；服务端补 `client_ip`（复用 analytics 里的 `_client_ip` 取 `X-Forwarded-For` 首段逻辑）与接收时间。
-
-### 请求体 `AppLogBatchIn`（批级公共字段发一次，省带宽）
-
-| 字段 | 类型 | 必填 | 约束/说明 |
-|---|---|---|---|
-| `device_id` | str | 是 | `max_length=64`；限流/分组键 |
-| `user_id` | int? | 否 | 可选，未登录态也采集 |
-| `app_ver` | str? | 否 | `max_length=32` |
-| `platform` | str? | 否 | `max_length=16`（android/ios/harmony） |
-| `sent_at` | int? | 否 | 本批上报时刻 epoch ms |
-| `logs` | list[dict] | 是 | `min_length=1, max_length=500`；**每条为对象**，逐条按 §5 契约处理 |
-
-`logs` 用 `list[dict[str, Any]]` 而非强类型列表：这是**尽力而为**的日志链路，单条内容异常不应让整批 422 失败。超过 500 条由 Pydantic `max_length` 触发 422（客户端应更小批）。
-
-### 响应 `AppLogIngestOut`
-
-```jsonc
-{ "ok": true, "received": 128, "dropped": 2 }
-```
-- `received`：成功写入文件的条数。
-- `dropped`：服务端处理/序列化失败被跳过的条数（正常为 0，属异常兜底计数）。**oversize 的 `msg` 是截断而非丢弃**，不计入 dropped。
-
-### 限额（防撑盘 / 注入 / DoS）
-
-| 限额 | 默认 | 超限行为 | env |
-|---|---|---|---|
-| 单批条数 | 500 | 422（Pydantic） | `APPLOG_MAX_BATCH` |
-| body 字节 | 2 MB | 413（依赖查 `Content-Length`，在 body 校验前拦截；缺该头由 nginx `client_max_body_size` 兜底） | `APPLOG_MAX_BODY_BYTES` |
-| 单条 `msg` 字节 | 8192 | 截断 + 标记，不丢 | `APPLOG_MAX_MSG_BYTES` |
-
-同时**对齐 nginx `client_max_body_size`**（见 [deploy/nginx](../../../deploy/nginx/)）避免反代先于应用截断。限流复用 `app/core/ratelimit.py`（项目现有 IP 固定窗口）；具体挂法参照现有已限流写端点，测试环境 `RATE_LIMIT_ENABLED=false` 关闭。
-
-## 5. 每条记录契约 + 白名单键 + `data` 兜底
-
-**客户端每条日志的识别键（仅这些提到输出行顶层）：**
-
-| 键 | 类型 | 说明 |
-|---|---|---|
-| `client_ts` | int | 端事件时间 epoch ms（与 analytics 命名一致） |
-| `level` | str | 服务端归一化为大写；不做硬枚举拒绝（fire-and-forget） |
-| `trace_id` | str? | **§6 的核心**：有服务端交互的日志带上当初 API 返回的 trace |
-| `tag` | str? | 模块/分类，便于 SLS 过滤 |
-| `msg` | str | 消息主体，超 `APPLOG_MAX_MSG_BYTES` 截断并加标记 |
-
-**其余任意自定义字段 → 服务端一律收进单个 `data` 对象。**
-
-**为什么这么设计（防 SLS 索引列爆炸）：** Logtail JSON 模式下每个**顶层 key** 都会成为 logstore 一个可索引字段/列。若放任客户端往顶层写任意 key（甚至把动态 id 拼进 key），logstore 会长出成千上万个不同顶层列 → 索引成本膨胀、可能撞字段数上限、schema 混乱到无法建稳定 dashboard/告警，一个客户端 bug 就能把 logstore 搞脏。
-
-**「兜底」= 服务端强制、不信任客户端。** `logs` 以 `list[dict]` 原样收下（不强类型，单条异常不该让整批 422），在**写入层 `client_log.py`** 逐条拆分：白名单键提顶层，**其余键（含客户端自带的 `data`）统一并进 `data`**（而非透传到顶层，也非静默丢弃——日志要保真）。于是**输出行顶层列恒定**，无论客户端怎么发。
-
-这与现有 `JsonFormatter` 平铺 `phase/step/command/cost_ms` 同思路，区别：那些 extra 是**服务端可信有限**的键；客户端不可信无界，故只给一个 `data` 沙盒。
-
-## 6. 落盘 writer
-
-新模块 `app/core/client_log.py`：
-
-- 惰性单例 `logging.getLogger("client")`，**`propagate=False`**（否则冒泡进 root 被 `app-server.log` 二次写入并污染）。
-- 独占一个 `RotatingFileHandler`，formatter 为 `%(message)s`——**不复用 root 的 `JsonFormatter`**（那会把已是 JSON 的行二次编码成字符串）。writer 自己拼信封 dict 后 `json.dumps(..., ensure_ascii=False, default=str)` 得到**一行**，`logger.info(line)` 写出。
-- 复用 `logging` 模块的 handler 锁保证多线程（uvicorn threadpool）并发写安全。
-- 幂等 setup（仿 `setup_logging` 的 `_CONFIGURED` 守卫）。
-
-**滚动规则（与服务日志同机制 `RotatingFileHandler`，尺寸给客户端量级）：**
-
-| 参数 | 默认 | env |
-|---|---|---|
-| 文件路径 | `logs/app-client.log` | `CLIENT_LOG_FILE` / `LOG_DIR` |
-| `maxBytes` | 20 MB | `CLIENT_LOG_MAX_BYTES` |
-| `backupCount` | 10 | `CLIENT_LOG_BACKUP_COUNT` |
-| `service` 字段 | `app-client` | `CLIENT_LOG_SERVICE_NAME` |
-
-≈ 200 MB / ~2 天缓冲，给 Logtail 断线留余量（按 <10 万条/天、条均值估算）。**滚动文件不 gzip**——Logtail 读不了压缩包会丢数据。
-
-> ⚠️ **单 worker 约束**：`RotatingFileHandler` 多进程并发 `doRollover()` 会损坏/丢日志。当前生产 `--workers 1`（与限流器/SMS 码/SQLite 写锁同一既有假设，见 [deploy/shaguabijia-app-server.service](../../../deploy/shaguabijia-app-server.service)）故安全。**代码注释显式标注**：扩 worker 前必须换 `QueueHandler`→单写入者 或外部 logrotate（copytruncate）或写 stdout 交 journald 采集。
-
-**每条输出行（写入 `app-client.log`）：**
-
-```jsonc
-{ "time": "2026-07-19T12:00:00.123",  // 服务端接收时间 = SLS 主时间(客户端时钟不可信)
-  "source": "client", "service": "app-client",
-  "level": "ERROR", "trace_id": "abc123", "tag": "automation", "msg": "...",
-  "device_id": "d-xxx", "user_id": 123, "app_ver": "1.2.3", "platform": "android",
-  "client_ip": "1.2.3.4", "client_ts": 1737000000123, "sent_at": 1737000005000,
-  "data": { /* 客户端其余任意字段 */ } }
-```
-- `time` 用服务端接收时间作 SLS 主时间；`client_ts` 保留为可查字段（时钟漂移不影响检索基准）。
-- 值为空的可选字段省略，保持行精简（仿服务端 formatter 省略空 `trace_id`）。
-
-## 7. trace_id 检索（满足目标 #3）
-
-关键：**per-record 把 `trace_id` 提到输出行顶层，字段名与服务端日志完全一致（`trace_id`）**。来源是客户端在**它发起过服务端调用的那些日志**里带上当初 API 返回的 trace（如 `/api/v1/compare/*` 由 [pricebot_router](../../../app/core/pricebot_router.py) 透传的 trace）。没有服务端交互的纯客户端日志不带 `trace_id`，正常。
-
-于是 SLS 里对客户端 logstore 与服务端 logstore 各查 `trace_id: "xxx"`，即可拼出「客户端自动化视角 + 服务端比价链路」的端到端故事。
-
-> **需客户端配合**：给有服务端 trace 的日志记录打上 `trace_id`（Android 侧改动，见 §10）。
-
-## 8. Logtail / SLS 侧配置（运维，非本仓代码）
-
-- 新建**独立 logstore**（独立保留期，客户端日志建议**比服务端短**以控成本）。
-- 新 Logtail 配置采集 `logs/app-client.log`，**JSON 模式**（每行一条 JSON，零正则，与 `app-server.log` 同套路）。
-- **把 `trace_id` 配成索引字段**（否则 #3 查不了）；`level` / `tag` / `device_id` 亦建议建索引。
-- 时间字段用输出行 `time`（服务端接收时间）。
-
-## 9. 失败语义 / 安全
-
-- **fire-and-forget**：写文件失败 → 服务端记一笔（`shagua.applog` logger）+ 仍返回 2xx，**绝不 500**（对比 selfstat 的 503 是 DB 关键链路，日志不是；500 会招致客户端重试风暴+重复上报）。
-- **日志行注入防护**：一律 `json.dumps` 重新序列化，内嵌 `\n` 被转义，客户端伪造不出假日志行；绝不把客户端原始字符串直接写文件。
-- **撑盘/DoS**：§4 的条数/体积/msg 上限 + IP 限流；`device_id` 便于后续拉黑滥用设备。
-
-## 10. 客户端契约（Android 侧需配合，属另一仓）
-
-1. 每条日志结构：顶层放 `client_ts / level / trace_id? / tag? / msg`，其余自定义字段放 `data`（否则会被服务端兜底挪进 `data`）。
-2. 有服务端交互的日志带上对应 `trace_id`。
-3. 等级/采样与 PII 控制在客户端侧做（省流量、免服务端脱敏）。
-4. 单批 ≤500 条、body ≤2MB；失败可重试（服务端接受重复）。
-
-## 11. 代码落点
-
-| 文件 | 职责 |
-|---|---|
-| `app/api/v1/applog.py` | 瘦路由：body 上限依赖 → 解析 `AppLogBatchIn` → 调 writer → 返回 `received/dropped`；`_client_ip` 复用 analytics 逻辑、IP 限流 |
-| `app/schemas/applog.py` | `AppLogBatchIn`（`logs: list[dict]` 不强类型）/ `AppLogIngestOut` |
-| `app/core/client_log.py` | 专用 logger/handler、滚动配置、白名单+`data` 兜底与信封拼装 `write_records(...)` |
-| `app/main.py` | 注册 `applog_router` |
-
-## 12. 测试计划（`tests/test_applog.py`）
-
-用临时目录做 `CLIENT_LOG_FILE`（测试前置 env + 重置 writer 单例）。
-
-1. **落盘逐行**：POST N 条 → 200，`received=N`，文件恰 N 行、每行合法 JSON、关键字段齐。
-2. **trace_id 顶层**：带 `trace_id` 的记录 → 输出行顶层出现 `trace_id`。
-3. **未知键兜底**：记录带 `foo` → 输出行顶层无 `foo`，`data.foo` 存在。
-4. **msg 截断**：`msg` > 8KB → 截断+标记，仍 `received`（不进 dropped）。
-5. **超批拒绝**：>500 条 → 422。
-6. **超体积拒绝**：`Content-Length` > 2MB → 413。
-7. **写失败不 500**：monkeypatch writer 抛错 → 仍 2xx。
-8. **不污染服务日志**：`client` logger `propagate=False`，写客户端日志不落 `app-server.log`。
-
-## 13. env 变量汇总
-
-| env | 默认 | 用途 |
-|---|---|---|
-| `CLIENT_LOG_FILE` | `logs/app-client.log` | 客户端日志文件路径 |
-| `CLIENT_LOG_MAX_BYTES` | `20971520`(20MB) | 单文件滚动阈值 |
-| `CLIENT_LOG_BACKUP_COUNT` | `10` | 保留滚动文件数 |
-| `CLIENT_LOG_SERVICE_NAME` | `app-client` | 输出行 `service` 字段 |
-| `APPLOG_MAX_BATCH` | `500` | 单批最大条数 |
-| `APPLOG_MAX_BODY_BYTES` | `2097152`(2MB) | 请求体上限 |
-| `APPLOG_MAX_MSG_BYTES` | `8192` | 单条 msg 截断阈值 |
-
-滚动/文件类 env 在 `client_log.py` 用 `os.getenv` 读取（与 [logging.py](../../../app/core/logging.py) 风格一致）；请求限额类同样以 `os.getenv` 兜默认。
-
-## 14. 已知取舍 / 未来工作
-
-- **重复**：本期接受 SLS 重复条目；需要时加 `batch_id` 去重。
-- **多 worker**：见 §6 约束；扩容前迁移写入模型。
-- **服务端脱敏**：留作后续 knob。
-- **更多设备维度**（os/model/rom）：需要时加到批级字段或让客户端放 `data`；可经 `device_id` 与 analytics/device 表关联。

docs/superpowers/specs/2026-07-24-withdraw-allow-concurrent-design.md

@@ -1,119 +0,0 @@
-# 允许在途提现时继续提交新的提现申请 设计
-
-- **日期**:2026-07-24
-- **状态**:Draft — 待评审
-- **所属**:app-server(`app/`),含一处 Alembic 迁移;另有一条 Android/客户端注意点(非本次后端工作)
-- **一句话**:取消「同一用户同一时刻只能有一笔在途提现」的限制 —— 已有 `reviewing`(待审核)或 `pending`(打款在途)提现单时,允许再次发起新的提现申请。
-
----
-
-## 1. 背景与目标
-
-现状:用户发起提现后,在管理员审核通过并打款完成之前(`reviewing` / `pending`),**无法再发起第二笔提现**,会收到 409「已有提现申请正在审核或打款中,请处理完成后再申请」。人工审核有延迟时,用户被卡住、体验差。
-
-**目标**:放开该限制,已有在途提现单时仍可继续提交新的提现申请。
-
-### 非目标(本期不做)
-
-- 不改「先扣款」模型(提现建单即原子扣现金,天然防超提)。
-- 不改 `coin_cash` 的每日档位次数限制(仍是独立的限额闸)。
-- 不加任何新的并发/次数硬上限(见 §3 决策)。
-- 不改 admin 审核/打款/对账逻辑(其全部按单号维度操作,天然支持一人多单)。
-
----
-
-## 2. 需求
-
-| # | 需求 | 落地 |
-|---|---|---|
-| R1 | 已有 `reviewing` 或 `pending` 单时可再次发起提现 | 删除应用层在途单互斥检查 + 删除 DB 分区唯一索引(§4) |
-| R2 | 不引入新的并发上限 | 仅靠既有约束:先扣款余额 + `coin_cash` 每日档位次数(§5) |
-| R3 | 既有幂等/限额/退款/对账行为不回退 | 保留 `out_bill_no` 幂等、档位闸、解绑退款、对账(§5) |
-
----
-
-## 3. 决策记录(来自评审问答)
-
-| 决策点 | 结论 | 理由 |
-|---|---|---|
-| **放行范围** | `reviewing` 与 `pending` **两种在途状态都放行**,彻底取消「同时仅一单」 | 需求即"存在在途提现时可继续提交";人工审核延迟不应卡住用户 |
-| **并发上限** | **不加硬上限** | 现金**先扣款**→每笔各需自己的余额,不会超提;`coin_cash` 每日档位次数已是天然上限;`invite_cash` 仅受余额约束,可接受 |
-| **实现方式** | **彻底移除**(删检查 + 删索引 + 清理死代码),非配置开关 | 决策明确且无回滚诉求,YAGNI;避免留半死代码与多余配置项 |
-| **已失效异常/文案** | 删除 `WithdrawTooFrequentError` 及端点的 409 处理 | 全仓仅这 4 处引用(§4),移除后无残留 |
-
-### 已知取舍(可接受)
-
-- **多笔 `pending` × 未开免确认**:每笔 `pending` 会各自返回一个微信确认页 `package_info`。用户若**未开启免确认**,可能同时存在多笔待确认。属客户端交互问题(§6),后端行为正确;开启免确认后直接到账、无此问题。
-- **回滚风险**:迁移 `downgrade` 会重建分区唯一索引;若届时某用户已有 ≥2 张在途单,重建会失败 —— 属预期的回滚代价,在迁移里注释说明。
-
----
-
-## 4. 现状机制与改动点
-
-「同一时刻仅一笔在途提现」由**两道闸**共同强制,均以 `status IN ('reviewing','pending')` 为口径:
-
-1. **应用层** — [`app/repositories/wallet.py:758-765`](../../../app/repositories/wallet.py) `create_withdraw` 内:查在途单 → `raise WithdrawTooFrequentError` → 端点转 409。
-2. **数据库层** — [`app/models/wallet.py:99-107`](../../../app/models/wallet.py) 的**分区唯一索引** `ux_withdraw_order_user_active`(`user_id WHERE status IN ('reviewing','pending')`)。这是硬约束,`create_withdraw` 的 `IntegrityError` 兜底([`:814-833`](../../../app/repositories/wallet.py))即捕获它。
-
-> 提现单状态机:`reviewing`(待审核,建单即扣现金)→`pending`(审核通过、打款在途)→`success`/`failed`;或 `reviewing`→`rejected`(已退款)。
-
-### 改动清单(4 处代码 + 1 个迁移)
-
-**① `app/repositories/wallet.py` · `create_withdraw`**
-- 删除在途单互斥检查([`:758-765`](../../../app/repositories/wallet.py)):`select WithdrawOrder.id WHERE status IN (_WITHDRAW_ACTIVE_STATUSES)` → `raise WithdrawTooFrequentError`。
-- `IntegrityError` 兜底([`:814-833`](../../../app/repositories/wallet.py)):**保留** `out_bill_no` 幂等重试分支([`:816-824`](../../../app/repositories/wallet.py));**删除**其中的在途单二次检查分支([`:825-832`](../../../app/repositories/wallet.py))(索引移除后不会再因在途单触发 `IntegrityError`);末尾其余情况原样 `raise`(仅剩 `out_bill_no` 唯一冲突等,正常不该出现)。
-- 删除模块常量 `_WITHDRAW_ACTIVE_STATUSES`([`:38`](../../../app/repositories/wallet.py))与异常类 `WithdrawTooFrequentError`([`:72-73`](../../../app/repositories/wallet.py))。`_NEWBIE_TIER_HELD_STATUSES`(档位资格判定,含 `success`)与本改动无关,**保留**。
-
-**② `app/models/wallet.py` · `WithdrawOrder`**
-- 删除 `__table_args__` 中的分区唯一索引 `ux_withdraw_order_user_active`([`:99-107`](../../../app/models/wallet.py))。该表 `__table_args__` 仅此一项,整块移除。
-
-**③ `app/api/v1/wallet.py` · `withdraw` 端点**
-- 删除 `except crud_wallet.WithdrawTooFrequentError`([`:225-229`](../../../app/api/v1/wallet.py))这段已失效的 409 处理。
-
-**④ 新增 Alembic 迁移** `alembic/versions/<...>_drop_withdraw_active_unique_index.py`
-- `down_revision` = 当前 head(实现时确定)。
-- `upgrade`:`op.drop_index("ux_withdraw_order_user_active", table_name="withdraw_order")`。
-- `downgrade`:`op.create_index("ux_withdraw_order_user_active", "withdraw_order", ["user_id"], unique=True, sqlite_where=text("status IN ('reviewing','pending')"), postgresql_where=text("status IN ('reviewing','pending')"))`,并注释"若已有用户存在多张在途单则重建失败,属预期回滚代价"。
-- 索引的 drop/create 为具名操作,SQLite/PG 均无需 `render_as_batch` 重建表。
-
----
-
-## 5. 天然保持不变(无需改动)的约束
-
-| 约束 | 为何仍成立 |
-|---|---|
-| **不会超提** | 建单即原子扣现金(`_try_deduct_cash`,余额不足影响 0 行 → `InsufficientCashError`);每笔并行单各需自己的余额 |
-| **`coin_cash` 每日档位次数** | `withdraw_tier_states` 的档位闸独立于在途单检查:常规档按**当天发起即计入(任意状态,含被拒/失败,按 `created_at` 北京日)**、每档每日限次(0.5×3 / 10×1 / 20×1)且当天只选一档;新人档(0.1/0.3)按 `reviewing/pending/success` 一次性占用。故即便并行,`coin_cash` 单日在途仍被档位天然封顶(至多 3 笔 0.5) |
-| **`out_bill_no` 幂等** | 幂等分支在被删检查之前,同号重试仍原样返回旧单、不重复扣款 |
-| **解绑退款** | `refund_reviewing_withdraws_on_unbind` 已 `for` 遍历该用户**所有** `reviewing` 单,天然支持多单 |
-| **admin 审核 / 打款 / 对账** | `approve_withdraw`/`reject_withdraw`/`refresh_withdraw_status`/对账全按 `out_bill_no` 单号维度,不假设一人一单 |
-
----
-
-## 6. 客户端/App 团队注意点(跨仓,非本次后端工作)
-
-> - 允许多笔并行后,每次提交都要生成**新的 `out_bill_no`**(复用旧号会命中幂等、返回旧单)。
-> - 用户**未开启免确认**时,多笔 `pending` 会各自返回一个微信确认页 `package_info`,App 需能处理/串行多笔待确认。开启免确认后直接到账、无此问题。
-
----
-
-## 7. 测试计划(`tests/test_withdraw.py`,沿用现有 helper)
-
-- **新增 · 多笔在途放行**:同一用户 seed ≥1 元现金,用**两个不同 `out_bill_no`** 各提 0.5 元(在 0.5 元档 3 次/天限额内)→ 两次均 200 且 `status=reviewing`;`/withdraw-orders` 返回 2 条;余额正确扣两次(1 元 → 0)。
-- **新增 · 第二笔余额不足**:seed 0.5 元,连提两笔 0.5 元 → 第一笔 200、第二笔 409(`InsufficientCashError`),验证每笔各需自己的余额。
-- **回归 · 幂等**:`test_withdraw_idempotent_same_bill_no`(同 `out_bill_no` → 同一单、只扣一次)仍绿。
-- **回归 · 档位限额**:`tests/test_withdraw_tiers.py`(0.5 元日 3 次、第 4 次 409;跨档互斥)不受影响仍绿。
-- 沿用 `tests/conftest.py`(临时 SQLite、`RATE_LIMIT_ENABLED=false`);wxpay 网络调用全部 monkeypatch。
-
----
-
-## 附:涉及文件清单
-
-**改动**
-- `app/repositories/wallet.py` — 删在途单检查 + `IntegrityError` 兜底瘦身 + 删 `_WITHDRAW_ACTIVE_STATUSES` / `WithdrawTooFrequentError`
-- `app/models/wallet.py` — 删分区唯一索引 `ux_withdraw_order_user_active`
-- `app/api/v1/wallet.py` — 删 `WithdrawTooFrequentError` 的 409 处理
-- `tests/test_withdraw.py` — 新增多笔在途放行 / 第二笔余额不足用例
-
-**新增**
-- `alembic/versions/<...>_drop_withdraw_active_unique_index.py` — drop 分区唯一索引(downgrade 重建)

scripts/seed_mock_feedback.py

@@ -175,22 +175,22 @@ def seed(db) -> list[Feedback]:
         # 普通反馈 · 新端(带环境快照)· 无图
         fb("13255550001", "签到金币到账有时候会延迟一两分钟,能不能做成实时到账?",
            source="profile",
-           app_version="2.3.1", device_model="PJA110", rom_name="ColorOS 14", android_version="14",
+           app_version="2.3.1", device_model="PJA110", rom_name="ColorOS", android_version="14",
            created=ago(minutes=6)),
         # 比价反馈 · scene=优惠不对 · 新端 · 2 图
         fb("13255550002", "这家店京东外卖的到手价比你们算出来的最低价还低,截图为证,麻烦核实。",
            source="comparison", scene="优惠不对", images=[imgs[0], imgs[1]],
-           app_version="2.3.1", device_model="M2012K11AC", rom_name="MIUI 14", android_version="13",
+           app_version="2.3.1", device_model="M2012K11AC", rom_name="MIUI", android_version="13",
            created=ago(minutes=22)),
         # 比价反馈 · scene=找错商品 · 新端 · 无图
         fb("13255550002", "比价结果里的商品跟我搜的不是同一个规格,数量对不上。",
            source="comparison", scene="找错商品",
-           app_version="2.3.0", device_model="V2309A", rom_name="OriginOS 4", android_version="14",
+           app_version="2.3.0", device_model="V2309A", rom_name="OriginOS", android_version="14",
            created=ago(hours=1)),
         # 普通反馈 · 新端 · 1 图(表扬 + 小问题)
         fb("13255550003", "提现秒到账,好评!顺手反馈个小 bug:金币记录页偶尔白屏,要退出去重进。",
            source="profile", images=[imgs[2]],
-           app_version="2.3.1", device_model="23078RKD5C", rom_name="MIUI 14", android_version="14",
+           app_version="2.3.1", device_model="23078RKD5C", rom_name="MIUI", android_version="14",
            created=ago(hours=3)),
         # 比价反馈 · scene=比价太慢 · 历史数据(env 全 NULL、contact 有值)
         fb("13255550004", "比价转圈太久了,经常要等十几秒才出结果,体验不太好。",
@@ -206,7 +206,7 @@ def seed(db) -> list[Feedback]:
            source="profile", images=[imgs[3]],
            status="adopted", reward_coins=2000,
            review_note="有效产品建议,已排期到 2.4.0", admin_reply="感谢反馈!该功能已在规划中,金币奖励已发放~",
-           app_version="2.2.8", device_model="PJA110", rom_name="ColorOS 13", android_version="13",
+           app_version="2.2.8", device_model="PJA110", rom_name="ColorOS", android_version="13",
            created=ago(days=2)),
 
         # ===== 未采纳 rejected(带原因 + 回复)=====
@@ -214,7 +214,7 @@ def seed(db) -> list[Feedback]:
            source="comparison", scene="价格不准",
            status="rejected", reject_reason="截图价格为限时活动价且已过期,不满足「长期可复现更低价」条件,暂不采纳。",
            admin_reply="感谢参与,本次未通过,欢迎继续上报有效更低价~",
-           app_version="2.3.0", device_model="M2012K11AC", rom_name="MIUI 14", android_version="13",
+           app_version="2.3.0", device_model="M2012K11AC", rom_name="MIUI", android_version="13",
            created=ago(days=3)),
     ]
     db.add_all(feedbacks)

scripts/seed_risk_monitor_demo.py

@@ -1,274 +0,0 @@
-"""为本地“风控监控”页面灌入一组可重复的完整演示数据。
-
-仅允许在 APP_ENV=dev 运行。脚本会重建 ``risk-demo-*`` 前缀的数据，并创建本地
-后台账号 ``risk_demo / RiskDemo123!``，方便端到端和视觉验收。
-"""
-from __future__ import annotations
-
-from datetime import timedelta
-
-from sqlalchemy import delete, select
-
-from app.admin.repositories import admin_user as admin_repo
-from app.core.config import settings
-from app.core.security import hash_password
-from app.db.session import SessionLocal
-from app.models.comparison import ComparisonRecord
-from app.models.risk import BehaviorEvent, RiskIncident, SubjectRestriction
-from app.repositories import risk as risk_repo
-from app.repositories import user as user_repo
-
-DEMO_PREFIX = "risk-demo-"
-ADMIN_USERNAME = "risk_demo"
-ADMIN_PASSWORD = "RiskDemo123!"
-
-
-def _reset_demo(db) -> None:
-    demo_user_ids = list(
-        db.scalars(
-            select(ComparisonRecord.user_id)
-            .where(
-                ComparisonRecord.trace_id.like(f"{DEMO_PREFIX}%"),
-                ComparisonRecord.user_id.is_not(None),
-            )
-            .distinct()
-        ).all()
-    )
-    demo_incident_ids = list(
-        db.scalars(
-            select(RiskIncident.id).where(
-                (RiskIncident.subject_id.like(f"{DEMO_PREFIX}%"))
-                | (
-                    (RiskIncident.rule_code == risk_repo.RULE_COMPARE_DAILY)
-                    & (RiskIncident.subject_id.in_([str(value) for value in demo_user_ids]))
-                )
-            )
-        ).all()
-    )
-    if demo_incident_ids:
-        db.execute(
-            delete(SubjectRestriction).where(
-                SubjectRestriction.incident_id.in_(demo_incident_ids)
-            )
-        )
-    db.execute(
-        delete(SubjectRestriction).where(
-            SubjectRestriction.subject_id.like(f"{DEMO_PREFIX}%")
-        )
-    )
-    db.execute(
-        delete(RiskIncident).where(
-            (RiskIncident.subject_id.like(f"{DEMO_PREFIX}%"))
-            | (
-                (RiskIncident.rule_code == risk_repo.RULE_COMPARE_DAILY)
-                & (RiskIncident.subject_id.in_([str(value) for value in demo_user_ids]))
-            )
-        )
-    )
-    db.execute(
-        delete(BehaviorEvent).where(
-            BehaviorEvent.subject_id.like(f"{DEMO_PREFIX}%")
-        )
-    )
-    db.execute(
-        delete(ComparisonRecord).where(
-            ComparisonRecord.trace_id.like(f"{DEMO_PREFIX}%")
-        )
-    )
-    db.commit()
-
-
-def _ensure_admin(db) -> None:
-    admin = admin_repo.get_by_username(db, ADMIN_USERNAME)
-    if admin is None:
-        admin_repo.create_admin(
-            db,
-            username=ADMIN_USERNAME,
-            password=ADMIN_PASSWORD,
-            role="super_admin",
-        )
-        return
-    admin.password_hash = hash_password(ADMIN_PASSWORD)
-    admin.role = "super_admin"
-    admin.status = "active"
-    db.commit()
-
-
-def _seed_sms(db, now) -> None:
-    alerted = [
-        ("risk-demo-sms-oppo-a5", "OPPO A5", "13812343001", 9),
-        ("risk-demo-sms-xiaomi14", "Xiaomi 14", "13812343002", 7),
-        ("risk-demo-sms-iphone15", "iPhone 15", "13812343003", 5),
-    ]
-    events: list[BehaviorEvent] = []
-    for device_id, model, phone, count in alerted:
-        for index in range(count):
-            events.append(
-                BehaviorEvent(
-                    event_type=risk_repo.EVENT_SMS_SEND,
-                    subject_type="device",
-                    subject_id=device_id,
-                    device_id=device_id,
-                    device_model=model,
-                    phone=phone if index == 0 else f"138{index:08d}"[-11:],
-                    client_ip="127.0.0.1",
-                    outcome="success",
-                    details={"demo": True},
-                    occurred_at=now + timedelta(seconds=index),
-                )
-            )
-    # 其余成功下发分散到未达阈值的设备，每台最多 4 条，确保报警设备仍严格为 3 台。
-    remaining = 1284 - sum(row[3] for row in alerted)
-    for index in range(remaining):
-        device_no = index // 4
-        device_id = f"risk-demo-sms-normal-{device_no:04d}"
-        events.append(
-            BehaviorEvent(
-                event_type=risk_repo.EVENT_SMS_SEND,
-                subject_type="device",
-                subject_id=device_id,
-                device_id=device_id,
-                device_model="演示普通设备",
-                phone=f"137{index % 100_000_000:08d}",
-                client_ip="127.0.0.1",
-                outcome="success",
-                details={"demo": True},
-                occurred_at=now + timedelta(seconds=index % 1800),
-            )
-        )
-    db.add_all(events)
-    db.flush()
-    for device_id, _, phone, _ in alerted:
-        risk_repo.evaluate_behavior_rule(
-            db,
-            rule_code=risk_repo.RULE_SMS_HOURLY,
-            subject_id=device_id,
-            at=now,
-        )
-        user = user_repo.upsert_user_for_login(
-            db, phone=phone, register_channel="sms"
-        )
-        db.add(
-            BehaviorEvent(
-                event_type=risk_repo.EVENT_SMS_LOGIN,
-                subject_type="device",
-                subject_id=device_id,
-                user_id=user.id,
-                device_id=device_id,
-                phone=phone,
-                outcome="success",
-                details={"demo": True},
-                occurred_at=now + timedelta(minutes=2),
-            )
-        )
-    db.commit()
-
-
-def _seed_oneclick(db, now) -> None:
-    devices = [
-        ("risk-demo-oneclick-oppo-reno", "OPPO Reno", "13912343001", 482),
-        ("risk-demo-oneclick-vivo-y36", "vivo Y36", "13912343002", 481),
-    ]
-    for device_id, model, phone, count in devices:
-        user = user_repo.upsert_user_for_login(
-            db, phone=phone, register_channel="jverify"
-        )
-        db.add_all(
-            [
-                BehaviorEvent(
-                    event_type=risk_repo.EVENT_ONECLICK_LOGIN,
-                    subject_type="device",
-                    subject_id=device_id,
-                    user_id=user.id,
-                    device_id=device_id,
-                    device_model=model,
-                    phone=phone,
-                    client_ip="127.0.0.1",
-                    outcome="failed" if index % 11 == 0 else "success",
-                    reason="运营商校验失败" if index % 11 == 0 else None,
-                    details={"demo": True},
-                    occurred_at=now + timedelta(seconds=index * 2),
-                )
-                for index in range(count)
-            ]
-        )
-        db.flush()
-        risk_repo.evaluate_behavior_rule(
-            db,
-            rule_code=risk_repo.RULE_ONECLICK_DAILY,
-            subject_id=device_id,
-            at=now,
-        )
-    db.commit()
-
-
-def _seed_compare(db, now) -> None:
-    local_now = now.astimezone(risk_repo.CN_TZ).replace(tzinfo=None)
-    accounts = [
-        ("13612343281", "risk-demo-compare-device-a", 1053),
-        ("13511106208", "risk-demo-compare-device-b", 1052),
-    ]
-    for phone, device_id, count in accounts:
-        user = user_repo.upsert_user_for_login(
-            db, phone=phone, register_channel="sms"
-        )
-        rows = []
-        for index in range(count):
-            rows.append(
-                ComparisonRecord(
-                    user_id=user.id,
-                    device_id=device_id,
-                    trace_id=f"{DEMO_PREFIX}compare-{user.id}-{index}",
-                    store_name=("春熙路小吃店", "科技园轻食", "万达广场烤肉")[
-                        index % 3
-                    ],
-                    product_names=("招牌套餐", "鸡胸沙拉", "双人烤肉")[index % 3],
-                    status="failed" if index % 17 == 0 else "success",
-                    information="演示比价记录",
-                    items=[{"name": "演示菜品", "qty": 1}],
-                    comparison_results=[
-                        {
-                            "platform_id": "meituan",
-                            "platform_name": "美团",
-                            "price": 23.8,
-                        },
-                        {
-                            "platform_id": "taobao",
-                            "platform_name": "淘宝",
-                            "price": 21.5,
-                        },
-                        {
-                            "platform_id": "jd",
-                            "platform_name": "京东",
-                            "price": 22.2,
-                        },
-                    ],
-                    skipped_dish_names=[],
-                    saved_amount_cents=230,
-                    raw_payload={"demo": True},
-                    created_at=local_now + timedelta(seconds=index * 2),
-                )
-            )
-        db.add_all(rows)
-        db.commit()
-        risk_repo.sync_compare_incident(db, user_id=user.id, at=local_now)
-
-
-def main() -> None:
-    if settings.APP_ENV != "dev":
-        raise SystemExit("拒绝执行：风控演示数据脚本仅允许 APP_ENV=dev")
-    now = risk_repo.utcnow().replace(minute=10, second=0, microsecond=0)
-    with SessionLocal() as db:
-        _reset_demo(db)
-        _ensure_admin(db)
-        _seed_sms(db, now)
-        _seed_oneclick(db, now)
-        _seed_compare(db, now)
-    print("风控监控演示数据已重建")
-    print(f"后台账号：{ADMIN_USERNAME}")
-    print(f"后台密码：{ADMIN_PASSWORD}")
-    print("期望卡片：短信 3 / 1284；一键登录 2 / 963；比价 2 / 2105")
-
-
-if __name__ == "__main__":
-    main()

tests/test_admin_ad_revenue_scope.py

@@ -8,7 +8,6 @@ from sqlalchemy import delete
 from app.admin.repositories import ad_revenue
 from app.db.session import SessionLocal
 from app.models.ad_ecpm import AdEcpmRecord
-from app.models.ad_feed_reward import AdFeedRewardRecord
 from app.models.ad_pangle_revenue import AdPangleDailyRevenue
 from app.models.ad_reward import AdRewardRecord
 from app.models.user import User
@@ -209,165 +208,3 @@ def test_reward_video_incomplete_playback_has_zero_revenue() -> None:
         db.execute(delete(User).where(User.phone == phone))
         db.commit()
         db.close()
-
-
-def test_business_category_ecpm_merges_draw_feed_and_both_video_types() -> None:
-    db = SessionLocal()
-    phone = "18800009993"
-    category_date = "2040-02-05"
-    try:
-        user = User(phone=phone, username="29999999993", register_channel="sms")
-        db.add(user)
-        db.flush()
-        db.add_all([
-            AdEcpmRecord(
-                user_id=user.id, ad_type="draw", ad_session_id="category-draw",
-                app_env="prod", our_code_id="prod-draw", ecpm_raw="10000",
-                report_date=category_date, created_at=datetime(2040, 2, 5, 1, tzinfo=UTC),
-            ),
-            AdEcpmRecord(
-                user_id=user.id, ad_type="feed", ad_session_id="category-feed",
-                app_env="prod", our_code_id="prod-draw", ecpm_raw="20000",
-                report_date=category_date, created_at=datetime(2040, 2, 5, 2, tzinfo=UTC),
-            ),
-            AdEcpmRecord(
-                user_id=user.id, ad_type="reward_video", ad_session_id="category-reward",
-                app_env="prod", our_code_id="prod-reward", ecpm_raw="30000",
-                report_date=category_date, created_at=datetime(2040, 2, 5, 3, tzinfo=UTC),
-            ),
-            AdEcpmRecord(
-                user_id=user.id, ad_type="withdrawal_video", ad_session_id="category-withdraw",
-                app_env="prod", our_code_id="prod-reward", ecpm_raw="50000",
-                report_date=category_date, created_at=datetime(2040, 2, 5, 4, tzinfo=UTC),
-            ),
-        ])
-        db.commit()
-
-        result = ad_revenue.ad_revenue_report(
-            db,
-            date_from=category_date,
-            date_to=category_date,
-            user_id=user.id,
-            app_env="prod",
-            revenue_scope="all",
-        )
-
-        assert result["category_stats"] == {
-            "draw": {"impressions": 2, "revenue_yuan": 0.3, "ecpm_yuan": 150.0},
-            "video": {"impressions": 2, "revenue_yuan": 0.8, "ecpm_yuan": 400.0},
-        }
-    finally:
-        db.rollback()
-        db.execute(delete(AdEcpmRecord).where(AdEcpmRecord.report_date == category_date))
-        db.execute(delete(User).where(User.phone == phone))
-        db.commit()
-        db.close()
-
-
-def test_feed_reward_details_keep_each_record_adn() -> None:
-    db = SessionLocal()
-    phone = "18800009994"
-    detail_date = "2040-02-06"
-    try:
-        user = User(phone=phone, username="29999999994", register_channel="sms")
-        db.add(user)
-        db.flush()
-        db.add_all([
-            AdFeedRewardRecord(
-                client_event_id="detail-adn-pangle", user_id=user.id,
-                reward_date=detail_date, duration_seconds=20, unit_count=1,
-                ecpm_raw="12000", adn="pangle", slot_id="rit-pangle",
-                ad_type="draw", feed_scene="coupon", trace_id="detail-adn-trace",
-                app_env="prod", our_code_id="104098712", coin=12, status="granted",
-                created_at=datetime(2040, 2, 6, 1, tzinfo=UTC),
-            ),
-            AdFeedRewardRecord(
-                client_event_id="detail-adn-gdt", user_id=user.id,
-                reward_date=detail_date, duration_seconds=20, unit_count=1,
-                ecpm_raw="25000", adn="gdt", slot_id="rit-gdt",
-                ad_type="draw", feed_scene="coupon", trace_id="detail-adn-trace",
-                app_env="prod", our_code_id="104098712", coin=25, status="granted",
-                created_at=datetime(2040, 2, 6, 2, tzinfo=UTC),
-            ),
-        ])
-        db.commit()
-
-        result = ad_revenue.ad_revenue_report(
-            db, date_from=detail_date, date_to=detail_date,
-            user_id=user.id, app_env="prod", revenue_scope="all",
-        )
-
-        item = next(row for row in result["items"] if row["event_key"].startswith("feedgrp-"))
-        assert [detail["adn"] for detail in item["sub_rewards"]] == ["pangle", "gdt"]
-        assert [detail["slot_id"] for detail in item["sub_rewards"]] == ["rit-pangle", "rit-gdt"]
-    finally:
-        db.rollback()
-        db.execute(delete(AdFeedRewardRecord).where(AdFeedRewardRecord.reward_date == detail_date))
-        db.execute(delete(User).where(User.phone == phone))
-        db.commit()
-        db.close()
-
-
-def test_feed_reward_source_fallback_requires_unique_trace_and_ecpm() -> None:
-    db = SessionLocal()
-    phone = "18800009995"
-    fallback_date = "2040-02-07"
-    try:
-        user = User(phone=phone, username="29999999995", register_channel="sms")
-        db.add(user)
-        db.flush()
-        db.add_all([
-            AdFeedRewardRecord(
-                client_event_id="source-fallback-unique", user_id=user.id,
-                reward_date=fallback_date, duration_seconds=3, unit_count=0,
-                ecpm_raw="4700", ad_session_id="flow-session", trace_id="source-trace",
-                app_env="prod", our_code_id="104098712", coin=0, status="too_short",
-                ad_type="draw", feed_scene="comparison",
-                created_at=datetime(2040, 2, 7, 1, tzinfo=UTC),
-            ),
-            AdFeedRewardRecord(
-                client_event_id="source-fallback-ambiguous", user_id=user.id,
-                reward_date=fallback_date, duration_seconds=3, unit_count=0,
-                ecpm_raw="4800", ad_session_id="flow-session", trace_id="source-trace",
-                app_env="prod", our_code_id="104098712", coin=0, status="too_short",
-                ad_type="draw", feed_scene="comparison",
-                created_at=datetime(2040, 2, 7, 2, tzinfo=UTC),
-            ),
-            AdEcpmRecord(
-                user_id=user.id, ad_type="draw", ad_session_id="impression-unique",
-                trace_id="source-trace", ecpm_raw="4700", adn="baidu", slot_id="rit-baidu",
-                app_env="prod", our_code_id="104098712", report_date=fallback_date,
-                created_at=datetime(2040, 2, 7, 1, tzinfo=UTC),
-            ),
-            AdEcpmRecord(
-                user_id=user.id, ad_type="draw", ad_session_id="impression-ambiguous-a",
-                trace_id="source-trace", ecpm_raw="4800", adn="baidu", slot_id="rit-baidu",
-                app_env="prod", our_code_id="104098712", report_date=fallback_date,
-                created_at=datetime(2040, 2, 7, 2, tzinfo=UTC),
-            ),
-            AdEcpmRecord(
-                user_id=user.id, ad_type="draw", ad_session_id="impression-ambiguous-b",
-                trace_id="source-trace", ecpm_raw="4800", adn="ks", slot_id="rit-ks",
-                app_env="prod", our_code_id="104098712", report_date=fallback_date,
-                created_at=datetime(2040, 2, 7, 2, 1, tzinfo=UTC),
-            ),
-        ])
-        db.commit()
-
-        result = ad_revenue.ad_revenue_report(
-            db, date_from=fallback_date, date_to=fallback_date,
-            user_id=user.id, app_env="prod", revenue_scope="all",
-        )
-        item = next(row for row in result["items"] if row["event_key"].startswith("feedgrp-"))
-        details = {detail["ecpm"]: detail for detail in item["sub_rewards"]}
-        assert details["4700"]["adn"] == "baidu"
-        assert details["4700"]["slot_id"] == "rit-baidu"
-        assert details["4800"]["adn"] is None
-        assert details["4800"]["slot_id"] is None
-    finally:
-        db.rollback()
-        db.execute(delete(AdFeedRewardRecord).where(AdFeedRewardRecord.reward_date == fallback_date))
-        db.execute(delete(AdEcpmRecord).where(AdEcpmRecord.report_date == fallback_date))
-        db.execute(delete(User).where(User.phone == phone))
-        db.commit()
-        db.close()

tests/test_admin_feedback_device_details.py

@@ -1,71 +0,0 @@
-from datetime import datetime, timedelta, timezone
-
-from app.admin.repositories import queries
-from app.db.session import SessionLocal
-from app.models.comparison import ComparisonRecord
-from app.models.feedback import Feedback
-from app.repositories import user as user_repo
-
-
-def test_feedback_device_details_use_same_user_and_model() -> None:
-    with SessionLocal() as db:
-        submitted_at = datetime.now(timezone.utc)
-        user = user_repo.upsert_user_for_login(
-            db,
-            phone="13800009876",
-            register_channel="sms",
-        )
-        db.add_all(
-            [
-                ComparisonRecord(
-                    user_id=user.id,
-                    trace_id="feedback-device-v2166ba",
-                    device_model="V2166BA",
-                    device_manufacturer="vivo",
-                    rom_name="OriginOS",
-                    rom_version=13,
-                    created_at=submitted_at - timedelta(minutes=5),
-                ),
-                ComparisonRecord(
-                    user_id=user.id,
-                    trace_id="feedback-device-other",
-                    device_model="OTHER-CODE",
-                    device_manufacturer="Other",
-                    rom_name="OtherOS",
-                    rom_version=99,
-                    created_at=submitted_at - timedelta(minutes=5),
-                ),
-                ComparisonRecord(
-                    user_id=user.id,
-                    trace_id="feedback-device-future-upgrade",
-                    device_model="V2166BA",
-                    device_manufacturer="vivo-new",
-                    rom_name="OriginOS",
-                    rom_version=99,
-                    created_at=submitted_at + timedelta(minutes=5),
-                ),
-                Feedback(
-                    user_id=user.id,
-                    content="设备信息补全测试",
-                    contact="",
-                    status="pending",
-                    device_model="V2166BA",
-                    rom_name="OriginOS",
-                    android_version="13",
-                    created_at=submitted_at,
-                ),
-            ]
-        )
-        db.commit()
-
-        items, _next_cursor, total = queries.list_feedbacks(
-            db,
-            user_id=user.id,
-            limit=20,
-        )
-
-        assert total == 1
-        assert items[0].device_model == "V2166BA"
-        assert items[0].device_model_name == "vivo Y77e"
-        assert items[0].device_manufacturer == "vivo"
-        assert items[0].rom_version == 13

tests/test_admin_read.py

@@ -1,7 +1,7 @@
 """Admin M2 读接口测试:大盘聚合 + 用户/流水/提现/反馈列表 + 鉴权拦截。"""
 from __future__ import annotations
 
-from datetime import UTC, datetime
+from datetime import datetime
 
 import pytest
 from fastapi.testclient import TestClient
@@ -9,13 +9,9 @@ from sqlalchemy import event
 
 from app.admin.main import admin_app
 from app.admin.repositories import admin_user as admin_repo
-from app.admin.repositories import queries
 from app.db.session import SessionLocal, engine
 from app.models.comparison import ComparisonRecord
 from app.models.feedback import Feedback
-from app.models.invite import InviteRelation
-from app.models.savings import SavingsRecord
-from app.models.user import User
 from app.models.wallet import CashTransaction, WithdrawOrder
 from app.repositories import user as user_repo
 from app.repositories import wallet as wallet_repo
@@ -148,8 +144,6 @@ def test_user_reward_detail_does_not_select_unrelated_new_ad_columns(
     ) -> None:
         if "ad_reward_record.boost_round_id" in statement:
             raise AssertionError("提现详情不应查询未使用的 boost_round_id")
-        if "FROM user" in statement and "user.phone" in statement:
-            raise AssertionError("奖励统计的用户存在性检查不应展开完整 user 表")
 
     event.listen(engine, "before_cursor_execute", reject_full_ad_reward_projection)
     try:
@@ -168,68 +162,6 @@ def test_user_reward_detail_does_not_select_unrelated_new_ad_columns(
     assert records.status_code == 200, records.text
 
 
-def test_user_reward_stats_can_scope_withdrawals_by_account(
-    admin_client: TestClient, admin_token: str
-) -> None:
-    uid = _seed_user_with_data("13800000023")
-    db = SessionLocal()
-    try:
-        account = wallet_repo.get_or_create_account(db, uid)
-        account.cash_balance_cents = 123
-        account.invite_cash_balance_cents = 456
-        db.add_all(
-            [
-                WithdrawOrder(
-                    user_id=uid,
-                    out_bill_no="rewardstatsinvite00000001",
-                    amount_cents=250,
-                    source="invite_cash",
-                    status="success",
-                ),
-                WithdrawOrder(
-                    user_id=uid,
-                    out_bill_no="rewardstatsinvite00000002",
-                    amount_cents=50,
-                    source="invite_cash",
-                    status="reviewing",
-                ),
-            ]
-        )
-        db.commit()
-    finally:
-        db.close()
-
-    coin = admin_client.get(
-        f"/admin/api/users/{uid}/reward-stats",
-        params={"withdraw_source": "coin_cash"},
-        headers=_auth(admin_token),
-    )
-    invite = admin_client.get(
-        f"/admin/api/users/{uid}/reward-stats",
-        params={"withdraw_source": "invite_cash"},
-        headers=_auth(admin_token),
-    )
-    assert coin.status_code == 200, coin.text
-    assert invite.status_code == 200, invite.text
-    assert coin.json()["withdraw_success_cents"] == 100
-    assert coin.json()["withdraw_total"] == 1
-    assert coin.json()["cash_balance_cents"] == 123
-    assert invite.json()["withdraw_success_cents"] == 250
-    assert invite.json()["withdraw_total"] == 2
-    assert invite.json()["cash_balance_cents"] == 456
-
-
-def test_user_coin_record_sort_accepts_mixed_timezone_datetimes() -> None:
-    """线上 PostgreSQL 返回 aware，SQLite/历史转换可能返回 naive，二者必须可混排。"""
-    naive = datetime(2038, 1, 1, 8, 0)
-    aware = datetime(2038, 1, 1, 7, 0, tzinfo=UTC)
-
-    rows = [{"created_at": aware}, {"created_at": naive}]
-    rows.sort(key=queries._coin_record_sort_key, reverse=True)
-
-    assert rows == [{"created_at": naive}, {"created_at": aware}]
-
-
 def test_user_filter_by_status(admin_client: TestClient, admin_token: str) -> None:
     _seed_user_with_data("13800000003")
     r = admin_client.get("/admin/api/users", params={"status": "active"}, headers=_auth(admin_token))
@@ -375,19 +307,10 @@ def test_withdraw_list_exposes_source_and_filters(
     db = SessionLocal()
     try:
         uid = user_repo.upsert_user_for_login(db, phone="13800009002", register_channel="sms").id
-        # 直接从 ORM 查询，验证列表富化返回人工风险结论。
-        user = db.get(User, uid)
-        assert user is not None
-        user.is_high_risk = True
-        user.high_risk_note = "邀请行为异常"
         db.add(WithdrawOrder(user_id=uid, out_bill_no=f"src{uid}coin0001",
                              amount_cents=100, status="success", source="coin_cash"))
         db.add(WithdrawOrder(user_id=uid, out_bill_no=f"src{uid}invite001",
                              amount_cents=200, status="success", source="invite_cash"))
-        db.add(WithdrawOrder(user_id=uid, out_bill_no=f"src{uid}coinreview",
-                             amount_cents=50, status="reviewing", source="coin_cash"))
-        db.add(WithdrawOrder(user_id=uid, out_bill_no=f"src{uid}invitereview",
-                             amount_cents=80, status="reviewing", source="invite_cash"))
         db.commit()
     finally:
         db.close()
@@ -402,307 +325,6 @@ def test_withdraw_list_exposes_source_and_filters(
     )
     items = r.json()["items"]
     assert items and all(it["source"] == "invite_cash" for it in items)
-    assert all(it["is_high_risk"] is True for it in items)
-    assert all(it["high_risk_note"] == "邀请行为异常" for it in items)
-    # 累计提现按当前审核页账户隔离，不把普通现金的 100 分串进邀请金。
-    assert all(it["cumulative_success_cents"] == 200 for it in items)
-
-    invite_summary = admin_client.get(
-        "/admin/api/withdraws/summary",
-        params={"source": "invite_cash"},
-        headers=_auth(admin_token),
-    ).json()
-    other_summary = admin_client.get(
-        "/admin/api/withdraws/summary",
-        params={"source": "coin_cash"},
-        headers=_auth(admin_token),
-    ).json()
-    assert invite_summary["reviewing_count"] >= 1
-    assert other_summary["reviewing_count"] >= 1
-    assert invite_summary["reviewing_amount_cents"] >= 80
-    assert other_summary["reviewing_amount_cents"] >= 50
-
-
-def test_invite_withdraw_detail_contains_invitee_first_actions(
-    admin_client: TestClient, admin_token: str
-) -> None:
-    db = SessionLocal()
-    try:
-        inviter = user_repo.upsert_user_for_login(
-            db, phone="13800009031", register_channel="sms"
-        )
-        invitee = user_repo.upsert_user_for_login(
-            db, phone="13800009032", register_channel="sms"
-        )
-        db.add(
-            InviteRelation(
-                inviter_user_id=inviter.id,
-                invitee_user_id=invitee.id,
-                status="effective",
-                compare_reward_granted=True,
-                compare_reward_cents=50,
-            )
-        )
-        db.add(
-            ComparisonRecord(
-                user_id=invitee.id,
-                trace_id="invite-detail-first-compare",
-                status="success",
-                store_name="首次比价商家",
-                product_names="商品甲、商品乙",
-            )
-        )
-        db.add(
-            SavingsRecord(
-                user_id=invitee.id,
-                order_amount_cents=1888,
-                saved_amount_cents=300,
-                source="compare",
-                shop_name="首次下单商家",
-                title="首次下单商品",
-                dishes=[],
-            )
-        )
-        bill = "inviteoverviewbill0001"
-        db.add(
-            WithdrawOrder(
-                user_id=inviter.id,
-                out_bill_no=bill,
-                amount_cents=100,
-                status="reviewing",
-                source="invite_cash",
-            )
-        )
-        db.commit()
-    finally:
-        db.close()
-
-    response = admin_client.get(
-        f"/admin/api/withdraws/{bill}", headers=_auth(admin_token)
-    )
-    assert response.status_code == 200, response.text
-    overview = response.json()["invite_overview"]
-    assert overview["invite_total"] == 1
-    assert overview["invite_success_total"] == 1
-    item = overview["items"][0]
-    assert item["phone"] == "13800009032"
-    assert item["first_compare_store"] == "首次比价商家"
-    assert item["first_compare_products"] == "商品甲、商品乙"
-    assert item["first_order_store"] == "首次下单商家"
-    assert item["first_order_products"] == "首次下单商品"
-    assert item["first_order_amount_cents"] == 1888
-
-    filtered = admin_client.get(
-        f"/admin/api/withdraws/{bill}",
-        params={
-            "date_from": "2099-01-01T00:00:00Z",
-            "date_to": "2099-01-02T00:00:00Z",
-        },
-        headers=_auth(admin_token),
-    )
-    assert filtered.status_code == 200, filtered.text
-    assert filtered.json()["invite_overview"]["invite_total"] == 0
-
-
-def test_withdraw_summary_counts_match_status_lists_by_source(
-    admin_client: TestClient, admin_token: str
-) -> None:
-    """每个审核页签的汇总数必须等于相同 source、status 的列表总数。"""
-    db = SessionLocal()
-    try:
-        uid = user_repo.upsert_user_for_login(
-            db, phone="13800009003", register_channel="sms"
-        ).id
-        for index, status in enumerate(
-            ("reviewing", "pending", "success", "rejected", "failed"), start=1
-        ):
-            db.add(
-                WithdrawOrder(
-                    user_id=uid,
-                    out_bill_no=f"summary{uid}invite{index}",
-                    amount_cents=index * 10,
-                    status=status,
-                    source="invite_cash",
-                )
-            )
-        db.add(
-            WithdrawOrder(
-                user_id=uid,
-                out_bill_no=f"summary{uid}coinfailed",
-                amount_cents=99,
-                status="failed",
-                source="coin_cash",
-            )
-        )
-        db.commit()
-    finally:
-        db.close()
-
-    status_fields = {
-        "reviewing": "reviewing_count",
-        "pending": "pending_count",
-        "success": "success_count",
-        "rejected": "rejected_count",
-        "failed": "failed_count",
-    }
-    for source in ("coin_cash", "invite_cash"):
-        summary_response = admin_client.get(
-            "/admin/api/withdraws/summary",
-            params={"source": source},
-            headers=_auth(admin_token),
-        )
-        assert summary_response.status_code == 200, summary_response.text
-        summary = summary_response.json()
-
-        for status, field in status_fields.items():
-            list_response = admin_client.get(
-                "/admin/api/withdraws",
-                params={"source": source, "status": status, "limit": 1},
-                headers=_auth(admin_token),
-            )
-            assert list_response.status_code == 200, list_response.text
-            assert summary[field] == list_response.json()["total"]
-
-        reviewing_response = admin_client.get(
-            "/admin/api/withdraws",
-            params={"source": source, "status": "reviewing", "limit": 100},
-            headers=_auth(admin_token),
-        )
-        assert reviewing_response.status_code == 200, reviewing_response.text
-        reviewing_body = reviewing_response.json()
-        assert reviewing_body["total"] == len(reviewing_body["items"])
-        assert summary["reviewing_amount_cents"] == sum(
-            item["amount_cents"] for item in reviewing_body["items"]
-        )
-
-        all_response = admin_client.get(
-            "/admin/api/withdraws",
-            params={"source": source, "limit": 1},
-            headers=_auth(admin_token),
-        )
-        assert all_response.status_code == 200, all_response.text
-        assert summary["total_count"] == all_response.json()["total"]
-        assert summary["total_count"] == sum(
-            summary[field] for field in status_fields.values()
-        )
-
-    assert admin_client.get(
-        "/admin/api/withdraws/summary",
-        params={"source": "unknown"},
-        headers=_auth(admin_token),
-    ).status_code == 422
-
-
-def test_comparison_records_show_readable_device_and_rom_version(
-    admin_client: TestClient, admin_token: str
-) -> None:
-    db = SessionLocal()
-    try:
-        user = user_repo.upsert_user_for_login(
-            db, phone="13800009041", register_channel="sms"
-        )
-        record = ComparisonRecord(
-            user_id=user.id,
-            trace_id="comparison-readable-device",
-            status="success",
-            device_model="V2166BA",
-            device_manufacturer="vivo",
-            rom_vendor="vivo",
-            rom_name="OriginOS",
-            rom_version=4,
-            android_version="14",
-        )
-        db.add(record)
-        db.commit()
-        record_id = record.id
-        user_id = user.id
-    finally:
-        db.close()
-
-    response = admin_client.get(
-        "/admin/api/comparison-records",
-        params={"user_id": user_id},
-        headers=_auth(admin_token),
-    )
-    assert response.status_code == 200, response.text
-    item = response.json()["items"][0]
-    assert item["device_model"] == "V2166BA"
-    assert item["device_model_name"] == "vivo Y77e"
-    assert item["rom_name"] == "OriginOS"
-    assert item["rom_version"] == 4
-
-    detail = admin_client.get(
-        f"/admin/api/comparison-records/{record_id}",
-        headers=_auth(admin_token),
-    )
-    assert detail.status_code == 200, detail.text
-    assert detail.json()["device_model_name"] == "vivo Y77e"
-    assert detail.json()["rom_version"] == 4
-
-
-def test_comparison_records_show_real_order_status(
-    admin_client: TestClient, admin_token: str
-) -> None:
-    db = SessionLocal()
-    try:
-        user = user_repo.upsert_user_for_login(
-            db, phone="13800009042", register_channel="sms"
-        )
-        ordered_record = ComparisonRecord(
-            user_id=user.id,
-            trace_id="comparison-ordered-shop",
-            status="success",
-            store_name="真实下单店",
-        )
-        unordered_record = ComparisonRecord(
-            user_id=user.id,
-            trace_id="comparison-demo-order-shop",
-            status="success",
-            store_name="演示下单店",
-        )
-        db.add_all([ordered_record, unordered_record])
-        db.flush()
-        db.add_all(
-            [
-                SavingsRecord(
-                    user_id=user.id,
-                    order_amount_cents=1800,
-                    saved_amount_cents=300,
-                    shop_name="真实下单店",
-                    source="compare",
-                    client_event_id="admin-comparison-real-order",
-                ),
-                SavingsRecord(
-                    user_id=user.id,
-                    order_amount_cents=1500,
-                    saved_amount_cents=200,
-                    shop_name="演示下单店",
-                    source="demo",
-                ),
-            ]
-        )
-        db.commit()
-        ordered_record_id = ordered_record.id
-        user_id = user.id
-    finally:
-        db.close()
-
-    response = admin_client.get(
-        "/admin/api/comparison-records",
-        params={"user_id": user_id},
-        headers=_auth(admin_token),
-    )
-    assert response.status_code == 200, response.text
-    by_trace = {item["trace_id"]: item for item in response.json()["items"]}
-    assert by_trace["comparison-ordered-shop"]["ordered"] is True
-    assert by_trace["comparison-demo-order-shop"]["ordered"] is False
-
-    detail = admin_client.get(
-        f"/admin/api/comparison-records/{ordered_record_id}",
-        headers=_auth(admin_token),
-    )
-    assert detail.status_code == 200, detail.text
-    assert detail.json()["ordered"] is True
 
 
 def test_ad_coin_audit_full_count_truncate_and_only_mismatch(

tests/test_admin_roles.py

@@ -68,17 +68,10 @@ def test_monitoring_audit_catalog_and_api_permissions(
     ).json()
     monitoring = next(group for group in catalog if group["group"] == "监控审计")
     assert [page["key"] for page in monitoring["pages"]] == [
-        "risk-monitor",
-        "device-liveness",
-        "analytics-health",
-        "event-logs",
-        "audit-logs",
+        "device-liveness", "analytics-health", "event-logs", "audit-logs",
     ]
 
-    # 运营默认可查风控和设备存活，不能绕过导航直调技术/审计接口。
-    assert admin_client.get(
-        "/admin/api/risk-monitor/summary", headers=_auth(operator_token)
-    ).status_code == 200
+    # 运营默认只能查设备存活，不能绕过导航直调技术/审计接口。
     assert admin_client.get(
         "/admin/api/device-liveness/stats", headers=_auth(operator_token)
     ).status_code == 200
@@ -89,9 +82,8 @@ def test_monitoring_audit_catalog_and_api_permissions(
     ):
         assert admin_client.get(path, headers=_auth(operator_token)).status_code == 403
 
-    # 技术角色默认拥有监控审计组全部五项权限。
+    # 技术角色默认拥有监控审计组全部四项权限。
     for path in (
-        "/admin/api/risk-monitor/summary",
         "/admin/api/device-liveness/stats",
         "/admin/api/analytics-health/overview?date_from=2026-07-01T00:00:00Z&date_to=2026-07-02T00:00:00Z",
         "/admin/api/event-logs",
@@ -190,16 +182,10 @@ def test_builtin_roles_labels_and_pages(admin_client, super_token) -> None:
     assert roles["finance"]["label"] == "财务"
     assert roles["tech"]["label"] == "技术"
     # 页集对齐 Prototypes/dashboard/permissions.md 的 ROLES
-    assert set(roles["finance"]["pages"]) == {
-        "dashboard",
-        "ad-revenue-report",
-        "cps",
-        "invite-withdraws",
-        "withdraws",
-    }
+    assert set(roles["finance"]["pages"]) == {"dashboard", "ad-revenue-report", "cps", "withdraws"}
     assert set(roles["tech"]["pages"]) == {
-        "dashboard", "risk-monitor", "device-liveness", "analytics-health", "config",
-        "ad-revenue", "huawei-review", "event-logs", "audit-logs",
+        "dashboard", "device-liveness", "analytics-health", "config", "ad-revenue", "huawei-review",
+        "event-logs", "audit-logs",
     }
 
 

tests/test_admin_write.py

@@ -103,61 +103,6 @@ def _seed_price_report(phone: str) -> int:
         db.close()
 
 
-def test_set_user_risk_requires_note_and_writes_audit(
-    admin_client: TestClient, operator_token: str
-) -> None:
-    uid = _seed_user("13900000991")
-
-    missing_note = admin_client.post(
-        f"/admin/api/users/{uid}/risk",
-        json={"is_high_risk": True, "note": "   "},
-        headers=_auth(operator_token),
-    )
-    assert missing_note.status_code == 422
-
-    marked = admin_client.post(
-        f"/admin/api/users/{uid}/risk",
-        json={"is_high_risk": True, "note": "邀请记录存在批量异常"},
-        headers=_auth(operator_token),
-    )
-    assert marked.status_code == 200, marked.text
-
-    listed = admin_client.get(
-        "/admin/api/users",
-        params={"phone": "13900000991"},
-        headers=_auth(operator_token),
-    ).json()["items"][0]
-    assert listed["is_high_risk"] is True
-    assert listed["high_risk_note"] == "邀请记录存在批量异常"
-
-    db = SessionLocal()
-    try:
-        audit = db.execute(
-            select(AdminAuditLog)
-            .where(
-                AdminAuditLog.action == "user.risk.set",
-                AdminAuditLog.target_id == str(uid),
-            )
-            .order_by(AdminAuditLog.id.desc())
-        ).scalars().first()
-        assert audit is not None
-        assert audit.detail["after"]["is_high_risk"] is True
-    finally:
-        db.close()
-
-    cleared = admin_client.post(
-        f"/admin/api/users/{uid}/risk",
-        json={"is_high_risk": False, "note": None},
-        headers=_auth(operator_token),
-    )
-    assert cleared.status_code == 200
-    overview = admin_client.get(
-        f"/admin/api/users/{uid}", headers=_auth(operator_token)
-    ).json()
-    assert overview["user"]["is_high_risk"] is False
-    assert overview["user"]["high_risk_note"] is None
-
-
 # ===== 调金币 =====
 
 def test_grant_coins_writes_txn_and_audit(admin_client: TestClient, finance_token: str) -> None:
@@ -634,47 +579,15 @@ def test_withdraw_refresh_404(admin_client: TestClient, finance_token: str) -> N
     ).status_code == 404
 
 
-def test_withdraw_refresh_enriches_existing_failed_reason(
-    admin_client: TestClient, finance_token: str, monkeypatch
-) -> None:
-    uid = _seed_user("13900000017")
-    with SessionLocal() as db:
-        db.add(
-            WithdrawOrder(
-                user_id=uid,
-                out_bill_no="adminfailedreason01",
-                amount_cents=100,
-                status="failed",
-                wechat_state="FAIL",
-                fail_reason="微信转账状态 FAIL",
-            )
-        )
-        db.commit()
-
+def test_withdraw_reconcile(admin_client: TestClient, finance_token: str, monkeypatch) -> None:
     from app.repositories import wallet as wr
-
     monkeypatch.setattr(
-        wr.wxpay,
-        "query_transfer",
-        lambda out_bill_no: {
-            "status_code": 200,
-            "data": {
-                "state": "FAIL",
-                "fail_reason": "TRANSFER_RISK",
-                "transfer_bill_no": "wx_failed_reason_01",
-            },
-        },
+        wr.wxpay, "query_transfer",
+        lambda obn: {"status_code": 200, "data": {"state": "SUCCESS"}},
     )
-
-    response = admin_client.post(
-        "/admin/api/withdraws/adminfailedreason01/refresh",
+    r = admin_client.post(
+        "/admin/api/withdraws/reconcile", params={"older_than_minutes": 0},
         headers=_auth(finance_token),
     )
-
-    assert response.status_code == 200, response.text
-    assert response.json()["status"] == "failed"
-    assert response.json()["wechat_state"] == "FAIL"
-    assert response.json()["transfer_bill_no"] == "wx_failed_reason_01"
-    assert response.json()["fail_reason"] == (
-        "微信转账失败：该笔转账存在风险，已被微信拦截（TRANSFER_RISK）"
-    )
+    assert r.status_code == 200, r.text
+    assert "checked" in r.json() and "resolved" in r.json()

tests/test_applog.py

@@ -1,182 +0,0 @@
-"""客户端运行日志上报:writer 单测 + 端点集成测试。"""
-from __future__ import annotations
-
-import json
-from pathlib import Path
-
-import pytest
-
-from app.core import client_log
-
-
-@pytest.fixture()
-def client_log_file(tmp_path, monkeypatch):
-    """把客户端日志切到临时文件,并重置 writer 单例使其按当时 env 重建。"""
-    p = tmp_path / "app-client.log"
-    monkeypatch.setenv("CLIENT_LOG_FILE", str(p))
-    client_log.reset_client_logger()
-    yield p
-    client_log.reset_client_logger()
-
-
-def _read_lines(p: Path) -> list[dict]:
-    text = p.read_text(encoding="utf-8").strip()
-    return [json.loads(ln) for ln in text.splitlines() if ln]
-
-
-# ---------------- writer 层 ----------------
-
-def _meta(**kw) -> dict:
-    base = {"device_id": "d-1", "user_id": None, "app_ver": None,
-            "platform": None, "sent_at": None}
-    base.update(kw)
-    return base
-
-
-def test_writer_writes_one_line_per_record(client_log_file):
-    recs = [
-        {"client_ts": 1737000000000, "level": "info", "msg": "hello"},
-        {"client_ts": 1737000000001, "level": "error", "msg": "boom", "tag": "net"},
-    ]
-    received, dropped = client_log.write_records(
-        recs, meta=_meta(user_id=42, app_ver="1.2.3", platform="android"),
-        client_ip="1.2.3.4",
-    )
-    assert (received, dropped) == (2, 0)
-    lines = _read_lines(client_log_file)
-    assert len(lines) == 2
-    assert lines[0]["source"] == "client"
-    assert lines[0]["service"] == "app-client"
-    assert lines[0]["device_id"] == "d-1"
-    assert lines[0]["user_id"] == 42
-    assert lines[0]["app_ver"] == "1.2.3"
-    assert lines[0]["client_ip"] == "1.2.3.4"
-    assert lines[0]["level"] == "INFO"  # 归一化大写
-    assert lines[0]["msg"] == "hello"
-    assert lines[0]["client_ts"] == 1737000000000
-    assert lines[1]["tag"] == "net"
-
-
-def test_writer_hoists_trace_id_to_top_level(client_log_file):
-    client_log.write_records(
-        [{"client_ts": 1, "level": "info", "msg": "x", "trace_id": "abc123"}],
-        meta=_meta(), client_ip="",
-    )
-    assert _read_lines(client_log_file)[0]["trace_id"] == "abc123"
-
-
-def test_writer_sweeps_unknown_keys_into_data(client_log_file):
-    client_log.write_records(
-        [{"client_ts": 1, "level": "info", "msg": "x",
-          "foo": 123, "data": {"bar": "baz"}}],
-        meta=_meta(), client_ip="",
-    )
-    line = _read_lines(client_log_file)[0]
-    assert "foo" not in line               # 白名单外不进顶层
-    assert line["data"]["foo"] == 123      # 兜底进 data
-    assert line["data"]["bar"] == "baz"    # 客户端自带 data 合并进来
-
-
-def test_writer_truncates_oversize_msg(client_log_file, monkeypatch):
-    monkeypatch.setenv("APPLOG_MAX_MSG_BYTES", "10")
-    received, dropped = client_log.write_records(
-        [{"client_ts": 1, "level": "info", "msg": "x" * 100}],
-        meta=_meta(), client_ip="",
-    )
-    assert (received, dropped) == (1, 0)   # 截断而非丢弃
-    line = _read_lines(client_log_file)[0]
-    assert line["msg_truncated"] is True
-    assert line["msg"].endswith("…[truncated]")
-    body = line["msg"].removesuffix("…[truncated]")
-    assert len(body.encode("utf-8")) <= 10   # 截断体不超过字节上限
-
-
-def test_writer_caps_indexed_field_lengths(client_log_file):
-    client_log.write_records(
-        [{"client_ts": 1, "level": "info" * 20, "msg": "x",
-          "trace_id": "t" * 1000, "tag": "g" * 1000}],
-        meta=_meta(), client_ip="",
-    )
-    line = _read_lines(client_log_file)[0]
-    assert len(line["level"]) <= 16       # 索引字段(spec §8)做长度上限
-    assert len(line["trace_id"]) <= 256
-    assert len(line["tag"]) <= 128
-
-
-def test_writer_logger_does_not_propagate(client_log_file):
-    lg = client_log.get_logger()
-    assert lg.name == "shagua.client_log"
-    assert lg.propagate is False           # 不冒泡到 root → 不写 app-server.log
-
-
-def test_writer_drops_bad_record_without_raising(client_log_file, monkeypatch):
-    def _boom(*a, **kw):
-        raise RuntimeError("boom")
-    monkeypatch.setattr(client_log, "_build_line", _boom)
-    received, dropped = client_log.write_records(
-        [{"client_ts": 1, "level": "info", "msg": "x"}],
-        meta=_meta(), client_ip="",
-    )
-    assert (received, dropped) == (0, 1)   # 坏条计 dropped,且不抛给上层
-
-
-# ---------------- 端点层 ----------------
-
-def _post(client, body):
-    return client.post("/api/v1/applog/batch", json=body)
-
-
-def test_endpoint_happy_path(client, client_log_file):
-    body = {
-        "device_id": "d-1", "user_id": 42, "app_ver": "1.2.3", "platform": "android",
-        "logs": [
-            {"client_ts": 1, "level": "info", "msg": "a", "trace_id": "t1"},
-            {"client_ts": 2, "level": "warn", "msg": "b"},
-        ],
-    }
-    resp = _post(client, body)
-    assert resp.status_code == 200
-    assert resp.json() == {"ok": True, "received": 2, "dropped": 0}
-    lines = _read_lines(client_log_file)
-    assert len(lines) == 2
-    assert lines[0]["trace_id"] == "t1"       # 端到端:trace_id 落到文件顶层
-    assert lines[0]["client_ip"]              # 服务端补了 IP
-
-
-def test_endpoint_rejects_batch_over_max(client, client_log_file):
-    body = {"device_id": "d-1",
-            "logs": [{"client_ts": i, "level": "info", "msg": str(i)} for i in range(501)]}
-    resp = _post(client, body)
-    assert resp.status_code == 422           # Pydantic max_length=500
-
-
-def test_endpoint_rejects_body_over_limit(client, client_log_file, monkeypatch):
-    # 只测有 Content-Length 的常规情形(TestClient/requests 恒发该头)。缺该头(chunked)
-    # 时依赖 nginx client_max_body_size 兜底,不在应用层测。
-    monkeypatch.setenv("APPLOG_MAX_BODY_BYTES", "50")
-    body = {"device_id": "d-1", "logs": [{"client_ts": 1, "level": "info", "msg": "x" * 500}]}
-    resp = _post(client, body)
-    assert resp.status_code == 413           # 依赖查 Content-Length,body 校验前拦截
-
-
-def test_endpoint_returns_200_on_write_failure(client, client_log_file, monkeypatch):
-    class _BoomLogger:
-        name = "shagua.client_log"
-        propagate = False
-        handlers: list = []
-
-        def info(self, *a, **k):
-            raise RuntimeError("disk full")
-
-    monkeypatch.setattr(client_log, "get_logger", lambda: _BoomLogger())
-    body = {"device_id": "d-1", "logs": [
-        {"client_ts": 1, "level": "info", "msg": "a"},
-        {"client_ts": 2, "level": "info", "msg": "b"}]}
-    resp = _post(client, body)
-    assert resp.status_code == 200           # fire-and-forget:写失败不 500
-    assert resp.json() == {"ok": True, "received": 0, "dropped": 2}
-
-
-def test_endpoint_missing_device_id_is_422(client, client_log_file):
-    resp = _post(client, {"logs": [{"client_ts": 1, "level": "info", "msg": "a"}]})
-    assert resp.status_code == 422           # device_id 必填

tests/test_compare_harvest.py

@@ -9,16 +9,17 @@ pricebot 用 httpx mock,不真连(同 test_compare_proxy)。
 """
 from __future__ import annotations
 
+import json
 import uuid
 from unittest.mock import MagicMock, patch
 
 import httpx
-from sqlalchemy import select
 
 from app.db.session import SessionLocal
 from app.models.comparison import ComparisonRecord
 from app.repositories import comparison as crud
 from app.schemas.compare_record import ComparisonRecordIn
+from sqlalchemy import select
 
 
 def _tid() -> str:
@@ -215,9 +216,7 @@ def test_price_step_done_harvests_success(client) -> None:
                   "action": {"command": "done", "params": _done_params()},
                   "trace_url": "https://price.shaguabijia.com/traces/done2/"}
     p, _cap = _mock_pricebot(done_frame)
-    with p, patch(
-        "app.api.v1.compare.backfill_comparison_llm_cost"
-    ) as backfill:
+    with p:
         r = client.post("/api/v1/price/step", json=_stub_body(trace_id=tid, step=8))
     assert r.status_code == 200
     with SessionLocal() as db:
@@ -225,7 +224,6 @@ def test_price_step_done_harvests_success(client) -> None:
         assert rec is not None and rec.status == "success"
         assert rec.best_platform_id == "meituan"
         assert rec.saved_amount_cents == 500
-        backfill.assert_called_once_with(rec.id, tid)
 
 
 def test_trace_finalize_harvests_abort(client) -> None:

tests/test_comparison_llm_backfill.py

@@ -1,161 +0,0 @@
-from __future__ import annotations
-
-from datetime import UTC, datetime, timedelta
-
-from app.core.rewards import CN_TZ
-from app.db.session import SessionLocal
-from app.models.app_config import AppConfig
-from app.models.comparison import ComparisonRecord
-from app.services import comparison_llm_backfill
-
-
-def _record(
-    trace_id: str,
-    *,
-    status: str = "success",
-    created_at: datetime | None = None,
-) -> int:
-    with SessionLocal() as db:
-        rec = ComparisonRecord(
-            trace_id=trace_id,
-            status=status,
-            created_at=created_at or datetime.now(),
-        )
-        db.add(rec)
-        db.commit()
-        return rec.id
-
-
-def _delete(record_id: int) -> None:
-    with SessionLocal() as db:
-        rec = db.get(ComparisonRecord, record_id)
-        if rec is not None:
-            db.delete(rec)
-            db.commit()
-
-
-def test_backfill_retries_then_persists_cost(monkeypatch):
-    record_id = _record("llm-retry-1")
-    calls = [
-        {
-            "model": "unknown-model",
-            "error": None,
-            "usage": {"prompt_tokens": 1000, "completion_tokens": 500},
-        }
-    ]
-    responses = iter([[], calls])
-    monkeypatch.setattr(
-        comparison_llm_backfill,
-        "fetch_llm_calls",
-        lambda trace_id: next(responses),
-    )
-    sleeps: list[float] = []
-    monkeypatch.setattr(comparison_llm_backfill.time, "sleep", sleeps.append)
-    monkeypatch.setattr(
-        comparison_llm_backfill.settings, "INTERNAL_API_SECRET", "test-secret"
-    )
-
-    try:
-        assert comparison_llm_backfill.backfill_comparison_llm_cost(
-            record_id, "llm-retry-1", attempts=2, retry_delays=(0.25,)
-        )
-        assert sleeps == [0.25]
-        with SessionLocal() as db:
-            rec = db.get(ComparisonRecord, record_id)
-            assert rec.input_tokens == 1000
-            assert rec.output_tokens == 500
-            assert rec.llm_cost_yuan is not None
-            assert rec.llm_calls == calls
-    finally:
-        _delete(record_id)
-
-
-def test_repair_batch_only_targets_terminal_missing_rows(monkeypatch):
-    missing_id = _record("llm-repair-missing")
-    running_id = _record("llm-repair-running", status="running")
-    calls = [
-        {
-            "model": "unknown-model",
-            "error": None,
-            "usage": {"prompt_tokens": 100, "completion_tokens": 20},
-        }
-    ]
-    seen: list[str] = []
-
-    def fetch(trace_id: str) -> list[dict]:
-        seen.append(trace_id)
-        return calls
-
-    monkeypatch.setattr(comparison_llm_backfill, "fetch_llm_calls", fetch)
-    monkeypatch.setattr(
-        comparison_llm_backfill.settings, "INTERNAL_API_SECRET", "test-secret"
-    )
-    try:
-        result = comparison_llm_backfill.repair_missing_comparison_llm_costs(
-            limit=10, lookback_days=1
-        )
-        assert result["repaired"] >= 1
-        assert "llm-repair-missing" in seen
-        assert "llm-repair-running" not in seen
-        with SessionLocal() as db:
-            assert db.get(ComparisonRecord, missing_id).llm_cost_yuan is not None
-            assert db.get(ComparisonRecord, running_id).llm_cost_yuan is None
-    finally:
-        _delete(missing_id)
-        _delete(running_id)
-
-
-def test_repair_excludes_records_before_current_price_config(monkeypatch):
-    price_changed_at = datetime.now(UTC) - timedelta(hours=1)
-    before_change = (price_changed_at - timedelta(minutes=30)).astimezone(CN_TZ)
-    after_change = (price_changed_at + timedelta(minutes=30)).astimezone(CN_TZ)
-    before_id = _record(
-        "llm-before-price-change",
-        created_at=before_change.replace(tzinfo=None),
-    )
-    after_id = _record(
-        "llm-after-price-change",
-        created_at=after_change.replace(tzinfo=None),
-    )
-    with SessionLocal() as db:
-        existing = db.get(AppConfig, "llm_token_price")
-        if existing is not None:
-            db.delete(existing)
-            db.flush()
-        db.add(
-            AppConfig(
-                key="llm_token_price",
-                value={"default": {"input_per_1m": 1, "output_per_1m": 1}},
-                updated_at=price_changed_at,
-            )
-        )
-        db.commit()
-
-    seen: list[str] = []
-
-    def backfill(record_id: int, trace_id: str, **kwargs) -> bool:
-        seen.append(trace_id)
-        return True
-
-    monkeypatch.setattr(
-        comparison_llm_backfill,
-        "backfill_comparison_llm_cost",
-        backfill,
-    )
-    try:
-        result = comparison_llm_backfill.repair_missing_comparison_llm_costs(
-            limit=10_000,
-            lookback_days=1,
-        )
-        assert "llm-after-price-change" in seen
-        assert "llm-before-price-change" not in seen
-        assert result["repaired"] == len(seen)
-        assert result["unresolved"] == 0
-    finally:
-        _delete(before_id)
-        _delete(after_id)
-        with SessionLocal() as db:
-            config = db.get(AppConfig, "llm_token_price")
-            if config is not None:
-                db.delete(config)
-                db.commit()

tests/test_comparison_result_in_skipped.py

@@ -1,17 +0,0 @@
-"""ComparisonResultIn 保留逐平台 skipped_dish_count(落库/回读用)。
-
-记录页三平台网格要按逐平台缺菜数标"缺少 X 个菜品"; pricebot 现把 skipped_dish_count 冗余进
-comparison_results 行。上报边界必须显式声明该字段, 否则 model_dump() 会静默丢弃(POST 路径),
-记录页拿不到。纯 schema, 不碰 DB。
-"""
-from app.schemas.compare_record import ComparisonResultIn
-
-
-def test_comparison_result_in_preserves_skipped_dish_count():
-    r = ComparisonResultIn(platform_id="jd_waimai", price=25.0, skipped_dish_count=2)
-    assert r.model_dump().get("skipped_dish_count") == 2
-
-
-def test_comparison_result_in_skipped_defaults_none():
-    r = ComparisonResultIn(platform_id="meituan", price=42.0, is_source=True)
-    assert r.model_dump().get("skipped_dish_count") is None

tests/test_derive_best_excludes_short.py

@@ -1,102 +0,0 @@
-"""_derive_from_results / _derive: 缺菜(漏菜)店总价虚低, 不当记录级"最低价"。
-
-回归: pricebot comparison_results[].rank 是纯价格排序(含缺菜), server 派生 best 若照单全收,
-会把缺菜店的虚低价当 best_price → 记录页戴"最低"红框 + 虚假省额。
-修复: 派生 best 时按 platform_results[pid].skipped_dish_count 排除缺菜店(源平台永远全菜, 仍可当 best)。
-纯函数, 不碰 DB。
-"""
-from app.repositories.comparison import _derive, _derive_from_results
-from app.schemas.compare_record import ComparisonRecordIn, ComparisonResultIn
-
-
-def test_derive_from_results_excludes_short_ordered_from_best():
-    # jd 缺 2 道菜 → 虚低 ¥25(rank=1); tb 全有 ¥38.5; 源美团 ¥42。best 应是 tb(干净最便宜), 不是 jd。
-    results = [
-        {"platform_id": "meituan", "platform_name": "美团", "price": 42.0, "is_source": True, "rank": 3},
-        {"platform_id": "jd_waimai", "platform_name": "京东外卖", "price": 25.0, "is_source": False, "rank": 1},
-        {"platform_id": "taobao_flash", "platform_name": "淘宝闪购", "price": 38.5, "is_source": False, "rank": 2},
-    ]
-    platform_results = {
-        "jd_waimai": {"skipped_dish_count": 2},
-        "taobao_flash": {"skipped_dish_count": 0},
-        "meituan": {"is_source": True},
-    }
-    d = _derive_from_results(results, platform_results)
-    assert d["best_platform_id"] == "taobao_flash"
-    assert d["best_price_cents"] == 3850
-    assert d["saved_amount_cents"] == 4200 - 3850   # 350, 用干净店算省额, 不是缺菜虚低价 42-25=17元
-    assert d["is_source_best"] is False
-
-
-def test_derive_from_results_all_targets_short_falls_back_to_source():
-    # 唯一比源便宜的都是缺菜 → 不crown缺菜店; 源全菜 → best=源, is_source_best, 不虚报省额。
-    results = [
-        {"platform_id": "meituan", "price": 42.0, "is_source": True, "rank": 2},
-        {"platform_id": "jd_waimai", "price": 25.0, "is_source": False, "rank": 1},
-    ]
-    platform_results = {"jd_waimai": {"skipped_dish_count": 3}}
-    d = _derive_from_results(results, platform_results)
-    assert d["best_platform_id"] == "meituan"
-    assert d["is_source_best"] is True
-    assert d["saved_amount_cents"] == 0
-
-
-def test_derive_from_results_no_platform_results_keeps_old_behavior():
-    # 不传 platform_results(老 harvest / 无缺菜信息)→ 行为不变: 纯 rank/price 选 best。
-    results = [
-        {"platform_id": "meituan", "price": 42.0, "is_source": True, "rank": 2},
-        {"platform_id": "jd_waimai", "price": 25.0, "is_source": False, "rank": 1},
-    ]
-    d = _derive_from_results(results)
-    assert d["best_platform_id"] == "jd_waimai"
-    assert d["best_price_cents"] == 2500
-
-
-def test_derive_from_results_malformed_platform_results_no_crash():
-    # 内层值非 dict(异常/伪造上报)→ 不抛 AttributeError, 按"不缺菜"处理, 照常选最便宜。
-    results = [
-        {"platform_id": "meituan", "price": 42.0, "is_source": True, "rank": 2},
-        {"platform_id": "jd_waimai", "price": 25.0, "is_source": False, "rank": 1},
-    ]
-    d = _derive_from_results(results, {"jd_waimai": "oops"})
-    assert d["best_platform_id"] == "jd_waimai"
-    assert d["best_price_cents"] == 2500
-
-
-def test_derive_pydantic_excludes_short():
-    # _derive(老客户端 POST 路径)同样排除缺菜店: jd 缺菜虚低 ¥25 不当 best, 取干净的淘宝 ¥38.5。
-    payload = ComparisonRecordIn(
-        trace_id="t-short-pyd",
-        source_price=42.0,
-        source_platform_id="meituan",
-        comparison_results=[
-            ComparisonResultIn(platform_id="meituan", platform_name="美团", price=42.0, is_source=True, rank=3),
-            ComparisonResultIn(platform_id="jd_waimai", platform_name="京东外卖", price=25.0, is_source=False, rank=1),
-            ComparisonResultIn(platform_id="taobao_flash", platform_name="淘宝闪购", price=38.5, is_source=False, rank=2),
-        ],
-        platform_results={
-            "jd_waimai": {"skipped_dish_count": 2},
-            "taobao_flash": {"skipped_dish_count": 0},
-        },
-    )
-    d = _derive(payload)
-    assert d["best_platform_id"] == "taobao_flash"
-    assert d["best_price_cents"] == 3850
-    assert d["saved_amount_cents"] == 4200 - 3850
-    assert d["is_source_best"] is False
-
-
-def test_derive_pydantic_malformed_platform_results_no_crash():
-    # _derive 的 platform_results 来自老客户端透传(可伪造): 内层非 dict 不应打 500。
-    payload = ComparisonRecordIn(
-        trace_id="t-malformed-pyd",
-        source_price=42.0,
-        comparison_results=[
-            ComparisonResultIn(platform_id="meituan", price=42.0, is_source=True, rank=2),
-            ComparisonResultIn(platform_id="jd_waimai", price=25.0, is_source=False, rank=1),
-        ],
-        platform_results={"jd_waimai": "oops"},
-    )
-    d = _derive(payload)  # 不抛 AttributeError
-    assert d["best_platform_id"] == "jd_waimai"
-    assert d["best_price_cents"] == 2500

tests/test_invite_cash_withdraw.py

@@ -127,53 +127,9 @@ def test_invite_cash_reject_refunds_invite_account(client, monkeypatch) -> None:
         db.close()
 
 
-def test_invite_cash_reject_recreates_missing_account(client, monkeypatch) -> None:
-    """A legacy or hand-written order without CoinAccount can still be refunded."""
-    _patch_userinfo(monkeypatch, "openid_ic_missing_account")
-    token = _login(client, "13800004012")
-    _seed_balances(client, token, "13800004012", cash=0, invite_cash=200)
-    client.post("/api/v1/wallet/bind-wechat", json={"code": "c"}, headers=_auth(token))
-
-    response = client.post(
-        "/api/v1/wallet/withdraw",
-        json={"amount_cents": 200, "source": "invite_cash"},
-        headers=_auth(token),
-    )
-    assert response.status_code == 200, response.text
-    bill = response.json()["out_bill_no"]
-
-    with SessionLocal() as db:
-        user = db.execute(
-            select(User).where(User.phone == "13800004012")
-        ).scalar_one()
-        db.delete(db.get(CoinAccount, user.id))
-        db.commit()
-
-    _reject(bill, "missing account fixture")
-
-    with SessionLocal() as db:
-        user = db.execute(
-            select(User).where(User.phone == "13800004012")
-        ).scalar_one()
-        account = db.get(CoinAccount, user.id)
-        order = crud_wallet._get_withdraw_or_raise(db, bill)
-        refunds = db.execute(
-            select(InviteCashTransaction).where(
-                InviteCashTransaction.user_id == user.id,
-                InviteCashTransaction.biz_type == "invite_withdraw_refund",
-                InviteCashTransaction.ref_id == bill,
-            )
-        ).scalars().all()
-
-        assert account is not None
-        assert account.invite_cash_balance_cents == 200
-        assert order.status == "rejected"
-        assert order.fail_reason == "missing account fixture"
-        assert len(refunds) == 1 and refunds[0].amount_cents == 200
-
-
 def test_two_accounts_withdraw_independent(client, monkeypatch) -> None:
-    """两账户各提各的不串:提 invite_cash(拒绝→验证退款回原账户),再提 cash,各扣各账户互不串。"""
+    """两账户各提各的不串:先提 invite_cash(拒绝结清),再提 cash,各扣各账户。
+    注:一个用户同一时间只能一个活跃提现单(跨账户),故第二笔需先结清第一笔。"""
     _patch_userinfo(monkeypatch, "openid_ic_3")
     token = _login(client, "13800004003")
     _seed_balances(client, token, "13800004003", cash=400, invite_cash=500)
@@ -184,7 +140,7 @@ def test_two_accounts_withdraw_independent(client, monkeypatch) -> None:
         json={"amount_cents": 200, "source": "invite_cash"},
         headers=_auth(token),
     )
-    _reject(r1.json()["out_bill_no"])    # 拒绝退回 invite_cash(验证退款回原账户)
+    _reject(r1.json()["out_bill_no"])    # 退回 invite_cash + 结清活跃单
     r2 = client.post(
         "/api/v1/wallet/withdraw",
         # 50 分 = 0.5 元档(7-9 起 coin_cash 只能提预设档位)
@@ -198,39 +154,6 @@ def test_two_accounts_withdraw_independent(client, monkeypatch) -> None:
     assert cash == 350           # 扣了 cash 50
 
 
-def test_invite_cash_multiple_in_flight_allowed(client, monkeypatch) -> None:
-    """取消「同时仅一单」:invite_cash 无档位上限,已有在途时仍可继续提交,多笔并存各扣 invite_cash。"""
-    _patch_userinfo(monkeypatch, "openid_ic_multi")
-    token = _login(client, "13800004006")
-    _seed_balances(client, token, "13800004006", cash=0, invite_cash=500)
-    client.post("/api/v1/wallet/bind-wechat", json={"code": "c"}, headers=_auth(token))
-
-    r1 = client.post(
-        "/api/v1/wallet/withdraw",
-        json={"amount_cents": 200, "source": "invite_cash", "out_bill_no": "billicflight0001"},
-        headers=_auth(token),
-    )
-    assert r1.status_code == 200, r1.text
-    assert r1.json()["status"] == "reviewing"
-
-    r2 = client.post(
-        "/api/v1/wallet/withdraw",
-        json={"amount_cents": 200, "source": "invite_cash", "out_bill_no": "billicflight0002"},
-        headers=_auth(token),
-    )
-    assert r2.status_code == 200, r2.text
-    assert r2.json()["status"] == "reviewing"
-
-    # 两笔 invite_cash 在途并存,共扣 400(500→100),金币现金不动
-    cash, invite_cash = _balances(client, token)
-    assert invite_cash == 100 and cash == 0
-    orders = client.get(
-        "/api/v1/wallet/withdraw-orders", params={"source": "invite_cash"}, headers=_auth(token)
-    ).json()["items"]
-    reviewing = [o for o in orders if o["status"] == "reviewing"]
-    assert len(reviewing) == 2
-
-
 def test_invite_me_returns_reward_stats(client) -> None:
     """/invite/me 返回 reward_balance_cents(可提现奖励金)。"""
     token = _login(client, "13800004004")
@@ -247,11 +170,12 @@ def test_withdraw_orders_source_filter(client, monkeypatch) -> None:
     _seed_balances(client, token, "13800004005", cash=400, invite_cash=500)
     client.post("/api/v1/wallet/bind-wechat", json={"code": "c"}, headers=_auth(token))
 
-    client.post(
+    r1 = client.post(
         "/api/v1/wallet/withdraw",
         json={"amount_cents": 200, "source": "invite_cash"},
         headers=_auth(token),
     )
+    _reject(r1.json()["out_bill_no"])    # 结清,才能提第二笔
     client.post(
         "/api/v1/wallet/withdraw",
         # 50 分 = 0.5 元档(7-9 起 coin_cash 只能提预设档位)

tests/test_llm_cost.py

@@ -132,7 +132,6 @@ def test_backfill_llm_calls_stores_cost_and_snapshot(monkeypatch):
     from app.models.app_config import AppConfig
     from app.models.comparison import ComparisonRecord
     from app.repositories import app_config
-    from app.services import comparison_llm_backfill
 
     sample = [
         {"model": "qwen3.5-flash", "error": None, "usage": {"prompt_tokens": 1512, "completion_tokens": 22}},
@@ -140,12 +139,7 @@ def test_backfill_llm_calls_stores_cost_and_snapshot(monkeypatch):
         {"model": "qwen3.5-flash", "error": None, "usage": {"prompt_tokens": 1940, "completion_tokens": 142}},
         {"model": "qwen3.5-flash", "error": None, "usage": {"prompt_tokens": 1325, "completion_tokens": 13}},
     ]
-    monkeypatch.setattr(
-        comparison_llm_backfill, "fetch_llm_calls", lambda trace_id: sample
-    )
-    monkeypatch.setattr(
-        comparison_llm_backfill.settings, "INTERNAL_API_SECRET", "test-secret"
-    )
+    monkeypatch.setattr(compare_record, "fetch_llm_calls", lambda trace_id: sample)
 
     db = SessionLocal()
     try:

tests/test_pricebot_llm_calls.py

@@ -1,55 +0,0 @@
-from unittest.mock import MagicMock
-
-from app.core.config import settings
-from app.services import pricebot_llm_calls
-
-
-def test_auth_probe_accepts_matching_secret(monkeypatch):
-    monkeypatch.setattr(settings, "INTERNAL_API_SECRET", "same-secret")
-    response = MagicMock(status_code=200)
-    get = MagicMock(return_value=response)
-    monkeypatch.setattr(pricebot_llm_calls.httpx, "get", get)
-
-    assert pricebot_llm_calls.pricebot_llm_auth_ready() is True
-    assert get.call_count == len(settings.pricebot_instances)
-    assert all(
-        call.kwargs["headers"]["X-Internal-Secret"] == "same-secret"
-        for call in get.call_args_list
-    )
-
-
-def test_auth_probe_rejects_mismatched_secret(monkeypatch):
-    monkeypatch.setattr(settings, "INTERNAL_API_SECRET", "app-server-secret")
-    monkeypatch.setattr(
-        pricebot_llm_calls.httpx,
-        "get",
-        MagicMock(return_value=MagicMock(status_code=403)),
-    )
-
-    assert pricebot_llm_calls.pricebot_llm_auth_ready() is False
-
-
-def test_fetch_falls_back_to_other_instance_when_hash_target_is_empty(monkeypatch):
-    monkeypatch.setattr(settings, "INTERNAL_API_SECRET", "same-secret")
-    monkeypatch.setattr(
-        settings,
-        "PRICEBOT_INSTANCES",
-        "http://pricebot-1:8000,http://pricebot-2:8000",
-    )
-    monkeypatch.setattr(
-        pricebot_llm_calls,
-        "pick_pricebot",
-        lambda trace_id: "http://pricebot-1:8000",
-    )
-    calls = [{"model": "qwen", "usage": {"prompt_tokens": 1}}]
-
-    def get(url, **kwargs):
-        response = MagicMock(status_code=200)
-        response.json.return_value = {
-            "calls": [] if "pricebot-1" in url else calls
-        }
-        return response
-
-    monkeypatch.setattr(pricebot_llm_calls.httpx, "get", get)
-
-    assert pricebot_llm_calls.fetch_llm_calls("trace-after-rescale") == calls

tests/test_risk_monitor.py

@@ -1,541 +0,0 @@
-"""风控监控：三类规则、明细及处置闭环。"""
-from __future__ import annotations
-
-from datetime import datetime, timedelta
-from uuid import uuid4
-
-import pytest
-from fastapi.testclient import TestClient
-
-from app.admin.main import admin_app
-from app.admin.repositories import admin_user as admin_repo
-from app.api.v1 import compare as compare_api
-from app.core.config_schema import (
-    RISK_COMPARE_DAILY_THRESHOLD_KEY,
-    RISK_ONECLICK_DAILY_THRESHOLD_KEY,
-    RISK_SMS_HOURLY_THRESHOLD_KEY,
-)
-from app.core.security import issue_token_pair
-from app.db.session import SessionLocal
-from app.models.app_config import AppConfig
-from app.models.comparison import ComparisonRecord
-from app.models.device import DeviceLiveness
-from app.models.risk import RiskIncident
-from app.repositories import risk as risk_repo
-from app.repositories import user as user_repo
-
-
-@pytest.fixture(autouse=True)
-def _reset_risk_rule_config():
-    keys = (
-        RISK_SMS_HOURLY_THRESHOLD_KEY,
-        RISK_ONECLICK_DAILY_THRESHOLD_KEY,
-        RISK_COMPARE_DAILY_THRESHOLD_KEY,
-        risk_repo.RISK_RESET_BASELINES_KEY,
-    )
-    with SessionLocal() as db:
-        db.query(AppConfig).filter(AppConfig.key.in_(keys)).delete(
-            synchronize_session=False
-        )
-        db.commit()
-    yield
-    with SessionLocal() as db:
-        db.query(AppConfig).filter(AppConfig.key.in_(keys)).delete(
-            synchronize_session=False
-        )
-        db.commit()
-
-
-def _admin_token() -> str:
-    username = "risk_monitor_admin"
-    with SessionLocal() as db:
-        if admin_repo.get_by_username(db, username) is None:
-            admin_repo.create_admin(
-                db, username=username, password="risk-pass-123", role="super_admin"
-            )
-    with TestClient(admin_app) as client:
-        response = client.post(
-            "/admin/api/auth/login",
-            json={"username": username, "password": "risk-pass-123"},
-        )
-    assert response.status_code == 200
-    return response.json()["access_token"]
-
-
-def _headers() -> dict[str, str]:
-    return {"Authorization": f"Bearer {_admin_token()}"}
-
-
-def _seed_incidents() -> tuple[int, int, int, int, str]:
-    suffix = uuid4().hex[:8]
-    sms_subject = f"risk_sms_{suffix}"
-    oneclick_subject = f"risk_oneclick_{suffix}"
-    now = (risk_repo.utcnow() - timedelta(minutes=5)).replace(microsecond=0)
-    with SessionLocal() as db:
-        user = user_repo.upsert_user_for_login(
-            db,
-            phone=f"139{int(suffix, 16) % 100_000_000:08d}",
-            register_channel="sms",
-        )
-        second_user = user_repo.upsert_user_for_login(
-            db,
-            phone=f"137{int(suffix, 16) % 100_000_000:08d}",
-            register_channel="sms",
-        )
-        db.add(
-            DeviceLiveness(
-                user_id=user.id,
-                device_id=sms_subject,
-                created_at=now - timedelta(days=10),
-            )
-        )
-        for index in range(5):
-            risk_repo.record_behavior_event(
-                db,
-                event_type=risk_repo.EVENT_SMS_SEND,
-                subject_type="device",
-                subject_id=sms_subject,
-                device_id=sms_subject,
-                device_model="OPPO A5",
-                phone=f"13877771{index:03d}",
-                outcome="success",
-                occurred_at=now + timedelta(seconds=index),
-                evaluate_rule=risk_repo.RULE_SMS_HOURLY,
-            )
-        risk_repo.record_behavior_event(
-            db,
-            event_type=risk_repo.EVENT_SMS_LOGIN,
-            subject_type="device",
-            subject_id=sms_subject,
-            user_id=user.id,
-            device_id=sms_subject,
-            device_model="OPPO A5",
-            phone="13877771000",
-            outcome="success",
-            occurred_at=now + timedelta(seconds=30),
-        )
-        risk_repo.record_behavior_event(
-            db,
-            event_type=risk_repo.EVENT_SMS_LOGIN,
-            subject_type="device",
-            subject_id=sms_subject,
-            user_id=second_user.id,
-            device_id=sms_subject,
-            device_model="OPPO A5",
-            phone="13877771001",
-            outcome="success",
-            occurred_at=now + timedelta(seconds=31),
-        )
-
-        for index in range(21):
-            risk_repo.record_behavior_event(
-                db,
-                event_type=risk_repo.EVENT_ONECLICK_LOGIN,
-                subject_type="device",
-                subject_id=oneclick_subject,
-                user_id=second_user.id if index == 20 else user.id,
-                device_id=oneclick_subject,
-                device_model="OPPO Reno",
-                phone=user.phone,
-                outcome="success" if index % 3 else "failed",
-                reason="mock provider failure" if index % 3 == 0 else None,
-                occurred_at=now + timedelta(seconds=index),
-                evaluate_rule=risk_repo.RULE_ONECLICK_DAILY,
-            )
-
-        local_now = now.astimezone(risk_repo.CN_TZ).replace(tzinfo=None)
-        for index in range(100):
-            db.add(
-                ComparisonRecord(
-                    user_id=user.id,
-                    device_id="risk_compare_device",
-                    trace_id=f"risk-monitor-{suffix}-{index}",
-                    store_name="测试门店",
-                    product_names="测试菜品",
-                    status="success",
-                    items=[{"name": "测试菜品", "qty": 1}],
-                    comparison_results=[
-                        {"platform_id": "meituan", "platform_name": "美团", "price": 12.5},
-                        {"platform_id": "taobao", "platform_name": "淘宝", "price": 11.8},
-                    ],
-                    skipped_dish_names=[],
-                    saved_amount_cents=70,
-                    created_at=local_now + timedelta(seconds=index),
-                )
-            )
-        db.commit()
-        risk_repo.sync_compare_incident(db, user_id=user.id, at=local_now)
-
-        incidents = {
-            incident.rule_code: incident.id
-            for incident in db.query(RiskIncident)
-            .filter(
-                RiskIncident.subject_id.in_(
-                    (sms_subject, oneclick_subject, str(user.id))
-                )
-            )
-            .all()
-        }
-        return (
-            incidents[risk_repo.RULE_SMS_HOURLY],
-            incidents[risk_repo.RULE_ONECLICK_DAILY],
-            incidents[risk_repo.RULE_COMPARE_DAILY],
-            user.id,
-            sms_subject,
-        )
-
-
-def test_risk_monitor_summary_lists_and_details() -> None:
-    sms_id, oneclick_id, compare_id, _, _ = _seed_incidents()
-    headers = _headers()
-    with TestClient(admin_app) as client:
-        summary = client.get("/admin/api/risk-monitor/summary", headers=headers)
-        assert summary.status_code == 200
-        cards = {card["kind"]: card for card in summary.json()["cards"]}
-        assert cards["sms"]["alert_subject_count"] >= 1
-        assert cards["sms"]["today_total"] >= 5
-        assert cards["oneclick"]["alert_subject_count"] >= 1
-        assert cards["oneclick"]["today_total"] >= 20
-        assert cards["compare"]["alert_subject_count"] >= 1
-        assert cards["compare"]["today_total"] >= 100
-
-        sms_list = client.get("/admin/api/risk-monitor/incidents/sms", headers=headers)
-        assert sms_list.status_code == 200
-        sms_item = next(
-            item for item in sms_list.json()["items"] if item["incident_id"] == sms_id
-        )
-        assert sms_item["device_model"] == "OPPO A5"
-        assert sms_item["event_count"] == 5
-        assert sms_item["first_used_at"].startswith(
-            (risk_repo.utcnow() - timedelta(days=10)).date().isoformat()
-        )
-
-        sms_detail = client.get(
-            f"/admin/api/risk-monitor/incidents/sms/{sms_id}/details",
-            headers=headers,
-        )
-        assert sms_detail.status_code == 200
-        assert sms_detail.json()["total"] == 5
-        assert sms_detail.json()["distinct_accounts"] == 2
-        assert any(item["verified"] for item in sms_detail.json()["items"])
-
-        oneclick_detail = client.get(
-            f"/admin/api/risk-monitor/incidents/oneclick/{oneclick_id}/details?limit=1",
-            headers=headers,
-        )
-        assert oneclick_detail.status_code == 200
-        assert oneclick_detail.json()["total"] == 21
-        assert oneclick_detail.json()["distinct_accounts"] == 2
-
-        compare_detail = client.get(
-            f"/admin/api/risk-monitor/incidents/compare/{compare_id}/details",
-            headers=headers,
-        )
-        assert compare_detail.status_code == 200
-        assert compare_detail.json()["total"] == 100
-        assert compare_detail.json()["items"][0]["prices"]["美团"] == 12.5
-
-
-def test_risk_monitor_ignore_and_block_are_enforced(client: TestClient) -> None:
-    sms_id, oneclick_id, compare_id, user_id, sms_subject = _seed_incidents()
-    headers = _headers()
-    with TestClient(admin_app) as admin_client:
-        ignored = admin_client.post(
-            f"/admin/api/risk-monitor/incidents/{oneclick_id}/ignore",
-            json={"reason": "测试确认正常"},
-            headers=headers,
-        )
-        assert ignored.status_code == 200
-        assert ignored.json()["status"] == "ignored"
-
-        blocked_device = admin_client.post(
-            f"/admin/api/risk-monitor/incidents/{sms_id}/block",
-            json={"reason": "测试设备异常"},
-            headers=headers,
-        )
-        assert blocked_device.status_code == 200
-        assert blocked_device.json()["restriction_id"]
-
-        blocked_user = admin_client.post(
-            f"/admin/api/risk-monitor/incidents/{compare_id}/block",
-            json={"reason": "测试账号异常"},
-            headers=headers,
-        )
-        assert blocked_user.status_code == 200
-        device_restriction_id = blocked_device.json()["restriction_id"]
-        user_restriction_id = blocked_user.json()["restriction_id"]
-
-        blocked_sms = admin_client.get(
-            "/admin/api/risk-monitor/incidents/sms?status=blocked",
-            headers=headers,
-        )
-        assert blocked_sms.status_code == 200
-        assert blocked_sms.json()["items"][0]["restriction_id"] == device_restriction_id
-        assert blocked_sms.json()["items"][0]["restricted"] is True
-
-        blocked_compare = admin_client.get(
-            "/admin/api/risk-monitor/incidents/compare?status=blocked",
-            headers=headers,
-        )
-        assert blocked_compare.status_code == 200
-        assert blocked_compare.json()["items"][0]["restriction_id"] == user_restriction_id
-        assert blocked_compare.json()["items"][0]["restricted"] is True
-
-    denied_sms = client.post(
-        "/api/v1/auth/sms/send",
-        json={
-            "phone": "13877779999",
-            "device_id": sms_subject,
-            "device_model": "OPPO A5",
-        },
-    )
-    assert denied_sms.status_code == 403
-    assert denied_sms.json()["detail"] == "当前设备环境异常，暂无法发送验证码"
-
-    tokens = issue_token_pair(user_id)
-    denied_compare = client.post(
-        "/api/v1/compare/start",
-        json={"trace_id": "risk-blocked-new-trace", "device_id": "risk_compare_device"},
-        headers={"Authorization": f"Bearer {tokens['access_token']}"},
-    )
-    assert denied_compare.status_code == 403
-    assert denied_compare.json()["detail"] == "账号存在异常，该功能暂不可用"
-
-    denied_compare_step = client.post(
-        "/api/v1/intent/recognize",
-        json={},
-        headers={"Authorization": f"Bearer {tokens['access_token']}"},
-    )
-    assert denied_compare_step.status_code == 403
-    assert denied_compare_step.json()["detail"] == "账号存在异常，该功能暂不可用"
-
-    with TestClient(admin_app) as admin_client:
-        assert (
-            admin_client.post(
-                f"/admin/api/risk-monitor/restrictions/{device_restriction_id}/revoke",
-                headers=headers,
-            ).status_code
-            == 200
-        )
-        assert (
-            admin_client.post(
-                f"/admin/api/risk-monitor/restrictions/{user_restriction_id}/revoke",
-                headers=headers,
-            ).status_code
-            == 200
-        )
-
-    allowed_sms = client.post(
-        "/api/v1/auth/sms/send",
-        json={
-            "phone": "13877779998",
-            "device_id": sms_subject,
-            "device_model": "OPPO A5",
-        },
-    )
-    assert allowed_sms.status_code == 200
-
-    with SessionLocal() as db:
-        assert not risk_repo.is_restricted(
-            db,
-            subject_type="user",
-            subject_id=str(user_id),
-            scope=risk_repo.SCOPE_ECONOMIC_ACCOUNT,
-        )
-        assert db.get(RiskIncident, compare_id).status == "resolved"
-
-
-def test_admin_can_reset_all_alerts_and_sms_restarts_from_zero() -> None:
-    sms_id, oneclick_id, compare_id, _, sms_subject = _seed_incidents()
-    headers = _headers()
-
-    with TestClient(admin_app) as client:
-        reset = client.post("/admin/api/risk-monitor/reset", headers=headers)
-        assert reset.status_code == 200
-        payload = reset.json()
-        assert payload["reset_incident_count"] >= 3
-        assert payload["reset_counts"]["sms"] >= 1
-        assert payload["reset_counts"]["oneclick"] >= 1
-        assert payload["reset_counts"]["compare"] >= 1
-
-        summary = client.get("/admin/api/risk-monitor/summary", headers=headers)
-        assert summary.status_code == 200
-        cards = {card["kind"]: card for card in summary.json()["cards"]}
-        assert all(card["alert_subject_count"] == 0 for card in cards.values())
-        # 重置只清待处理报警，不删除今日事实总量。
-        assert cards["sms"]["today_total"] >= 5
-        assert cards["oneclick"]["today_total"] >= 20
-        assert cards["compare"]["today_total"] >= 100
-
-    reset_at = datetime.fromisoformat(payload["reset_at"])
-    with SessionLocal() as db:
-        for incident_id in (sms_id, oneclick_id, compare_id):
-            incident = db.get(RiskIncident, incident_id)
-            assert incident.status == "resolved"
-            assert incident.action_reason == risk_repo.MANUAL_RESET_REASON
-
-        for index in range(4):
-            risk_repo.record_behavior_event(
-                db,
-                event_type=risk_repo.EVENT_SMS_SEND,
-                subject_type="device",
-                subject_id=sms_subject,
-                device_id=sms_subject,
-                phone=f"13688880{index:03d}",
-                outcome="success",
-                occurred_at=reset_at + timedelta(seconds=index + 1),
-                evaluate_rule=risk_repo.RULE_SMS_HOURLY,
-            )
-        assert db.get(RiskIncident, sms_id).status == "resolved"
-
-        risk_repo.record_behavior_event(
-            db,
-            event_type=risk_repo.EVENT_SMS_SEND,
-            subject_type="device",
-            subject_id=sms_subject,
-            device_id=sms_subject,
-            phone="13688880999",
-            outcome="success",
-            occurred_at=reset_at + timedelta(seconds=5),
-            evaluate_rule=risk_repo.RULE_SMS_HOURLY,
-        )
-        incident = db.get(RiskIncident, sms_id)
-        assert incident.status == "open"
-        assert incident.event_count == 5
-        assert incident.window_start == reset_at.replace(tzinfo=None)
-
-
-def test_real_compare_harvest_creates_incident_at_threshold() -> None:
-    suffix = uuid4().hex[:8]
-    local_now = risk_repo.utcnow().astimezone(risk_repo.CN_TZ).replace(tzinfo=None)
-    with SessionLocal() as db:
-        user = user_repo.upsert_user_for_login(
-            db,
-            phone=f"136{int(suffix, 16) % 100_000_000:08d}",
-            register_channel="sms",
-        )
-        for index in range(99):
-            db.add(
-                ComparisonRecord(
-                    user_id=user.id,
-                    device_id="real-harvest-device",
-                    trace_id=f"risk-real-harvest-{suffix}-{index}",
-                    status="running",
-                    created_at=local_now + timedelta(milliseconds=index),
-                )
-            )
-        db.commit()
-        user_id = user.id
-
-    compare_api._harvest_running_blocking(
-        f"risk-real-harvest-{suffix}-99",
-        user_id,
-        "food",
-        "real-harvest-device",
-        {"model": "OPPO A5"},
-        None,
-    )
-
-    with SessionLocal() as db:
-        incident = db.query(RiskIncident).filter(
-            RiskIncident.rule_code == risk_repo.RULE_COMPARE_DAILY,
-            RiskIncident.subject_id == str(user_id),
-            RiskIncident.window_key == local_now.strftime("%Y-%m-%d"),
-        ).one()
-        assert incident.event_count == 100
-
-
-def test_admin_can_edit_rules_and_current_window_is_reconciled() -> None:
-    suffix = uuid4().hex[:8]
-    subject = f"risk_dynamic_sms_{suffix}"
-    now = risk_repo.utcnow().replace(microsecond=0)
-    with SessionLocal() as db:
-        for index in range(3):
-            risk_repo.record_behavior_event(
-                db,
-                event_type=risk_repo.EVENT_SMS_SEND,
-                subject_type="device",
-                subject_id=subject,
-                device_id=subject,
-                device_model="动态规则测试机",
-                phone=f"13800001{index:03d}",
-                outcome="success",
-                occurred_at=now + timedelta(seconds=index),
-            )
-
-    headers = _headers()
-    with TestClient(admin_app) as client:
-        defaults = client.get("/admin/api/risk-monitor/rules", headers=headers)
-        assert defaults.status_code == 200
-        assert defaults.json() == {
-            "sms_hourly_threshold": 5,
-            "oneclick_daily_threshold": 20,
-            "compare_daily_threshold": 100,
-        }
-
-        lowered = client.patch(
-            "/admin/api/risk-monitor/rules",
-            headers=headers,
-            json={
-                "sms_hourly_threshold": 3,
-                "oneclick_daily_threshold": 20,
-                "compare_daily_threshold": 100,
-            },
-        )
-        assert lowered.status_code == 200
-        with SessionLocal() as db:
-            incident = db.query(RiskIncident).filter(
-                RiskIncident.rule_code == risk_repo.RULE_SMS_HOURLY,
-                RiskIncident.subject_id == subject,
-            ).one()
-            assert incident.status == "open"
-            assert incident.event_count == 3
-
-        raised = client.patch(
-            "/admin/api/risk-monitor/rules",
-            headers=headers,
-            json={
-                "sms_hourly_threshold": 4,
-                "oneclick_daily_threshold": 20,
-                "compare_daily_threshold": 100,
-            },
-        )
-        assert raised.status_code == 200
-        with SessionLocal() as db:
-            incident = db.query(RiskIncident).filter(
-                RiskIncident.rule_code == risk_repo.RULE_SMS_HOURLY,
-                RiskIncident.subject_id == subject,
-            ).one()
-            assert incident.status == "resolved"
-            assert incident.action_reason == risk_repo.AUTO_RESOLVED_REASON
-
-        reopened = client.patch(
-            "/admin/api/risk-monitor/rules",
-            headers=headers,
-            json={
-                "sms_hourly_threshold": 3,
-                "oneclick_daily_threshold": 20,
-                "compare_daily_threshold": 100,
-            },
-        )
-        assert reopened.status_code == 200
-        with SessionLocal() as db:
-            incident = db.query(RiskIncident).filter(
-                RiskIncident.rule_code == risk_repo.RULE_SMS_HOURLY,
-                RiskIncident.subject_id == subject,
-            ).one()
-            assert incident.status == "open"
-            assert incident.triggered_at == (
-                now + timedelta(seconds=2)
-            ).replace(tzinfo=None)
-
-        invalid = client.patch(
-            "/admin/api/risk-monitor/rules",
-            headers=headers,
-            json={
-                "sms_hourly_threshold": 21,
-                "oneclick_daily_threshold": 20,
-                "compare_daily_threshold": 100,
-            },
-        )
-        assert invalid.status_code == 422

tests/test_test_account.py

@@ -190,42 +190,6 @@ def test_exempt_from_device_ip_send_rate_limit(client, enabled, monkeypatch) ->
         )
 
 
-def test_send_is_audit_only_and_does_not_trigger_risk_alert(client, enabled) -> None:
-    """测试号不真发短信：可留审计流水，但不能算正式短信下发或触发设备风控。"""
-    from app.db.session import SessionLocal
-    from app.models.risk import BehaviorEvent, RiskIncident
-    from app.repositories import risk as risk_repo
-
-    device_id = "qa-test-account-device"
-    for _ in range(6):
-        response = client.post(
-            "/api/v1/auth/sms/send",
-            json={"phone": TEST_PHONE, "device_id": device_id},
-        )
-        assert response.status_code == 200
-
-    with SessionLocal() as db:
-        events = (
-            db.query(BehaviorEvent)
-            .filter(
-                BehaviorEvent.event_type == risk_repo.EVENT_SMS_SEND,
-                BehaviorEvent.subject_id == device_id,
-            )
-            .all()
-        )
-        assert len(events) == 6
-        assert {event.outcome for event in events} == {"test"}
-        assert (
-            db.query(RiskIncident)
-            .filter(
-                RiskIncident.rule_code == risk_repo.RULE_SMS_HOURLY,
-                RiskIncident.subject_id == device_id,
-            )
-            .count()
-            == 0
-        )
-
-
 # ============================ 计数单元逻辑 ============================
 
 def test_quota_resets_across_day(enabled, monkeypatch) -> None:

tests/test_withdraw.py

@@ -9,7 +9,7 @@ from sqlalchemy import select
 
 from app.db.session import SessionLocal
 from app.models.user import User
-from app.models.wallet import CoinAccount, WechatTransferAuthorization, WithdrawOrder
+from app.models.wallet import CoinAccount, WithdrawOrder, WechatTransferAuthorization
 from app.repositories import wallet as crud_wallet
 
 
@@ -232,78 +232,6 @@ def test_withdraw_approve_transfer_fail_refunds(client, monkeypatch) -> None:
     assert r.json()["items"][0]["status"] == "failed"
 
 
-def test_approved_withdraw_query_fail_exposes_wechat_reason(client, monkeypatch) -> None:
-    """审核通过后微信终态失败时，保存官方失败码对应原因并退回余额。"""
-    monkeypatch.setattr(
-        "app.integrations.wxpay.code_to_userinfo",
-        lambda code: {
-            "openid": "openid_query_fail",
-            "nickname": None,
-            "avatar_url": None,
-            "raw": {},
-        },
-    )
-    monkeypatch.setattr(
-        "app.integrations.wxpay.create_transfer",
-        lambda openid, amount_fen, out_bill_no, user_name=None: {
-            "status_code": 200,
-            "data": {
-                "state": "WAIT_USER_CONFIRM",
-                "package_info": "pkg_query_fail",
-                "transfer_bill_no": "tb_query_fail",
-            },
-        },
-    )
-    token = _login(client, "13800002025")
-    _seed_cash(client, token, "13800002025", 100)
-    client.post("/api/v1/wallet/bind-wechat", json={"code": "c"}, headers=_auth(token))
-
-    response = client.post(
-        "/api/v1/wallet/withdraw",
-        json={"amount_cents": 50},
-        headers=_auth(token),
-    )
-    bill = response.json()["out_bill_no"]
-    _approve(bill)
-
-    monkeypatch.setattr(
-        "app.integrations.wxpay.query_transfer",
-        lambda out_bill_no: {
-            "status_code": 200,
-            "data": {
-                "state": "FAIL",
-                "fail_reason": "PAYEE_ACCOUNT_ABNORMAL",
-                "transfer_bill_no": "tb_query_fail",
-            },
-        },
-    )
-    response = client.get(
-        "/api/v1/wallet/withdraw/status",
-        params={"out_bill_no": bill},
-        headers=_auth(token),
-    )
-
-    assert response.status_code == 200, response.text
-    assert response.json()["status"] == "failed"
-    assert response.json()["wechat_state"] == "FAIL"
-    assert response.json()["fail_reason"] == (
-        "微信转账失败：用户微信账户收款异常（PAYEE_ACCOUNT_ABNORMAL）"
-    )
-    with SessionLocal() as db:
-        order = db.execute(
-            select(WithdrawOrder).where(WithdrawOrder.out_bill_no == bill)
-        ).scalar_one()
-        assert order.transfer_bill_no == "tb_query_fail"
-    account = client.get("/api/v1/wallet/account", headers=_auth(token))
-    assert account.json()["cash_balance_cents"] == 100
-
-
-def test_unknown_wechat_fail_reason_code_is_preserved() -> None:
-    assert crud_wallet._wechat_terminal_failure_reason(
-        {"fail_reason": "NEW_WECHAT_REASON"}, "FAIL"
-    ) == "微信转账失败：NEW_WECHAT_REASON"
-
-
 def test_withdraw_idempotent_same_bill_no(client, monkeypatch) -> None:
     """#2 同 out_bill_no 重试:只转一次,第二次返回同一单,余额只扣一次。"""
     monkeypatch.setattr("app.integrations.wxpay.code_to_userinfo", lambda code: {"openid": "openid_idem", "nickname": None, "avatar_url": None, "raw": {}})
@@ -340,61 +268,6 @@ def test_withdraw_idempotent_same_bill_no(client, monkeypatch) -> None:
     assert sum(1 for t in r.json()["items"] if t["biz_type"] == "withdraw") == 1
 
 
-def test_withdraw_multiple_in_flight_allowed(client, monkeypatch) -> None:
-    """取消「同时仅一单」:已有在途(reviewing)时,不同 out_bill_no 可继续提交,两单并存。"""
-    _patch_userinfo(monkeypatch, "openid_multi_inflight")
-    token = _login(client, "13800002020")
-    _seed_cash(client, token, "13800002020", 100)  # 够两笔 0.5
-    client.post("/api/v1/wallet/bind-wechat", json={"code": "c"}, headers=_auth(token))
-
-    r1 = client.post(
-        "/api/v1/wallet/withdraw",
-        json={"amount_cents": 50, "out_bill_no": "billmulti00000001"},
-        headers=_auth(token),
-    )
-    assert r1.status_code == 200, r1.text
-    assert r1.json()["status"] == "reviewing"
-
-    r2 = client.post(
-        "/api/v1/wallet/withdraw",
-        json={"amount_cents": 50, "out_bill_no": "billmulti00000002"},
-        headers=_auth(token),
-    )
-    assert r2.status_code == 200, r2.text
-    assert r2.json()["status"] == "reviewing"
-
-    # 两张在途单并存
-    r = client.get("/api/v1/wallet/withdraw-orders", headers=_auth(token))
-    reviewing = [o for o in r.json()["items"] if o["status"] == "reviewing"]
-    assert len(reviewing) == 2, r.text
-    # 余额扣两次:100-50-50=0
-    r = client.get("/api/v1/wallet/account", headers=_auth(token))
-    assert r.json()["cash_balance_cents"] == 0
-
-
-def test_withdraw_second_blocked_only_by_insufficient_cash(client, monkeypatch) -> None:
-    """并行放开后第二笔仅受余额约束:余额不足返 409「现金余额不足」,而非旧的「已有提现」拦截。"""
-    _patch_userinfo(monkeypatch, "openid_multi_insuff")
-    token = _login(client, "13800002021")
-    _seed_cash(client, token, "13800002021", 50)  # 仅够一笔 0.5
-    client.post("/api/v1/wallet/bind-wechat", json={"code": "c"}, headers=_auth(token))
-
-    r1 = client.post(
-        "/api/v1/wallet/withdraw",
-        json={"amount_cents": 50, "out_bill_no": "billinsuff0000001"},
-        headers=_auth(token),
-    )
-    assert r1.status_code == 200, r1.text
-
-    r2 = client.post(
-        "/api/v1/wallet/withdraw",
-        json={"amount_cents": 50, "out_bill_no": "billinsuff0000002"},
-        headers=_auth(token),
-    )
-    assert r2.status_code == 409, r2.text
-    assert "现金余额不足" in r2.json()["detail"]
-
-
 def test_withdraw_ambiguous_timeout_then_success_no_refund(client, monkeypatch) -> None:
     """#3 转账调用超时(异常),但查单确认已 SUCCESS → 不退款,单置 success。"""
     monkeypatch.setattr("app.integrations.wxpay.code_to_userinfo", lambda code: {"openid": "openid_amb", "nickname": None, "avatar_url": None, "raw": {}})

tests/test_withdraw_ledger_check.py

@@ -0,0 +1,151 @@
+"""提现现金账本校验(admin ledger-check)测试:两本物理隔离的账各自对账。
+
+历史盲区:`withdraw_ledger_check` 曾拿全部提现单去和**普通现金流水**(cash_transaction)比对,
+而 source=invite_cash 的提现单流水其实在 invite_cash_transaction 表,导致每笔邀请提现单都被
+误报「缺扣款/缺退款流水」。这里用真实提现 API 造单 + before/after 差值断言锁定修复:
+  1) 邀请提现单不再污染普通现金账的缺流水计数;
+  2) 邀请账户已被纳入对账(能抓到它自己的缺流水);
+  3) 普通现金账的原有对账未被改坏。
+
+conftest 的库是 session 级共享、测试间不清,故一律用 before/after 差值,只反映本用例造的数据。
+"""
+from __future__ import annotations
+
+from sqlalchemy import delete, select
+
+from app.admin.repositories.queries import withdraw_ledger_check
+from app.db.session import SessionLocal
+from app.models.user import User
+from app.models.wallet import CoinAccount, InviteCashTransaction
+from app.repositories import wallet as crud_wallet
+
+
+def _login(client, phone: str) -> str:
+    client.post("/api/v1/auth/sms/send", json={"phone": phone})
+    r = client.post("/api/v1/auth/sms/login", json={"phone": phone, "code": "123456"})
+    assert r.status_code == 200, r.text
+    return r.json()["access_token"]
+
+
+def _auth(token: str) -> dict[str, str]:
+    return {"Authorization": f"Bearer {token}"}
+
+
+def _patch_userinfo(monkeypatch, openid: str) -> None:
+    monkeypatch.setattr(
+        "app.integrations.wxpay.code_to_userinfo",
+        lambda code: {"openid": openid, "nickname": None, "avatar_url": None, "raw": {}},
+    )
+
+
+def _seed_balances(client, token: str, phone: str, *, cash: int = 0, invite_cash: int = 0) -> None:
+    client.get("/api/v1/wallet/account", headers=_auth(token))
+    db = SessionLocal()
+    try:
+        user = db.execute(select(User).where(User.phone == phone)).scalar_one()
+        acc = db.get(CoinAccount, user.id)
+        acc.cash_balance_cents = cash
+        acc.invite_cash_balance_cents = invite_cash
+        db.commit()
+    finally:
+        db.close()
+
+
+def _reject(bill: str, reason: str = "测试拒绝") -> None:
+    db = SessionLocal()
+    try:
+        crud_wallet.reject_withdraw(db, bill, reason)
+    finally:
+        db.close()
+
+
+def _ledger() -> dict:
+    db = SessionLocal()
+    try:
+        return withdraw_ledger_check(db)
+    finally:
+        db.close()
+
+
+def test_rejected_invite_withdraw_not_flagged_missing(client, monkeypatch) -> None:
+    """核心回归:一笔被拒绝的 invite_cash 提现单,扣款/退款流水都在 invite_cash_transaction,
+    不应让普通现金账的缺扣款/缺退款计数增加(修复前每笔会各 +1)。"""
+    before = _ledger()
+
+    _patch_userinfo(monkeypatch, "openid_lc_1")
+    token = _login(client, "13800005001")
+    _seed_balances(client, token, "13800005001", cash=0, invite_cash=500)
+    client.post("/api/v1/wallet/bind-wechat", json={"code": "c"}, headers=_auth(token))
+    r = client.post(
+        "/api/v1/wallet/withdraw",
+        json={"amount_cents": 200, "source": "invite_cash"},
+        headers=_auth(token),
+    )
+    assert r.status_code == 200, r.text
+    _reject(r.json()["out_bill_no"])  # rejected + 退款流水落 invite_cash_transaction
+
+    after = _ledger()
+
+    # 普通现金账不该因这笔 invite 单产生缺流水(修复前会各 +1 → 就是页面上看到的误报)
+    assert after["missing_withdraw_txn_count"] == before["missing_withdraw_txn_count"]
+    assert after["missing_refund_txn_count"] == before["missing_refund_txn_count"]
+    # 邀请账扣款 + 退款流水齐全,邀请账自身也不该缺
+    assert after["invite_missing_withdraw_txn_count"] == before["invite_missing_withdraw_txn_count"]
+    assert after["invite_missing_refund_txn_count"] == before["invite_missing_refund_txn_count"]
+
+
+def test_invite_ledger_detects_missing_withdraw_txn(client, monkeypatch) -> None:
+    """删掉一笔 invite 提现单的扣款流水 → 邀请账缺扣款计数 +1、ok=False,
+    证明邀请账户已真正纳入对账(修复前邀请账完全不校验、永远报不出问题)。"""
+    _patch_userinfo(monkeypatch, "openid_lc_2")
+    token = _login(client, "13800005002")
+    _seed_balances(client, token, "13800005002", cash=0, invite_cash=500)
+    client.post("/api/v1/wallet/bind-wechat", json={"code": "c"}, headers=_auth(token))
+    r = client.post(
+        "/api/v1/wallet/withdraw",
+        json={"amount_cents": 200, "source": "invite_cash"},
+        headers=_auth(token),
+    )
+    bill = r.json()["out_bill_no"]
+
+    before = _ledger()
+    db = SessionLocal()
+    try:
+        db.execute(
+            delete(InviteCashTransaction).where(
+                InviteCashTransaction.ref_id == bill,
+                InviteCashTransaction.biz_type == "invite_withdraw",
+            )
+        )
+        db.commit()
+    finally:
+        db.close()
+    after = _ledger()
+
+    assert (
+        after["invite_missing_withdraw_txn_count"]
+        == before["invite_missing_withdraw_txn_count"] + 1
+    )
+    assert after["ok"] is False
+
+
+def test_coin_cash_withdraw_still_reconciled(client, monkeypatch) -> None:
+    """普通现金 coin_cash 提现单齐全时不新增缺流水(确保分账改造没弄坏原有普通现金对账)。"""
+    _patch_userinfo(monkeypatch, "openid_lc_3")
+    token = _login(client, "13800005003")
+    _seed_balances(client, token, "13800005003", cash=500, invite_cash=0)
+    client.post("/api/v1/wallet/bind-wechat", json={"code": "c"}, headers=_auth(token))
+
+    before = _ledger()
+    r = client.post(
+        "/api/v1/wallet/withdraw",
+        # 50 分 = 0.5 元档(7-9 起 coin_cash 只能提预设档位)
+        json={"amount_cents": 50, "source": "coin_cash"},
+        headers=_auth(token),
+    )
+    assert r.status_code == 200, r.text
+    after = _ledger()
+
+    # 普通现金提现扣款流水随单写入 cash_transaction,缺扣款计数不变;邀请账更不受影响
+    assert after["missing_withdraw_txn_count"] == before["missing_withdraw_txn_count"]
+    assert after["invite_missing_withdraw_txn_count"] == before["invite_missing_withdraw_txn_count"]