Merge branch 'main' of https://gitea.shaguabijia.com/WonderableAI/shaguabijia-app-server into feat/analytics-success-rate

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

.env.example

@@ -27,55 +27,7 @@ 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
 
-# ===== 厂商直推(无障碍保护存活告警 + 消息中心 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 后置兜底)=====
+# ===== 无障碍保护存活监控(pull 后置检测;本期不接推送)=====
 HEARTBEAT_MONITOR_ENABLED=true
 HEARTBEAT_TIMEOUT_MINUTES=60
 HEARTBEAT_SCAN_INTERVAL_SEC=60
@@ -185,19 +137,3 @@ PANGLE_REPORT_SECURITY_KEY=
 # GroMore AppId(报表 site_id 维度)→ 应用环境;默认取现网两个应用,按需覆盖。
 PANGLE_REPORT_SITE_ID_PROD=5830519
 PANGLE_REPORT_SITE_ID_TEST=5832303
-
-# ===== 可观测(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

AGENTS.md

@@ -1,116 +0,0 @@
-# AGENTS.md
-
-This file provides guidance to Codex (Codex.ai/code) when working with code in this repository.
-
-## Project overview
-
-Shaguabijia (傻瓜比价) App backend — FastAPI + SQLAlchemy 2.0 + JWT. Covers user auth (Jiguang one-click / SMS), welfare wallet (coins/cash/signin/tasks/savings), WeChat Pay withdrawals, ad-reward callbacks (Pangle/GroMore S2S), Meituan CPS (coupon forwarding / price comparison), and an admin backend.
-
-## Commands
-
-```bash
-# Install
-pip install -e ".[dev]"
-
-# Run app server (port 8770, auto-migrates, auto-reload)
-./run.sh                    # or: uvicorn app.main:app --reload --port 8770
-
-# Run admin server (port 8771, separate process)
-uvicorn app.admin.main:admin_app --reload --port 8771
-
-# Database
-alembic upgrade head        # apply all migrations (idempotent)
-alembic revision --autogenerate -m "description"  # generate new migration
-
-# Tests
-pytest -q                   # all tests
-pytest tests/test_auth.py -q        # single file
-pytest -k "test_sms_login" -q       # single test by name
-
-# Lint
-ruff check .
-ruff check --fix .
-```
-
-## Architecture: two FastAPI apps
-
-This repo runs **two separate FastAPI processes** sharing the same `app/` codebase (models, repositories, integrations, config):
-
-| | App server | Admin server |
-|---|---|---|
-| Entry | `app/main.py` → `app:app` | `app/admin/main.py` → `admin_app` |
-| Port | 8770 | 8771 |
-| Auth | User JWT (`JWT_SECRET_KEY`) | Admin JWT (`ADMIN_JWT_SECRET`, independent) |
-| Audience | Mobile app clients | Internal admin dashboard |
-| Docs | `/docs` (non-prod only) | `/admin/docs` (non-prod only) |
-
-The two apps are intentionally decoupled — `app.main` never imports `app.admin`. Admin has its own auth chain (`app/admin/deps.py`, `app/admin/security.py`), role-based guards (`require_role`), and routers under `app/admin/routers/`.
-
-## Layered request flow
-
-```
-api/v1/  (thin: parse → delegate → respond + HTTP errors)
-  ├── integrations/   (external SDKs: signature, encryption, HTTP calls)
-  └── repositories/   (data access + transactions)
-        └── models/   (SQLAlchemy ORM, DeclarativeBase)
-```
-
-- **`api/v1/`**: Route handlers. Keep these thin — parse request, call repository or integration, return response. Never put business logic or external HTTP here.
-- **`api/deps.py`**: Shared FastAPI dependencies — `get_current_user` (Bearer JWT → User ORM object), `get_db` (request-scoped session).
-- **`integrations/`**: All external service logic — Jiguang REST + RSA decryption, WeChat Pay V3 signing/encryption, Meituan CPS gateway signing, Pangle callback signature verification, SMS sending. This is the layer you change when swapping vendors.
-- **`repositories/`**: Data access. Each file wraps SQLAlchemy queries + transactions for one domain (user, wallet, signin, savings, ad_reward, etc.). Some repositories also call integrations (e.g., `wallet.py` calls `integrations/wxpay.py` for withdrawals).
-- **`models/`**: ORM table definitions (SQLAlchemy 2.0 `Mapped` style, `DeclarativeBase`). Every new model must be imported in `app/models/__init__.py` so Alembic can discover it.
-- **`schemas/`**: Pydantic request/response contracts.
-- **`core/`**: Infrastructure — config (`pydantic-settings`), JWT (`security.py`), in-memory rate limiter (`ratelimit.py`), reward constants (`rewards.py`), logging setup, pricebot router (consistent-hash load balancing), withdraw reconcile worker.
-
-## Internal (server-to-server) endpoints
-
-Endpoints under `app/api/internal/` are for server-to-server communication (pricebot → app-server), NOT for clients. They use a shared secret header `X-Internal-Secret` (compared via `hmac.compare_digest`) instead of user JWT. If `INTERNAL_API_SECRET` is empty, these endpoints return 503.
-
-## Auth system
-
-- **User login**: Jiguang one-click (`integrations/jiguang.py` — REST token verification + RSA decryption with multi-padding retry) or SMS code (mock by default; `SMS_MOCK=true`).
-- **Tokens**: JWT access (2h) + refresh (30d). Both are JWT with `typ` claim (`"access"` vs `"refresh"`) to prevent refresh-as-access. See `core/security.py`.
-- **Admin auth**: Separate JWT secret (`ADMIN_JWT_SECRET`), 12h expiry, no refresh. Username + bcrypt password login. Role-based access via `require_role()` guard in `app/admin/deps.py` (`super_admin` bypasses all role checks).
-- **Rate limiting**: In-memory fixed-window by client IP (`core/ratelimit.py`). Single-worker only; disabled in tests via `RATE_LIMIT_ENABLED=false`.
-
-## Database
-
-- **Dev**: SQLite (`sqlite:///./data/app.db`), `check_same_thread=False`, no connection pool.
-- **Prod**: PostgreSQL — just change `DATABASE_URL` in `.env`. Pool size 10 + max overflow 20, pool_recycle 3600.
-- **Migrations**: Alembic with `render_as_batch` for SQLite compatibility. ~60+ migration files in `alembic/versions/` (filenames are descriptive, not hex prefixes). Migration chain uses `down_revision` within each file.
-- **New models**: Define in `app/models/`, import in `app/models/__init__.py`, then run `alembic revision --autogenerate`.
-
-## Config
-
-All config via `pydantic-settings` in `app/core/config.py`. Single `Settings` class with env vars / `.env` file. Access anywhere via `from app.core.config import settings`. Key patterns:
-- `*_configured` properties gate features gracefully (e.g., `mt_cps_configured`, `wxpay_configured`, `pangle_callback_configured`) — missing credentials → endpoints return empty/503 rather than crashing at startup.
-- Prod validation: `_enforce_prod_secrets` model validator blocks startup if `APP_ENV=prod` with weak JWT secrets.
-
-## Testing
-
-- `tests/conftest.py`: Sets env vars BEFORE imports, creates temp SQLite file, builds all tables with `Base.metadata.create_all()`, tears down with `drop_all()` + unlink.
-- External integrations are monkeypatched in tests (e.g., WeChat Pay, Jiguang, Pangle callbacks) — tests never make real HTTP calls.
-- `TestClient` from FastAPI is used for all tests. Rate limiting is disabled globally in tests.
-
-## Key integration details
-
-- **Jiguang one-click login**: REST call to verify `loginToken`, then RSA decrypt the returned phone number. Multiple padding schemes tried in order (PKCS1v15, OAEP with SHA1/SHA256) because Jiguang's encryption padding varies.
-- **WeChat Pay withdrawals**: V3 API merchant transfer to user WeChat balance. Lazy-loads merchant certificates from `secrets/`. Withdrawal flow: bind WeChat → create withdraw order → auto-reconcile worker polls pending orders.
-- **Pangle ad rewards**: S2S callback verification via SHA256 signature. Multiple `m-key` secrets supported (one per ad placement). Callback is idempotent by `trans_id`. Test grant endpoint (`AD_REWARD_TEST_GRANT_ENABLED`) for local debugging — must be false in prod.
-- **Meituan CPS**: Gateway signature-based API calls. Proxy support (`MT_CPS_PROXY`) for local dev (direct connection causes SSL EOF). Coupon endpoints gracefully return empty when credentials are missing.
-- **Pricebot forwarding**: `/api/v1/coupon/step` and `/api/v1/compare/*` proxy to pricebot-backend. Multi-instance support with consistent-hash routing by `trace_id` (see `core/pricebot_router.py`).
-- **CPS redirect**: `/c/{code}` is a public (no auth) short-link redirect — records a click then 302s to Meituan. Click recording failure never blocks the redirect.
-
-## Money and units
-
-All monetary amounts are in **cents** (`*_cents` fields). Coins/gold have their own unit. Conversion constants are in `core/rewards.py`.
-
-## Scripts
-
-Key operational scripts in `scripts/`:
-- `migrate.sh` — run migrations standalone
-- `create_admin.py` — create admin user
-- `daily_auto_exchange.py` — auto-convert coins to cash (triggered by systemd timer)
-- `reconcile_withdraws.py` — reconcile withdrawal orders with WeChat Pay
-- `sim_pangle_callback.py` — simulate Pangle S2S callback for testing

alembic/versions/135e79414fd0_add_inactivity_tables.py

@@ -1,68 +0,0 @@
-"""add inactivity tables
-
-Revision ID: 135e79414fd0
-Revises: comparison_llm_cost
-Create Date: 2026-07-16 18:31:02.105929
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = '135e79414fd0'
-down_revision: Union[str, Sequence[str], None] = 'comparison_llm_cost'
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    op.create_table(
-        "inactivity_reset_log",
-        sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
-        sa.Column("user_id", sa.Integer(), nullable=False),
-        sa.Column("coin_balance_before", sa.Integer(), nullable=False),
-        sa.Column("cash_balance_cents_before", sa.Integer(), nullable=False),
-        sa.Column("invite_cash_balance_cents_before", sa.Integer(), nullable=False),
-        sa.Column("last_active_at", sa.DateTime(timezone=True), nullable=True),
-        sa.Column("inactive_days", sa.Integer(), nullable=False),
-        sa.Column("reason", sa.String(length=32), nullable=False),
-        sa.Column("reset_at", sa.DateTime(timezone=True),
-                  server_default=sa.text("(CURRENT_TIMESTAMP)"), nullable=False),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    with op.batch_alter_table("inactivity_reset_log", schema=None) as batch_op:
-        batch_op.create_index(batch_op.f("ix_inactivity_reset_log_user_id"), ["user_id"], unique=False)
-        batch_op.create_index(batch_op.f("ix_inactivity_reset_log_reset_at"), ["reset_at"], unique=False)
-
-    op.create_table(
-        "inactivity_notification_log",
-        sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
-        sa.Column("user_id", sa.Integer(), nullable=False),
-        sa.Column("stage", sa.Integer(), nullable=False),
-        sa.Column("inactive_days", sa.Integer(), nullable=False),
-        sa.Column("coin_balance", sa.Integer(), nullable=False),
-        sa.Column("cash_balance_cents", sa.Integer(), nullable=False),
-        sa.Column("invite_cash_balance_cents", sa.Integer(), nullable=False),
-        sa.Column("channel", sa.String(length=16), nullable=False),
-        sa.Column("status", sa.String(length=16), nullable=False),
-        sa.Column("created_at", sa.DateTime(timezone=True),
-                  server_default=sa.text("(CURRENT_TIMESTAMP)"), nullable=False),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    with op.batch_alter_table("inactivity_notification_log", schema=None) as batch_op:
-        batch_op.create_index(batch_op.f("ix_inactivity_notification_log_user_id"), ["user_id"], unique=False)
-        batch_op.create_index(batch_op.f("ix_inactivity_notification_log_created_at"), ["created_at"], unique=False)
-
-
-def downgrade() -> None:
-    with op.batch_alter_table("inactivity_notification_log", schema=None) as batch_op:
-        batch_op.drop_index(batch_op.f("ix_inactivity_notification_log_created_at"))
-        batch_op.drop_index(batch_op.f("ix_inactivity_notification_log_user_id"))
-    op.drop_table("inactivity_notification_log")
-    with op.batch_alter_table("inactivity_reset_log", schema=None) as batch_op:
-        batch_op.drop_index(batch_op.f("ix_inactivity_reset_log_reset_at"))
-        batch_op.drop_index(batch_op.f("ix_inactivity_reset_log_user_id"))
-    op.drop_table("inactivity_reset_log")

alembic/versions/1a924c274fce_merge_direct_vendor_push_and_feedback_.py

@@ -1,26 +0,0 @@
-"""merge direct_vendor_push and feedback_type_reply heads
-
-Revision ID: 1a924c274fce
-Revises: direct_vendor_push_fields, feedback_type_reply
-Create Date: 2026-07-14 18:53:02.856979
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = '1a924c274fce'
-down_revision: Union[str, Sequence[str], None] = ('direct_vendor_push_fields', 'feedback_type_reply')
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    pass
-
-
-def downgrade() -> None:
-    pass

alembic/versions/ad_ecpm_trace_id.py

@@ -1,44 +0,0 @@
-"""ad_ecpm_record.trace_id(展示收益归属到比价/领券 trace)
-
-信息流(Draw)展示 eCPM 上报时带上本场比价/领券 trace_id,落此列;领券数据 / 比价记录看板
-按 trace_id 聚合"本次广告收益"。激励视频/福利/旧客户端为 NULL。
-
-本迁移原以 (11c44afbea58, merge_pages_override_coupon_slot) 为双亲、顺带收敛双 head,
-但与它并行落 main 的 merge_selfstat_coupon_slot 已用同一对双亲做了纯收敛 → 同一对
-父节点出现两个收敛点、main 上又成双 head。故重挂到该 merge 之后成单链(仅改链接、
-schema 改动不变;两文件都保留,已 stamp 在 merge 上的库可直接线性升级)。
-
-Revision ID: ad_ecpm_trace_id
-Revises: merge_selfstat_coupon_slot
-Create Date: 2026-07-10
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-revision: str = "ad_ecpm_trace_id"
-down_revision: Union[str, Sequence[str], None] = "merge_selfstat_coupon_slot"
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    # SQLite 下 ADD COLUMN(可空)与 CREATE INDEX 均原生支持,无需 batch_alter_table
-    # (同 ad_feed_reward_trace_id 迁移)。
-    op.add_column(
-        "ad_ecpm_record",
-        sa.Column("trace_id", sa.String(length=64), nullable=True),
-    )
-    op.create_index(
-        op.f("ix_ad_ecpm_record_trace_id"),
-        "ad_ecpm_record",
-        ["trace_id"],
-        unique=False,
-    )
-
-
-def downgrade() -> None:
-    op.drop_index(op.f("ix_ad_ecpm_record_trace_id"), table_name="ad_ecpm_record")
-    op.drop_column("ad_ecpm_record", "trace_id")

alembic/versions/analytics_active_idx_active_composite_index.py

@@ -1,36 +0,0 @@
-"""analytics_event 活跃口径复合索引
-
-Revision ID: analytics_active_idx
-Revises: 135e79414fd0
-Create Date: 2026-07-18 17:35:00.000000
-
-给 analytics_event 加活跃口径热点复合索引 (event, page, user_id, created_at):
-activity.active_event_condition 按 (event=show & page=home) ∪ 比价 ∪ 领券 过滤后
-group by user_id、max(created_at)。覆盖索引让该聚合走 index-only,避免高频 show 事件全表扫。
-
-⚠️ 本分支迁移树有**既有多头**:135e79414fd0(不活跃两表)与 phone_rebind_log 同从
-comparison_llm_cost 分叉,`alembic upgrade head` 会多头报错。本迁移挂在 135e79414fd0
-一侧;集成到 main 时需 `alembic merge` 合并 phone_rebind_log 那个头(与本迁移无关的既有问题)。
-"""
-from typing import Sequence, Union
-
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision: str = "analytics_active_idx"
-down_revision: Union[str, Sequence[str], None] = "135e79414fd0"
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    op.create_index(
-        "ix_analytics_event_active",
-        "analytics_event",
-        ["event", "page", "user_id", "created_at"],
-        unique=False,
-    )
-
-
-def downgrade() -> None:
-    op.drop_index("ix_analytics_event_active", table_name="analytics_event")

alembic/versions/comparison_llm_cost.py

@@ -1,33 +0,0 @@
-"""comparison_record: llm_cost_yuan + llm_price_snapshot(比价 LLM 调用成本 + 当时单价快照)
-
-回填 llm_calls 时按「当时的价」逐模型算出本次比价 LLM 总成本(元),连同所用单价快照一起冻结到
-记录上;admin 比价记录详情展示实际成本(旧记录 NULL → 前端回退估算)。见 services/llm_cost.py。
-
-Revision ID: comparison_llm_cost
-Revises: ad_ecpm_trace_id
-Create Date: 2026-07-13
-"""
-from collections.abc import Sequence
-
-import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
-from alembic import op
-
-revision: str = "comparison_llm_cost"
-down_revision: str | Sequence[str] | None = "ad_ecpm_trace_id"
-branch_labels: str | Sequence[str] | None = None
-depends_on: str | Sequence[str] | None = None
-
-_JSONB = sa.JSON().with_variant(postgresql.JSONB(), "postgresql")
-
-
-def upgrade() -> None:
-    # 均可空、无索引;SQLite 原生支持 ADD COLUMN,无需 batch_alter_table(同 comparison_debug_fields)。
-    op.add_column("comparison_record", sa.Column("llm_cost_yuan", sa.Float(), nullable=True))
-    op.add_column("comparison_record", sa.Column("llm_price_snapshot", _JSONB, nullable=True))
-
-
-def downgrade() -> None:
-    op.drop_column("comparison_record", "llm_price_snapshot")
-    op.drop_column("comparison_record", "llm_cost_yuan")

alembic/versions/coupon_claim_app_env.py

@@ -1,32 +0,0 @@
-"""coupon_claim_record 加 app_env 列(领券所属 session 环境;每券成功率表按它过滤 prod/dev)
-
-Revision ID: coupon_claim_app_env
-Revises: coupon_session_platform_success
-Create Date: 2026-07-08 00:00:00.000000
-
-"""
-
-from collections.abc import Sequence
-
-import sqlalchemy as sa
-
-from alembic import op
-
-revision: str = "coupon_claim_app_env"
-down_revision: str | Sequence[str] | None = "coupon_session_platform_success"
-branch_labels: str | Sequence[str] | None = None
-depends_on: str | Sequence[str] | None = None
-
-
-def upgrade() -> None:
-    with op.batch_alter_table("coupon_claim_record", schema=None) as batch_op:
-        batch_op.add_column(sa.Column("app_env", sa.String(length=16), nullable=True))
-        batch_op.create_index(
-            "ix_coupon_claim_record_app_env", ["app_env"], unique=False
-        )
-
-
-def downgrade() -> None:
-    with op.batch_alter_table("coupon_claim_record", schema=None) as batch_op:
-        batch_op.drop_index("ix_coupon_claim_record_app_env")
-        batch_op.drop_column("app_env")

alembic/versions/coupon_session_platform_success.py

@@ -1,37 +0,0 @@
-"""coupon_session 加 platform_success 列(本次至少领到一张的平台 id 列表)
-
-供 admin「领券数据」算 ②整单成功率 / ③点位成功率(平台粒度)。数据落点:服务端 /step 逐帧
-按 trace_id 并集写入(见 app/repositories/coupon_state.merge_session_platform_success)。旧行 NULL
-视作空集,已建表环境靠它补列、全新环境顺序应用不重复加列。设计:docs/guides/领券成功率指标-设计与埋点.md。
-
-Revision ID: coupon_session_platform_success
-Revises: admin_user_plain_password
-Create Date: 2026-07-07 00:00:00.000000
-
-"""
-
-from collections.abc import Sequence
-
-import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision: str = "coupon_session_platform_success"
-down_revision: str | Sequence[str] | None = "admin_user_plain_password"
-branch_labels: str | Sequence[str] | None = None
-depends_on: str | Sequence[str] | None = None
-
-# PG 用 JSONB,SQLite(本地/测试)退化为通用 JSON(同 model 的 _JSON variant / 建表迁移)。
-_JSON = sa.JSON().with_variant(postgresql.JSONB(), "postgresql")
-
-
-def upgrade() -> None:
-    with op.batch_alter_table("coupon_session", schema=None) as batch_op:
-        batch_op.add_column(sa.Column("platform_success", _JSON, nullable=True))
-
-
-def downgrade() -> None:
-    with op.batch_alter_table("coupon_session", schema=None) as batch_op:
-        batch_op.drop_column("platform_success")

alembic/versions/direct_vendor_push_fields.py

@@ -1,30 +0,0 @@
-"""add direct vendor push fields
-
-Revision ID: direct_vendor_push_fields
-Revises: jd_cps_order_fields
-Create Date: 2026-07-01 16:30:00.000000
-"""
-from __future__ import annotations
-
-from alembic import op
-import sqlalchemy as sa
-
-
-revision = "direct_vendor_push_fields"
-down_revision = "jd_cps_order_fields"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    with op.batch_alter_table("device_liveness") as batch_op:
-        batch_op.add_column(sa.Column("push_vendor", sa.String(length=32), nullable=True))
-        batch_op.add_column(sa.Column("push_token", sa.String(length=256), nullable=True))
-        batch_op.create_index("ix_device_liveness_push_vendor", ["push_vendor"])
-
-
-def downgrade() -> None:
-    with op.batch_alter_table("device_liveness") as batch_op:
-        batch_op.drop_index("ix_device_liveness_push_vendor")
-        batch_op.drop_column("push_token")
-        batch_op.drop_column("push_vendor")

alembic/versions/merge_active_phone_merge_inactivity_analytics_active_idx_.py

@@ -1,25 +0,0 @@
-"""merge inactivity(analytics_active_idx) + phone_rebind_log heads
-
-Revision ID: merge_active_phone
-Revises: analytics_active_idx, phone_rebind_log
-Create Date: 2026-07-18 18:52:34.001148
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-
-
-# revision identifiers, used by Alembic.
-revision: str = 'merge_active_phone'
-down_revision: Union[str, Sequence[str], None] = ('analytics_active_idx', 'phone_rebind_log')
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    pass
-
-
-def downgrade() -> None:
-    pass

alembic/versions/merge_pages_override_coupon_slot.py

@@ -1,28 +0,0 @@
-"""合并两个 alembic head:admin_user_pages_override(#126 权限)+ coupon_claim_app_env(领券成功率)。
-
-两条迁移都从 admin_user_plain_password 分叉——#126 经 pull main 进入本分支,领券成功率为本分支新增——
-于是出现两个 head。本迁移仅把二者收敛成单 head,让 `alembic upgrade head`(单数,部署/run.sh 用)
-恢复正常;**不含任何表结构 / 数据改动**(纯 merge)。
-
-Revision ID: merge_pages_override_coupon_slot
-Revises: admin_user_pages_override, coupon_claim_app_env
-Create Date: 2026-07-09 00:00:00.000000
-"""
-
-from collections.abc import Sequence
-
-revision: str = "merge_pages_override_coupon_slot"
-down_revision: str | Sequence[str] | None = (
-    "admin_user_pages_override",
-    "coupon_claim_app_env",
-)
-branch_labels: str | Sequence[str] | None = None
-depends_on: str | Sequence[str] | None = None
-
-
-def upgrade() -> None:
-    """纯合并 head,无 schema 改动。"""
-
-
-def downgrade() -> None:
-    """拆回两个 head,无 schema 改动。"""

alembic/versions/merge_selfstat_coupon_slot.py

@@ -1,29 +0,0 @@
-"""合并两个 alembic head:11c44afbea58(#127 埋点健康度 selfstat)+ merge_pages_override_coupon_slot(#130 自带的合并迁移)。
-
-三条分支都从 admin_user_plain_password 分叉(#126 权限 / #127 selfstat / #130 领券成功率)。
-#130 自带的 merge 创建时本地 main 尚无 #127 的 11c44afbea58,只收敛了 #126 + 自身两条,
-#130 合入后 main 上仍留两个 head → `alembic upgrade head`(单数,部署/run.sh 用)直接报错、服务起不来。
-本迁移仅把二者收敛成单 head;**不含任何表结构 / 数据改动**(纯 merge)。
-
-Revision ID: merge_selfstat_coupon_slot
-Revises: 11c44afbea58, merge_pages_override_coupon_slot
-Create Date: 2026-07-10 00:00:00.000000
-"""
-
-from collections.abc import Sequence
-
-revision: str = "merge_selfstat_coupon_slot"
-down_revision: str | Sequence[str] | None = (
-    "11c44afbea58",
-    "merge_pages_override_coupon_slot",
-)
-branch_labels: str | Sequence[str] | None = None
-depends_on: str | Sequence[str] | None = None
-
-
-def upgrade() -> None:
-    """纯合并 head,无 schema 改动。"""
-
-
-def downgrade() -> None:
-    """拆回两个 head,无 schema 改动。"""

alembic/versions/notification_table.py

@@ -1,68 +0,0 @@
-"""notification table (消息通知中心 站内消息)
-
-Revision ID: notification_table
-Revises: 1a924c274fce
-Create Date: 2026-07-15 12:00:00.000000
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
-
-# revision identifiers, used by Alembic.
-revision: str = 'notification_table'
-down_revision: Union[str, Sequence[str], None] = '1a924c274fce'
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-# PG 用 JSONB,SQLite 退化为通用 JSON(与 models/notification._JSON 一致)。
-_JSON = sa.JSON().with_variant(postgresql.JSONB(), 'postgresql')
-
-
-def upgrade() -> None:
-    op.create_table(
-        'notification',
-        sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
-        sa.Column('user_id', sa.Integer(), nullable=False),
-        sa.Column('type', sa.String(length=32), nullable=False),
-        sa.Column('coins', sa.Integer(), nullable=True),
-        sa.Column('cash_cents', sa.Integer(), nullable=True),
-        sa.Column('info_rows', _JSON, nullable=False),
-        sa.Column('extra', _JSON, nullable=False),
-        sa.Column('is_read', sa.Boolean(), nullable=False),
-        sa.Column('read_at', sa.DateTime(timezone=True), nullable=True),
-        sa.Column('dedup_key', sa.String(length=64), nullable=True),
-        sa.Column('sent_at', sa.DateTime(timezone=True), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=False),
-        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.ForeignKeyConstraint(['user_id'], ['user.id'], ),
-        sa.PrimaryKeyConstraint('id'),
-    )
-    with op.batch_alter_table('notification', schema=None) as batch_op:
-        batch_op.create_index('ix_notification_type', ['type'], unique=False)
-        # 列表分页:按用户取 + sent_at 倒序
-        batch_op.create_index('ix_notification_user_sent', ['user_id', 'sent_at'], unique=False)
-        # 铃铛角标:count where user_id=? and is_read=false —— 部分索引只覆盖未读行
-        batch_op.create_index(
-            'ix_notification_user_unread', ['user_id'], unique=False,
-            sqlite_where=sa.text('is_read = 0'),
-            postgresql_where=sa.text('is_read = false'),
-        )
-        # 去重/合并:同一 (user, type, dedup_key) 未读期间只允许一条(已读后可再生成)
-        batch_op.create_index(
-            'uq_notification_user_type_dedup', ['user_id', 'type', 'dedup_key'], unique=True,
-            sqlite_where=sa.text('dedup_key IS NOT NULL AND is_read = 0'),
-            postgresql_where=sa.text('dedup_key IS NOT NULL AND is_read = false'),
-        )
-
-
-def downgrade() -> None:
-    with op.batch_alter_table('notification', schema=None) as batch_op:
-        batch_op.drop_index('uq_notification_user_type_dedup')
-        batch_op.drop_index('ix_notification_user_unread')
-        batch_op.drop_index('ix_notification_user_sent')
-        batch_op.drop_index('ix_notification_type')
-    op.drop_table('notification')

alembic/versions/phone_rebind_log.py

@@ -1,32 +0,0 @@
-"""phone_rebind_log 表(M2 换绑 30 天限制台账)
-
-Revision ID: phone_rebind_log
-Revises: comparison_llm_cost
-"""
-from alembic import op
-import sqlalchemy as sa
-
-revision = "phone_rebind_log"
-down_revision = "comparison_llm_cost"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    op.create_table(
-        "phone_rebind_log",
-        sa.Column("id", sa.Integer(), primary_key=True, autoincrement=True),
-        sa.Column("phone", sa.String(length=20), nullable=False),
-        sa.Column("old_user_id", sa.Integer(), nullable=True),
-        sa.Column("new_user_id", sa.Integer(), nullable=False),
-        sa.Column("source", sa.String(length=32), nullable=False, server_default="wechat_conflict"),
-        sa.Column("rebound_at", sa.DateTime(timezone=True), server_default=sa.func.now(), nullable=False),
-    )
-    op.create_index("ix_phone_rebind_log_phone", "phone_rebind_log", ["phone"])
-    op.create_index("ix_phone_rebind_log_rebound_at", "phone_rebind_log", ["rebound_at"])
-
-
-def downgrade() -> None:
-    op.drop_index("ix_phone_rebind_log_rebound_at", table_name="phone_rebind_log")
-    op.drop_index("ix_phone_rebind_log_phone", table_name="phone_rebind_log")
-    op.drop_table("phone_rebind_log")

app/admin/repositories/coupon_data.py

@@ -5,21 +5,17 @@
 - 发起数 = 区间内全部 session(含 started/completed/failed/abandoned),= 流失统计的基数。
 - 完成数 / 耗时均值 / 分位 = 仅 status==completed 子集(成功跑完才有可比的"领券耗时")。
 - summary/daily/hourly/total 在全量上算,不受分页;items 为排序后当前页。
-- 另含 coupon_slot_report(数据源 coupon_claim_record):按 coupon_id「按券成功率」表,见设计 §13。
 """
 from __future__ import annotations
 
-from datetime import UTC, datetime
-from datetime import date as _date
+from datetime import UTC, date as _date, datetime
 
-from sqlalchemy import case, func, or_, select
+from sqlalchemy import func, or_, select
 from sqlalchemy.orm import Session
 
 from app.core import rewards
-from app.models.coupon_state import CouponClaimRecord, CouponSession
+from app.models.coupon_state import CouponSession
 from app.models.user import User
-from app.repositories import ad_ecpm as crud_ecpm
-from app.repositories.coupon_state import DEFAULT_PLATFORMS, coupon_id_to_platform
 
 
 def _cn_hour(dt: datetime) -> int:
@@ -46,47 +42,7 @@ def _avg(vals: list[int]) -> int | None:
     return round(sum(vals) / len(vals)) if vals else None
 
 
-def _success_rates(rows: list) -> dict:
-    """平台粒度成功率(见 docs/guides/领券成功率指标-设计与埋点.md §3/§12):
-
-    - sel(s) = 勾选平台(`platforms` 空 → 全领三档 DEFAULT_PLATFORMS);
-    - succ(s) = `platform_success` ∩ sel(至少领到一张的平台);
-    - ② 整单成功率 = #{sel⊆succ 且 sel≠∅} / 发起数;
-    - ③ 点位成功率 = Σ|succ| / Σ|sel|;per_platform[p] = 勾了 p 且成功 / 勾了 p。
-    基数含全部 session(started/completed/failed/abandoned),与「发起数」同基数。
-    """
-    started = len(rows)
-    full_success = 0
-    point_success = 0
-    point_total = 0
-    per_succ = {p: 0 for p in DEFAULT_PLATFORMS}
-    per_total = {p: 0 for p in DEFAULT_PLATFORMS}
-    for r in rows:
-        sel = set(r.platforms) if r.platforms else set(DEFAULT_PLATFORMS)
-        succ = set(r.platform_success or []) & sel
-        point_success += len(succ)
-        point_total += len(sel)
-        if sel and succ == sel:
-            full_success += 1
-        for p in sel:
-            if p in per_total:  # 只统计三档已知平台;未知/非法平台 id 不进 per_platform
-                per_total[p] += 1
-                if p in succ:
-                    per_succ[p] += 1
-    return {
-        "full_success_count": full_success,
-        "full_success_rate": round(full_success / started, 4) if started else None,
-        "point_success_count": point_success,
-        "point_total_count": point_total,
-        "point_success_rate": round(point_success / point_total, 4) if point_total else None,
-        "per_platform": {
-            p: (round(per_succ[p] / per_total[p], 4) if per_total[p] else None)
-            for p in DEFAULT_PLATFORMS
-        },
-    }
-
-
-def _session_to_row(r, phone: str | None = None, nickname: str | None = None, ad_revenue_yuan: float = 0.0) -> dict:
+def _session_to_row(r, phone: str | None = None, nickname: str | None = None) -> dict:
     """CouponSession ORM → 明细行 dict(主表「领券数据」与「用户全部领券」抽屉共用)。"""
     return {
         "id": r.id,
@@ -105,7 +61,6 @@ def _session_to_row(r, phone: str | None = None, nickname: str | None = None, ad
         "started_at": r.started_at,
         "claimed_count": r.claimed_count,
         "trace_url": r.trace_url,
-        "ad_revenue_yuan": ad_revenue_yuan,
     }
 
 
@@ -129,7 +84,6 @@ def coupon_data_report(
     date_to: str,
     user: str | None = None,
     app_env: str | None = None,
-    statuses: list[str] | None = None,
     granularity: str = "day",
     limit: int = 500,
     offset: int = 0,
@@ -139,8 +93,6 @@ def coupon_data_report(
 
     - user:手机号/昵称模糊搜(匹配不到任何用户 → 空结果)。
     - app_env:prod/dev 精确;None=全部。
-    - statuses:领券状态多选(started/completed/failed/abandoned);None/空=全部。整个视图
-      (汇总/成功率/趋势/明细)按选中状态算,与 app_env 同级过滤(方案 A)。
     - sort:time=发起时刻倒序(默认) / elapsed=全程耗时倒序(None 末尾)。
     """
     by_hour = granularity == "hour"
@@ -163,8 +115,6 @@ def coupon_data_report(
     )
     if app_env is not None:
         stmt = stmt.where(CouponSession.app_env == app_env)
-    if statuses:
-        stmt = stmt.where(CouponSession.status.in_(statuses))
     if user_ids is not None:
         stmt = stmt.where(CouponSession.user_id.in_(user_ids))
     rows = list(db.execute(stmt).scalars())
@@ -181,7 +131,6 @@ def coupon_data_report(
         "p50_ms": _percentile(completed_elapsed, 50),
         "p95_ms": _percentile(completed_elapsed, 95),
         "p99_ms": _percentile(completed_elapsed, 99),
-        **_success_rates(rows),
     }
 
     # ── 按天趋势(柱=发起/完成数,线=平均耗时)──
@@ -248,11 +197,10 @@ def coupon_data_report(
                 select(User.id, User.phone, User.nickname).where(User.id.in_(uids))
             ).all()
         }
-    rev_map = crud_ecpm.revenue_yuan_by_trace(db, [r.trace_id for r in page])
     items = []
     for r in page:
         phone, nickname = user_map.get(r.user_id, (None, None)) if r.user_id is not None else (None, None)
-        items.append(_session_to_row(r, phone, nickname, ad_revenue_yuan=rev_map.get(r.trace_id, 0.0)))
+        items.append(_session_to_row(r, phone, nickname))
 
     return {
         "summary": summary,
@@ -274,57 +222,4 @@ def coupon_user_records(db: Session, *, user_id: int, limit: int = 100) -> dict:
     total = db.execute(
         select(func.count()).select_from(CouponSession).where(CouponSession.user_id == user_id)
     ).scalar_one()
-    rev_map = crud_ecpm.revenue_yuan_by_trace(db, [r.trace_id for r in rows])
-    return {
-        "items": [_session_to_row(r, ad_revenue_yuan=rev_map.get(r.trace_id, 0.0)) for r in rows],
-        "total": int(total),
-    }
-
-
-_SLOT_OK = ("success", "already_claimed")
-_SLOT_TRIED = ("success", "already_claimed", "failed")
-
-
-def coupon_slot_report(
-    db: Session, *, date_from: str, date_to: str, app_env: str | None = None
-) -> dict:
-    """按 coupon_id(具体券)聚合成功率(见 docs/guides/领券成功率指标-设计与埋点.md §13)。
-
-    数据源 coupon_claim_record(粒度=设备-天,唯一键 device+coupon+day)。
-    - 尝试 = status ∈ {success, already_claimed, failed}(skipped 排除);
-    - 成功 = status ∈ {success, already_claimed};成功率 = 成功/尝试;
-    - claim_date 区间 + app_env(None=全部)过滤;按 tried 倒序返回。
-    """
-    d_from = _date.fromisoformat(date_from)
-    d_to = _date.fromisoformat(date_to)
-    ok = case((CouponClaimRecord.status.in_(_SLOT_OK), 1), else_=0)
-    stmt = (
-        select(
-            CouponClaimRecord.coupon_id,
-            func.max(CouponClaimRecord.coupon_name).label("coupon_name"),
-            func.count().label("tried"),
-            func.sum(ok).label("succeeded"),
-        )
-        .where(
-            CouponClaimRecord.claim_date >= d_from,
-            CouponClaimRecord.claim_date <= d_to,
-            CouponClaimRecord.status.in_(_SLOT_TRIED),
-        )
-        .group_by(CouponClaimRecord.coupon_id)
-    )
-    if app_env is not None:
-        stmt = stmt.where(CouponClaimRecord.app_env == app_env)
-    items = []
-    for coupon_id, coupon_name, tried, succeeded in db.execute(stmt).all():
-        tried = int(tried or 0)
-        succeeded = int(succeeded or 0)
-        items.append({
-            "coupon_id": coupon_id,
-            "coupon_name": coupon_name,
-            "platform": coupon_id_to_platform(coupon_id),
-            "tried": tried,
-            "succeeded": succeeded,
-            "success_rate": round(succeeded / tried, 4) if tried else None,
-        })
-    items.sort(key=lambda x: (-x["tried"], x["coupon_id"]))
-    return {"items": items}
+    return {"items": [_session_to_row(r) for r in rows], "total": int(total)}

app/admin/repositories/queries.py

@@ -11,6 +11,7 @@ from zoneinfo import ZoneInfo
 from sqlalchemy import Select, asc, case, desc, func, or_, select
 from sqlalchemy.orm import Session
 
+from app.admin.repositories.stats import COMPARE_START_EVENT, COUPON_START_EVENT
 from app.core import rewards
 from app.core.config import settings
 from app.models.ad_feed_reward import AdFeedRewardRecord
@@ -31,7 +32,9 @@ from app.models.wallet import (
     InviteCashTransaction,
     WithdrawOrder,
 )
-from app.repositories import activity, ad_ecpm
+
+# 「最近活跃」计入的行为事件(与大盘 DAU/留存活跃口径一致:开始比价 + 开始领券)
+_ACTIVE_EVENTS = (COMPARE_START_EVENT, COUPON_START_EVENT)
 
 # 折算成可提现现金时,非广告金币来源的排除集(广告单独统计、人工调整不算"赚取")
 _NON_TASK_BIZ_TYPES = ("reward_video", "feed_ad_reward", "admin_grant", "admin_deduct")
@@ -84,6 +87,49 @@ def offset_paginate(
     return items, next_cursor, total
 
 
+def _last_active_parts():
+    """「最近活跃」的两个按 user_id 预聚合派生表(最近开始比价/领券事件、最近领券发起)。
+
+    活跃口径与大盘 DAU/留存一致(2026-07-05 产品定:进入 App≈登录 last_login_at +
+    发起比价 real_compare_start + 发起领券 real_coupon_start/claim_started)。
+    用 LEFT JOIN 预聚合而非相关标量子查询:后者在 PG 上对 users 每行各跑一个 SubPlan
+    (排序键、range 筛选、offset_paginate 的 count 三处叠加),埋点表大了会拖垮列表接口;
+    预聚合借 analytics_event.event 索引只扫两类 start 事件,每次查询聚合一次。
+    """
+    ev_agg = (
+        select(
+            AnalyticsEvent.user_id.label("user_id"),
+            func.max(AnalyticsEvent.created_at).label("last_at"),
+        )
+        .where(
+            AnalyticsEvent.user_id.is_not(None),
+            AnalyticsEvent.event.in_(_ACTIVE_EVENTS),
+        )
+        .group_by(AnalyticsEvent.user_id)
+        .subquery()
+    )
+    eng_agg = (
+        select(
+            CouponPromptEngagement.user_id.label("user_id"),
+            func.max(CouponPromptEngagement.created_at).label("last_at"),
+        )
+        .where(
+            CouponPromptEngagement.user_id.is_not(None),
+            CouponPromptEngagement.engage_type == "claim_started",
+        )
+        .group_by(CouponPromptEngagement.user_id)
+        .subquery()
+    )
+    return ev_agg, eng_agg
+
+
+def _norm_utc(dt: datetime | None) -> datetime | None:
+    """naive 视为 UTC 补 tzinfo(SQLite 读回 naive、PG 读回 aware,混着 max() 会 TypeError)。"""
+    if dt is None:
+        return None
+    return dt if dt.tzinfo is not None else dt.replace(tzinfo=timezone.utc)
+
+
 def _attach_last_active(db: Session, users: list[User]) -> None:
     """给本页用户瞬态挂 last_active_at(非 DB 列,供 AdminUserListItem from_attributes 读)。
 
@@ -97,7 +143,7 @@ def _attach_last_active(db: Session, users: list[User]) -> None:
             select(AnalyticsEvent.user_id, func.max(AnalyticsEvent.created_at))
             .where(
                 AnalyticsEvent.user_id.in_(uids),
-                activity.active_event_condition(),
+                AnalyticsEvent.event.in_(_ACTIVE_EVENTS),
             )
             .group_by(AnalyticsEvent.user_id)
         ).all()
@@ -114,9 +160,9 @@ def _attach_last_active(db: Session, users: list[User]) -> None:
     )
     for u in users:
         candidates = [
-            activity.norm_utc(u.created_at),      # baseline 由 last_login_at 改为 created_at(登录不算活跃)
-            activity.norm_utc(ev_map.get(u.id)),
-            activity.norm_utc(eng_map.get(u.id)),
+            _norm_utc(u.last_login_at),
+            _norm_utc(ev_map.get(u.id)),
+            _norm_utc(eng_map.get(u.id)),
         ]
         u.last_active_at = max((c for c in candidates if c is not None), default=None)
 
@@ -144,12 +190,16 @@ def list_users(
     (口径见 [_last_active_expr])。**offset 分页**(cursor=offset):任意列排序下游标语义统一,
     代价是翻页期间数据变动可能错位一条——admin 低频场景可接受(同 [list_all_withdraw_orders])。
     日期入参统一转 tz-aware UTC 比较(列为 timestamptz,见 _as_utc)。"""
-    # 最近活跃 = max(注册时间, 最近行为事件, 最近领券发起)。baseline 由 last_login_at 改为 created_at
-    #(登录不代表在用 App;口径统一到 activity.py,含 home_view + 比价 + 领券,见 activity.ACTIVE_EVENTS)。
-    # 未命中侧 coalesce 到 created_at(恒非空基线)。派生表 1:1,outerjoin 不放大行数。
-    ev_agg, eng_agg = activity.last_active_subqueries(db)
-    last_active = activity.last_active_expr(
-        User.created_at, ev_agg, eng_agg, db.get_bind().dialect.name
+    # 最近活跃 = max(最近登录, 最近行为事件, 最近领券发起)。PG 用 GREATEST;SQLite 标量 max()
+    # 任一参数 NULL 即返回 NULL,故 LEFT JOIN 未命中侧 coalesce 到 last_login_at 兜底
+    # (注册即登录,该列恒非空)。派生表 1:1(按 user_id 聚合),outerjoin 不会放大行数,
+    # offset_paginate 的 count 不受影响。
+    ev_agg, eng_agg = _last_active_parts()
+    greatest = func.greatest if db.get_bind().dialect.name == "postgresql" else func.max
+    last_active = greatest(
+        User.last_login_at,
+        func.coalesce(ev_agg.c.last_at, User.last_login_at),
+        func.coalesce(eng_agg.c.last_at, User.last_login_at),
     )
     stmt = (
         select(User)
@@ -248,11 +298,6 @@ def list_comparison_records(
         limit=limit, cursor=cursor,
     )
     _attach_user_info(db, 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])
-    for it in items:
-        it.ad_revenue_yuan = rev.get(it.trace_id, 0.0)
     return items, next_cursor, total
 
 

app/admin/routers/coupon_data.py

@@ -18,8 +18,6 @@ from app.admin.schemas.coupon_data import (
     CouponDataOut,
     CouponDataRow,
     CouponDataSummary,
-    CouponSlotRow,
-    CouponSlotsOut,
     CouponUserRecordsOut,
 )
 from app.core.rewards import cn_today
@@ -54,10 +52,6 @@ def get_coupon_data(
     date_to: Annotated[str | None, Query(description="结束日 北京 YYYY-MM-DD,闭区间,默认=date_from")] = None,
     user: Annotated[str | None, Query(description="用户手机号/昵称模糊搜;不传=全部")] = None,
     app_env: Annotated[str, Query(description="prod(默认) / dev / all(全部环境)")] = "prod",
-    status: Annotated[
-        list[str] | None,
-        Query(description="领券状态多选 started/completed/failed/abandoned;不传=全部"),
-    ] = None,
     granularity: Annotated[
         str, Query(description="day=按天 / hour=按小时(北京);区间>1 天建议 day")
     ] = "day",
@@ -79,7 +73,7 @@ def get_coupon_data(
     env = None if app_env == "all" else app_env
     result = coupon_data.coupon_data_report(
         db, date_from=d_from.isoformat(), date_to=d_to.isoformat(),
-        user=user, app_env=env, statuses=status, granularity=granularity,
+        user=user, app_env=env, granularity=granularity,
         limit=limit, offset=offset, sort=sort,
     )
     return CouponDataOut(
@@ -93,35 +87,6 @@ def get_coupon_data(
     )
 
 
-@router.get(
-    "/coupons",
-    response_model=CouponSlotsOut,
-    summary="按券成功率(coupon_id 粒度;成功/(成功+失败),skipped 排除,设备-天口径)",
-)
-def get_coupon_slots(
-    db: AdminDb,
-    date_from: Annotated[str | None, Query(description="起始日 北京 YYYY-MM-DD,默认今天")] = None,
-    date_to: Annotated[str | None, Query(description="结束日 北京 YYYY-MM-DD,闭区间,默认=date_from")] = None,
-    app_env: Annotated[str, Query(description="prod(默认) / dev / all(全部环境)")] = "prod",
-) -> CouponSlotsOut:
-    today = cn_today()
-    d_from = _parse_day(date_from, field="date_from", default=today)
-    d_to = _parse_day(date_to, field="date_to", default=d_from)
-    if d_to < d_from:
-        raise HTTPException(status_code=422, detail="date_to 不能早于 date_from")
-    if (d_to - d_from).days + 1 > _MAX_RANGE_DAYS:
-        raise HTTPException(status_code=422, detail=f"区间最长 {_MAX_RANGE_DAYS} 天")
-    env = None if app_env == "all" else app_env
-    result = coupon_data.coupon_slot_report(
-        db, date_from=d_from.isoformat(), date_to=d_to.isoformat(), app_env=env
-    )
-    return CouponSlotsOut(
-        date_from=d_from.isoformat(),
-        date_to=d_to.isoformat(),
-        items=[CouponSlotRow(**r) for r in result["items"]],
-    )
-
-
 @router.get(
     "/user-records",
     response_model=CouponUserRecordsOut,

app/admin/routers/feedback.py

@@ -19,7 +19,6 @@ from app.admin.schemas.feedback import (
 from app.models.admin import AdminUser
 from app.models.feedback import Feedback
 from app.repositories import wallet as wallet_repo
-from app.services import notification_events
 
 router = APIRouter(
     prefix="/admin/api/feedbacks",
@@ -135,11 +134,7 @@ def approve_feedback(
     )
     db.commit()
     db.refresh(fb)
-    out = FeedbackOut.model_validate(fb)
-    # PRD #10 反馈奖励:采纳发金币后通知用户(站内 + push,必带官方留言)。
-    # 业务已 commit,通知失败只 log 不影响审核结果。
-    notification_events.notify_feedback_reward(db, fb)
-    return out
+    return FeedbackOut.model_validate(fb)
 
 
 @router.post("/{feedback_id}/reject", response_model=FeedbackOut, summary="拒绝采纳反馈")
@@ -184,7 +179,4 @@ def reject_feedback(
     )
     db.commit()
     db.refresh(fb)
-    out = FeedbackOut.model_validate(fb)
-    # PRD #9 官方回复:未采纳也回复了用户(原因/留言用户端可见),通知去反馈历史页查看。
-    notification_events.notify_feedback_reply(db, fb)
-    return out
+    return FeedbackOut.model_validate(fb)

app/admin/routers/price_report.py

@@ -3,8 +3,7 @@
 数据由客户端 POST /api/v1/report 写入 price_report 表(提交即 pending);本路由是运营后台
 对它的人工审核窗口。**通过** → 给上报用户钱包发固定金币(PRICE_REPORT_REWARD_COINS):
 改状态 + 发金币(wallet.grant_coins)+ 审计同一事务一起 commit(原子,仿 users.grant_user_coins),
-绝不只改状态不发钱或反之。通过后下发「爆料审核通过」通知(站内 + push,PRD #11);
-客户端也可轮询 GET /api/v1/report/records 看到结果。
+绝不只改状态不发钱或反之。客户端轮询 GET /api/v1/report/records 自动看到结果(无需推送)。
 """
 from __future__ import annotations
 
@@ -25,7 +24,6 @@ from app.core.rewards import PRICE_REPORT_REWARD_COINS
 from app.models.admin import AdminUser
 from app.models.price_report import PriceReport
 from app.repositories import wallet as wallet_repo
-from app.services import notification_events
 
 router = APIRouter(
     prefix="/admin/api/price-reports",
@@ -86,8 +84,6 @@ def approve_price_report(
         detail={"reward_coins": coins, "user_id": rep.user_id}, ip=get_client_ip(request), commit=False,
     )
     db.commit()
-    # PRD #11 爆料审核通过:发金币后通知用户(站内 + push)。业务已 commit,通知失败只 log。
-    notification_events.notify_report_approved(db, rep)
     return OkResponse()
 
 

app/admin/schemas/comparison.py

@@ -36,14 +36,11 @@ class AdminComparisonListItem(BaseModel):
     retry_count: int | None = None
     input_tokens: int | None = None      # Σ usage.prompt_tokens(server 派生)
     output_tokens: int | None = None     # Σ usage.completion_tokens(server 派生)
-    # 本次比价 LLM 总成本(元,按当时价冻结);旧记录/未回填为 None → 前端「成本」列回退估算。见 services/llm_cost.py。
-    llm_cost_yuan: float | None = None
     device_model: str | None = None
     rom_vendor: str | None = None
     rom_name: str | None = None
     android_version: str | None = None
     app_version: str | None = None
-    ad_revenue_yuan: float = 0.0   # 本次比价看的信息流广告预估收益(元),queries 瞬态挂 ORM 实例上
     created_at: datetime
 
 
@@ -74,5 +71,3 @@ class AdminComparisonDetail(AdminComparisonListItem):
     # 原始上报全量;「卡在哪一步」从 raw_payload.platform_results[*].status 读
     # (store_not_found/items_not_found/below_minimum/unsupported = 卡在 找店/加菜/起送/读价)。
     raw_payload: dict | None = None
-    # 算成本所用单价快照 {mode, prices:{model:{...}}}(llm_cost_yuan 继承自列表项)。见 services/llm_cost.py。
-    llm_price_snapshot: dict | None = None

app/admin/schemas/coupon_data.py

@@ -19,16 +19,6 @@ class CouponDataSummary(BaseModel):
     p50_ms: int | None = Field(None, description="耗时 50 分位(ms,中位数)")
     p95_ms: int | None = Field(None, description="耗时 95 分位(ms)")
     p99_ms: int | None = Field(None, description="耗时 99 分位(ms)")
-    # 平台粒度成功率(见 docs/guides/领券成功率指标-设计与埋点.md):基数含全部 session。
-    full_success_count: int = Field(0, description="整单成功数(勾选平台全部领到的 session 数)")
-    full_success_rate: float | None = Field(None, description="整单成功率②=整单成功数/发起数;无数据为空")
-    point_success_count: int = Field(0, description="成功平台点位数(Σ 每次成功的平台数)")
-    point_total_count: int = Field(0, description="总平台点位数(Σ 每次勾选平台数;空勾选=全领三档)")
-    point_success_rate: float | None = Field(None, description="点位成功率③=成功点位/总点位;无数据为空")
-    per_platform: dict[str, float | None] = Field(
-        default_factory=dict,
-        description="分平台点位成功率 {平台id: rate|None};恒含美团/淘宝/京东三档,区间内无人勾选的平台为 None",
-    )
 
 
 class CouponDataDaily(BaseModel):
@@ -70,9 +60,6 @@ class CouponDataRow(BaseModel):
     started_at: datetime = Field(..., description="发起时刻(明细「时间」列)")
     claimed_count: int | None = None
     trace_url: str | None = Field(None, description="pricebot 公网 trace 链接(仅 completed 有);admin 渲染可点链接,无则显示可复制 trace_id")
-    ad_revenue_yuan: float = Field(
-        0.0, description="本次领券看的信息流广告预估收益(元);按 trace_id 聚合 ad_ecpm_record"
-    )
 
 
 class CouponDataOut(BaseModel):
@@ -94,22 +81,3 @@ class CouponUserRecordsOut(BaseModel):
 
     items: list[CouponDataRow]
     total: int
-
-
-class CouponSlotRow(BaseModel):
-    """按券成功率一行(§13):粒度=设备-天;成功率=成功/(成功+失败),skipped 排除。"""
-
-    coupon_id: str
-    coupon_name: str | None = None
-    platform: str | None = Field(None, description="美团/淘宝/京东 平台 id;无法识别为空")
-    tried: int = Field(..., description="尝试数(success+already_claimed+failed 的设备-天数)")
-    succeeded: int = Field(..., description="成功数(success+already_claimed)")
-    success_rate: float | None = Field(None, description="成功率=成功/尝试")
-
-
-class CouponSlotsOut(BaseModel):
-    """按券成功率表响应(§13)。"""
-
-    date_from: str
-    date_to: str
-    items: list[CouponSlotRow]

app/admin/schemas/device.py

@@ -24,9 +24,7 @@ class DeviceLivenessItem(BaseModel):
     device_model: str | None = None      # 由 device_id 解析(device_<机型>_<hash>);非 DB 列
     platform: str
     app_version: str | None = None
-    registration_id: str | None = None  # 旧极光字段,仅兼容历史数据
-    push_vendor: str | None = None
-    push_token: str | None = None
+    registration_id: str | None = None  # 非空 = 拿到极光 token、可推送
 
     ever_protected: bool                 # 是否开过无障碍(=该设备对功能有意义)
     first_protected_at: datetime | None = None   # 首次开无障碍时刻(老设备为 null)

app/api/v1/ad.py

@@ -286,7 +286,6 @@ def ecpm_report(payload: EcpmReportIn, user: CurrentUser, db: DbSession) -> Ecpm
         ad_session_id=payload.ad_session_id,
         adn=payload.adn, slot_id=payload.slot_id,
         feed_scene=payload.feed_scene,
-        trace_id=payload.trace_id,
         app_env=payload.app_env, our_code_id=payload.our_code_id,
     )
     logger.info(

app/api/v1/auth.py

@@ -12,36 +12,19 @@ from __future__ import annotations
 
 import logging
 
-from fastapi import APIRouter, HTTPException, Request
-from sqlalchemy.exc import IntegrityError
+from fastapi import APIRouter, HTTPException, Request, status
 
 from app.api.deps import CurrentUser, DbSession
 from app.core import test_account
-from app.core.ratelimit import (
-    RateLimitRule,
-    check_rate_limits,
-    enforce_rate_limit,
-    record_rate_limits,
-)
-from app.core.security import (
-    TokenError,
-    create_bind_ticket,
-    create_conflict_ticket,
-    decode_bind_ticket,
-    decode_conflict_ticket,
-    decode_token,
-    issue_token_pair,
-)
-from app.integrations import wxpay
+from app.core.ratelimit import enforce_rate_limit
+from app.core.security import TokenError, decode_token, issue_token_pair
 from app.integrations.jiguang import JiguangError, mask_phone, verify_and_get_phone
 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 user as user_repo
 from app.schemas.auth import (
     JverifyLoginRequest,
     LogoutResponse,
-    OccupiedAccountInfo,
     RefreshRequest,
     SmsLoginRequest,
     SmsSendRequest,
@@ -49,13 +32,6 @@ from app.schemas.auth import (
     TokenPair,
     TokenWithUser,
     UserOut,
-    WechatBindPhoneJverifyRequest,
-    WechatBindPhoneSmsRequest,
-    WechatBindResultResponse,
-    WechatConflictContinueRequest,
-    WechatConflictRebindRequest,
-    WechatLoginRequest,
-    WechatLoginResponse,
 )
 
 logger = logging.getLogger("shagua.auth")
@@ -64,10 +40,9 @@ router = APIRouter(prefix="/api/v1/auth", tags=["auth"])
 
 # 手机号登录防刷:同一设备(device_id) + 同一 IP 每小时最多的登录尝试次数(成功/失败都计)。
 SMS_LOGIN_MAX_PER_HOUR = 5
-# 发码防刷(同一设备 device_id + 同一 IP,**只按成功发码计数**;被单号 60s 冷却挡下的重发不占额度):
+# 发码防刷:同一设备(device_id) + 同一 IP 每小时最多的发码次数。
 # 堵「换手机号绕开单号 60s 冷却」的洞 —— 冷却是单号维度,一机换号能绕开。
-SMS_SEND_MAX_PER_HOUR_PER_DEVICE = 5     # 每小时上限
-SMS_SEND_MAX_PER_DAY_PER_DEVICE = 20     # 每天上限(再叠一层日封顶,挡低频长时间轰炸)
+SMS_SEND_MAX_PER_HOUR_PER_DEVICE = 5
 
 
 def _login_response(
@@ -124,26 +99,23 @@ def sms_send(req: SmsSendRequest, request: Request) -> SmsSendResponse:
         logger.info("test_account sms_send short-circuit (不真发)")
         return SmsSendResponse(sent=True, mock=True, cooldown_sec=0)
 
-    # 发码防刷:同一设备(device_id) + 同一 IP,每小时 / 每天两道闸,**均只按成功发码计数**。
-    # 补「换手机号绕开单号 60s 冷却」的洞(冷却是单号维度,一机换号能绕);设备维度按机器封顶,挡短信轰炸/烧钱。
-    # 关键:被单号 60s 冷却挡下的重发是「没真发、没烧钱」→ 不该占额度。故 check(先判)放在真发之前
-    # (超限直接 429、不真发),record(计数)只在 send_code 成功后调 —— 冷却/供应商失败抛 429 时直接返回、不计数。
-    send_rules = [
-        RateLimitRule("sms-send-device", SMS_SEND_MAX_PER_HOUR_PER_DEVICE, 3600,
-                      "操作过于频繁,请稍后再试"),
-        RateLimitRule("sms-send-device-daily", SMS_SEND_MAX_PER_DAY_PER_DEVICE, 86400,
-                      "今日验证码发送次数过多,请明天再试"),
-    ]
-    check_rate_limits(request, subject=req.device_id, rules=send_rules)
+    # 防刷:同一设备(device_id) + 同一 IP 每小时最多 SMS_SEND_MAX_PER_HOUR_PER_DEVICE 次发码。
+    # 补「换手机号绕开单号 60s 冷却」的洞(冷却是单号维度,一机换号能绕);设备维度按机器封顶,
+    # 挡短信轰炸/烧钱。放在真发(send_code)之前 → 超限直接拦下、不真发短信。
+    enforce_rate_limit(
+        request,
+        scope="sms-send-device",
+        subject=req.device_id,
+        limit=SMS_SEND_MAX_PER_HOUR_PER_DEVICE,
+        window_sec=3600,
+        detail="操作过于频繁,请稍后再试",
+    )
 
     try:
         cooldown = send_code(req.phone)
     except SmsError as e:
         raise HTTPException(status_code=e.status_code, detail=str(e)) from e
 
-    # 发码成功 → 两道闸各 +1(被单号冷却挡下的重发走不到这里,故不占额度)
-    record_rate_limits(request, subject=req.device_id, rules=send_rules)
-
     from app.core.config import settings  # 局部 import 避免循环
 
     return SmsSendResponse(sent=True, mock=settings.SMS_MOCK, cooldown_sec=cooldown)
@@ -194,261 +166,6 @@ def sms_login(req: SmsLoginRequest, request: Request, db: DbSession) -> TokenWit
     return _login_response(user, onboarding_completed=completed)
 
 
-# ===================== 微信登录 =====================
-
-@router.post(
-    "/wechat-login",
-    response_model=WechatLoginResponse,
-    summary="微信登录(openid 命中即登入,否则发绑号令牌)",
-)
-def wechat_login(req: WechatLoginRequest, db: DbSession) -> WechatLoginResponse:
-    from app.core.config import settings  # 局部 import,避免循环
-
-    # 微信登录只需 code→openid(sns/oauth2),不需要商户转账证书;故只校验 APP_ID/SECRET。
-    if not (settings.WECHAT_APP_ID and settings.WECHAT_APP_SECRET):
-        raise HTTPException(status_code=503, detail="wechat login not configured")
-
-    try:
-        info = wxpay.code_to_userinfo(req.code)  # {openid, nickname, avatar_url, raw};失败抛 ValueError
-    except ValueError as e:
-        raise HTTPException(status_code=400, detail=str(e)) from e
-
-    openid = info["openid"]
-    user = user_repo.get_user_by_wechat_openid(db, openid)
-    if user is not None:
-        # openid 命中 → 直接登入(绝不套用提现 bind-wechat 的"撞号即 409"逻辑)
-        if user.status != "active":
-            raise HTTPException(status_code=403, detail="account disabled")
-        user_repo.touch_last_login(db, user)
-        completed = onboarding_repo.is_completed(db, user_id=user.id, device_id=req.device_id)
-        logger.info("wechat_login hit user_id=%d openid=%s*** onboarded=%s", user.id, openid[:6], completed)
-        return WechatLoginResponse(
-            status="logged_in",
-            token=_login_response(user, onboarding_completed=completed),
-        )
-
-    # 未命中 → 签发短时 bind_ticket,进手机号绑定流程(账号此刻还不建)
-    ticket = create_bind_ticket(
-        openid=openid,
-        wechat_nickname=info["nickname"],
-        wechat_avatar_url=info["avatar_url"],
-    )
-    logger.info("wechat_login new openid=%s*** issue bind_ticket", openid[:6])
-    return WechatLoginResponse(
-        status="need_bind_phone",
-        bind_ticket=ticket,
-        wechat_nickname=info["nickname"],
-        wechat_avatar_url=info["avatar_url"],
-    )
-
-
-def _finish_wechat_bind(
-    db,
-    *,
-    openid: str,
-    wechat_nickname: str | None,
-    wechat_avatar_url: str | None,
-    phone: str,
-    device_id: str,
-) -> WechatBindResultResponse:
-    """绑手机建号的公共尾段:手机号被占用 → 返回 phone_occupied(M2 处理 3 选 1);
-    未占用 → 新建微信账号(channel=wechat,昵称头像取微信)→ 签 token 登入。"""
-    existing = user_repo.get_user_by_phone(db, phone)
-    if existing is not None:
-        from app.core.config import settings  # 局部 import,避免循环
-
-        ticket = create_conflict_ticket(
-            openid=openid,
-            wechat_nickname=wechat_nickname,
-            wechat_avatar_url=wechat_avatar_url,
-            phone=phone,
-        )
-        blocked = rebind_repo.rebound_within_days(db, phone, settings.PHONE_REBIND_LIMIT_DAYS)
-        logger.info(
-            "wechat bind phone occupied phone=%s by user_id=%d has_wechat=%s",
-            mask_phone(phone), existing.id, bool(existing.wechat_openid),
-        )
-        return WechatBindResultResponse(
-            status="phone_occupied",
-            occupied_account=OccupiedAccountInfo(
-                nickname=existing.nickname,
-                avatar_url=existing.avatar_url,
-                created_at=existing.created_at,
-                has_wechat=bool(existing.wechat_openid),
-            ),
-            conflict_ticket=ticket,
-            rebind_available=not blocked,
-            rebind_blocked_days=(
-                rebind_repo.remaining_block_days(db, phone, settings.PHONE_REBIND_LIMIT_DAYS)
-                if blocked else 0
-            ),
-        )
-    user = user_repo.create_wechat_user(
-        db,
-        phone=phone,
-        openid=openid,
-        wechat_nickname=wechat_nickname,
-        wechat_avatar_url=wechat_avatar_url,
-    )
-    completed = onboarding_repo.is_completed(db, user_id=user.id, device_id=device_id)
-    logger.info("wechat bind ok user_id=%d phone=%s openid=%s*** onboarded=%s",
-                user.id, mask_phone(phone), openid[:6], completed)
-    return WechatBindResultResponse(
-        status="logged_in",
-        token=_login_response(user, onboarding_completed=completed),
-    )
-
-
-@router.post(
-    "/wechat/bind-phone/sms",
-    response_model=WechatBindResultResponse,
-    summary="微信登录·其他手机号(短信)绑定",
-)
-def wechat_bind_phone_sms(
-    req: WechatBindPhoneSmsRequest, request: Request, db: DbSession
-) -> WechatBindResultResponse:
-    try:
-        claims = decode_bind_ticket(req.bind_ticket)
-    except TokenError as e:
-        raise HTTPException(status_code=401, detail="授权已过期,请重新用微信登录") from e
-
-    # 防刷:同 sms/login,按 设备+IP 每小时限流(放在验证码校验之前,失败也计数)
-    enforce_rate_limit(
-        request,
-        scope="wechat-bind-sms-device",
-        subject=req.device_id,
-        limit=SMS_LOGIN_MAX_PER_HOUR,
-        window_sec=3600,
-        detail="登录尝试过于频繁,请稍后再试",
-    )
-
-    if not verify_code(req.phone, req.code):
-        raise HTTPException(status_code=400, detail="invalid sms code")
-
-    return _finish_wechat_bind(
-        db,
-        openid=claims["openid"],
-        wechat_nickname=claims["wnk"],
-        wechat_avatar_url=claims["wav"],
-        phone=req.phone,
-        device_id=req.device_id,
-    )
-
-
-@router.post(
-    "/wechat/bind-phone/jverify",
-    response_model=WechatBindResultResponse,
-    summary="微信登录·本机号(极光)绑定",
-)
-def wechat_bind_phone_jverify(
-    req: WechatBindPhoneJverifyRequest, db: DbSession
-) -> WechatBindResultResponse:
-    try:
-        claims = decode_bind_ticket(req.bind_ticket)
-    except TokenError as e:
-        raise HTTPException(status_code=401, detail="授权已过期,请重新用微信登录") from e
-
-    try:
-        phone = verify_and_get_phone(req.login_token)
-    except JiguangError as e:
-        logger.error("[JG] verify+decrypt failed: %s", e, exc_info=True)
-        raise HTTPException(status_code=502, detail=f"jiguang verify failed: {e}") from e
-
-    return _finish_wechat_bind(
-        db,
-        openid=claims["openid"],
-        wechat_nickname=claims["wnk"],
-        wechat_avatar_url=claims["wav"],
-        phone=phone,
-        device_id=req.device_id,
-    )
-
-
-# ===================== 微信占用冲突(M2) =====================
-
-@router.post(
-    "/wechat/conflict/continue",
-    response_model=WechatBindResultResponse,
-    summary="微信占用冲突·继续绑定(登录老账号,能绑就绑)",
-)
-def wechat_conflict_continue(
-    req: WechatConflictContinueRequest, request: Request, db: DbSession
-) -> WechatBindResultResponse:
-    try:
-        claims = decode_conflict_ticket(req.conflict_ticket)
-    except TokenError as e:
-        raise HTTPException(status_code=401, detail="操作超时,请重新用微信登录") from e
-
-    enforce_rate_limit(
-        request, scope="wechat-conflict-device", subject=req.device_id,
-        limit=SMS_LOGIN_MAX_PER_HOUR, window_sec=3600, detail="操作过于频繁,请稍后再试",
-    )
-
-    user = user_repo.get_user_by_phone(db, claims["phone"])
-    if user is None:
-        # P 期间被腾空(老账号改号/注销)→ 前提已变,让前端重走
-        raise HTTPException(status_code=409, detail="账号状态已变化,请重新登录")
-    if user.status != "active":
-        raise HTTPException(status_code=403, detail="account disabled")
-
-    if user.wechat_openid is None:
-        try:
-            user_repo.attach_wechat_to_user(
-                db, user, openid=claims["openid"],
-                wechat_nickname=claims["wnk"], wechat_avatar_url=claims["wav"],
-            )
-        except IntegrityError:
-            db.rollback()  # openid 被别处绑走 → 只登入不绑
-            user_repo.touch_last_login(db, user)
-    else:
-        user_repo.touch_last_login(db, user)  # X 已绑别的微信 → 只登入,丢弃本次 openid
-
-    completed = onboarding_repo.is_completed(db, user_id=user.id, device_id=req.device_id)
-    logger.info("wechat conflict continue user_id=%d openid=%s***", user.id, claims["openid"][:6])
-    return WechatBindResultResponse(
-        status="logged_in",
-        token=_login_response(user, onboarding_completed=completed),
-    )
-
-
-@router.post(
-    "/wechat/conflict/rebind",
-    response_model=WechatBindResultResponse,
-    summary="微信占用冲突·换绑(注销老账号+用该号重建全新账号)",
-)
-def wechat_conflict_rebind(
-    req: WechatConflictRebindRequest, request: Request, db: DbSession
-) -> WechatBindResultResponse:
-    from app.core.config import settings  # 局部 import,避免循环
-
-    try:
-        claims = decode_conflict_ticket(req.conflict_ticket)
-    except TokenError as e:
-        raise HTTPException(status_code=401, detail="操作超时,请重新用微信登录") from e
-
-    enforce_rate_limit(
-        request, scope="wechat-conflict-device", subject=req.device_id,
-        limit=SMS_LOGIN_MAX_PER_HOUR, window_sec=3600, detail="操作过于频繁,请稍后再试",
-    )
-
-    phone = claims["phone"]
-    if rebind_repo.rebound_within_days(db, phone, settings.PHONE_REBIND_LIMIT_DAYS):
-        days = rebind_repo.remaining_block_days(db, phone, settings.PHONE_REBIND_LIMIT_DAYS)
-        raise HTTPException(status_code=409, detail=f"该手机号 {days} 天内已换绑过,暂不能再次换绑")
-
-    user = user_repo.rebind_account(
-        db, phone=phone, openid=claims["openid"],
-        wechat_nickname=claims["wnk"], wechat_avatar_url=claims["wav"],
-    )
-    completed = onboarding_repo.is_completed(db, user_id=user.id, device_id=req.device_id)
-    logger.info("wechat conflict rebind new_user_id=%d phone=%s openid=%s***",
-                user.id, mask_phone(phone), claims["openid"][:6])
-    return WechatBindResultResponse(
-        status="logged_in",
-        token=_login_response(user, onboarding_completed=completed),
-    )
-
-
 # ===================== Refresh =====================
 
 @router.post("/refresh", response_model=TokenPair, summary="用 refresh_token 换新 token 对")

app/api/v1/compare_record.py

@@ -27,7 +27,6 @@ from app.schemas.compare_record import (
     ComparisonRecordOut,
     ComparisonRecordPage,
 )
-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")
@@ -82,8 +81,6 @@ def _backfill_llm_calls(record_id: int, trace_id: str) -> None:
         # 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",

app/api/v1/coupon.py

@@ -81,16 +81,7 @@ def _record_claims_blocking(
     device_id: str, user_id: int | None, trace_id: str | None, results: list[dict]
 ) -> None:
     with SessionLocal() as db:
-        # 取本次 session 环境,给 coupon_claim_record 打 app_env 标(每券成功率表按它过滤;设计 §13)。
-        app_env = coupon_repo.session_app_env(db, trace_id)
-        coupon_repo.record_claims(db, device_id, user_id, trace_id, results, app_env=app_env)
-        # 顺带把本帧「成功平台」并入 coupon_session.platform_success(admin 领券数据 ②整单/③点位成功率;
-        # 设计 route B,见 docs/guides/领券成功率指标-设计与埋点.md)。复用同一 SessionLocal、紧接 record_claims,
-        # 不新增连接;并集幂等(无新平台不写),trace_id 缺失或 session 行未落库则跳过。
-        if trace_id:
-            coupon_repo.merge_session_platform_success(
-                db, trace_id, coupon_repo.succeeded_platforms(results)
-            )
+        coupon_repo.record_claims(db, device_id, user_id, trace_id, results)
 
 
 def _mark_completed_blocking(

app/api/v1/device.py

@@ -1,22 +1,19 @@
 """设备注册 / 心跳 endpoint(无障碍保护存活检测)。
 
 路由前缀 /api/v1/device,需 Bearer 鉴权(设备绑登录用户)。
-  POST /register   注册设备 / 更新厂商 push token(App 前台、拿到 push token 时调)
+  POST /register   注册设备 / 更新 registration_id(App 前台、拿到 push token 时调)
   POST /heartbeat  上报心跳(无障碍服务存活时周期调,刷新存活)
-  POST /push-test  开发验收:延迟发送厂商通道测试推送
 
-后端 heartbeat_monitor_worker 据此发现心跳超时的设备并厂商直推告警。
+后端 heartbeat_monitor_worker 据此发现心跳超时的设备并极光推送告警。
 见 spec: spec/accessibility-liveness-push.md。
 """
 from __future__ import annotations
 
 import logging
-import time
 
-from fastapi import APIRouter, BackgroundTasks, HTTPException, status
+from fastapi import APIRouter
 
 from app.api.deps import CurrentUser, DbSession
-from app.integrations import vendor_push
 from app.repositories import device as device_repo
 from app.schemas.device import (
     DeviceOut,
@@ -25,8 +22,6 @@ from app.schemas.device import (
     LivenessAckRequest,
     LivenessOut,
     OkResponse,
-    PushTestOut,
-    PushTestRequest,
 )
 
 logger = logging.getLogger("shagua.device")
@@ -34,37 +29,6 @@ logger = logging.getLogger("shagua.device")
 router = APIRouter(prefix="/api/v1/device", tags=["device"])
 
 
-def _send_push_test_after_delay(
-    push_vendor: str,
-    push_token: str,
-    delay_seconds: int,
-    user_id: int,
-    device_id: str,
-) -> None:
-    if delay_seconds > 0:
-        time.sleep(delay_seconds)
-    try:
-        vendor_push.send_accessibility_disabled(
-            push_vendor,
-            push_token,
-            title="测试推送",
-            alert="这是一条厂商通道测试推送。收到它说明 App 被划掉后仍可通过系统通知栏触达。",
-        )
-        logger.info(
-            "push test sent user_id=%d device_id=%s delay=%ds",
-            user_id,
-            device_id,
-            delay_seconds,
-        )
-    except vendor_push.VendorPushError as e:
-        logger.warning(
-            "push test failed user_id=%d device_id=%s error=%s",
-            user_id,
-            device_id,
-            e,
-        )
-
-
 @router.post("/register", response_model=DeviceOut, summary="注册设备/更新推送token")
 def register_device(
     req: DeviceRegisterRequest,
@@ -76,17 +40,13 @@ def register_device(
         user_id=user.id,
         device_id=req.device_id,
         registration_id=req.registration_id,
-        push_vendor=req.push_vendor,
-        push_token=req.push_token,
         platform=req.platform,
         app_version=req.app_version,
     )
     logger.info(
-        "device register user_id=%d device_id=%s vendor=%s token=%s legacy_reg=%s",
+        "device register user_id=%d device_id=%s reg=%s",
         user.id,
         req.device_id,
-        req.push_vendor,
-        bool(req.push_token),
         bool(req.registration_id),
     )
     return DeviceOut.model_validate(device)
@@ -104,59 +64,10 @@ def report_heartbeat(
         device_id=req.device_id,
         accessibility_enabled=req.accessibility_enabled,
         registration_id=req.registration_id,
-        push_vendor=req.push_vendor,
-        push_token=req.push_token,
     )
     return OkResponse()
 
 
-@router.post("/push-test", response_model=PushTestOut, summary="延迟发送厂商通道测试推送")
-def request_push_test(
-    req: PushTestRequest,
-    background_tasks: BackgroundTasks,
-    user: CurrentUser,
-    db: DbSession,
-) -> PushTestOut:
-    """开发验收用:App 内点一次,服务端延迟发厂商直推,验证离线通道。"""
-    push_vendor = req.push_vendor.strip() if req.push_vendor else None
-    push_token = req.push_token.strip() if req.push_token else None
-    if push_vendor and push_token:
-        device_repo.register_or_update(
-            db,
-            user_id=user.id,
-            device_id=req.device_id,
-            registration_id=req.registration_id,
-            push_vendor=push_vendor,
-            push_token=push_token,
-        )
-    else:
-        device = device_repo.get_device(db, user_id=user.id, device_id=req.device_id)
-        push_vendor = device.push_vendor if device is not None else None
-        push_token = device.push_token if device is not None else None
-
-    if not push_vendor or not push_token:
-        raise HTTPException(
-            status_code=status.HTTP_409_CONFLICT,
-            detail="push vendor token not ready",
-        )
-
-    background_tasks.add_task(
-        _send_push_test_after_delay,
-        push_vendor,
-        push_token,
-        req.delay_seconds,
-        user.id,
-        req.device_id,
-    )
-    logger.info(
-        "push test scheduled user_id=%d device_id=%s delay=%ds",
-        user.id,
-        req.device_id,
-        req.delay_seconds,
-    )
-    return PushTestOut(delay_seconds=req.delay_seconds, has_push_token=True)
-
-
 @router.get("/liveness", response_model=LivenessOut, summary="查询本机掉线告警(后置检测)")
 def get_liveness(
     device_id: str,

app/api/v1/notifications.py

@@ -1,124 +0,0 @@
-"""消息通知中心 endpoint(PRD《消息通知中心》)。
-
-路由前缀 `/api/v1/notifications`,需 Bearer 鉴权(消息按用户隔离)。
-  GET  /              消息列表(分页;全列表时间倒序,不分组——PRD 原文的分组已取消)
-  GET  /unread-count  未读总数(首页铃铛角标)
-  POST /read          标记已读({ids:[...]} 单条/多条 或 {all:true} 全量清零)
-
-数据落库 `notification` 表(repositories/notification.py,按用户隔离)。业务事件(奖励过期、
-提现回执、反馈回复……)调 `create_notification` 下发;未接入业务前列表为空,可用
-`/api/v1/push/test` 的 createNotification 造联调数据。
-
-⚠️ 字段命名:本组接口对外为 **camelCase**(sentAt / isRead / pageSize…,PRD 前端契约),
-详见 schemas/notification.py 顶部说明。
-"""
-from __future__ import annotations
-
-import logging
-
-from fastapi import APIRouter, HTTPException, Query
-
-from app.api.deps import CurrentUser, DbSession
-from app.core import notification_catalog as catalog
-from app.models.notification import Notification
-from app.repositories import notification as notif_repo
-from app.schemas.notification import (
-    InfoRow,
-    MarkReadOut,
-    MarkReadRequest,
-    NotificationItem,
-    NotificationListOut,
-    UnreadCountOut,
-)
-
-logger = logging.getLogger("shagua.notifications")
-
-router = APIRouter(prefix="/api/v1/notifications", tags=["notifications"])
-
-
-def _to_item(n: Notification) -> NotificationItem:
-    """通知行 + 类型静态目录 → 接口出参。"""
-    ntype = catalog.get_type(n.type)
-    return NotificationItem(
-        id=n.id,
-        category=ntype.category,
-        category_label=catalog.category_label(ntype.category),
-        type=ntype.key,
-        card_style=ntype.card_style,
-        title=ntype.card_title,
-        coins=n.coins,
-        cash_cents=n.cash_cents,
-        cash_yuan=notif_repo.cash_yuan(n.cash_cents),
-        info_rows=[InfoRow(**row) for row in n.info_rows],
-        action_text=ntype.action_text,
-        extra=n.extra,
-        sent_at=notif_repo.as_cst(n.sent_at),
-        is_read=n.is_read,
-    )
-
-
-@router.get("", response_model=NotificationListOut, summary="消息列表(分页)")
-def list_notifications(
-    user: CurrentUser,
-    db: DbSession,
-    page: int = Query(default=1, ge=1, description="页码,1 起"),
-    page_size: int = Query(
-        default=20, ge=1, le=100, alias="pageSize", description="每页条数,默认 20,最大 100"
-    ),
-) -> NotificationListOut:
-    """通知中心消息列表。
-
-    - 排序服务端已做好:**全列表按时间倒序**(最新在前,不做分类分组;PRD §1 的
-      "按分类分组"为笔误,已与需求方确认取消),前端按返回顺序渲染即可。
-    - 每条的字段构成与各版式说明见 NotificationItem schema。
-    - 响应同时带 unreadCount,进页面时可顺手刷新角标。
-    - 无消息时返回空列表(total=0);数据由业务事件下发,联调可用 /push/test 造。
-    """
-    items, total, unread = notif_repo.list_notifications(
-        db, user.id, page=page, page_size=page_size
-    )
-    return NotificationListOut(
-        items=[_to_item(n) for n in items],
-        page=page,
-        page_size=page_size,
-        total=total,
-        has_more=page * page_size < total,
-        unread_count=unread,
-    )
-
-
-@router.get("/unread-count", response_model=UnreadCountOut, summary="未读总数(铃铛角标)")
-def get_unread_count(user: CurrentUser, db: DbSession) -> UnreadCountOut:
-    """首页铃铛角标数据源。刷新时机(PRD §4):进入首页时、从通知中心/其他页面返回首页时。
-
-    - count:精确未读条数;
-    - badgeText:直接可展示的角标文案——超过 99 返回 "99+",等于 0 返回 null(隐藏整个角标)。
-    """
-    count = notif_repo.unread_count(db, user.id)
-    badge = None if count == 0 else ("99+" if count > 99 else str(count))
-    return UnreadCountOut(count=count, badge_text=badge)
-
-
-@router.post("/read", response_model=MarkReadOut, summary="标记已读(单条/多条/全量)")
-def mark_read(req: MarkReadRequest, user: CurrentUser, db: DbSession) -> MarkReadOut:
-    """红点消除(PRD §4),两种调用模式:
-
-    1. `{"ids": [90001]}` —— 点击某张消息卡片(无论点击后是跳转/弹窗/无动作都算已读);
-       用户点击 push 直达落地页时,客户端也用它把对应站内消息同步置读(push extras 里带
-       notificationId);
-    2. `{"all": true}` —— 进入通知中心自动清零(只是浏览列表就消红点,无需逐条点击)。
-
-    幂等:不存在或已读的 id 忽略;重复调用 markedCount 为 0、不报错。
-    响应带 unreadCount(处理后剩余未读),可直接刷新铃铛角标。
-    """
-    if not req.all and not req.ids:
-        raise HTTPException(status_code=400, detail="ids 与 all 至少传一个:{ids:[...]} 或 {all:true}")
-    marked, unread = notif_repo.mark_read(db, user.id, ids=req.ids, mark_all=req.all)
-    logger.info(
-        "notifications read user_id=%d mode=%s marked=%d unread_left=%d",
-        user.id,
-        "all" if req.all else f"ids×{len(req.ids or [])}",
-        marked,
-        unread,
-    )
-    return MarkReadOut(ok=True, marked_count=marked, unread_count=unread)

app/api/v1/push.py

@@ -1,187 +0,0 @@
-"""厂商推送 测试/联调 endpoint。
-
-路由前缀 `/api/v1/push`,需 Bearer 鉴权。围绕「消息中心 13 类通知的厂商直推」提供三件套:
-  GET  /vendors    5 个厂商(荣耀/华为/小米/OPPO/vivo)服务端凭据配置状态,缺哪些键一目了然
-  GET  /templates  13 种通知类型的 push 标题/正文模板 + PRD 示例渲染效果
-  POST /test       测试发送:默认 mock(不真调厂商 API,回显渲染结果);mock=false 真发到手机
-
-与 `/api/v1/device/push-test`(无障碍召回通道的延迟自测)互补:本组面向消息中心 13 类
-push 的文案/参数/厂商通道联调。真实业务触发统一走 services/notification_events
-(提现回执/反馈审核/爆料通过/好友下单已接入),底层与本测试端点同一条
-integrations.vendor_push.send_notification 发送链路。
-"""
-from __future__ import annotations
-
-import logging
-
-from fastapi import APIRouter, HTTPException, status
-
-from app.api.deps import CurrentUser, DbSession
-from app.core import notification_catalog as catalog
-from app.integrations import vendor_push
-from app.repositories import device as device_repo
-from app.repositories import notification as notif_repo
-from app.schemas.push import (
-    PushTemplateOut,
-    PushTemplatesOut,
-    PushTestOut,
-    PushTestRequest,
-    PushVendorsOut,
-    PushVendorStatus,
-)
-
-logger = logging.getLogger("shagua.push")
-
-router = APIRouter(prefix="/api/v1/push", tags=["push"])
-
-# /vendors 的展示顺序(荣耀/华为/小米/OPPO/vivo)
-_VENDOR_ORDER = ("honor", "huawei", "xiaomi", "oppo", "vivo")
-
-_GENERIC_TEST_TITLE = "傻瓜比价测试推送"
-_GENERIC_TEST_BODY = "这是一条{label}通道的测试推送,收到说明服务端 → {label}厂商通道已打通。"
-
-
-@router.get("/vendors", response_model=PushVendorsOut, summary="厂商推送配置状态")
-def vendor_status(user: CurrentUser) -> PushVendorsOut:
-    """检查 5 个厂商的服务端推送凭据是否配齐(读 .env,不打厂商接口)。
-
-    missingKeys 列出的即还需要在 .env 里补的配置键;全空说明该厂商随时可真发。
-    mock 测试(POST /test 默认模式)不依赖任何凭据。
-    """
-    return PushVendorsOut(
-        vendors=[
-            PushVendorStatus(
-                vendor=v,
-                label=vendor_push.VENDOR_LABELS[v],
-                configured=not vendor_push.missing_settings(v),
-                missing_keys=vendor_push.missing_settings(v),
-            )
-            for v in _VENDOR_ORDER
-        ]
-    )
-
-
-@router.get("/templates", response_model=PushTemplatesOut, summary="13 类通知的 push 模板预览")
-def push_templates(user: CurrentUser) -> PushTemplatesOut:
-    """PRD §5 的 13 条 push 文案模板 + 用示例值渲染后的效果,联调对文案用。
-
-    标题固定(≤11 字不带变量);正文里 {var} 为变量,POST /test 的 vars 字段可覆盖。
-    """
-    templates: list[PushTemplateOut] = []
-    for key, ntype in catalog.TYPES.items():
-        title, body_sample = catalog.render_push(key)
-        templates.append(
-            PushTemplateOut(
-                type=key,
-                category=ntype.category,
-                category_label=catalog.category_label(ntype.category),
-                card_style=ntype.card_style,
-                push_title=title,
-                push_body_sample=body_sample,
-                push_body_template=ntype.push_body_template,
-                variables=catalog.push_variable_names(key),
-                sample_vars=ntype.sample_vars,
-            )
-        )
-    return PushTemplatesOut(templates=templates)
-
-
-@router.post("/test", response_model=PushTestOut, summary="测试发送厂商推送(默认 mock)")
-def send_test_push(req: PushTestRequest, user: CurrentUser, db: DbSession) -> PushTestOut:
-    """向指定厂商 token(或本用户已注册设备)发一条测试 push。
-
-    - **mock=true(默认)**:不真调厂商 API——校验参数、渲染文案后原样返回,并在
-      missingKeys 里提示真发前还缺哪些配置。虚拟数据阶段随便打,不会骚扰真机。
-    - **mock=false**:真发。要求该厂商凭据已配置(缺则 400 报缺失键);厂商 API 报错回 502。
-      注意 vivo 未上架前是测试推送模式(VIVO_PUSH_MODE=1),目标手机要先在 vivo 后台加为测试设备。
-    - **createNotification=true**:同时往消息中心(notification 表)插一条同类型未读通知并把
-      notificationId 放进 push extras → 客户端点击 push 后调 POST /notifications/read
-      {ids:[notificationId]} 即可闭环验证 PRD §4 的 push 已读联动。
-    """
-    # ---- 1. 解析推送目标(vendor + token):直填优先,缺则按 deviceId 反查已注册设备 ----
-    vendor_raw = req.vendor.strip()
-    push_token = req.push_token.strip()
-    if (not vendor_raw or not push_token) and req.device_id.strip():
-        device = device_repo.get_device(db, user_id=user.id, device_id=req.device_id.strip())
-        if device is not None:
-            vendor_raw = vendor_raw or (device.push_vendor or "")
-            push_token = push_token or (device.push_token or "")
-
-    vendor = vendor_push.normalize_vendor(vendor_raw)
-    if not vendor or vendor not in vendor_push.SUPPORTED_VENDORS:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail=f"vendor 无效或无法从设备推断,支持: {', '.join(_VENDOR_ORDER)}",
-        )
-    if not push_token:
-        # mock 模式给个占位 token,让「只想看看渲染结果」的调用免造数据;真发必须给真 token。
-        if req.mock:
-            push_token = "mock-token"
-        else:
-            raise HTTPException(
-                status_code=status.HTTP_409_CONFLICT,
-                detail="push token 未知:请直传 pushToken,或先用该设备调 /api/v1/device/register 上报",
-            )
-
-    # ---- 2. 组装文案与 extras:直填 > type 模板 > 通用测试文案 ----
-    extras: dict[str, str] = {}
-    notification_id: int | None = None
-    if req.type:
-        try:
-            title, body = catalog.render_push(req.type, req.vars or None)
-        except catalog.UnknownNotificationType as e:
-            raise HTTPException(status_code=400, detail=str(e)) from e
-        extras["type"] = req.type
-        if req.create_notification:
-            item = notif_repo.insert_sample(db, user.id, req.type)
-            notification_id = item.id
-            extras.update({str(k): str(v) for k, v in item.extra.items()})
-            extras["notificationId"] = str(item.id)
-    else:
-        label = vendor_push.VENDOR_LABELS[vendor]
-        title = _GENERIC_TEST_TITLE
-        body = _GENERIC_TEST_BODY.format(label=label)
-        extras["type"] = "push_test"
-    if req.title.strip():
-        title = req.title.strip()
-    if req.content.strip():
-        body = req.content.strip()
-
-    # ---- 3. 发送(mock / 真发) ----
-    missing = vendor_push.missing_settings(vendor)
-    vendor_response = None
-    if req.mock:
-        vendor_push.send_notification(
-            vendor, push_token, title=title, body=body, extras=extras, mock=True
-        )
-    else:
-        if missing:
-            raise HTTPException(
-                status_code=400,
-                detail=f"{vendor_push.VENDOR_LABELS[vendor]}推送凭据未配置,先在 .env 补上: "
-                       f"{', '.join(missing)}",
-            )
-        try:
-            vendor_response = vendor_push.send_notification(
-                vendor, push_token, title=title, body=body, extras=extras
-            )
-        except vendor_push.VendorPushError as e:
-            raise HTTPException(
-                status_code=status.HTTP_502_BAD_GATEWAY, detail=f"厂商推送失败: {e}"
-            ) from e
-
-    logger.info(
-        "push test user_id=%d vendor=%s type=%s mock=%s notification_id=%s",
-        user.id, vendor, req.type or "generic", req.mock, notification_id,
-    )
-    return PushTestOut(
-        ok=True,
-        mock=req.mock,
-        vendor=vendor,
-        title=title,
-        body=body,
-        extras=extras,
-        notification_id=notification_id,
-        missing_keys=missing,
-        vendor_response=vendor_response,
-    )

app/api/v1/wallet.py

@@ -43,7 +43,6 @@ from app.schemas.welfare import (
     WithdrawRequest,
     WithdrawResultOut,
     WithdrawStatusOut,
-    WithdrawTierOut,
 )
 
 logger = logging.getLogger("shagua.wallet")
@@ -174,15 +173,8 @@ def unbind_wechat(
     return UnbindWechatResultOut(bound=False)
 
 
-@router.get("/withdraw-info", response_model=WithdrawInfoOut, summary="提现额度/绑定状态/免确认开关/档位")
-def withdraw_info(
-    user: CurrentUser,
-    db: DbSession,
-    source: str = Query(
-        "coin_cash",
-        description="提现账户:coin_cash(福利页,下发 tiers 档位) / invite_cash(邀请页,tiers 为空走旧逻辑)",
-    ),
-) -> WithdrawInfoOut:
+@router.get("/withdraw-info", response_model=WithdrawInfoOut, summary="提现额度/绑定状态/免确认开关")
+def withdraw_info(user: CurrentUser, db: DbSession) -> WithdrawInfoOut:
     u = db.get(User, user.id)
     # 顺带同步免确认授权状态(捕获首单确认后已生效的授权 pending→active),让开关展示实时
     auth = crud_wallet.sync_transfer_auth(db, user.id)
@@ -193,7 +185,6 @@ def withdraw_info(
         wechat_nickname=u.wechat_nickname if u else None,
         wechat_avatar_url=u.wechat_avatar_url if u else None,
         transfer_auth_enabled=bool(auth and auth.state == "active"),
-        tiers=[WithdrawTierOut(**t) for t in crud_wallet.withdraw_tier_states(db, user.id, source)],
     )
 
 
@@ -227,9 +218,6 @@ def withdraw(req: WithdrawRequest, user: CurrentUser, db: DbSession) -> Withdraw
             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
     except crud_wallet.InsufficientCashError as e:
         raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail="现金余额不足") from e
 

app/core/config.py

@@ -44,11 +44,6 @@ class Settings(BaseSettings):
     JWT_ALGORITHM: str = "HS256"
     JWT_ACCESS_TOKEN_EXPIRE_MINUTES: int = 120
     JWT_REFRESH_TOKEN_EXPIRE_DAYS: int = 30
-    # 微信登录未命中 openid 时签发的"待绑手机"令牌有效期(JWT_SECRET_KEY 签名,typ=wechat_bind;
-    # 见 security.create_bind_ticket)。需覆盖"授权→输手机号→收短信→输验证码"整个绑定流程。
-    WECHAT_BIND_TICKET_EXPIRE_MINUTES: int = 10
-    # 一个手机号 30 天内最多换绑一次(微信占用冲突页的"换绑"动作)。见 phone_rebind_log。
-    PHONE_REBIND_LIMIT_DAYS: int = 30
 
     # ===== Admin 后台 =====
     # admin 用独立 JWT secret(≠ JWT_SECRET_KEY),App 用户 token 无法越权访问后台。
@@ -71,59 +66,7 @@ class Settings(BaseSettings):
     JG_VERIFY_ENDPOINT: str = "https://api.verification.jpush.cn/v1/web/loginTokenVerify"
     JG_REQUEST_TIMEOUT_SEC: int = 15
 
-    # ===== 厂商直推(无障碍保护存活告警)=====
-    ANDROID_PACKAGE_NAME: str = "com.jishisongfu.shaguabijia"
-    PUSH_REQUEST_TIMEOUT_SEC: int = 15
-    PUSH_TIME_TO_LIVE_SEC: int = 86400
-
-    HONOR_PUSH_APP_ID: str = ""
-    HONOR_PUSH_CLIENT_ID: str = ""
-    HONOR_PUSH_CLIENT_SECRET: str = ""
-    HONOR_PUSH_TOKEN_ENDPOINT: str = "https://iam.developer.honor.com/auth/token"
-    HONOR_PUSH_SEND_ENDPOINT_TEMPLATE: str = (
-        "https://push-api.cloud.honor.com/api/v1/{app_id}/sendMessage"
-    )
-
-    # 华为 Push Kit:AGC 控制台 → 项目设置 → 常规 → 应用,取 AppId + AppSecret
-    # (OAuth 换 token 时 client_id 即 AppId)。发送走 v1 messages:send,成功码 80000000。
-    HUAWEI_PUSH_APP_ID: str = ""
-    HUAWEI_PUSH_APP_SECRET: str = ""
-    HUAWEI_PUSH_TOKEN_ENDPOINT: str = "https://oauth-login.cloud.huawei.com/oauth2/v3/token"
-    HUAWEI_PUSH_SEND_ENDPOINT_TEMPLATE: str = (
-        "https://push-api.cloud.huawei.com/v1/{app_id}/messages:send"
-    )
-
-    VIVO_PUSH_APP_ID: str = ""
-    VIVO_PUSH_APP_KEY: str = ""
-    VIVO_PUSH_APP_SECRET: str = ""
-    VIVO_PUSH_AUTH_ENDPOINT: str = "https://api-push.vivo.com.cn/message/auth"
-    VIVO_PUSH_SEND_ENDPOINT: str = "https://api-push.vivo.com.cn/message/send"
-    VIVO_PUSH_MODE: int = 1                  # 0=正式推送,1=测试推送(未上架 vivo 时用)
-    VIVO_PUSH_NOTIFY_TYPE: int = 4           # 1=无,2=响铃,3=振动,4=响铃+振动
-    VIVO_PUSH_CATEGORY: str = "DEVICE_REMINDER"
-
-    XIAOMI_PUSH_APP_SECRET: str = ""
-    XIAOMI_PUSH_SEND_ENDPOINT: str = "https://api.xmpush.xiaomi.com/v3/message/regid"
-    XIAOMI_PUSH_CHANNEL_ID: str = ""
-    XIAOMI_PUSH_TEMPLATE_ID: str = ""
-    XIAOMI_PUSH_TEMPLATE_TITLE: str = ""
-    XIAOMI_PUSH_TEMPLATE_DESCRIPTION: str = ""
-    XIAOMI_PUSH_TEMPLATE_PARAM_JSON: str = ""
-
-    OPPO_PUSH_APP_KEY: str = ""
-    OPPO_PUSH_MASTER_SECRET: str = ""
-    OPPO_PUSH_AUTH_ENDPOINT: str = "https://api.push.oppomobile.com/server/v1/auth"
-    OPPO_PUSH_SEND_ENDPOINT: str = (
-        "https://api.push.oppomobile.com/server/v1/message/notification/unicast"
-    )
-    # OPPO 新消息分类(2024-11-20 后创建的应用必须携带,否则可能被拒/限):
-    # channel_id=通知栏通道(OPPO 后台「通道ID」),category=消息分类 code(如 MARKETING 内容营销)。
-    # notify_level=提醒方式(0=不传走 OPPO 默认;内容营销类仅支持 1 通知栏/2 通知栏+锁屏)。
-    OPPO_PUSH_CHANNEL_ID: str = ""
-    OPPO_PUSH_CATEGORY: str = ""
-    OPPO_PUSH_NOTIFY_LEVEL: int = 0
-
-    # 无障碍保护存活监控后台任务(推送 + pull 后置兜底)
+    # 无障碍保护存活监控后台任务(pull 后置检测;本期不接推送)
     HEARTBEAT_MONITOR_ENABLED: bool = True       # 总开关
     HEARTBEAT_TIMEOUT_MINUTES: int = 60          # 多久没心跳算掉线(1 小时,避免短暂离线误判被杀)
     HEARTBEAT_SCAN_INTERVAL_SEC: int = 60        # 扫描周期
@@ -138,7 +81,6 @@ class Settings(BaseSettings):
     SMS_SIGN_ID: int = 31729       # 极光短信签名 ID(非机密,可被 .env 覆盖)
     SMS_TEMPLATE_ID: int = 1       # 极光短信模板 ID(变量名 code,有效期 5 分钟)
     SMS_CODE_LENGTH: int = 6       # 验证码位数(本服务生成;前端 code 字段 4-8 位兼容)
-    SMS_DAILY_LIMIT_PER_PHONE: int = 10   # 单手机号每日发送上限(防刷 + 控费)
     SMS_MAX_VERIFY_ATTEMPTS: int = 5      # 单个验证码最多校验失败次数,超过即作废(防爆破)
 
     # ===== 测试账号(release 包全流程联调用)=====
@@ -164,9 +106,6 @@ class Settings(BaseSettings):
     # 美团调用走的代理。本机开发直连美团会 SSL EOF,需填 http://127.0.0.1:7897;
     # 线上国内服务器留空(=直连)。见 .env.example 与 integrations/meituan.py。
     MT_CPS_PROXY: str = ""
-    # 本地开发:开启后 /feed 接口直接返回 mock 数据,不调美团 API、不查离线库,
-    # 方便前端联调 feed 卡片样式、分页、距离排序等 UI。生产必须 false。
-    MT_CPS_MOCK_FEED: bool = True
 
     @property
     def mt_cps_configured(self) -> bool:
@@ -230,15 +169,6 @@ class Settings(BaseSettings):
     # 进程内自动兑换 worker 的检查间隔(秒):每隔这么久醒一次,跨过北京 0 点就跑一轮。
     # 默认 600s=10min,即 0 点后最多 10 分钟内兑完(客户端文案已注明「可能存在延迟」)。
     AUTO_EXCHANGE_CHECK_INTERVAL_SEC: int = 600
-    # === 15 天不活跃清零(app.core.inactivity_reset_worker,worker 常驻)===
-    # ENABLED 只决定是否**真清**:false(默认)= 只记审计名单、不动钱(dry-run,灰度看名单);
-    # true = 真清金币 + 折算现金(邀请金不清)。看准名单后再置 true。
-    INACTIVITY_RESET_ENABLED: bool = False
-    INACTIVITY_RESET_DAYS: int = 15                  # 不活跃阈值(天),第 (N+1) 日 0 点清
-    INACTIVITY_WARN_DAYS_BEFORE: str = "7,2"         # 清零前几天各推一次;""=不推。逗号分隔
-    INACTIVITY_RESET_RUN_HOUR: int = 3               # 北京时间每日执行点(0-23)
-    INACTIVITY_NOTIFY_CHANNEL: str = "log"           # log(占位) / jpush / sms
-    INACTIVITY_RESET_CHECK_INTERVAL_SEC: int = 1800  # worker 唤醒间隔(秒)
     # 免确认收款授权(用户授权免确认模式)的授权结果回调地址,必须公网可访问 HTTPS、不带参数。
     # 发起授权 / 首单顺带授权时作为 authorization_notify_url 传给微信。一期不处理回调内容
     # (授权状态靠 query 查询兜底),但微信要求该字段非空,故启用免确认前必须配置;留空时免确认相关接口返回未配置。
@@ -259,19 +189,6 @@ class Settings(BaseSettings):
         """免确认收款授权可用 = 微信支付凭证齐全 + 授权回调地址已配。"""
         return bool(self.wxpay_configured and self.WXPAY_AUTH_NOTIFY_URL)
 
-    @property
-    def inactivity_warn_stages(self) -> list[int]:
-        """解析 INACTIVITY_WARN_DAYS_BEFORE → 降序去重的提前天数列表。
-        丢弃非数字 / <=0 / >=RESET_DAYS 的项(空串 → 空列表 = 不推)。"""
-        out: list[int] = []
-        for part in (self.INACTIVITY_WARN_DAYS_BEFORE or "").split(","):
-            part = part.strip()
-            if part.isdigit():
-                v = int(part)
-                if 0 < v < self.INACTIVITY_RESET_DAYS and v not in out:
-                    out.append(v)
-        return sorted(out, reverse=True)
-
     # ===== 穿山甲激励视频(服务端发奖回调)=====
     # 看完激励视频后穿山甲服务器回调本服务发金币(S2S,客户端被破解也刷不到)。
     # 穿山甲后台配置的"奖励校验密钥"(m-key),验签用。每个 GroMore 广告位 m-key 不同(后台各自
@@ -399,31 +316,6 @@ class Settings(BaseSettings):
             return []
         return [o.strip() for o in self.CORS_ALLOW_ORIGINS.split(",") if o.strip()]
 
-    # ===== 可观测(OpenObserve 接口指标)=====
-    # 采集每个接口的 QPS + 耗时 + 错误率,批量直采到 OpenObserve(本地 Docker)。
-    # 默认关(prod 安全):未开启 → 中间件透传、worker 不启动,整套 no-op。
-    # 开启需 ENABLED=true 且 ENDPOINT/USER/PASSWORD 齐全(见 observe_configured)。
-    OBSERVE_ENABLED: bool = False
-    OBSERVE_ENDPOINT: str = "http://localhost:5080"   # OpenObserve base URL
-    OBSERVE_ORG: str = "default"                        # 组织名
-    OBSERVE_STREAM: str = "app_requests"               # stream 名(首次上报自动建)
-    OBSERVE_USER: str = ""                             # Basic auth 邮箱
-    OBSERVE_PASSWORD: str = ""                         # Basic auth 密码/token
-    OBSERVE_FLUSH_INTERVAL_SEC: float = 5.0            # worker 最长攒批间隔
-    OBSERVE_BATCH_MAX: int = 200                       # 单批最大事件数
-    OBSERVE_QUEUE_MAX: int = 10000                     # 有界队列上限,满则丢
-    OBSERVE_TIMEOUT_SEC: float = 5.0                   # 上报 HTTP 超时
-
-    @property
-    def observe_configured(self) -> bool:
-        """观测上报可用 = 总开关开 且 endpoint/账号/密码齐全(缺则整套 no-op)。"""
-        return bool(
-            self.OBSERVE_ENABLED
-            and self.OBSERVE_ENDPOINT
-            and self.OBSERVE_USER
-            and self.OBSERVE_PASSWORD
-        )
-
     @property
     def is_prod(self) -> bool:
         return self.APP_ENV == "prod"

app/core/config_schema.py

@@ -96,19 +96,4 @@ CONFIG_DEFS: dict[str, dict[str, Any]] = {
         "group": "首页轮播", "type": "enum", "hidden": True,
         "help": "mixed=真实优先+种子补位(默认);real=只用真实比价记录;seed=只用种子/合成(演示)。",
     },
-    # 比价 LLM 调用成本计价。值是嵌套 JSON(非 str→int),借 dict_str_int 类型在配置页走原始 JSON
-    # 编辑框;set_value 不校验类型,嵌套 JSON 照存。
-    "llm_token_price": {
-        "default": {
-            "per_model": {"qwen3.5-flash": {"input_per_1m": 0.8, "output_per_1m": 2.0}},
-            "default": {"input_per_1m": 3.0, "output_per_1m": 15.0},
-            "currency": "CNY", "unit": "per_1m_tokens",
-        },
-        "label": "LLM 模型单价(元/百万 token)",
-        "group": "LLM 成本", "type": "dict_str_int",
-        "help": (
-            "比价 LLM 调用成本计价。JSON:per_model 按模型配 input/output 单价(元/1M token),"
-            "default 兜底未登记的模型。改价只影响之后回填的新记录,历史记录用当时价格快照。"
-        ),
-    },
 }

app/core/heartbeat_monitor_worker.py

@@ -1,7 +1,7 @@
 """无障碍保护存活监控后台任务。
 
 周期扫描「曾经保护过、当前 alive、心跳超时」的设备 = App 被彻底杀掉/无障碍已停(心跳断了),
-**命中即在服务器终端打印告警并尝试厂商直推**;并把状态机
+**命中即在服务器终端打印告警**(本期先不接推送,工程量大,用终端打印代替真实通知);并把状态机
 推进到 notified 防每轮重复打印(心跳恢复时由 repositories.device.touch_heartbeat 重置回 alive)。
 结构仿 withdraw_reconcile_worker(单实例锁 + asyncio 轮询 + 优雅退出)。
 
@@ -22,7 +22,6 @@ from sqlalchemy.exc import SQLAlchemyError
 
 from app.core.config import settings
 from app.db.session import SessionLocal
-from app.integrations import vendor_push
 from app.repositories import device as device_repo
 
 logger = logging.getLogger("shagua.heartbeat_monitor")
@@ -72,66 +71,32 @@ def _silent_seconds(last: datetime | None) -> int | None:
     """距上次心跳的秒数(兼容 sqlite 取回的 naive datetime)。"""
     if last is None:
         return None
-    ref = datetime.now(timezone.utc) if last.tzinfo is not None else datetime.utcnow()  # noqa: UP017
+    ref = datetime.now(timezone.utc) if last.tzinfo is not None else datetime.utcnow()
     return int((ref - last).total_seconds())
 
 
 def _scan_once(timeout_minutes: int) -> dict:
-    """扫描一轮:找出心跳超时(App 被彻底杀掉/无障碍已停)的设备并召回。
+    """扫描一轮:找出心跳超时(App 被彻底杀掉/无障碍已停)的设备,在**服务器终端打印**告警代替真实推送。
 
-    有 push_vendor + push_token 时先发厂商直推,无 token 或推送失败时仍置
-    kill_alert_pending,客户端下次进 App 继续走后置提醒兜底。
+    本期不接推送(极光/厂商通道工程量大),只做服务端掉线检测:命中即 logger.warning 打印到终端,
+    并把状态机推进到 notified 防每轮重复打印(心跳恢复时 touch_heartbeat 会重置回 alive)。
     """
     notified = 0
-    pushed = 0
-    push_failed = 0
     with SessionLocal() as db:
         overdue = device_repo.list_overdue(db, timeout_minutes=timeout_minutes)
         for device in overdue:
             silent = _silent_seconds(device.last_heartbeat_at)
             logger.warning(
                 "[掉线检测] user_id=%s device_id=%s 已 %s 秒无心跳(阈值 %d 分钟)"
-                " → 判定 App 已被杀/无障碍已停。",
+                " → 判定 App 已被杀/无障碍已停。【已置 kill_alert_pending: 用户下次进 App 将弹「开启自启动」引导(后置检测);推送本期未接】",
                 device.user_id,
                 device.device_id,
                 silent if silent is not None else "?",
                 timeout_minutes,
             )
-            if device.push_vendor and device.push_token:
-                try:
-                    vendor_push.send_accessibility_disabled(
-                        device.push_vendor,
-                        device.push_token,
-                    )
-                    pushed += 1
-                    logger.info(
-                        "[掉线检测] push sent user_id=%s device_id=%s vendor=%s",
-                        device.user_id,
-                        device.device_id,
-                        device.push_vendor,
-                    )
-                except vendor_push.VendorPushError as e:
-                    push_failed += 1
-                    logger.warning(
-                        "[掉线检测] push failed user_id=%s device_id=%s error=%s",
-                        device.user_id,
-                        device.device_id,
-                        e,
-                    )
-            else:
-                logger.info(
-                    "[掉线检测] device has no push vendor/token, skip push user_id=%s device_id=%s",
-                    device.user_id,
-                    device.device_id,
-                )
             device_repo.mark_notified(db, device_id_pk=device.id)
             notified += 1
-        return {
-            "checked": len(overdue),
-            "notified": notified,
-            "pushed": pushed,
-            "push_failed": push_failed,
-        }
+        return {"checked": len(overdue), "notified": notified}
 
 
 async def _run_loop() -> None:

app/core/inactivity_reset_worker.py

@@ -1,145 +0,0 @@
-"""15 天不活跃清零的进程内每日任务。
-
-仿 daily_exchange_worker:App 启动自带,每 `INACTIVITY_RESET_CHECK_INTERVAL_SEC` 醒一次,
-跨进北京新的一天且到达 `INACTIVITY_RESET_RUN_HOUR`(默认 3 点)后跑一轮 `run_once`(预警 + 清零)。
-
-健壮性:
-- **逐用户幂等**:清完余额=0 次日不再匹配;预警按 streak 去重。启动补跑 / 多次唤醒 / 重启都安全。
-- **同机多进程互斥**:文件锁保证多 worker 只有一个实际跑。
-- **常驻 + dry-run 默认**:worker 一直跑;INACTIVITY_RESET_ENABLED=false(默认)只记审计名单、
-  不动钱(dry-run 灰度看名单),=true 才真清。
-
-⚠️ 这是不可逆批量资金操作(清空金币 + 折算现金,**邀请现金不清**)。口径见
-app.repositories.inactivity / app.repositories.activity。
-"""
-from __future__ import annotations
-
-import asyncio
-import contextlib
-import logging
-import os
-import time
-from collections.abc import Iterator
-from datetime import date, datetime
-from pathlib import Path
-
-from sqlalchemy.exc import SQLAlchemyError
-
-from app.core.config import settings
-from app.core.rewards import CN_TZ, cn_today
-from app.db.session import SessionLocal
-from app.integrations.notifier import get_notifier
-from app.repositories import inactivity as inactivity_repo
-
-logger = logging.getLogger("shagua.inactivity")
-_LOCK_PATH = Path(__file__).resolve().parents[2] / "data" / "inactivity_reset.lock"
-
-
-def _cn_today() -> date:
-    return cn_today()
-
-
-def _touch_lock() -> None:
-    with contextlib.suppress(FileNotFoundError):
-        os.utime(_LOCK_PATH, None)
-
-
-@contextlib.contextmanager
-def _single_instance_lock(stale_after_sec: int) -> Iterator[bool]:
-    """同机多进程保护:同一时间只允许一个清零 worker 运行。"""
-    _LOCK_PATH.parent.mkdir(parents=True, exist_ok=True)
-    fd: int | None = None
-    try:
-        try:
-            fd = os.open(str(_LOCK_PATH), os.O_CREAT | os.O_EXCL | os.O_WRONLY)
-        except FileExistsError:
-            try:
-                age = time.time() - _LOCK_PATH.stat().st_mtime
-            except FileNotFoundError:
-                age = stale_after_sec + 1
-            if age > stale_after_sec:
-                with contextlib.suppress(FileNotFoundError):
-                    _LOCK_PATH.unlink()
-                try:
-                    fd = os.open(str(_LOCK_PATH), os.O_CREAT | os.O_EXCL | os.O_WRONLY)
-                except FileExistsError:
-                    fd = None
-
-        if fd is None:
-            yield False
-            return
-
-        os.write(fd, f"pid={os.getpid()} started_at={int(time.time())}\n".encode("ascii"))
-        yield True
-    finally:
-        if fd is not None:
-            os.close(fd)
-            with contextlib.suppress(FileNotFoundError):
-                _LOCK_PATH.unlink()
-
-
-def _run_once_entry() -> dict:
-    """跑一轮(预警 + 清零)。独立开 Session。"""
-    notifier = get_notifier(settings.INACTIVITY_NOTIFY_CHANNEL)
-    with SessionLocal() as db:
-        return inactivity_repo.run_once(
-            db,
-            notifier=notifier,
-            reset_days=settings.INACTIVITY_RESET_DAYS,
-            warn_stages=settings.inactivity_warn_stages,
-            today=_cn_today(),
-            dry_run=not settings.INACTIVITY_RESET_ENABLED,  # ENABLED=false → 只记审计名单、不清
-        )
-
-
-async def _run_loop() -> None:
-    interval = max(60, int(settings.INACTIVITY_RESET_CHECK_INTERVAL_SEC))
-    lock_stale_after = max(interval * 3, 1800)
-    with _single_instance_lock(lock_stale_after) as lock_acquired:
-        if not lock_acquired:
-            logger.warning("inactivity reset skipped: another worker owns lock")
-            return
-        await _run_locked_loop(interval)
-
-
-async def _run_locked_loop(interval: int) -> None:
-    logger.info(
-        "inactivity reset worker started interval=%ss run_hour=%s mode=%s",
-        interval,
-        settings.INACTIVITY_RESET_RUN_HOUR,
-        "clear" if settings.INACTIVITY_RESET_ENABLED else "dry-run(audit-only)",
-    )
-    # 本进程上次跑过的北京日;None=尚未跑过本进程(当天到点即补)。
-    last_run: date | None = None
-    try:
-        while True:
-            try:
-                _touch_lock()
-                today = _cn_today()
-                hour = datetime.now(CN_TZ).hour
-                if last_run != today and hour >= int(settings.INACTIVITY_RESET_RUN_HOUR):
-                    result = await asyncio.to_thread(_run_once_entry)
-                    last_run = today
-                    logger.info("inactivity reset done date=%s result=%s", today, result)
-            except SQLAlchemyError:
-                logger.exception("inactivity reset db error")
-            except Exception:  # noqa: BLE001 - 后台任务不能因单次异常退出
-                logger.exception("inactivity reset unexpected error")
-            await asyncio.sleep(interval)
-    except asyncio.CancelledError:
-        logger.info("inactivity reset worker stopped")
-        raise
-
-
-def start_inactivity_reset_worker() -> asyncio.Task | None:
-    # worker 常驻(不再有"完全关"档);INACTIVITY_RESET_ENABLED 只决定是否**真清**:
-    # false(默认)= 只记审计名单(dry-run,不动钱),true = 真清金币+现金。
-    return asyncio.create_task(_run_loop(), name="inactivity-reset")
-
-
-async def stop_inactivity_reset_worker(task: asyncio.Task | None) -> None:
-    if task is None:
-        return
-    task.cancel()
-    with contextlib.suppress(asyncio.CancelledError):
-        await task

app/core/notification_catalog.py

@@ -1,241 +0,0 @@
-"""消息通知中心:13 种通知类型的静态目录 + Push 文案模板。
-
-对应 PRD《消息通知中心》:§1 类型清单 / §3 字段元素 / §5 Push 文案。
-这里只放**静态定义**(分类、版式、标题、操作行、Push 模板),供两处消费:
-  - repositories/notification.py       消息中心列表按 type 派生分类/版式/标题/操作行
-  - api/v1/push.py                     渲染 13 类 push 标题/文案(厂商推送 + 测试端点)
-
-PRD 文案规范(§5):push 标题 ≤11 字、固定文案不带变量;变量只出现在正文里且尽量前置。
-模板变量用 `{name}` 占位,渲染时缺省回退 sample_vars(PRD 示例值),保证 mock 阶段随时可发。
-"""
-from __future__ import annotations
-
-from dataclasses import dataclass, field
-
-# ---------------------------------------------------------------------------
-# 分类(仅作卡片头部的分类标签展示;列表不按分类分组——PRD §1 的分组已确认取消,全表时间倒序)
-# ---------------------------------------------------------------------------
-
-CATEGORY_WITHDRAW = "withdraw_assistant"
-CATEGORY_SYSTEM = "system"
-CATEGORY_FEEDBACK = "feedback"
-CATEGORY_REPORT = "report"
-CATEGORY_INVITE = "invite"
-
-# key → 中文标签
-CATEGORIES: dict[str, str] = {
-    CATEGORY_WITHDRAW: "提现助手",
-    CATEGORY_SYSTEM: "系统通知",
-    CATEGORY_FEEDBACK: "我的反馈",
-    CATEGORY_REPORT: "我的爆料",
-    CATEGORY_INVITE: "好友邀请",
-}
-
-
-def category_label(key: str) -> str:
-    return CATEGORIES[key]
-
-
-# ---------------------------------------------------------------------------
-# 卡片版式(PRD §3「版式」列;前端按此渲染五种卡)
-# ---------------------------------------------------------------------------
-
-CARD_DUAL_AMOUNT = "dual_amount"    # 双金额卡(金币数 + 现金数)
-CARD_WITHDRAW = "withdraw"          # 提现卡(¥金额)
-CARD_PLAIN_TEXT = "plain_text"      # 纯文本卡(无数值)
-CARD_COIN_REWARD = "coin_reward"    # 金币奖励卡(金币数 + 单位「金币」)
-CARD_FRIEND_CASH = "friend_cash"    # 好友现金卡(¥金额)
-
-
-@dataclass(frozen=True)
-class NotificationType:
-    """一种通知类型的静态定义(卡片元数据 + Push 模板)。"""
-
-    key: str                    # 类型 key(接口 type 字段;前端按它决定点击跳转,见 PRD §2)
-    category: str               # 分类 key(CATEGORIES 之一)
-    card_style: str             # 卡片版式(CARD_* 之一)
-    card_title: str             # 卡片标题(PRD §3「标题」列)
-    action_text: str | None     # 操作行文案;None = 无操作行(如「提现成功」)
-    push_title: str             # push 标题(≤11 字固定文案,PRD §5)
-    push_body_template: str     # push 正文模板,`{var}` 为变量
-    sample_vars: dict[str, str] = field(default_factory=dict)  # PRD 示例值,渲染缺省回退
-
-
-# 13 种类型,编号/文案与 PRD §1/§3/§5 一一对应(插入顺序 = PRD 编号顺序)。
-TYPES: dict[str, NotificationType] = {
-    t.key: t
-    for t in [
-        # -- 提现助手 -------------------------------------------------------
-        NotificationType(
-            key="reward_expiring",
-            category=CATEGORY_WITHDRAW,
-            card_style=CARD_DUAL_AMOUNT,
-            card_title="金币现金奖励即将失效",
-            action_text="立即激活您的收益",
-            push_title="您的奖励即将失效",
-            push_body_template="{coins}金币和{cash}元现金{days}天后失效，完成快来激活收益",
-            sample_vars={"coins": "86", "cash": "12.80", "days": "3"},
-        ),
-        NotificationType(
-            key="reward_expired",
-            category=CATEGORY_WITHDRAW,
-            card_style=CARD_DUAL_AMOUNT,
-            card_title="金币现金奖励已失效",
-            action_text="立即赚取新收益",
-            push_title="您的奖励已失效",
-            push_body_template="{coins}金币和{cash}元现金已过期，完成一次一键领券或一键比价可赚取新收益",
-            sample_vars={"coins": "35", "cash": "0.60"},
-        ),
-        NotificationType(
-            key="withdraw_success",
-            category=CATEGORY_WITHDRAW,
-            card_style=CARD_WITHDRAW,
-            card_title="提现成功",
-            action_text=None,  # PRD §3:提现成功卡无操作行,点击也无跳转、仅消红点
-            push_title="提现到账提醒",
-            push_body_template="¥{amount}已存入您的微信钱包，点击查看到账详情",
-            sample_vars={"amount": "0.50"},
-        ),
-        NotificationType(
-            key="withdraw_failed",
-            category=CATEGORY_WITHDRAW,
-            card_style=CARD_WITHDRAW,
-            card_title="提现失败，款项已退回",
-            action_text="重新提现",
-            push_title="提现失败，款项已退回",
-            push_body_template="¥{amount}因{reason}退回现金余额，点击重新提现",
-            sample_vars={"amount": "3.50", "reason": "微信零钱未实名"},
-        ),
-        # -- 系统通知(权限异常 ×4;标题里的功能名按类型写死,见 PRD §1/§3)----
-        NotificationType(
-            key="perm_accessibility",
-            category=CATEGORY_SYSTEM,
-            card_style=CARD_PLAIN_TEXT,
-            card_title="检测到您的比价功能已失效",
-            action_text="去开启",
-            push_title="检测到您的比价功能已失效",
-            push_body_template="未开启将导致核心功能不可用，请尽快来傻瓜比价开启",
-        ),
-        NotificationType(
-            key="perm_battery",
-            category=CATEGORY_SYSTEM,
-            card_style=CARD_PLAIN_TEXT,
-            card_title="检测到您的比价续航保护已失效",
-            action_text="去开启",
-            push_title="检测到您的比价续航保护已失效",
-            push_body_template="未开启将导致核心功能不可用，请尽快来傻瓜比价开启",
-        ),
-        NotificationType(
-            key="perm_autostart",
-            category=CATEGORY_SYSTEM,
-            card_style=CARD_PLAIN_TEXT,
-            card_title="检测到您的比价启动保护已失效",
-            action_text="去开启",
-            push_title="检测到您的比价启动保护已失效",
-            push_body_template="未开启将导致核心功能不可用，请尽快来傻瓜比价开启",
-        ),
-        NotificationType(
-            key="perm_overlay",
-            category=CATEGORY_SYSTEM,
-            card_style=CARD_PLAIN_TEXT,
-            card_title="检测到您的比价按钮已失效",
-            action_text="去开启",
-            push_title="检测到您的比价按钮已失效",
-            push_body_template="未开启将导致核心功能不可用，请尽快来傻瓜比价开启",
-        ),
-        # -- 我的反馈 -------------------------------------------------------
-        NotificationType(
-            key="feedback_reply",
-            category=CATEGORY_FEEDBACK,
-            card_style=CARD_PLAIN_TEXT,
-            card_title="傻瓜比价官方回复了您的反馈",
-            action_text="查看详情",
-            push_title="您的反馈有回复啦",
-            push_body_template="您提的建议我们认真看过了，来看看我们的回复吧～",
-        ),
-        NotificationType(
-            key="feedback_reward",
-            category=CATEGORY_FEEDBACK,
-            card_style=CARD_COIN_REWARD,
-            card_title="反馈奖励",
-            action_text="查看反馈详情",
-            push_title="反馈奖励已到账",
-            push_body_template="谢谢您帮傻瓜比价变得更好，{coins}金币已到账，还有一条给您的留言～",
-            sample_vars={"coins": "300"},
-        ),
-        # -- 我的爆料 -------------------------------------------------------
-        NotificationType(
-            key="report_approved",
-            category=CATEGORY_REPORT,
-            card_style=CARD_COIN_REWARD,
-            card_title="爆料审核通过",
-            action_text="查看爆料详情",
-            push_title="爆料审核通过",
-            push_body_template="您爆料的「{store}」更低价审核通过，{coins}金币已到账，感谢您的分享",
-            sample_vars={"store": "蜀大侠火锅", "coins": "1000"},
-        ),
-        # -- 好友邀请 -------------------------------------------------------
-        NotificationType(
-            key="invite_order_reward",
-            category=CATEGORY_INVITE,
-            card_style=CARD_FRIEND_CASH,
-            card_title="好友比价成功，现金已到账",
-            action_text="邀请更多好友赚现金",
-            push_title="您的邀请奖励已到账",
-            push_body_template="您的好友「{nickname}」完成首次下单，{amount}元现金已到账",
-            sample_vars={"nickname": "柚子", "amount": "2"},
-        ),
-        NotificationType(
-            key="invite_remind",
-            category=CATEGORY_INVITE,
-            card_style=CARD_PLAIN_TEXT,
-            card_title="你邀请的好友还差一步",
-            action_text="去提醒 TA",
-            push_title="提醒好友完成比价的奖励",
-            push_body_template="您的好友「{nickname}」还没完成比价下单，提醒TA完成，您可得{amount}元现金",
-            sample_vars={"nickname": "阿泽", "amount": "2"},
-        ),
-    ]
-}
-
-
-class UnknownNotificationType(ValueError):
-    """type key 不在 13 种类型之内。"""
-
-
-def get_type(type_key: str) -> NotificationType:
-    ntype = TYPES.get(type_key)
-    if ntype is None:
-        raise UnknownNotificationType(
-            f"unknown notification type: {type_key!r} (可选: {', '.join(TYPES)})"
-        )
-    return ntype
-
-
-def render_push(type_key: str, variables: dict[str, str] | None = None) -> tuple[str, str]:
-    """渲染某类型的 push (标题, 正文)。
-
-    variables 覆盖模板变量;缺的变量回退 sample_vars(PRD 示例值)——保证虚拟数据
-    阶段不传变量也能发出完整文案。多余的变量忽略。
-    """
-    ntype = get_type(type_key)
-    merged = {**ntype.sample_vars, **(variables or {})}
-
-    class _Fallback(dict):
-        def __missing__(self, key: str) -> str:  # 模板变量既没传也没示例值 → 保留 {key} 原样
-            return "{" + key + "}"
-
-    body = ntype.push_body_template.format_map(_Fallback(merged))
-    return ntype.push_title, body
-
-
-def push_variable_names(type_key: str) -> list[str]:
-    """列出模板里出现的变量名(给 /push/templates 预览用)。"""
-    import string
-
-    ntype = get_type(type_key)
-    return [
-        fname
-        for _, fname, _, _ in string.Formatter().parse(ntype.push_body_template)
-        if fname
-    ]

app/core/observe.py

@@ -1,110 +0,0 @@
-"""接口指标埋点:有界事件队列 + 纯 ASGI 中间件。
-
-每个 HTTP 请求测总耗时、抓路由模板 + 状态码,非阻塞塞进有界队列;由 observe_worker
-后台批量上报到 OpenObserve。请求路径上无任何 I/O。未配置观测时中间件直接透传。
-"""
-from __future__ import annotations
-
-import asyncio
-import os
-import time
-
-from starlette.routing import Match
-
-from app.core.config import settings
-
-# 不采集的路径(纯噪音):健康检查。
-_SKIP_PATHS = frozenset({"/health"})
-# 未匹配路由(404/扫描器)归一到此,防维度爆炸。
-_UNMATCHED = "__unmatched__"
-# service 字段:与 logging.py 同源(LOG_SERVICE_NAME),默认 app-server。
-_SERVICE = os.getenv("LOG_SERVICE_NAME", "app-server")
-
-# 有界事件队列(懒创建,见 get_queue):首次取用时在运行中的 loop 里建,避免 import 期
-# 无 loop 的边角问题;put_nowait/get_nowait 不需运行中的 loop → 可在无 loop 下测试。
-_queue: asyncio.Queue[dict] | None = None
-# 队列满时的丢弃计数,worker 定期取出打日志。
-_dropped = 0
-
-
-def get_queue() -> asyncio.Queue[dict]:
-    """返回全局有界事件队列(懒创建)。测试可 monkeypatch 模块级 _queue 换成小队列。"""
-    global _queue
-    if _queue is None:
-        _queue = asyncio.Queue(maxsize=settings.OBSERVE_QUEUE_MAX)
-    return _queue
-
-
-def take_dropped() -> int:
-    """取出并清零累计丢弃数(供 worker 打点)。"""
-    global _dropped
-    n, _dropped = _dropped, 0
-    return n
-
-
-def record_event(event: dict) -> None:
-    """非阻塞入队;队列满则丢弃当前事件并计数。永不抛异常、永不阻塞请求。"""
-    global _dropped
-    try:
-        get_queue().put_nowait(event)
-    except asyncio.QueueFull:
-        _dropped += 1
-
-
-def _resolve_route(scope) -> str:
-    """从 scope 取路由模板(如 /things/{tid})。优先 scope['route'](现代 Starlette
-    路由后写入);取不到则手动匹配一次(老版本兜底);仍无 → __unmatched__(404/扫描器)。"""
-    route = scope.get("route")
-    path = getattr(route, "path", None)
-    if path:
-        return path
-    app_ = scope.get("app")
-    router = getattr(app_, "router", None)
-    for candidate in getattr(router, "routes", []):
-        try:
-            match, _ = candidate.matches(scope)
-        except Exception:  # noqa: BLE001 - 匹配兜底,任一路由异常不影响整体
-            continue
-        if match == Match.FULL and getattr(candidate, "path", None):
-            return candidate.path
-    return _UNMATCHED
-
-
-class RequestMetricsMiddleware:
-    """纯 ASGI 中间件:测每个 http 请求耗时,记 method/route/status/duration。
-
-    放在最外层(main.py 里 CORS 之后 add),测到含 CORS 的完整耗时。未配置观测 → 透传。
-    """
-
-    def __init__(self, app) -> None:
-        self.app = app
-
-    async def __call__(self, scope, receive, send) -> None:
-        if scope["type"] != "http" or not settings.observe_configured:
-            await self.app(scope, receive, send)
-            return
-        if scope.get("path") in _SKIP_PATHS:
-            await self.app(scope, receive, send)
-            return
-
-        start = time.perf_counter()
-        status_holder = {"status": 500}  # 下游异常未产出 response 时兜底 500
-
-        async def send_wrapper(message) -> None:
-            if message["type"] == "http.response.start":
-                status_holder["status"] = message["status"]
-            await send(message)
-
-        try:
-            await self.app(scope, receive, send_wrapper)
-        finally:
-            duration_ms = (time.perf_counter() - start) * 1000.0
-            record_event({
-                "_timestamp": int(time.time() * 1_000_000),  # µs,OpenObserve 时间列
-                "service": _SERVICE,
-                "env": settings.APP_ENV,
-                "method": scope.get("method", ""),
-                "route": _resolve_route(scope),
-                "status": status_holder["status"],
-                "duration_ms": round(duration_ms, 3),
-            })

app/core/observe_worker.py

@@ -1,128 +0,0 @@
-"""接口指标后台上报 worker:批量 drain 事件队列 → POST 到 OpenObserve。
-
-对齐 heartbeat_monitor_worker 等的 start_*/stop_* 形态。best-effort 遥测:catch 全部
-异常,上报失败直接丢批不重试。未配置观测 → start 返回 None(不启动),整套 no-op。
-"""
-from __future__ import annotations
-
-import asyncio
-import contextlib
-import logging
-
-import httpx
-
-from app.core.config import settings
-from app.core.observe import get_queue, take_dropped
-
-logger = logging.getLogger("shagua.observe")
-
-# 上报用的 httpx client,start 时建、stop 时关。
-_client: httpx.AsyncClient | None = None
-
-
-async def _collect_batch() -> list[dict]:
-    """等到 ≥1 条(或到 flush 间隔)后,连抽到 BATCH_MAX 条或抽空。超时且空 → 返回 []。"""
-    queue = get_queue()
-    batch: list[dict] = []
-    try:
-        first = await asyncio.wait_for(
-            queue.get(), timeout=settings.OBSERVE_FLUSH_INTERVAL_SEC
-        )
-    except asyncio.TimeoutError:  # noqa: UP041 - 3.10 兼容:该版 wait_for 抛的 asyncio.TimeoutError ≠ 内置 TimeoutError
-        return batch
-    batch.append(first)
-    while len(batch) < settings.OBSERVE_BATCH_MAX:
-        try:
-            batch.append(queue.get_nowait())
-        except asyncio.QueueEmpty:
-            break
-    return batch
-
-
-async def _post_batch(client: httpx.AsyncClient, batch: list[dict]) -> None:
-    """POST 一批事件到 OpenObserve 的 _json ingest 端点。非 2xx 仅告警。"""
-    url = f"/api/{settings.OBSERVE_ORG}/{settings.OBSERVE_STREAM}/_json"
-    resp = await client.post(url, json=batch)
-    if resp.status_code >= 300:
-        logger.warning(
-            "observe ingest failed status=%s body=%s",
-            resp.status_code,
-            resp.text[:200],
-        )
-
-
-async def _run_loop(client: httpx.AsyncClient) -> None:
-    try:
-        while True:
-            batch = await _collect_batch()
-            dropped = take_dropped()
-            if dropped:
-                logger.warning("observe dropped %d events (queue full)", dropped)
-            if not batch:
-                continue
-            try:
-                await _post_batch(client, batch)
-            except Exception:  # noqa: BLE001 - best-effort 遥测,失败丢批不重试、不退出
-                logger.warning(
-                    "observe post batch failed, dropped %d events",
-                    len(batch),
-                    exc_info=True,
-                )
-    except asyncio.CancelledError:
-        logger.info("observe worker stopped")
-        raise
-
-
-def start_observe_worker() -> asyncio.Task | None:
-    """启动上报 worker。未配置观测 → 返回 None(no-op)。约定每进程只调一次(lifespan)。"""
-    global _client
-    if not settings.observe_configured:
-        return None
-    if _client is not None:
-        # 约定 start 每进程只调一次;已启动则不重复建 client(避免泄漏旧连接池)。
-        logger.warning("observe worker already started; ignoring duplicate start")
-        return None
-    _client = httpx.AsyncClient(
-        base_url=settings.OBSERVE_ENDPOINT,
-        auth=(settings.OBSERVE_USER, settings.OBSERVE_PASSWORD),
-        timeout=settings.OBSERVE_TIMEOUT_SEC,
-    )
-    logger.info(
-        "observe worker started endpoint=%s org=%s stream=%s",
-        settings.OBSERVE_ENDPOINT,
-        settings.OBSERVE_ORG,
-        settings.OBSERVE_STREAM,
-    )
-    return asyncio.create_task(_run_loop(_client), name="observe-worker")
-
-
-async def stop_observe_worker(task: asyncio.Task | None) -> None:
-    """收尾:cancel worker → best-effort 发最后一批 → 关 client。"""
-    global _client
-    if task is None:
-        return
-    task.cancel()
-    with contextlib.suppress(asyncio.CancelledError):
-        await task
-    dropped = take_dropped()  # 收口:补记最后一个 flush 窗口累计的丢弃数,不让账丢在关停期
-    if dropped:
-        logger.warning("observe dropped %d events (queue full) before shutdown", dropped)
-    if _client is not None:
-        # worker 已停,安全 drain 剩余并 best-effort 发最后一批(短超时,不卡关停);
-        # 超过一批(BATCH_MAX)的剩余直接丢,不做多轮 flush(best-effort,关停从速)。
-        try:
-            queue = get_queue()
-            final: list[dict] = []
-            while len(final) < settings.OBSERVE_BATCH_MAX:
-                try:
-                    final.append(queue.get_nowait())
-                except asyncio.QueueEmpty:
-                    break
-            if final:
-                await asyncio.wait_for(
-                    _post_batch(_client, final), timeout=settings.OBSERVE_TIMEOUT_SEC
-                )
-        except Exception:  # noqa: BLE001 - 关停期尽力而为,失败忽略
-            pass
-        await _client.aclose()
-        _client = None

app/core/ratelimit.py

@@ -9,41 +9,29 @@ from __future__ import annotations
 
 import threading
 import time
-from typing import NamedTuple
 
 from fastapi import HTTPException, Request, status
 
 from app.core.config import settings
 
-# key -> (window_start_ts, count, window_sec)
-# 存每个 key 自己的 window_sec:_buckets 混着不同窗口(60s 广告 / 3600s 登录 / 86400s 日闸)的 key,
-# GC 必须按各 key 自己的窗口判过期(见 [_purge_expired]),否则短窗口调用触发的 GC 会误删长窗口 key。
-_buckets: dict[str, tuple[float, int, float]] = {}
+# key -> (window_start_ts, count)
+_buckets: dict[str, tuple[float, int]] = {}
 _lock = threading.Lock()
-_GC_THRESHOLD = 10000  # _buckets 超此阈值才顺手清过期 key(仿 sms.py;测试可 monkeypatch 调小强制每次扫)
-
-
-def _purge_expired(now: float) -> None:
-    """清过期 key(**仅在持有 _lock 时调用**)。按每个 key 自己存的 window_sec 判过期,而非调用方的窗口
-    —— _buckets 是全局共享、混着 60s(广告)/3600s(登录)/86400s(日闸)不同窗口的 key;若用调用方窗口,
-    高频的 60s 广告端点触发 GC 时会把本该活 3600s/86400s 的登录/日闸计数一并删掉,使其在规模上(超阈值才
-    触发本清理)被反复清零而失效。仅在超阈值时扫,低频、开销可忽略。"""
-    if len(_buckets) <= _GC_THRESHOLD:
-        return
-    for k in [k for k, (s, _, w) in _buckets.items() if now - s >= w]:
-        _buckets.pop(k, None)
 
 
 def _hit(key: str, limit: int, window_sec: float) -> bool:
     """记一次访问。返回 True=放行,False=超限。"""
     now = time.monotonic()
     with _lock:
-        start, count, _ = _buckets.get(key, (now, 0, window_sec))
+        start, count = _buckets.get(key, (now, 0))
         if now - start >= window_sec:  # 窗口过期,重置
             start, count = now, 0
         count += 1
-        _buckets[key] = (start, count, window_sec)
-        _purge_expired(now)  # 顺手清过期 key(按各自窗口),防内存无限涨
+        _buckets[key] = (start, count)
+        # 顺手清理过期 key,防内存无限涨(低频访问足够)
+        if len(_buckets) > 10000:
+            for k in [k for k, (s, _) in _buckets.items() if now - s >= window_sec]:
+                _buckets.pop(k, None)
     return count <= limit
 
 
@@ -95,76 +83,3 @@ def enforce_rate_limit(
             status_code=status.HTTP_429_TOO_MANY_REQUESTS,
             detail=detail,
         )
-
-
-# ===================== 先判 / 后记(只按「成功」计数)=====================
-# _hit 是原子「判+记」:一调用就 +1,适合登录爆破(失败尝试也要计)。但对「短信发码」这类
-# **只想给成功动作计数**的场景不合适 —— 被单号冷却挡下的重发没真发、没烧钱,不该占额度。
-# 故拆成 _peek(只判不记)+ _commit(只记):check_rate_limits 先判 → 动作 → 成功后 record。
-
-
-class RateLimitRule(NamedTuple):
-    """一条限流规则。scope 区分不同闸(不同 key 前缀);同一 (subject, IP) 在 window_sec
-    内最多 limit 次,超限抛 429 用 detail 文案。
-
-    (scope, window_sec) 成对绑在一条规则里 —— check(先判)与 record(计数)复用同一条,
-    避免两处把窗口/scope 写歪导致 key 对不上。
-    """
-
-    scope: str
-    limit: int
-    window_sec: float
-    detail: str = "操作过于频繁,请稍后再试"
-
-
-def _peek(key: str, limit: int, window_sec: float) -> bool:
-    """只读:当前窗口内是否还没到上限(count < limit)。**不改计数**。
-    与 [_commit] 配对实现「先判后记」——只在动作成功后才 _commit。"""
-    now = time.monotonic()
-    with _lock:
-        start, count, _ = _buckets.get(key, (now, 0, window_sec))
-        if now - start >= window_sec:  # 窗口已过期 → 视作已重置(count 归零)
-            count = 0
-    return count < limit
-
-
-def _commit(key: str, window_sec: float) -> None:
-    """记一次访问(+1)。窗口过期则以本次为起点重置。仅在动作成功后调用。"""
-    now = time.monotonic()
-    with _lock:
-        start, count, _ = _buckets.get(key, (now, 0, window_sec))
-        if now - start >= window_sec:  # 窗口过期,重置
-            start, count = now, 0
-        _buckets[key] = (start, count + 1, window_sec)
-        _purge_expired(now)  # 顺手清过期 key(按各自窗口,同 [_hit])
-
-
-def check_rate_limits(request: Request, subject: str, rules: list[RateLimitRule]) -> None:
-    """【先判】一组限流:任一规则已达上限即抛 429,且**不改计数**。
-
-    配合 [record_rate_limits] 实现「只按成功计数」:先 check 所有闸(全未超才继续)→ 执行动作
-    → 动作**成功后**再 record。动作被下游挡下(如短信单号冷却)、没真正发生时不 record → 不占额度。
-    key = `scope:subject:client_ip`(与 [enforce_rate_limit] 同款)。
-    """
-    if not settings.RATE_LIMIT_ENABLED:
-        return
-    ip = _client_ip(request)
-    for rule in rules:
-        if not _peek(f"{rule.scope}:{subject}:{ip}", rule.limit, rule.window_sec):
-            raise HTTPException(
-                status_code=status.HTTP_429_TOO_MANY_REQUESTS,
-                detail=rule.detail,
-            )
-
-
-def record_rate_limits(request: Request, subject: str, rules: list[RateLimitRule]) -> None:
-    """【记一次】一组限流(每条规则 +1)。仅在动作成功后调用,与 [check_rate_limits] 配对。
-
-    ⚠️ check→动作→record 非原子:并发突发下计数可能略超 limit(每个在途请求各 +1)。对
-    「防脚本/防轰炸」的安全网定位可接受;要精确配额需迁 Redis(见模块 docstring)。
-    """
-    if not settings.RATE_LIMIT_ENABLED:
-        return
-    ip = _client_ip(request)
-    for rule in rules:
-        _commit(f"{rule.scope}:{subject}:{ip}", rule.window_sec)

app/core/rewards.py

@@ -6,7 +6,6 @@
 from __future__ import annotations
 
 from datetime import date, datetime, timedelta, timezone
-from typing import NamedTuple
 
 # 业务时区:签到的"今天"按北京时间算,不能用 UTC。
 # 否则 UTC+8 的凌晨 0~8 点会被算成 UTC 的前一天,导致签到日期错位。
@@ -53,30 +52,6 @@ WITHDRAW_MIN_CENTS: int = 10
 WITHDRAW_MAX_CENTS: int = 5_000_000  # 5 万元
 
 
-# ===== 提现档位(福利页 coin_cash;7-9 对齐原型 withdrawal.html)=====
-# 后端是档位唯一真相源:withdraw-info 按此下发,create_withdraw 按此校验(防绕过客户端刷)。
-# 规则(2026-07-09 拍板):
-#   - 新人档(is_newbie):账号历史一次性,"发起就算用过"(任意状态含被拒),用过即不再下发;
-#     0.1 与 0.3 各自独立同天可各提一次,且不参与常规档"每日选一个额度"互斥。
-#   - 常规档:按北京日计次(0.5×3 / 10×1 / 20×1),三档每天只能选一个。
-# invite_cash(邀请页)本轮无档位概念,不在此表。改档位=改这里发版。
-class WithdrawTier(NamedTuple):
-    amount_cents: int
-    label: str          # 客户端档位方块展示文案
-    badge: str | None   # 角标文案;None=无角标
-    daily_limit: int    # 每日次数上限(新人档的"历史一次性"另由 is_newbie 判定)
-    is_newbie: bool
-
-
-WITHDRAW_TIERS_COIN_CASH: tuple[WithdrawTier, ...] = (
-    WithdrawTier(10, "0.1", "新人福利", 1, True),
-    WithdrawTier(30, "0.3", "新人福利", 1, True),
-    WithdrawTier(50, "0.5", None, 3, False),
-    WithdrawTier(1000, "10", None, 1, False),
-    WithdrawTier(2000, "20", None, 1, False),
-)
-
-
 # ===== 一次性任务(领一次,user_task 去重)=====
 TASK_ENABLE_NOTIFICATION = "enable_notification"
 

app/core/security.py

@@ -87,91 +87,6 @@ def issue_token_pair(user_id: int) -> dict[str, Any]:
     }
 
 
-def create_bind_ticket(
-    *, openid: str, wechat_nickname: str | None, wechat_avatar_url: str | None
-) -> str:
-    """微信登录未命中 openid 时,签发短时"待绑手机"令牌,承载 openid + 微信昵称头像。
-
-    typ='wechat_bind'、sub=openid;有效期 settings.WECHAT_BIND_TICKET_EXPIRE_MINUTES 分钟。
-    与 access/refresh 用同一 JWT_SECRET_KEY 签名,靠 typ 区分,decode_bind_ticket 校验 typ。
-    """
-    now = _now()
-    expire = now + timedelta(minutes=settings.WECHAT_BIND_TICKET_EXPIRE_MINUTES)
-    payload: dict[str, Any] = {
-        "sub": openid,
-        "typ": "wechat_bind",
-        "wnk": wechat_nickname,
-        "wav": wechat_avatar_url,
-        "iat": int(now.timestamp()),
-        "exp": int(expire.timestamp()),
-    }
-    return jwt.encode(payload, settings.JWT_SECRET_KEY, algorithm=settings.JWT_ALGORITHM)
-
-
-def decode_bind_ticket(token: str) -> dict[str, Any]:
-    """解析"待绑手机"令牌,校验签名/过期/类型。失败抛 TokenError。
-
-    返回 {'openid': str, 'wnk': str|None, 'wav': str|None}。
-    """
-    try:
-        payload = jwt.decode(token, settings.JWT_SECRET_KEY, algorithms=[settings.JWT_ALGORITHM])
-    except jwt.ExpiredSignatureError as e:
-        raise TokenError("bind ticket expired") from e
-    except jwt.InvalidTokenError as e:
-        raise TokenError(f"invalid bind ticket: {e}") from e
-    if payload.get("typ") != "wechat_bind":
-        raise TokenError(f"wrong token type: want=wechat_bind got={payload.get('typ')}")
-    if "sub" not in payload:
-        raise TokenError("bind ticket missing sub")
-    return {"openid": payload["sub"], "wnk": payload.get("wnk"), "wav": payload.get("wav")}
-
-
-def create_conflict_ticket(
-    *, openid: str, wechat_nickname: str | None, wechat_avatar_url: str | None, phone: str
-) -> str:
-    """手机号占用时签发的短时"冲突处理"令牌。
-
-    比 bind_ticket 多编码 **已验证的手机号 phone** —— 换绑/继续绑定只认它,证明"这对
-    openid/手机号刚在绑号时验证通过",免用户重输验证码,又堵住"拿自己 openid + 任意手机号
-    去夺号"的接管漏洞。typ='wechat_conflict';有效期复用 WECHAT_BIND_TICKET_EXPIRE_MINUTES。
-    """
-    now = _now()
-    expire = now + timedelta(minutes=settings.WECHAT_BIND_TICKET_EXPIRE_MINUTES)
-    payload: dict[str, Any] = {
-        "sub": openid,
-        "typ": "wechat_conflict",
-        "wnk": wechat_nickname,
-        "wav": wechat_avatar_url,
-        "phn": phone,
-        "iat": int(now.timestamp()),
-        "exp": int(expire.timestamp()),
-    }
-    return jwt.encode(payload, settings.JWT_SECRET_KEY, algorithm=settings.JWT_ALGORITHM)
-
-
-def decode_conflict_ticket(token: str) -> dict[str, Any]:
-    """解析"冲突处理"令牌,校验签名/过期/类型。失败抛 TokenError。
-
-    返回 {'openid': str, 'wnk': str|None, 'wav': str|None, 'phone': str}。
-    """
-    try:
-        payload = jwt.decode(token, settings.JWT_SECRET_KEY, algorithms=[settings.JWT_ALGORITHM])
-    except jwt.ExpiredSignatureError as e:
-        raise TokenError("conflict ticket expired") from e
-    except jwt.InvalidTokenError as e:
-        raise TokenError(f"invalid conflict ticket: {e}") from e
-    if payload.get("typ") != "wechat_conflict":
-        raise TokenError(f"wrong token type: want=wechat_conflict got={payload.get('typ')}")
-    if "sub" not in payload or "phn" not in payload:
-        raise TokenError("conflict ticket missing sub/phn")
-    return {
-        "openid": payload["sub"],
-        "wnk": payload.get("wnk"),
-        "wav": payload.get("wav"),
-        "phone": payload["phn"],
-    }
-
-
 # ===================== 密码 hash(admin 后台账号用)=====================
 # 用户侧是手机号+验证码登录,不存密码;仅 admin 账号用 username+password 登录。
 

app/integrations/notifier.py

@@ -1,43 +0,0 @@
-"""不活跃预警通知器(可插拔)。
-
-v1 仅日志占位(LogNotifier):现状无真实推送能力(极光只用于一键登录解密 + 设备心跳告警,
-心跳 worker 也只打印),先把清零主流程 + 审计做扎实。后续实现同协议的 JPushNotifier /
-SmsNotifier 即可替换,worker/repo 不改。
-"""
-from __future__ import annotations
-
-import logging
-from typing import Protocol
-
-logger = logging.getLogger("shagua.inactivity")
-
-
-class InactivityNotifier(Protocol):
-    channel: str
-
-    def warn(self, *, user_id: int, coin: int, cash_cents: int,
-             stage: int, days_until_reset: int) -> str:
-        """发预警(只涉及会被清的金币 + 折算现金;邀请现金不清、不预警)。
-        返回状态:'sent' / 'failed' / 'placeholder'。"""
-        ...
-
-
-class LogNotifier:
-    """占位实现:只打印,不真推。参照 heartbeat_monitor_worker「本期先不接推送」先例。"""
-
-    channel = "log"
-
-    def warn(self, *, user_id: int, coin: int, cash_cents: int,
-             stage: int, days_until_reset: int) -> str:
-        logger.warning(
-            "[inactivity-warn] user=%s coin=%s cash_cents=%s stage=T-%s days_until_reset=%s",
-            user_id, coin, cash_cents, stage, days_until_reset,
-        )
-        return "placeholder"
-
-
-def get_notifier(channel: str) -> InactivityNotifier:
-    """按配置返回通知器。未实现的通道(jpush/sms)暂回退 LogNotifier 占位。"""
-    # 后续:if channel == "jpush": return JPushNotifier()
-    #       if channel == "sms":   return SmsNotifier()
-    return LogNotifier()

app/integrations/sms.py

@@ -13,8 +13,7 @@ worker / 多机时内存不共享 → 冷却、校验都会失效,届时迁移
 
 防刷两层(短信花钱 + `/sms/send` 在登录前无法 JWT 鉴权):
   1. 单号 `SMS_SEND_INTERVAL_SEC` 冷却(本文件)
-  2. 单设备(device_id)+ IP 每小时 / 每天频控(api 层 auth.sms_send 的 check/record_rate_limits,
-     **只按成功发码计数** —— 被本文件单号冷却挡下的重发不占额度)+ 极光控制台 IP 白名单/防轰炸(运维侧)。
+  2. 单设备(device_id)每小时频控(api 层 auth.sms_send 内 enforce_rate_limit)+ 极光控制台 IP 白名单/防轰炸(运维侧)。
      ⚠️ 原「单 IP 频控(rate_limit 依赖)」2026-06-26 按产品要求删除、改设备维度;但 device_id 客户端可伪造/轮换,
         脚本轮换 id 能绕过本层 → 挡脚本狂发主要靠极光控制台侧(+ 可选 nginx 限流)。
      ⚠️ 原「单号每日上限」2026-07-03 按精简要求删除(mentor 定:登录风控只留单号冷却 + 单设备频控);

app/integrations/vendor_push.py

@@ -1,584 +0,0 @@
-"""厂商直推集成(荣耀 / 华为 / 小米 / OPPO / vivo)。
-
-服务端不经由 JPush Push API,而是按客户端上报的 push_vendor + push_token
-分发到各手机厂商的服务端 API。
-
-对外两个入口:
-  - send_notification()            通用:任意标题/正文/extras(消息中心 13 类推送走这里),
-                                   mock=True 时不真调厂商、返回渲染结果(虚拟数据联调用)
-  - send_accessibility_disabled()  旧:无障碍掉线召回(heartbeat_monitor_worker 在用),
-                                   已改为 send_notification 的薄封装,行为不变
-
-各厂商鉴权方式:荣耀/华为 OAuth client_credentials 换 access_token(进程内缓存);
-vivo/OPPO 签名换 authToken(缓存 24h);小米直接 AppSecret 走 Authorization 头。
-"""
-from __future__ import annotations
-
-import hashlib
-import json
-import logging
-import time
-import uuid
-from collections.abc import Callable
-from dataclasses import dataclass
-from typing import Any
-from urllib.parse import quote
-
-import httpx
-
-from app.core.config import settings
-
-logger = logging.getLogger("shagua.vendor_push")
-
-TYPE_ACCESSIBILITY_DISABLED = "accessibility_disabled"
-SUPPORTED_VENDORS = frozenset({"honor", "huawei", "vivo", "xiaomi", "oppo"})
-
-# vendor key → 中文名(测试/配置状态接口展示用)
-VENDOR_LABELS: dict[str, str] = {
-    "honor": "荣耀",
-    "huawei": "华为",
-    "xiaomi": "小米",
-    "oppo": "OPPO",
-    "vivo": "vivo",
-}
-
-# 各厂商真发推送所需的 settings 键(缺任一即视为未配置;/api/v1/push/vendors 据此报缺)
-REQUIRED_SETTINGS: dict[str, tuple[str, ...]] = {
-    "honor": ("HONOR_PUSH_APP_ID", "HONOR_PUSH_CLIENT_ID", "HONOR_PUSH_CLIENT_SECRET"),
-    "huawei": ("HUAWEI_PUSH_APP_ID", "HUAWEI_PUSH_APP_SECRET"),
-    "xiaomi": ("XIAOMI_PUSH_APP_SECRET",),
-    "oppo": ("OPPO_PUSH_APP_KEY", "OPPO_PUSH_MASTER_SECRET"),
-    "vivo": ("VIVO_PUSH_APP_ID", "VIVO_PUSH_APP_KEY", "VIVO_PUSH_APP_SECRET"),
-}
-
-
-def missing_settings(vendor: str) -> list[str]:
-    """该厂商还缺哪些配置键(全配齐返回空列表)。vendor 需已 normalize。"""
-    return [key for key in REQUIRED_SETTINGS.get(vendor, ()) if not getattr(settings, key, "")]
-
-
-class VendorPushError(Exception):
-    """厂商推送调用失败。"""
-
-
-@dataclass
-class _CachedToken:
-    value: str
-    expires_at: float
-
-
-_token_cache: dict[str, _CachedToken] = {}
-
-
-def normalize_vendor(push_vendor: str | None) -> str | None:
-    if not push_vendor:
-        return None
-    vendor = push_vendor.strip().lower()
-    aliases = {
-        "hihonor": "honor",
-        "荣耀": "honor",
-        "hms": "huawei",
-        "华为": "huawei",
-        "harmony": "huawei",
-        "harmonyos": "huawei",
-        "mi": "xiaomi",
-        "小米": "xiaomi",
-        "oneplus": "oppo",
-        "realme": "oppo",
-    }
-    return aliases.get(vendor, vendor)
-
-
-def send_notification(
-    push_vendor: str,
-    push_token: str,
-    *,
-    title: str,
-    body: str,
-    extras: dict[str, str] | None = None,
-    mock: bool = False,
-) -> dict[str, Any]:
-    """按厂商 token 向单台设备发送一条通知(通用入口)。
-
-    - extras:透传给客户端的自定义键值(值统一 string,兼容各厂商限制)。消息中心推送约定
-      至少带 {"type": <13 种类型 key>, "notificationId": <站内消息 id>},客户端据此
-      深链落地 + 调 /notifications/read 同步置读(PRD §4 push 联动)。
-    - mock=True:不真调厂商 API,校验参数后原样返回渲染结果(虚拟数据阶段联调/自动化测试用)。
-    """
-    vendor = normalize_vendor(push_vendor)
-    token = push_token.strip() if push_token else ""
-    if not vendor or vendor not in SUPPORTED_VENDORS:
-        raise VendorPushError(f"unsupported push vendor: {push_vendor}")
-    if not token:
-        raise VendorPushError("push token is empty")
-    extras = {str(k): str(v) for k, v in (extras or {}).items()}
-
-    if mock:
-        logger.info(
-            "[mock push] vendor=%s token=%s... title=%s body=%s extras=%s",
-            vendor, token[:12], title, body, extras,
-        )
-        return {
-            "mock": True,
-            "vendor": vendor,
-            "title": title,
-            "body": body,
-            "extras": extras,
-        }
-
-    dispatch: dict[str, Callable[[str, str, str, dict[str, str]], dict[str, Any]]] = {
-        "honor": _send_honor,
-        "huawei": _send_huawei,
-        "vivo": _send_vivo,
-        "xiaomi": _send_xiaomi,
-        "oppo": _send_oppo,
-    }
-    return dispatch[vendor](token, title, body, extras)
-
-
-def send_accessibility_disabled(
-    push_vendor: str,
-    push_token: str,
-    *,
-    title: str = "保护已关闭",
-    alert: str = "傻瓜比价的无障碍保护被关了，点此重新开启，继续帮你自动比价省钱。",
-) -> dict[str, Any]:
-    """按厂商 token 向单台设备发送无障碍掉线通知(heartbeat_monitor_worker 在用,行为不变)。"""
-    return send_notification(
-        push_vendor,
-        push_token,
-        title=title,
-        body=alert,
-        extras={"type": TYPE_ACCESSIBILITY_DISABLED},
-    )
-
-
-def _require(value: str, name: str) -> str:
-    if not value:
-        raise VendorPushError(f"{name} not configured")
-    return value
-
-
-def _request_json(
-    method: str,
-    url: str,
-    *,
-    expected_status: tuple[int, ...] = (200,),
-    **kwargs: Any,
-) -> dict[str, Any]:
-    try:
-        resp = httpx.request(
-            method,
-            url,
-            timeout=settings.PUSH_REQUEST_TIMEOUT_SEC,
-            **kwargs,
-        )
-    except httpx.HTTPError as e:
-        raise VendorPushError(f"push http error: {e}") from e
-
-    if resp.status_code not in expected_status:
-        logger.error("vendor push http failed url=%s http=%s body=%s", url, resp.status_code, resp.text[:500])
-        raise VendorPushError(f"push http {resp.status_code}")
-    try:
-        return resp.json()
-    except ValueError as e:
-        raise VendorPushError(f"push invalid json: {resp.text[:200]}") from e
-
-
-def _request_form(
-    method: str,
-    url: str,
-    *,
-    expected_status: tuple[int, ...] = (200,),
-    **kwargs: Any,
-) -> dict[str, Any]:
-    try:
-        resp = httpx.request(
-            method,
-            url,
-            timeout=settings.PUSH_REQUEST_TIMEOUT_SEC,
-            **kwargs,
-        )
-    except httpx.HTTPError as e:
-        raise VendorPushError(f"push http error: {e}") from e
-
-    if resp.status_code not in expected_status:
-        logger.error("vendor push http failed url=%s http=%s body=%s", url, resp.status_code, resp.text[:500])
-        raise VendorPushError(f"push http {resp.status_code}")
-    try:
-        return resp.json()
-    except ValueError as e:
-        raise VendorPushError(f"push invalid json: {resp.text[:200]}") from e
-
-
-def _cache_get(key: str) -> str | None:
-    cached = _token_cache.get(key)
-    if cached and cached.expires_at > time.time() + 60:
-        return cached.value
-    return None
-
-
-def _cache_put(key: str, value: str, expires_in: int | float | None) -> str:
-    ttl = int(expires_in or 3600)
-    _token_cache[key] = _CachedToken(value=value, expires_at=time.time() + max(60, ttl - 60))
-    return value
-
-
-def _honor_access_token() -> str:
-    cache_key = "honor"
-    cached = _cache_get(cache_key)
-    if cached:
-        return cached
-    client_id = _require(settings.HONOR_PUSH_CLIENT_ID, "HONOR_PUSH_CLIENT_ID")
-    client_secret = _require(settings.HONOR_PUSH_CLIENT_SECRET, "HONOR_PUSH_CLIENT_SECRET")
-    data = _request_form(
-        "POST",
-        settings.HONOR_PUSH_TOKEN_ENDPOINT,
-        data={
-            "grant_type": "client_credentials",
-            "client_id": client_id,
-            "client_secret": client_secret,
-        },
-        headers={"Content-Type": "application/x-www-form-urlencoded"},
-    )
-    token = data.get("access_token")
-    if not token:
-        raise VendorPushError(f"honor auth failed: {data}")
-    return _cache_put(cache_key, str(token), data.get("expires_in"))
-
-
-def _send_honor(token: str, title: str, body: str, extras: dict[str, str]) -> dict[str, Any]:
-    app_id = _require(settings.HONOR_PUSH_APP_ID, "HONOR_PUSH_APP_ID")
-    access_token = _honor_access_token()
-    payload = {
-        # clickAction type=3(打开应用首页)时,荣耀点击会把 data JSON 的键值对注入启动 intent 的
-        # extras(与 HMS 同机制)→ MainActivity.consumeNavTarget 读 notif_id/notif_type 直达落地。
-        "data": json.dumps(_click_extras(extras), ensure_ascii=False),
-        "notification": {"title": title, "body": body},
-        "android": {
-            "ttl": f"{settings.PUSH_TIME_TO_LIVE_SEC}s",
-            "targetUserType": 1,
-            "notification": {
-                "title": title,
-                "body": body,
-                "clickAction": {"type": 3},
-                "importance": "NORMAL",
-            },
-        },
-        "token": [token],
-    }
-    data = _request_json(
-        "POST",
-        settings.HONOR_PUSH_SEND_ENDPOINT_TEMPLATE.format(app_id=app_id),
-        json=payload,
-        headers={
-            "Content-Type": "application/json; charset=UTF-8",
-            "Authorization": f"Bearer {access_token}",
-            "timestamp": str(int(time.time() * 1000)),
-        },
-    )
-    code = data.get("code")
-    if code is not None and int(code) != 200:
-        raise VendorPushError(f"honor push failed: {data}")
-    return data
-
-
-def _huawei_access_token() -> str:
-    """华为 OAuth2 client_credentials 换 access_token(client_id 即 AGC 应用的 AppId)。"""
-    cache_key = "huawei"
-    cached = _cache_get(cache_key)
-    if cached:
-        return cached
-    app_id = _require(settings.HUAWEI_PUSH_APP_ID, "HUAWEI_PUSH_APP_ID")
-    app_secret = _require(settings.HUAWEI_PUSH_APP_SECRET, "HUAWEI_PUSH_APP_SECRET")
-    data = _request_form(
-        "POST",
-        settings.HUAWEI_PUSH_TOKEN_ENDPOINT,
-        data={
-            "grant_type": "client_credentials",
-            "client_id": app_id,
-            "client_secret": app_secret,
-        },
-        headers={"Content-Type": "application/x-www-form-urlencoded"},
-    )
-    token = data.get("access_token")
-    if not token:
-        raise VendorPushError(f"huawei auth failed: {data}")
-    return _cache_put(cache_key, str(token), data.get("expires_in"))
-
-
-def _send_huawei(token: str, title: str, body: str, extras: dict[str, str]) -> dict[str, Any]:
-    """华为 Push Kit 下行消息(v1 messages:send)。成功码 '80000000';
-    '80100000' 为部分成功(单 token 场景仍视为失败,错误里带原始响应便于排障)。"""
-    app_id = _require(settings.HUAWEI_PUSH_APP_ID, "HUAWEI_PUSH_APP_ID")
-    access_token = _huawei_access_token()
-    payload = {
-        "validate_only": False,
-        "message": {
-            # click_action type=3(打开应用首页)时,HMS 点击会把 data JSON 的键值对注入启动 intent
-            # 的 extras → MainActivity.consumeNavTarget 读 notif_id/notif_type 直达落地。
-            "data": json.dumps(_click_extras(extras), ensure_ascii=False),
-            "android": {
-                "ttl": f"{settings.PUSH_TIME_TO_LIVE_SEC}s",
-                "notification": {
-                    "title": title,
-                    "body": body,
-                    "click_action": {"type": 3},
-                    "importance": "NORMAL",
-                },
-            },
-            "token": [token],
-        },
-    }
-    data = _request_json(
-        "POST",
-        settings.HUAWEI_PUSH_SEND_ENDPOINT_TEMPLATE.format(app_id=app_id),
-        json=payload,
-        headers={
-            "Content-Type": "application/json; charset=UTF-8",
-            "Authorization": f"Bearer {access_token}",
-        },
-    )
-    if str(data.get("code", "")) != "80000000":
-        raise VendorPushError(f"huawei push failed: {data}")
-    return data
-
-
-def _vivo_auth_token() -> str:
-    cache_key = "vivo"
-    cached = _cache_get(cache_key)
-    if cached:
-        return cached
-    app_id = _require(settings.VIVO_PUSH_APP_ID, "VIVO_PUSH_APP_ID")
-    app_key = _require(settings.VIVO_PUSH_APP_KEY, "VIVO_PUSH_APP_KEY")
-    app_secret = _require(settings.VIVO_PUSH_APP_SECRET, "VIVO_PUSH_APP_SECRET")
-    timestamp = str(int(time.time() * 1000))
-    sign = hashlib.md5(f"{app_id}{app_key}{timestamp}{app_secret}".encode()).hexdigest()  # noqa: S324
-    data = _request_json(
-        "POST",
-        settings.VIVO_PUSH_AUTH_ENDPOINT,
-        json={
-            "appId": app_id,
-            "appKey": app_key,
-            "timestamp": timestamp,
-            "sign": sign,
-        },
-        headers={"Content-Type": "application/json"},
-    )
-    if int(data.get("result", -1)) != 0:
-        raise VendorPushError(f"vivo auth failed: {data}")
-    token = data.get("authToken")
-    if not token:
-        raise VendorPushError(f"vivo auth missing authToken: {data}")
-    return _cache_put(cache_key, str(token), 24 * 3600)
-
-
-def _send_vivo(token: str, title: str, body: str, extras: dict[str, str]) -> dict[str, Any]:
-    app_id = _require(settings.VIVO_PUSH_APP_ID, "VIVO_PUSH_APP_ID")
-    auth_token = _vivo_auth_token()
-    payload: dict[str, Any] = {
-        "appId": app_id,
-        "regId": token,
-        "notifyType": settings.VIVO_PUSH_NOTIFY_TYPE,
-        "title": title,
-        "content": body,
-        "timeToLive": settings.PUSH_TIME_TO_LIVE_SEC,
-        "requestId": uuid.uuid4().hex,
-        "pushMode": settings.VIVO_PUSH_MODE,
-        "clientCustomMap": extras,
-    }
-    # 点击落地:消息中心推送(带 notificationId)→ skipType=4 + skipContent=intent uri,由 vivo
-    # 系统直启 MainActivity 并携带 S. extras(与小米 notify_effect=2 同机制)。不依赖客户端
-    # VivoPushReceiver.onNotificationMessageClicked 里的后台 startActivity——Android 10+ BAL
-    # 会静默拦掉,receiver 路径仅作兜底。无 notificationId 的召回类保持 skipType=1 仅打开首页。
-    if extras.get("notificationId"):
-        payload["skipType"] = 4
-        payload["skipContent"] = _click_intent_uri(extras)
-    else:
-        payload["skipType"] = 1
-    if settings.VIVO_PUSH_CATEGORY:
-        payload["category"] = settings.VIVO_PUSH_CATEGORY
-    data = _request_json(
-        "POST",
-        settings.VIVO_PUSH_SEND_ENDPOINT,
-        json=payload,
-        headers={
-            "Content-Type": "application/json",
-            "authToken": auth_token,
-        },
-    )
-    if int(data.get("result", -1)) != 0:
-        raise VendorPushError(f"vivo push failed: {data}")
-    return data
-
-
-def _send_xiaomi(token: str, title: str, body: str, extras: dict[str, str]) -> dict[str, Any]:
-    app_secret = _require(settings.XIAOMI_PUSH_APP_SECRET, "XIAOMI_PUSH_APP_SECRET")
-    message_title = settings.XIAOMI_PUSH_TEMPLATE_TITLE.strip() or title
-    message_description = settings.XIAOMI_PUSH_TEMPLATE_DESCRIPTION.strip() or body
-    form = {
-        "registration_id": token,
-        "restricted_package_name": settings.ANDROID_PACKAGE_NAME,
-        "title": message_title,
-        "description": message_description,
-        "payload": json.dumps(extras, ensure_ascii=False),
-        "pass_through": "0",
-        "notify_type": "-1",
-        "time_to_live": str(settings.PUSH_TIME_TO_LIVE_SEC * 1000),
-    }
-    # 点击落地:带 notificationId 的消息中心推送 → notify_effect=2 + intent_uri,MiPush 直接打开
-    # MainActivity 并把 extras 作为 String extra 传入(客户端 MainActivity.consumeNavTarget 读
-    # notif_id/notif_type,兜底 notificationId/type)→ 置读 + 刷角标 + 按 type 直达对应页(PRD §5)。
-    # ⚠️ 早前用 notify_effect=1(仅打开 Launcher),小米自身不会把 payload 拆成普通 extra、而是塞进
-    #    序列化的 MiPushMessage(key_message),客户端读不到 → 点击后停在首页「没反应」。
-    # 无 notificationId 的系统召回类(如无障碍掉线)保持 notify_effect=1 仅拉起 App,行为不变。
-    if extras.get("notificationId"):
-        form["extra.notify_effect"] = "2"
-        form["extra.intent_uri"] = _click_intent_uri(extras)
-    else:
-        form["extra.notify_effect"] = "1"
-    if settings.XIAOMI_PUSH_CHANNEL_ID:
-        form["extra.channel_id"] = settings.XIAOMI_PUSH_CHANNEL_ID.strip()
-    if settings.XIAOMI_PUSH_TEMPLATE_ID:
-        form["extra.template_id"] = settings.XIAOMI_PUSH_TEMPLATE_ID.strip()
-    if settings.XIAOMI_PUSH_TEMPLATE_PARAM_JSON:
-        form["extra.template_param"] = _xiaomi_template_param(title, body)
-    data = _request_form(
-        "POST",
-        settings.XIAOMI_PUSH_SEND_ENDPOINT,
-        data=form,
-        headers={"Authorization": f"key={app_secret}"},
-    )
-    code = data.get("code")
-    if code not in (0, "0", None):
-        raise VendorPushError(f"xiaomi push failed: {data}")
-    if str(data.get("result", "ok")).lower() not in ("ok", "success"):
-        raise VendorPushError(f"xiaomi push failed: {data}")
-    return data
-
-
-def _click_extras(extras: dict[str, str]) -> dict[str, str]:
-    """点击落地参数:消息中心推送(extras 带 notificationId)补 notif_id/notif_type 别名——
-    客户端 MainActivity.consumeNavTarget 首选这两个键(厂商 receiver 路径的历史约定),原始键
-    (notificationId/type/feedbackId/reportId/…)保留作兜底与业务跳转参数。
-    无 notificationId(如无障碍召回)原样返回,不喂点击路由参数。"""
-    if not extras.get("notificationId"):
-        return dict(extras)
-    merged = dict(extras)
-    merged.setdefault("notif_id", extras["notificationId"])
-    if extras.get("type"):
-        merged.setdefault("notif_type", extras["type"])
-    return merged
-
-
-def _click_intent_uri(extras: dict[str, str]) -> str:
-    """构造「系统直启 MainActivity 并带 extras」的 intent uri(小米 notify_effect=2 的
-    extra.intent_uri、vivo skipType=4 的 skipContent 共用):点击后厂商系统用 Intent.parseUri
-    解析并 startActivity,extras 作为 String extra 原样送达。
-
-    - component 显式指向本包 MainActivity(exported=true、singleTask)→ 已运行则走 onNewIntent、
-      未运行则 onCreate,两条都会执行 consumeNavTarget。
-    - 参数 = _click_extras(补 notif_id/notif_type 别名 + 透传 feedbackId/reportId 等跳转参数)。
-    - 值按 Android Uri.encode 规则百分号编码(quote(safe="")):中文/分号/等号都不会破坏 intent uri
-      结构;客户端 Intent.parseUri 侧 Uri.decode 无损还原。表单/JSON 传输层的编码与本层相互独立、
-      各自解码,不会双重转义(2026-07-15 小米联调结论)。
-    """
-    pkg = settings.ANDROID_PACKAGE_NAME
-    parts = ["intent:#Intent", f"component={pkg}/{pkg}.MainActivity"]
-    parts += [f"S.{key}={quote(str(value), safe='')}" for key, value in _click_extras(extras).items()]
-    parts.append("end")
-    return ";".join(parts)
-
-
-def _xiaomi_template_param(title: str, alert: str) -> str:
-    rendered = (
-        settings.XIAOMI_PUSH_TEMPLATE_PARAM_JSON
-        .replace("{title}", title)
-        .replace("{alert}", alert)
-    )
-    try:
-        payload = json.loads(rendered)
-    except ValueError as e:
-        raise VendorPushError("XIAOMI_PUSH_TEMPLATE_PARAM_JSON invalid json") from e
-    if not isinstance(payload, dict):
-        raise VendorPushError("XIAOMI_PUSH_TEMPLATE_PARAM_JSON must be a json object")
-    for key, value in payload.items():
-        if not isinstance(key, str) or not isinstance(value, str):
-            raise VendorPushError("xiaomi template params must be string key-value pairs")
-        if not value.strip() or len(value) > 128:
-            raise VendorPushError("xiaomi template param value length must be 1-128")
-    return json.dumps(payload, ensure_ascii=False, separators=(",", ":"))
-
-
-def _oppo_auth_token() -> str:
-    cache_key = "oppo"
-    cached = _cache_get(cache_key)
-    if cached:
-        return cached
-    app_key = _require(settings.OPPO_PUSH_APP_KEY, "OPPO_PUSH_APP_KEY")
-    master_secret = _require(settings.OPPO_PUSH_MASTER_SECRET, "OPPO_PUSH_MASTER_SECRET")
-    timestamp = str(int(time.time() * 1000))
-    sign = hashlib.sha256(f"{app_key}{timestamp}{master_secret}".encode()).hexdigest()
-    data = _request_form(
-        "POST",
-        settings.OPPO_PUSH_AUTH_ENDPOINT,
-        data={
-            "app_key": app_key,
-            "timestamp": timestamp,
-            "sign": sign,
-        },
-        headers={"Content-Type": "application/x-www-form-urlencoded"},
-    )
-    if int(data.get("code", -1)) != 0:
-        raise VendorPushError(f"oppo auth failed: {data}")
-    token = (data.get("data") or {}).get("auth_token") or data.get("auth_token")
-    if not token:
-        raise VendorPushError(f"oppo auth missing auth_token: {data}")
-    return _cache_put(cache_key, str(token), 24 * 3600)
-
-
-def _send_oppo(token: str, title: str, body: str, extras: dict[str, str]) -> dict[str, Any]:
-    auth_token = _oppo_auth_token()
-    ttl_hours = max(1, min(72, settings.PUSH_TIME_TO_LIVE_SEC // 3600))
-    notification: dict[str, Any] = {
-        "app_message_id": f"{extras.get('type', 'notify')}_{uuid.uuid4().hex}",
-        "title": title,
-        "content": body,
-        "off_line": True,
-        "off_line_ttl": ttl_hours,
-        "action_parameters": json.dumps(_click_extras(extras), ensure_ascii=False),
-    }
-    # 点击落地:OPPO SDK 没有点击回调,参数只能靠服务端点击动作配置送达——action_parameters 的
-    # 键值对仅在 click_action_type=1/4 时才会注入目标 Activity 的 intent extras(type=0「启动应用」
-    # 会忽略它,extras 全丢 → 点了没反应,与小米 notify_effect=1 同款坑)。
-    # 消息中心推送(带 notificationId)→ type=4(打开应用内页面,Activity 全路径,exported=true);
-    # 无 notificationId 的召回类保持 type=0 仅打开应用。
-    if extras.get("notificationId"):
-        notification["click_action_type"] = 4
-        notification["click_action_activity"] = f"{settings.ANDROID_PACKAGE_NAME}.MainActivity"
-    else:
-        notification["click_action_type"] = 0
-    # 新消息分类(2024-11-20 后创建的 OPPO 应用必须带 category,否则可能被拒收/降级)
-    if settings.OPPO_PUSH_CHANNEL_ID.strip():
-        notification["channel_id"] = settings.OPPO_PUSH_CHANNEL_ID.strip()
-    if settings.OPPO_PUSH_CATEGORY.strip():
-        notification["category"] = settings.OPPO_PUSH_CATEGORY.strip()
-    if settings.OPPO_PUSH_NOTIFY_LEVEL:
-        notification["notify_level"] = settings.OPPO_PUSH_NOTIFY_LEVEL
-    message = {
-        "target_type": 2,
-        "target_value": token,
-        "notification": notification,
-    }
-    data = _request_form(
-        "POST",
-        settings.OPPO_PUSH_SEND_ENDPOINT,
-        data={
-            "auth_token": auth_token,
-            "message": json.dumps(message, ensure_ascii=False),
-        },
-        headers={"Content-Type": "application/x-www-form-urlencoded"},
-    )
-    if int(data.get("code", -1)) != 0:
-        raise VendorPushError(f"oppo push failed: {data}")
-    return data

app/main.py

@@ -31,10 +31,8 @@ from app.api.v1.device import router as device_router
 from app.api.v1.feedback import router as feedback_router
 from app.api.v1.invite import router as invite_router
 from app.api.v1.meituan import router as meituan_router
-from app.api.v1.notifications import router as notifications_router
 from app.api.v1.order import router as order_router
 from app.api.v1.platform import router as platform_router
-from app.api.v1.push import router as push_router
 from app.api.v1.report import router as report_router
 from app.api.v1.savings import router as savings_router
 from app.api.v1.signin import router as signin_router
@@ -51,16 +49,7 @@ from app.core.heartbeat_monitor_worker import (
     start_heartbeat_monitor,
     stop_heartbeat_monitor,
 )
-from app.core.inactivity_reset_worker import (
-    start_inactivity_reset_worker,
-    stop_inactivity_reset_worker,
-)
 from app.core.logging import setup_logging
-from app.core.observe import RequestMetricsMiddleware
-from app.core.observe_worker import (
-    start_observe_worker,
-    stop_observe_worker,
-)
 from app.core.pricebot_client import aclose_pricebot_client, get_pricebot_client
 from app.core.withdraw_reconcile_worker import (
     start_withdraw_reconcile_worker,
@@ -91,16 +80,12 @@ async def lifespan(_: FastAPI) -> AsyncIterator[None]:
     reconcile_task = start_withdraw_reconcile_worker()
     heartbeat_task = start_heartbeat_monitor()
     daily_exchange_task = start_daily_exchange_worker()
-    observe_task = start_observe_worker()
-    inactivity_task = start_inactivity_reset_worker()
     try:
         yield
     finally:
         await stop_heartbeat_monitor(heartbeat_task)
         await stop_withdraw_reconcile_worker(reconcile_task)
         await stop_daily_exchange_worker(daily_exchange_task)
-        await stop_observe_worker(observe_task)
-        await stop_inactivity_reset_worker(inactivity_task)
         await aclose_pricebot_client()
         logger.info("shutting down")
 
@@ -122,9 +107,6 @@ if settings.cors_origins_list:
         allow_headers=["*"],
     )
 
-# 接口指标埋点(放在 CORS 之后 = 最外层:测到含 CORS 的完整耗时)。未配置观测时中间件自 no-op。
-app.add_middleware(RequestMetricsMiddleware)
-
 
 @app.get("/health", tags=["meta"])
 def health() -> dict[str, str]:
@@ -150,10 +132,6 @@ app.include_router(savings_router)
 app.include_router(ad_router)
 app.include_router(order_router)
 app.include_router(report_router)
-# 消息通知中心(PRD;数据落库 notification 表,见 repositories/notification.py)
-app.include_router(notifications_router)
-# 厂商推送测试三件套(配置状态/模板预览/测试发送,支持 mock 与真发)
-app.include_router(push_router)
 # 内部(server→server)端点:pricebot 上报价格观测 / 店铺映射,靠共享密钥头校验,不对客户端开放。
 app.include_router(internal_price_router)
 app.include_router(internal_store_router)

app/models/__init__.py

@@ -27,17 +27,11 @@ from app.models.coupon_state import (  # noqa: F401
     CouponSession,
 )
 from app.models.feedback import Feedback  # noqa: F401
-from app.models.inactivity import (  # noqa: F401
-    InactivityNotificationLog,
-    InactivityResetLog,
-)
 from app.models.invite import InviteRelation  # noqa: F401
 from app.models.invite_fingerprint import InviteFingerprint  # noqa: F401
 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.price_observation import PriceObservation  # noqa: F401

app/models/ad_ecpm.py

@@ -32,9 +32,6 @@ class AdEcpmRecord(Base):
     # 点位场景:comparison(比价) / coupon(领券) / welfare(福利),供收益报表区分比价/领券 Draw 收益;
     # 仅信息流/Draw 上报(比价与领券共用同一代码位,只能客户端各调用点显式打标),激励视频为 NULL。
     feed_scene: Mapped[str | None] = mapped_column(String(16), nullable=True)
-    # 本次比价/领券 trace_id(信息流场景客户端带上):把这条展示收益归属到对应比价/领券记录。
-    # 领券数据 / 比价记录看板按 trace_id 聚合"本次广告收益"。激励视频/福利/旧客户端 = NULL。
-    trace_id: Mapped[str | None] = mapped_column(String(64), index=True, nullable=True)
     # 客户端生成的一次广告会话 id;激励视频 S2S 回调 extra 会透传同值
     ad_session_id: Mapped[str | None] = mapped_column(String(64), index=True, nullable=True)
     # 实际投放的 ADN(穿山甲 getShowEcpm().getSdkName(),如 pangle / gdt)

app/models/analytics_event.py

@@ -15,7 +15,7 @@ from __future__ import annotations
 
 from datetime import datetime
 
-from sqlalchemy import JSON, BigInteger, DateTime, Index, Integer, String, func
+from sqlalchemy import JSON, BigInteger, DateTime, Integer, String, func
 from sqlalchemy.orm import Mapped, mapped_column
 
 from app.db.base import Base
@@ -23,12 +23,6 @@ from app.db.base import Base
 
 class AnalyticsEvent(Base):
     __tablename__ = "analytics_event"
-    __table_args__ = (
-        # 活跃口径聚合热点(activity.active_event_condition + last_active_subqueries):
-        # 按 (event,page) 过滤 首页可见(show/home)∪比价∪领券,再 group by user_id 取
-        # max(created_at)。覆盖索引 → 该聚合走 index-only,避免高频 show 事件全表扫。
-        Index("ix_analytics_event_active", "event", "page", "user_id", "created_at"),
-    )
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
 

app/models/comparison.py

@@ -137,12 +137,6 @@ class ComparisonRecord(Base):
     # 每次 LLM 调用明细 [{scene,model,input_messages,output,usage,latency_ms,error}];
     # server 收上报后按 trace_id 同机拉 pricebot 落库(见 compare_record 端点)。旧记录/未采集为 None。
     llm_calls: Mapped[list | None] = mapped_column(_JSON, nullable=True)
-    # 本次比价 LLM 总成本(元):回填时按「当时的价」逐模型算好冻结(见 services/llm_cost.py)。
-    # 单次亚分级 → float「元」(不用 *_cents)。旧记录/未回填为 None,前端回退「估算成本」。
-    llm_cost_yuan: Mapped[float | None] = mapped_column(Float, nullable=True)
-    # 算成本所用单价快照 {mode, prices:{model:{input_per_1m,output_per_1m,_source}}}:app_config 只存
-    # 当前价、不留历史,故把当时价冻结进来供审计/复算。
-    llm_price_snapshot: Mapped[dict | None] = mapped_column(_JSON, nullable=True)
 
     created_at: Mapped[datetime] = mapped_column(
         DateTime(timezone=True), server_default=func.now(), index=True, nullable=False

app/models/coupon_state.py

@@ -66,9 +66,6 @@ class CouponClaimRecord(Base):
 
     # success / already_claimed / failed / skipped(原样取 pricebot coupon 结果)
     status: Mapped[str] = mapped_column(String(24), nullable=False)
-    # 领券所属 session 的环境 prod/dev(/step 按 trace_id 查 coupon_session.app_env 打标)。
-    # 旧行 NULL(不回填)。admin「按券成功率」表据此过滤环境。见设计 §13。
-    app_env: Mapped[str | None] = mapped_column(String(16), index=True, nullable=True)
     vendor: Mapped[str | None] = mapped_column(String(48), nullable=True)
     coupon_name: Mapped[str | None] = mapped_column(String(128), nullable=True)
     # 这张领到几张(pricebot display_count;给不出时为 None)
@@ -243,10 +240,6 @@ class CouponSession(Base):
     platform_elapsed: Mapped[dict | None] = mapped_column(_JSON, nullable=True)
     # 领到总张数(收尾帧带)。
     claimed_count: Mapped[int | None] = mapped_column(Integer, nullable=True)
-    # 本次 session 至少领到一张(status∈{success,already_claimed})的平台 id 列表,如 ["meituan-waimai","jd-waimai"]。
-    # admin「领券数据」据此算整单成功率(②)/点位成功率(③);服务端 /step 逐帧按 trace_id 并集写入
-    # (见 coupon_state.merge_session_platform_success)。旧行=NULL → 视作空集。
-    platform_success: Mapped[list | None] = mapped_column(_JSON, nullable=True)
     # pricebot done 帧回传的公网调试链接(price.shaguabijia.com/traces/{dir});含落盘时分秒、拼不出,只能存
     # (同 ComparisonRecord.trace_url)。admin「领券数据」明细据此渲染可点 trace 链接;未到 done(failed/abandoned)为空。
     trace_url: Mapped[str | None] = mapped_column(String(512), nullable=True)

app/models/device.py

@@ -1,9 +1,9 @@
-"""设备表(无障碍保护存活检测 + 厂商直推)。
+"""设备表(无障碍保护存活检测 + 极光推送)。
 
 每条 = 一个用户的一台设备(per-install,device_id 由客户端 DeviceId.get() 生成)。
 客户端的无障碍服务存活时周期上报心跳刷新 last_heartbeat_at;App 前台/登录时上报
-push_vendor + push_token(厂商推送目标)。后端 heartbeat_monitor_worker 扫描「曾经保护过、
-现在心跳超时」的设备,通过厂商直推提醒用户重开无障碍。
+registration_id(极光推送目标)。后端 heartbeat_monitor_worker 扫描「曾经保护过、
+现在心跳超时」的设备,通过极光推送提醒用户重开无障碍。
 
 liveness_state 状态机(防刷屏,一次掉线只推一条):
   unknown → alive(收到 service 心跳)→ silent/notified(扫描发现超时并已推送)
@@ -30,7 +30,7 @@ from app.db.base import Base
 
 class DeviceLiveness(Base):
     # 表名不叫 device:device 易被当成「设备信息(品牌/型号/系统)」表;本表实为**无障碍存活监控状态**
-    # (心跳 last_heartbeat_at + liveness_state + kill_alert_pending + 厂商推送目标),故名 device_liveness。
+    # (心跳 last_heartbeat_at + liveness_state + kill_alert_pending + 推送目标 registration_id),故名 device_liveness。
     __tablename__ = "device_liveness"
     __table_args__ = (
         UniqueConstraint("user_id", "device_id", name="uq_device_liveness_user_device"),
@@ -42,12 +42,8 @@ class DeviceLiveness(Base):
     )
     # 客户端 DeviceId.get() 生成的 per-install id(如 device_Pixel_ab12cd34)
     device_id: Mapped[str] = mapped_column(String(128), index=True, nullable=False)
-    # 旧极光推送 registration id,仅为兼容历史客户端/数据保留;新链路使用 push_vendor + push_token。
+    # 极光推送 registration id;拿到才填(JCollectionAuth 同意后才下发)
     registration_id: Mapped[str | None] = mapped_column(String(64), nullable=True)
-    # 厂商推送类型:honor/vivo/xiaomi/oppo 等;客户端按实际 SDK token 来源上报。
-    push_vendor: Mapped[str | None] = mapped_column(String(32), nullable=True)
-    # 厂商 push token / regId / registration_id;不同厂商命名不同,后端统一存这里。
-    push_token: Mapped[str | None] = mapped_column(String(256), nullable=True)
     platform: Mapped[str] = mapped_column(String(16), nullable=False, default="android")
     app_version: Mapped[str | None] = mapped_column(String(32), nullable=True)
 

app/models/inactivity.py

@@ -1,58 +0,0 @@
-"""15 天不活跃清零相关表。
-
-- inactivity_reset_log:每次清零一行,记清零前三桶余额快照 + 原因 + 判定时活跃时间/不活跃天数,
-  供纠纷排查(需求①)。清零同时另写 2 条钱包流水(金币 + 折算现金,biz_type=inactivity_reset),
-  资金流可逐笔回溯。**邀请现金是产品红线、不清零**,invite_cash_balance_cents_before 仅为清零时
-  仍保留的邀请现金快照(便于排查、非被清金额;见 wallet.CoinAccount 注释)。
-- inactivity_notification_log:每次预警一行,记推送时余额快照 + 档位 + 通道 + 状态,
-  兼作"预警去重"依据(created_at > last_active)与"待推送"占位 outbox(v1 通道=log)。
-
-append-only,不更新。user_id 只索引、不设外键(同 analytics_event,避免删用户级联/历史留痕)。
-"""
-from __future__ import annotations
-
-from datetime import datetime
-
-from sqlalchemy import DateTime, Integer, String, func
-from sqlalchemy.orm import Mapped, mapped_column
-
-from app.db.base import Base
-
-
-class InactivityResetLog(Base):
-    __tablename__ = "inactivity_reset_log"
-
-    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
-    user_id: Mapped[int] = mapped_column(Integer, index=True, nullable=False)
-    coin_balance_before: Mapped[int] = mapped_column(Integer, nullable=False)
-    cash_balance_cents_before: Mapped[int] = mapped_column(Integer, nullable=False)
-    invite_cash_balance_cents_before: Mapped[int] = mapped_column(Integer, nullable=False)
-    last_active_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
-    inactive_days: Mapped[int] = mapped_column(Integer, nullable=False)
-    reason: Mapped[str] = mapped_column(String(32), nullable=False)
-    reset_at: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), server_default=func.now(), index=True, nullable=False
-    )
-
-    def __repr__(self) -> str:  # pragma: no cover
-        return f"<InactivityResetLog id={self.id} user_id={self.user_id} coin={self.coin_balance_before}>"
-
-
-class InactivityNotificationLog(Base):
-    __tablename__ = "inactivity_notification_log"
-
-    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
-    user_id: Mapped[int] = mapped_column(Integer, index=True, nullable=False)
-    stage: Mapped[int] = mapped_column(Integer, nullable=False)      # 提前天数档(如 7 / 2)
-    inactive_days: Mapped[int] = mapped_column(Integer, nullable=False)
-    coin_balance: Mapped[int] = mapped_column(Integer, nullable=False)
-    cash_balance_cents: Mapped[int] = mapped_column(Integer, nullable=False)
-    invite_cash_balance_cents: Mapped[int] = mapped_column(Integer, nullable=False)
-    channel: Mapped[str] = mapped_column(String(16), nullable=False)   # log / jpush / sms
-    status: Mapped[str] = mapped_column(String(16), nullable=False)    # placeholder / sent / failed
-    created_at: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), server_default=func.now(), index=True, nullable=False
-    )
-
-    def __repr__(self) -> str:  # pragma: no cover
-        return f"<InactivityNotificationLog id={self.id} user_id={self.user_id} stage={self.stage}>"

app/models/notification.py

@@ -1,95 +0,0 @@
-"""消息通知中心:站内消息表(一行 = 一条下发给某用户的站内消息)。
-
-13 类通知的**静态定义**(分类 / 版式 / 标题 / 操作行 / push 模板)在
-`app/core/notification_catalog.py`,是代码常量,**不入库**;本表只存**每条消息的动态部分**
-(与接口 NotificationItem 的动态字段一一对应):type + 金额 + 信息行 + extra + 已读态 + 时间。
-category / card_style / title / action_text 都由 `type` 经 catalog 派生,不冗余存库。
-
-- 写:`repositories/notification.create_notification`(业务事件下发站内消息的统一入口)。
-- 读:`api/v1/notifications.py`(列表 / 未读数 / 标记已读),均按 user 隔离、sent_at 倒序。
-"""
-from __future__ import annotations
-
-from datetime import datetime
-
-from sqlalchemy import (
-    JSON,
-    Boolean,
-    DateTime,
-    ForeignKey,
-    Index,
-    Integer,
-    String,
-    func,
-    text,
-)
-from sqlalchemy.dialects.postgresql import JSONB
-from sqlalchemy.orm import Mapped, mapped_column
-
-from app.db.base import Base
-
-# PG 用 JSONB,SQLite(本地/测试)退化为通用 JSON(同 comparison_record.raw_payload 等)。
-_JSON = JSON().with_variant(JSONB(), "postgresql")
-
-
-class Notification(Base):
-    __tablename__ = "notification"
-    __table_args__ = (
-        # 列表分页:按用户取 + sent_at 倒序(核心查询,覆盖 user_id 前缀查找,故不再单独索引 user_id)
-        Index("ix_notification_user_sent", "user_id", "sent_at"),
-        # 铃铛角标:count where user_id=? and is_read=false —— 部分索引只覆盖未读行
-        Index(
-            "ix_notification_user_unread",
-            "user_id",
-            sqlite_where=text("is_read = 0"),
-            postgresql_where=text("is_read = false"),
-        ),
-        # 去重/合并:同一 (user, type, dedup_key) 未读期间只允许一条(perm_* 权限异常、
-        # reward_expiring 同批次即用它);消息一旦已读即离开索引,之后可再生成新的未读消息。
-        Index(
-            "uq_notification_user_type_dedup",
-            "user_id",
-            "type",
-            "dedup_key",
-            unique=True,
-            sqlite_where=text("dedup_key IS NOT NULL AND is_read = 0"),
-            postgresql_where=text("dedup_key IS NOT NULL AND is_read = false"),
-        ),
-    )
-
-    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
-    user_id: Mapped[int] = mapped_column(Integer, ForeignKey("user.id"), nullable=False)
-    # 13 类之一(catalog.TYPES 的 key);category/card_style/title/action_text 由它派生,不入库
-    type: Mapped[str] = mapped_column(String(32), nullable=False, index=True)
-    # 金币数(dual_amount / coin_reward 卡);其余类型 None
-    coins: Mapped[int | None] = mapped_column(Integer, nullable=True)
-    # 现金,单位【分】(dual_amount / withdraw / friend_cash 卡);其余 None
-    cash_cents: Mapped[int | None] = mapped_column(Integer, nullable=True)
-    # 信息行 [{label, value}](已渲染好文案,前端逐行展示)
-    info_rows: Mapped[list] = mapped_column(_JSON, nullable=False, default=list)
-    # 点击跳转/联动参数(feedbackId / withdrawId / permission / inviteeNickname / batchId …)
-    extra: Mapped[dict] = mapped_column(_JSON, nullable=False, default=dict)
-    is_read: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
-    # 置读时刻(未读时为 None;埋点/分析用)
-    read_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
-    # 去重键(可空):perm_*→permission、reward_expiring→batchId 等;配合部分唯一索引防重复未读
-    dedup_key: Mapped[str | None] = mapped_column(String(64), nullable=True)
-    # 下发/业务时间;列表排序与展示都用它(带 +08:00 下发)
-    sent_at: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), server_default=func.now(), nullable=False
-    )
-    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,
-    )
-
-    def __repr__(self) -> str:  # pragma: no cover
-        return (
-            f"<Notification id={self.id} user_id={self.user_id} "
-            f"type={self.type} read={self.is_read}>"
-        )

app/models/phone_rebind_log.py

@@ -1,31 +0,0 @@
-"""手机号换绑台账。
-
-记录"手机号从老账号被夺走、重建为新账号(X 注销 → Y)"这一破坏性事件,支撑"一个手机号
-30 天内最多换绑一次"的限制。手机号级、渠道无关(source 标来源);普通微信绑定不写此表。
-见 M2 spec §4.1。
-"""
-from __future__ import annotations
-
-from datetime import datetime
-
-from sqlalchemy import DateTime, Integer, String, func
-from sqlalchemy.orm import Mapped, mapped_column
-
-from app.db.base import Base
-
-
-class PhoneRebindLog(Base):
-    __tablename__ = "phone_rebind_log"
-
-    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
-    # 被换绑的真实手机号(注意:存真实号,不是老账号被腾号后的 deleted_<id>)
-    phone: Mapped[str] = mapped_column(String(20), index=True, nullable=False)
-    # 被注销的老账号 X;P 换绑时已被腾空(极边界)则为空
-    old_user_id: Mapped[int | None] = mapped_column(Integer, nullable=True)
-    # 换绑后新建的账号 Y
-    new_user_id: Mapped[int] = mapped_column(Integer, nullable=False)
-    # 换绑来源。手机号级配额、渠道无关,留字段给未来其他换绑路径共用同一份 30 天限制。
-    source: Mapped[str] = mapped_column(String(32), nullable=False, default="wechat_conflict")
-    rebound_at: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), server_default=func.now(), index=True, nullable=False
-    )

app/repositories/activity.py

@@ -1,101 +0,0 @@
-"""活跃口径唯一真源:worker(不活跃清零)与 admin(最近活跃/DAU)共用,防两处漂移。
-
-口径 = max(User.created_at, AnalyticsEvent[首页可见 show/home + 比价 + 领券], CouponPromptEngagement[claim_started])。
-**不含 last_login_at**(登录/re-login 不代表在用 App);created_at 为恒非空基线。
-清零/预警按北京自然日 0 点对齐(见 reset_cutoff)。
-"""
-from __future__ import annotations
-
-from datetime import date, datetime, timedelta, timezone
-
-from sqlalchemy import and_, func, or_, select
-from sqlalchemy.orm import Session
-
-from app.core.rewards import CN_TZ, cn_today
-from app.models.analytics_event import AnalyticsEvent
-from app.models.coupon_state import CouponPromptEngagement
-
-# —— 活跃口径事件(与"用户管理"口径一致)——
-# 首页可见:前端埋点 event=show + page=home(组合判定,单个 event 名不足以区分,见
-# active_event_condition);其余为纯 event 名。
-HOME_VIEW_EVENT = "show"
-HOME_VIEW_PAGE = "home"
-COMPARE_START_EVENT = "real_compare_start"   # 发起比价(含浮窗触发)
-COUPON_START_EVENT = "real_coupon_start"     # 发起领券
-# 纯 event 名即可判定的活跃事件(首页可见是 event+page 组合、不在此列)
-ACTIVE_EVENTS = (COMPARE_START_EVENT, COUPON_START_EVENT)
-ACTIVE_ENGAGE_TYPE = "claim_started"         # coupon_prompt_engagement 一键领取
-
-
-def active_event_condition():
-    """analytics_event 中算"活跃"的行为过滤:首页可见(event=show & page=home)
-    ∪ 发起比价 ∪ 发起领券。worker 子查询与 admin 展示共用,单一真源。"""
-    return or_(
-        and_(AnalyticsEvent.event == HOME_VIEW_EVENT, AnalyticsEvent.page == HOME_VIEW_PAGE),
-        AnalyticsEvent.event.in_(ACTIVE_EVENTS),
-    )
-
-
-def as_utc(value: datetime) -> datetime:
-    """任意 datetime → tz-aware UTC(无时区按 UTC 解释)。用于与 DateTime(timezone=True) 列比较,
-    比较绝对时刻、与会话时区无关(口径同 admin queries._as_utc)。"""
-    if value.tzinfo is None:
-        return value.replace(tzinfo=timezone.utc)
-    return value.astimezone(timezone.utc)
-
-
-def norm_utc(dt: datetime | None) -> datetime | None:
-    """naive 视为 UTC 补 tzinfo(SQLite 读回 naive、PG 读回 aware,混着 max() 会 TypeError)。"""
-    if dt is None:
-        return None
-    return dt if dt.tzinfo is not None else dt.replace(tzinfo=timezone.utc)
-
-
-def cn_midnight_utc(d: date) -> datetime:
-    """北京 d 日 00:00 → tz-aware UTC datetime。"""
-    return as_utc(datetime(d.year, d.month, d.day, tzinfo=CN_TZ))
-
-
-def reset_cutoff(reset_days: int, today: date | None = None) -> datetime:
-    """应清零边界(tz-aware UTC):last_active < 此值 ⟺ 距末次活跃已满 reset_days 天(北京 0 点对齐)。
-    = 北京 00:00 of (today − (reset_days − 1))。例:reset_days=15、today=1/20 → 北京 1/6 00:00。"""
-    today = today or cn_today()
-    return cn_midnight_utc(today - timedelta(days=reset_days - 1))
-
-
-def last_active_subqueries(db: Session):
-    """两个按 user_id 预聚合的派生表:最近活跃事件(见 active_event_condition)、
-    最近领券发起(claim_started)。返回 (ev_sub, eng_sub)。口径同 admin,LEFT JOIN 用。"""
-    ev_sub = (
-        select(
-            AnalyticsEvent.user_id.label("user_id"),
-            func.max(AnalyticsEvent.created_at).label("last_at"),
-        )
-        .where(AnalyticsEvent.user_id.is_not(None), active_event_condition())
-        .group_by(AnalyticsEvent.user_id)
-        .subquery()
-    )
-    eng_sub = (
-        select(
-            CouponPromptEngagement.user_id.label("user_id"),
-            func.max(CouponPromptEngagement.created_at).label("last_at"),
-        )
-        .where(
-            CouponPromptEngagement.user_id.is_not(None),
-            CouponPromptEngagement.engage_type == ACTIVE_ENGAGE_TYPE,
-        )
-        .group_by(CouponPromptEngagement.user_id)
-        .subquery()
-    )
-    return ev_sub, eng_sub
-
-
-def last_active_expr(base_col, ev_sub, eng_sub, dialect: str):
-    """max(base_col, 最近活跃事件, 最近领券) 的 SQL 表达式。PG 用 greatest、SQLite 用 max。
-    子聚合缺失(未命中)时 coalesce 到 base_col(= User.created_at,恒非空基线)。"""
-    greatest = func.greatest if dialect == "postgresql" else func.max
-    return greatest(
-        base_col,
-        func.coalesce(ev_sub.c.last_at, base_col),
-        func.coalesce(eng_sub.c.last_at, base_col),
-    )

app/repositories/ad_ecpm.py

@@ -10,7 +10,6 @@ from sqlalchemy import func, select
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import Session
 
-from app.core import rewards
 from app.core.rewards import cn_today
 from app.models.ad_ecpm import AdEcpmRecord
 
@@ -25,7 +24,6 @@ def create_ecpm_record(
     adn: str | None = None,
     slot_id: str | None = None,
     feed_scene: str | None = None,
-    trace_id: str | None = None,
     app_env: str | None = None,
     our_code_id: str | None = None,
 ) -> AdEcpmRecord:
@@ -45,7 +43,6 @@ def create_ecpm_record(
         adn=adn,
         slot_id=slot_id,
         feed_scene=feed_scene,
-        trace_id=trace_id,
         app_env=app_env,
         our_code_id=our_code_id,
         ecpm_raw=ecpm_raw,
@@ -108,27 +105,3 @@ def count_today(db: Session, user_id: int) -> int:
             AdEcpmRecord.report_date == cn_today().isoformat(),
         )
     ).scalar_one()
-
-
-def revenue_yuan_by_trace(db: Session, trace_ids: list[str]) -> dict[str, float]:
-    """各 trace_id 的广告预估收益(元):按 trace_id 聚合 ad_ecpm_record 的展示收益。
-
-    单条展示收益 = min(eCPM元, AD_ECPM_MAX_FEN/100) / 1000(与 admin 广告收益报表同口径)。
-    ecpm_raw 是字符串且需逐条钳顶,故取回后 Python 求和(行数=本页各 trace 的展示条数,很小)。
-    trace_id 仅信息流(比价/领券)场景客户端带,激励视频/旧数据为 NULL,按 trace_id 过滤天然只算对应场景。
-    只喂**当前页**的 trace_id(≤ 一页条数);空集合直接返回(避免 IN () 非法)。
-    """
-    if not trace_ids:
-        return {}
-    rows = db.execute(
-        select(AdEcpmRecord.trace_id, AdEcpmRecord.ecpm_raw).where(
-            AdEcpmRecord.trace_id.in_(trace_ids),
-        )
-    ).all()
-    cap_yuan = rewards.AD_ECPM_MAX_FEN / 100.0
-    out: dict[str, float] = {}
-    for tid, ecpm_raw in rows:
-        if not tid:
-            continue
-        out[tid] = out.get(tid, 0.0) + min(rewards.parse_ecpm_yuan(ecpm_raw), cap_yuan) / 1000.0
-    return {tid: round(v, 6) for tid, v in out.items()}

app/repositories/coupon_state.py

@@ -147,22 +147,12 @@ def reset_today_completion(db: Session, device_id: str) -> int:
 
 # ===== 领券记录(coupon_claim_record)=====
 
-def session_app_env(db: Session, trace_id: str | None) -> str | None:
-    """按 trace_id 取 coupon_session.app_env(每券成功率表打环境标用);无 trace_id / 查不到 → None。"""
-    if not trace_id:
-        return None
-    return db.execute(
-        select(CouponSession.app_env).where(CouponSession.trace_id == trace_id)
-    ).scalar_one_or_none()
-
-
 def record_claims(
     db: Session,
     device_id: str,
     user_id: int | None,
     trace_id: str | None,
     results: list[dict],
-    app_env: str | None = None,
 ) -> int:
     """一批券领取结果幂等写入,返回写入(新增 + 更新)条数。
 
@@ -196,15 +186,12 @@ def record_claims(
                 row.user_id = user_id
             if count is not None:
                 row.claimed_count = count
-            if app_env is not None:
-                row.app_env = app_env
             row.extra = r
         else:
             db.add(CouponClaimRecord(
                 device_id=device_id, user_id=user_id,
                 coupon_id=coupon_id, claim_date=today,
-                status=status, app_env=app_env,
-                vendor=r.get("vendor"), coupon_name=r.get("name"),
+                status=status, vendor=r.get("vendor"), coupon_name=r.get("name"),
                 claimed_count=count, trace_id=trace_id, reason=r.get("reason"),
                 extra=r,
             ))
@@ -248,47 +235,6 @@ def sum_claimed_count(db: Session, user_id: int) -> int:
     return int(total or 0)
 
 
-# ===== 领券平台推导(coupon_id → 平台;成功平台集)=====
-
-# 成功语义:success + already_claimed 算成功(pricebot 代码 emit already_claimed,协议 enum 漏了);
-# failed / skipped 不算。与 sum_claimed_count 同口径。
-_SUCCESS_STATUSES = frozenset({"success", "already_claimed"})
-
-# 三档平台 id 及固定序(美团→淘宝→京东),与客户端 DEFAULT_PLATFORM_ORDER 对齐。
-DEFAULT_PLATFORMS: tuple[str, ...] = ("meituan-waimai", "taobao-shanguang", "jd-waimai")
-
-
-def coupon_id_to_platform(coupon_id: str | None) -> str | None:
-    """coupon_id 前缀 → 平台 id;无法识别 / 空 → None。
-
-    与客户端 `CouponForegroundService.couponIdToPlatform` 同词表:
-    mt_→美团外卖 / tb_·ele_·elm_→淘宝闪购 / jd_→京东外卖。
-    """
-    if not coupon_id:
-        return None
-    if coupon_id.startswith("mt_"):
-        return "meituan-waimai"
-    if coupon_id.startswith(("tb_", "ele_", "elm_")):
-        return "taobao-shanguang"
-    if coupon_id.startswith("jd_"):
-        return "jd-waimai"
-    return None
-
-
-def succeeded_platforms(results: list[dict]) -> list[str]:
-    """一批券结果 → 至少领到一张的平台集(按 DEFAULT_PLATFORMS 去重保序)。
-
-    只取 status∈{success, already_claimed} 的券;失败/跳过、无法识别平台的券跳过。
-    """
-    ok: set[str] = set()
-    for r in results:
-        if r.get("status") in _SUCCESS_STATUSES:
-            platform = coupon_id_to_platform(r.get("coupon_id"))
-            if platform is not None:
-                ok.add(platform)
-    return [p for p in DEFAULT_PLATFORMS if p in ok]
-
-
 # ===== 领券任务流水(coupon_session,admin「领券数据」看板数据源)=====
 
 def upsert_coupon_session(
@@ -375,31 +321,3 @@ def upsert_coupon_session(
     except IntegrityError:
         # 并发下另一请求刚插了同 trace_id → 唯一约束撞,回滚忽略(本就幂等)。
         db.rollback()
-
-
-def merge_session_platform_success(
-    db: Session, trace_id: str, platforms: list[str]
-) -> None:
-    """把本帧「成功平台」并入 coupon_session.platform_success(按 trace_id,并集幂等,按 DEFAULT_PLATFORMS 保序)。
-
-    - 领券 /step 每逢带券结果的帧调一次(平台成败布尔,跨帧取并集天然幂等,不重复计)。
-    - 读不到该 trace_id 的行 → **静默跳过**(不建兜底行;设计 §5:started 帧几乎必先落库)。
-    - 并集无变化(该平台已记过)→ 不写库,省一次 UPDATE。
-    - fire-and-forget:调用方已吞异常;并发唯一冲突回滚忽略。
-    """
-    if not platforms:
-        return
-    row = db.execute(
-        select(CouponSession).where(CouponSession.trace_id == trace_id)
-    ).scalar_one_or_none()
-    if row is None:
-        return
-    merged = set(row.platform_success or []) | set(platforms)
-    new_list = [p for p in DEFAULT_PLATFORMS if p in merged]
-    if new_list == (row.platform_success or []):
-        return  # 幂等:无新平台,不写
-    row.platform_success = new_list
-    try:
-        db.commit()
-    except IntegrityError:
-        db.rollback()

app/repositories/device.py

@@ -21,23 +21,17 @@ def register_or_update(
     *,
     user_id: int,
     device_id: str,
-    registration_id: str | None = None,
-    push_vendor: str | None = None,
-    push_token: str | None = None,
+    registration_id: str | None,
     platform: str = "android",
     app_version: str | None = None,
 ) -> DeviceLiveness:
-    """注册设备或更新其厂商 push token / 元信息。upsert by (user_id, device_id)。"""
-    normalized_vendor = _normalize_push_vendor(push_vendor)
-    normalized_token = push_token.strip() if push_token else None
+    """注册设备或更新其 registration_id / 元信息。upsert by (user_id, device_id)。"""
     device = _get(db, user_id=user_id, device_id=device_id)
     if device is None:
         device = DeviceLiveness(
             user_id=user_id,
             device_id=device_id,
             registration_id=registration_id,
-            push_vendor=normalized_vendor,
-            push_token=normalized_token,
             platform=platform or "android",
             app_version=app_version,
         )
@@ -45,10 +39,6 @@ def register_or_update(
     else:
         if registration_id:
             device.registration_id = registration_id
-        if normalized_vendor:
-            device.push_vendor = normalized_vendor
-        if normalized_token:
-            device.push_token = normalized_token
         if platform:
             device.platform = platform
         if app_version:
@@ -64,9 +54,7 @@ def touch_heartbeat(
     user_id: int,
     device_id: str,
     accessibility_enabled: bool,
-    registration_id: str | None = None,
-    push_vendor: str | None = None,
-    push_token: str | None = None,
+    registration_id: str | None,
 ) -> DeviceLiveness:
     """处理一次心跳(心跳也能自注册)。
 
@@ -81,12 +69,6 @@ def touch_heartbeat(
 
     if registration_id:
         device.registration_id = registration_id
-    normalized_vendor = _normalize_push_vendor(push_vendor)
-    normalized_token = push_token.strip() if push_token else None
-    if normalized_vendor:
-        device.push_vendor = normalized_vendor
-    if normalized_token:
-        device.push_token = normalized_token
     device.last_report_protection_on = accessibility_enabled
 
     if accessibility_enabled:
@@ -105,7 +87,7 @@ def touch_heartbeat(
 def list_overdue(db: Session, *, timeout_minutes: int) -> list[DeviceLiveness]:
     """掉线设备:曾经保护过、当前 alive、心跳超时。
 
-    即使没有厂商 token 也要检出,后续由 kill_alert_pending 走客户端进 App 后兜底提醒。
+    本期只做终端打印检测、不推送 → 不再要求有 registration_id(没接极光 token 的设备也要检出)。
     """
     cutoff = datetime.now(timezone.utc) - timedelta(minutes=timeout_minutes)
     stmt = select(DeviceLiveness).where(
@@ -142,55 +124,3 @@ def ack_kill_alert(db: Session, *, user_id: int, device_id: str) -> None:
     if device is not None and device.kill_alert_pending:
         device.kill_alert_pending = False
         db.commit()
-
-
-def has_push_target(device: DeviceLiveness | None) -> bool:
-    """是否已有厂商直推所需的 vendor + token。"""
-    return bool(device and device.push_vendor and device.push_token)
-
-
-def list_push_targets(db: Session, *, user_id: int) -> list[DeviceLiveness]:
-    """该用户全部可用厂商推送目标(push_vendor + push_token 双非空),最近更新在前。
-
-    同 (vendor, token) 只留最新一行:同一台手机重装 App 后 device_id 会变、
-    留下 token 相同的旧行,去重防一次业务事件对同一台手机重复推送。
-    """
-    stmt = (
-        select(DeviceLiveness)
-        .where(
-            DeviceLiveness.user_id == user_id,
-            DeviceLiveness.push_vendor.is_not(None),
-            DeviceLiveness.push_token.is_not(None),
-        )
-        .order_by(DeviceLiveness.updated_at.desc(), DeviceLiveness.id.desc())
-    )
-    seen: set[tuple[str, str]] = set()
-    targets: list[DeviceLiveness] = []
-    for dev in db.execute(stmt).scalars():
-        if not dev.push_vendor or not dev.push_token:  # 空串兜底(旧数据)
-            continue
-        key = (dev.push_vendor, dev.push_token)
-        if key in seen:
-            continue
-        seen.add(key)
-        targets.append(dev)
-    return targets
-
-
-def _normalize_push_vendor(push_vendor: str | None) -> str | None:
-    if not push_vendor:
-        return None
-    vendor = push_vendor.strip().lower()
-    aliases = {
-        "honor": "honor",
-        "hihonor": "honor",
-        "荣耀": "honor",
-        "vivo": "vivo",
-        "xiaomi": "xiaomi",
-        "mi": "xiaomi",
-        "小米": "xiaomi",
-        "oppo": "oppo",
-        "oneplus": "oppo",
-        "realme": "oppo",
-    }
-    return aliases.get(vendor, vendor)

app/repositories/inactivity.py

@@ -1,198 +0,0 @@
-"""15 天不活跃清零业务逻辑(纯同步,可单测)。worker 只是它的 asyncio 外壳。
-
-活跃口径复用 app.repositories.activity;清零走 wallet.grant_*(负数出账、写流水、不 commit)。
-逐用户独立事务,一个失败不影响其余。
-"""
-from __future__ import annotations
-
-import logging
-from datetime import date, datetime
-
-from sqlalchemy import or_, select
-from sqlalchemy.exc import SQLAlchemyError
-from sqlalchemy.orm import Session
-
-from app.core.rewards import CN_TZ
-from app.integrations.notifier import InactivityNotifier
-from app.models.inactivity import InactivityNotificationLog, InactivityResetLog
-from app.models.user import User
-from app.models.wallet import CoinAccount
-from app.repositories import activity
-from app.repositories import wallet as wallet_repo
-
-logger = logging.getLogger("shagua.inactivity")
-
-RESET_BIZ_TYPE = "inactivity_reset"
-RESET_REMARK = "15天不活跃清零"
-
-# 清零候选口径:金币或折算现金有余额即入选。**邀请现金不算**——它是产品红线、不清零
-# (见 wallet.CoinAccount 注释),只有邀请现金余额的用户没有可清项,故不入选。
-_ANY_BALANCE = or_(
-    CoinAccount.coin_balance > 0,
-    CoinAccount.cash_balance_cents > 0,
-)
-
-
-def _base_query(db: Session):
-    """select(user_id, last_active, 三桶余额),join CoinAccount + 两活跃子查询。"""
-    ev_sub, eng_sub = activity.last_active_subqueries(db)
-    dialect = db.get_bind().dialect.name
-    last_active = activity.last_active_expr(User.created_at, ev_sub, eng_sub, dialect)
-    stmt = (
-        select(
-            User.id.label("user_id"),
-            last_active.label("last_active"),
-            CoinAccount.coin_balance,
-            CoinAccount.cash_balance_cents,
-            CoinAccount.invite_cash_balance_cents,
-        )
-        .join(CoinAccount, CoinAccount.user_id == User.id)
-        .outerjoin(ev_sub, ev_sub.c.user_id == User.id)
-        .outerjoin(eng_sub, eng_sub.c.user_id == User.id)
-    )
-    return stmt, last_active
-
-
-def _cn_date(dt: datetime) -> date:
-    """datetime → 北京自然日(naive 视为 UTC)。"""
-    return activity.norm_utc(dt).astimezone(CN_TZ).date()
-
-
-def _inactive_days(last_active: datetime, today: date) -> int:
-    return (today - _cn_date(last_active)).days
-
-
-def select_inactive_users(db: Session, *, cutoff: datetime):
-    """应清零用户:last_active < cutoff 且金币/折算现金有余额(邀请现金不清、不计)。
-    返回 Row 列表(值已快照,可跨 commit)。"""
-    stmt, last_active = _base_query(db)
-    stmt = stmt.where(_ANY_BALANCE, last_active < activity.as_utc(cutoff))
-    return db.execute(stmt).all()
-
-
-def clear_user(db: Session, *, user_id: int, last_active: datetime, inactive_days: int,
-               reason: str, dry_run: bool = False) -> bool:
-    """单用户清零(独立事务、行锁)。金币 + 折算现金归零 + 写审计 + 2 条流水;**邀请现金不清**
-    (产品红线,见 wallet.CoinAccount 注释),仅作快照记入审计。返回是否真处理了(有可清余额)。
-
-    dry_run=True:**只写审计名单、不动钱不写流水**(灰度看名单)。按 streak 去重——本 streak
-    已记过(reset_at > last_active)就跳,避免 worker 每日重复记。"""
-    acc = wallet_repo.get_or_create_account(db, user_id, commit=False, lock=True)
-    coin, cash, invite = acc.coin_balance, acc.cash_balance_cents, acc.invite_cash_balance_cents
-    if coin == 0 and cash == 0:  # 邀请现金不清,故不算"有可清余额"
-        return False
-    if dry_run and db.execute(
-        select(InactivityResetLog.id).where(
-            InactivityResetLog.user_id == user_id,
-            InactivityResetLog.reset_at > activity.as_utc(last_active),
-        ).limit(1)
-    ).first():
-        return False  # dry-run:本 streak 已记过审计,不重复记
-    log = InactivityResetLog(
-        user_id=user_id, coin_balance_before=coin, cash_balance_cents_before=cash,
-        invite_cash_balance_cents_before=invite, last_active_at=activity.norm_utc(last_active),
-        inactive_days=inactive_days, reason=reason,
-    )
-    db.add(log)
-    db.flush()  # 拿 log.id 作 ref_id 交叉链接审计↔流水
-    if not dry_run:  # dry-run 只记审计名单,不真出账
-        ref = str(log.id)
-        if coin:
-            wallet_repo.grant_coins(db, user_id, -coin, biz_type=RESET_BIZ_TYPE, ref_id=ref, remark=RESET_REMARK)
-        if cash:
-            wallet_repo.grant_cash(db, user_id, -cash, biz_type=RESET_BIZ_TYPE, ref_id=ref, remark=RESET_REMARK)
-        # 邀请现金(invite_cash_balance_cents)刻意不动:两本账物理隔离、邀请金是产品红线。
-    db.commit()
-    return True
-
-
-def run_reset_once(db: Session, *, reset_days: int, today: date, dry_run: bool = False) -> dict:
-    """扫一轮清零。逐用户独立 commit,失败隔离。dry_run=True 只记审计名单、不动钱(见 clear_user)。"""
-    stats = {"scanned": 0, "cleared": 0, "failed": 0}
-    cutoff = activity.reset_cutoff(reset_days, today)
-    reason = f"inactive_{reset_days}d" + ("_dryrun" if dry_run else "")
-    rows = select_inactive_users(db, cutoff=cutoff)  # 先物化,避免边遍历边 commit
-    for row in rows:
-        stats["scanned"] += 1
-        idays = _inactive_days(row.last_active, today)
-        try:
-            if clear_user(db, user_id=row.user_id, last_active=row.last_active,
-                          inactive_days=idays, reason=reason, dry_run=dry_run):
-                stats["cleared"] += 1
-        except SQLAlchemyError:
-            db.rollback()
-            stats["failed"] += 1
-    return stats
-
-
-def select_warn_candidates(db: Session, *, clear_cutoff: datetime, warn_hi: datetime):
-    """预警候选:clear_cutoff <= last_active < warn_hi 且有可清余额(即已进预警窗、尚未到清零)。"""
-    stmt, last_active = _base_query(db)
-    stmt = stmt.where(
-        _ANY_BALANCE,
-        last_active >= activity.as_utc(clear_cutoff),
-        last_active < activity.as_utc(warn_hi),
-    )
-    return db.execute(stmt).all()
-
-
-def run_warn_once(db: Session, notifier: InactivityNotifier, *,
-                  reset_days: int, warn_stages: list[int], today: date) -> dict:
-    """扫一轮预警。每人取"最紧急的已到达档",按 streak 去重(notification_log.created_at > last_active)。
-    预警只涉及会被清的金币 + 折算现金;邀请现金不清、不预警(仅在 notification_log 记快照)。
-    逐用户 try/except 隔离:单用户通知器抛错 / DB 错不阻断其余,也绝不能拖累后续清零。"""
-    stats = {"warned": 0, "warn_skipped": 0, "warn_failed": 0}
-    if not warn_stages:
-        return stats
-    clear_cutoff = activity.reset_cutoff(reset_days, today)                # 到此即清零,不再预警
-    warn_hi = activity.reset_cutoff(reset_days - max(warn_stages), today)  # 最早预警档边界
-    ascending = sorted(warn_stages)                                       # 最紧急(最小 k)在前
-    for row in select_warn_candidates(db, clear_cutoff=clear_cutoff, warn_hi=warn_hi):
-        idays = _inactive_days(row.last_active, today)
-        stage = next((k for k in ascending if idays >= reset_days - k), None)
-        if stage is None:  # 防御:候选已在预警窗内、stage 必命中,此分支实际不可达
-            continue
-        try:
-            already = db.execute(
-                select(InactivityNotificationLog.id).where(
-                    InactivityNotificationLog.user_id == row.user_id,
-                    InactivityNotificationLog.stage == stage,
-                    InactivityNotificationLog.created_at > activity.as_utc(row.last_active),
-                ).limit(1)
-            ).first()
-            if already:
-                stats["warn_skipped"] += 1
-                continue
-            status = notifier.warn(
-                user_id=row.user_id, coin=row.coin_balance, cash_cents=row.cash_balance_cents,
-                stage=stage, days_until_reset=reset_days - idays,
-            )
-            db.add(InactivityNotificationLog(
-                user_id=row.user_id, stage=stage, inactive_days=idays,
-                coin_balance=row.coin_balance, cash_balance_cents=row.cash_balance_cents,
-                invite_cash_balance_cents=row.invite_cash_balance_cents,  # 快照,不参与"将清"额度
-                channel=notifier.channel, status=status,
-            ))
-            db.commit()
-            stats["warned"] += 1
-        except Exception:  # noqa: BLE001 - 单用户预警失败(通知器抛错/DB 错)隔离,不阻断其余、不拖累清零
-            db.rollback()
-            stats["warn_failed"] += 1
-    return stats
-
-
-def run_once(db: Session, *, notifier: InactivityNotifier, reset_days: int,
-             warn_stages: list[int], today: date, dry_run: bool = False) -> dict:
-    """一轮完整任务:先预警(阶段 A)再清零(阶段 B)。返回合并统计。
-    预警整段异常也**绝不阻塞清零**——清零是核心、不可逆资金操作,不能被通知故障拖住。
-    dry_run=True(灰度默认):只记审计名单、不清、**也不预警**(不通知一个不会发生的清零)。"""
-    warn = {"warned": 0, "warn_skipped": 0, "warn_failed": 0}
-    if not dry_run:
-        try:
-            warn = run_warn_once(db, notifier, reset_days=reset_days, warn_stages=warn_stages, today=today)
-        except Exception:  # noqa: BLE001 - 预警阶段整体失败(如候选查询失败)也要继续清零
-            logger.exception("inactivity warn phase failed; proceeding to reset")
-            db.rollback()
-            warn = {"warned": 0, "warn_skipped": 0, "warn_failed": 0, "warn_phase_error": 1}
-    reset = run_reset_once(db, reset_days=reset_days, today=today, dry_run=dry_run)
-    return {**warn, **reset}

app/repositories/invite.py

@@ -25,7 +25,6 @@ from app.models.invite import InviteRelation
 from app.models.invite_fingerprint import InviteFingerprint
 from app.models.user import User
 from app.repositories import wallet as crud_wallet
-from app.services import notification_events
 
 # 邀请码字符集:去掉易混字符(0/O/1/I/L/B/8/S/5/Z/2),用户口述/手输不易错
 _CODE_ALPHABET = "ACDEFGHJKMNPQRTUVWXY34679"
@@ -198,13 +197,12 @@ def try_reward_on_compare(db: Session, invitee_user_id: int) -> CompareRewardRes
         return CompareRewardResult("inviter_inactive", rel.inviter_user_id)
 
     reward = rewards.INVITE_COMPARE_REWARD_CENTS
-    inviter_id = inviter.id
     rel.compare_reward_granted = True
     rel.compare_reward_cents = reward
     rel.compare_rewarded_at = datetime.now(timezone.utc)
     # 发邀请奖励金到邀请人的独立账户(与金币隔离),ref_id 指向被邀请人便于对账
     crud_wallet.grant_invite_cash(
-        db, inviter_id, reward,
+        db, inviter.id, reward,
         biz_type="invite_reward", ref_id=str(invitee_user_id), remark="好友比价奖励",
     )
     try:
@@ -212,11 +210,7 @@ def try_reward_on_compare(db: Session, invitee_user_id: int) -> CompareRewardRes
     except Exception:
         db.rollback()
         raise
-    # PRD #12 好友下单到账:发奖已 commit,通知邀请人(站内 + push;失败只 log 不影响发奖)
-    notification_events.notify_invite_order_reward(
-        db, inviter_user_id=inviter_id, invitee_user_id=invitee_user_id, cash_cents=reward
-    )
-    return CompareRewardResult("granted", inviter_id, reward)
+    return CompareRewardResult("granted", inviter.id, reward)
 
 
 def get_stats(db: Session, inviter_id: int) -> tuple[int, int]:

app/repositories/notification.py

@@ -1,318 +0,0 @@
-"""消息通知中心 数据仓库(落库版,查/写 `notification` 表)。
-
-沿用原 notification_mock 的同名函数(list_notifications / unread_count / mark_read /
-insert_sample),由内存 mock 迁到落库,**API 契约不变**。
-
-- 读:按 user 隔离、sent_at 倒序;未读数 / 标记已读同口径。
-- 写:`create_notification` 是落库统一入口。**业务事件请走 services/notification_events**
-  (站内消息 + 厂商 push 一起下发,已接入提现回执/反馈审核/爆料通过/好友下单);
-  `build_sample_card` / `insert_sample` 按类型造样例内容,供
-  `/api/v1/push/test` 的 createNotification 做「push → 站内已读联动」联调。
-
-排序规则:全列表按 sent_at 倒序(最新在前;同秒再按 id 倒序稳定化),不分组。
-"""
-from __future__ import annotations
-
-from datetime import datetime, timedelta, timezone
-
-from sqlalchemy import func, select
-from sqlalchemy.orm import Session
-
-from app.core import notification_catalog as catalog
-from app.models.notification import Notification
-
-# 北京时间:sent_at 统一带 +08:00 下发,前端直接按本地时区渲染「今天/昨天/M月D日」。
-_CST = timezone(timedelta(hours=8))
-
-
-def cash_yuan(cents: int | None) -> str | None:
-    """分 → 保留两位小数的元字符串(PRD §3:现金/提现金额保留两位小数)。"""
-    if cents is None:
-        return None
-    return f"{cents // 100}.{cents % 100:02d}"
-
-
-def as_cst(dt: datetime) -> datetime:
-    """把库里取出的时间归一到北京时间(+08:00)再下发,保证接口 sentAt 恒带 +08:00。
-
-    SQLite 的 DateTime 不存时区,取出为 naive(存的就是写入时的 CST 墙上时间)→ 直接贴 +08:00;
-    PostgreSQL 的 timestamptz 取出为 aware(通常 UTC)→ 转到 +08:00。两端下发口径一致。
-    """
-    if dt.tzinfo is None:
-        return dt.replace(tzinfo=_CST)
-    return dt.astimezone(_CST)
-
-
-def _fmt_time(dt: datetime) -> str:
-    """信息行里「到账时间」等 value 的展示格式。"""
-    return dt.strftime("%Y-%m-%d %H:%M")
-
-
-# ---------------------------------------------------------------------------
-# 读:列表 / 未读数 / 标记已读
-# ---------------------------------------------------------------------------
-
-
-def _unread_count(db: Session, user_id: int) -> int:
-    return int(
-        db.execute(
-            select(func.count())
-            .select_from(Notification)
-            .where(Notification.user_id == user_id, Notification.is_read.is_(False))
-        ).scalar_one()
-    )
-
-
-def list_notifications(
-    db: Session, user_id: int, *, page: int, page_size: int
-) -> tuple[list[Notification], int, int]:
-    """分页取通知列表。返回 (当前页条目, 总条数, 未读条数)。"""
-    total = int(
-        db.execute(
-            select(func.count())
-            .select_from(Notification)
-            .where(Notification.user_id == user_id)
-        ).scalar_one()
-    )
-    unread = _unread_count(db, user_id)
-    rows = (
-        db.execute(
-            select(Notification)
-            .where(Notification.user_id == user_id)
-            .order_by(Notification.sent_at.desc(), Notification.id.desc())
-            .offset((page - 1) * page_size)
-            .limit(page_size)
-        )
-        .scalars()
-        .all()
-    )
-    return list(rows), total, unread
-
-
-def unread_count(db: Session, user_id: int) -> int:
-    """未读总数(首页铃铛角标)。"""
-    return _unread_count(db, user_id)
-
-
-def mark_read(
-    db: Session, user_id: int, *, ids: list[int] | None = None, mark_all: bool = False
-) -> tuple[int, int]:
-    """标记已读。mark_all=True 全量清零,否则按 ids 逐条置读(不存在的 id 忽略,幂等)。
-
-    返回 (本次实际由未读→已读的条数, 剩余未读数)。
-    """
-    if not mark_all:
-        wanted = set(ids or [])
-        if not wanted:
-            return 0, _unread_count(db, user_id)
-
-    stmt = select(Notification).where(
-        Notification.user_id == user_id, Notification.is_read.is_(False)
-    )
-    if not mark_all:
-        stmt = stmt.where(Notification.id.in_(wanted))
-
-    now = datetime.now(timezone.utc)
-    marked = 0
-    for n in db.execute(stmt).scalars().all():
-        n.is_read = True
-        n.read_at = now
-        marked += 1
-    db.commit()
-    return marked, _unread_count(db, user_id)
-
-
-# ---------------------------------------------------------------------------
-# 写:业务下发入口
-# ---------------------------------------------------------------------------
-
-
-def create_notification(
-    db: Session,
-    *,
-    user_id: int,
-    type_key: str,
-    coins: int | None = None,
-    cash_cents: int | None = None,
-    info_rows: list[dict[str, str]] | None = None,
-    extra: dict[str, str] | None = None,
-    sent_at: datetime | None = None,
-    dedup_key: str | None = None,
-) -> Notification:
-    """下发一条站内消息(业务事件统一入口)。type_key 必须是 catalog 的 13 类之一。
-
-    dedup_key 非空时受部分唯一索引约束(同 user+type+dedup_key 未读期间仅一条);
-    需要「同批次/同权限只保留一条未读」的调用方,应捕获 IntegrityError 或先查已存在的未读再决定
-    更新 sent_at,而非重复插入(见 models/notification 的 uq_notification_user_type_dedup)。
-    """
-    catalog.get_type(type_key)  # 校验类型合法(未知类型抛 UnknownNotificationType)
-    row = Notification(
-        user_id=user_id,
-        type=type_key,
-        coins=coins,
-        cash_cents=cash_cents,
-        info_rows=info_rows or [],
-        extra=extra or {},
-        sent_at=sent_at or datetime.now(_CST),
-        dedup_key=dedup_key,
-    )
-    db.add(row)
-    db.commit()
-    db.refresh(row)
-    return row
-
-
-# ---------------------------------------------------------------------------
-# 样例内容(供 /push/test createNotification 联调;文案对齐 PRD §3)
-# ---------------------------------------------------------------------------
-
-
-def _card_reward_expiring(sent_at: datetime, coins: int = 86, cash: int = 1280, days: int = 3) -> dict:
-    return {
-        "coins": coins,
-        "cash_cents": cash,
-        "info_rows": [
-            {
-                "label": "过期说明",
-                "value": f"您有{coins}金币和{cash_yuan(cash)}元现金即将失效，"
-                         "完成一次一键领券或一键比价即可激活收益",
-            },
-            {"label": "过期时间", "value": f"{days}天后失效"},
-        ],
-        # batchId:同一批次激活成功后不再重复推送(PRD §2 激活逻辑)
-        "extra": {"batchId": f"batch_{sent_at:%Y%m%d}"},
-    }
-
-
-def _card_reward_expired(sent_at: datetime, coins: int = 35, cash: int = 60) -> dict:
-    return {
-        "coins": coins,
-        "cash_cents": cash,
-        "info_rows": [
-            {
-                "label": "过期说明",
-                "value": f"您的{coins}金币和{cash_yuan(cash)}元现金已失效，"
-                         "完成一次一键领券或一键比价可赚取新收益",
-            },
-            {"label": "过期时间", "value": f"已过期 {sent_at.month}月{sent_at.day}日失效"},
-        ],
-        "extra": {},  # 点击跳赚钱页(tab),无需参数
-    }
-
-
-def _card_withdraw_success(sent_at: datetime, cash: int = 50) -> dict:
-    return {
-        "cash_cents": cash,
-        "info_rows": [
-            {"label": "到账账户", "value": "微信钱包"},
-            {"label": "到账时间", "value": _fmt_time(sent_at)},
-        ],
-        "extra": {},  # 无跳转,仅消红点
-    }
-
-
-def _card_withdraw_failed(sent_at: datetime, cash: int = 350, reason: str = "微信零钱未实名") -> dict:
-    return {
-        "cash_cents": cash,
-        "info_rows": [
-            {"label": "失败原因", "value": reason},
-            {"label": "退回说明", "value": "款项已原路退回现金余额"},
-        ],
-        "extra": {"withdrawId": "88001"},  # 点击跳提现页
-    }
-
-
-def _card_permission(permission: str) -> dict:
-    # permission ∈ accessibility(无障碍)/ battery(省电策略)/ autostart(自启动)/ overlay(悬浮窗)
-    # 客户端点击时按此 key 实时检测该权限并弹对应开启弹窗(PRD §2 权限逻辑)。
-    return {
-        "info_rows": [
-            {"label": "说明文案", "value": "未开启将导致核心功能不可用，请尽快开启"},
-        ],
-        "extra": {"permission": permission},
-    }
-
-
-def _card_feedback_reply(feedback_id: str) -> dict:
-    return {
-        "info_rows": [
-            {"label": "说明文案", "value": "快去看看官方给您的回复吧～"},
-        ],
-        "extra": {"feedbackId": feedback_id},  # 跳反馈历史页并滚动高亮该条(PRD §2)
-    }
-
-
-def _card_feedback_reward(sent_at: datetime, coins: int = 300,
-                          reply: str = "感谢反馈，您说的问题已经修复上线，送您的金币请查收～") -> dict:
-    return {
-        "coins": coins,
-        "info_rows": [
-            {"label": "奖励说明", "value": "感谢您的反馈，您的金币奖励已到账"},
-            {"label": "官方留言", "value": reply},  # PRD §3:官方留言必填(发奖励必带留言)
-            {"label": "到账时间", "value": _fmt_time(sent_at)},
-        ],
-        "extra": {"feedbackId": "3002"},
-    }
-
-
-def _card_report_approved(sent_at: datetime, coins: int = 1000, store: str = "蜀大侠火锅") -> dict:
-    return {
-        "coins": coins,
-        "info_rows": [
-            {"label": "奖励说明", "value": f"您爆料的「{store}」更低价已通过审核，金币奖励已到账"},
-            {"label": "到账时间", "value": _fmt_time(sent_at)},
-        ],
-        "extra": {"reportId": "5001"},  # 跳爆料记录页并滚动高亮该条
-    }
-
-
-def _card_invite_order_reward(sent_at: datetime, cash: int = 200, nickname: str = "柚子") -> dict:
-    return {
-        "cash_cents": cash,
-        "info_rows": [
-            {"label": "奖励说明", "value": f"好友「{nickname}」完成首次下单"},
-            {"label": "到账时间", "value": _fmt_time(sent_at)},
-        ],
-        "extra": {"inviteeNickname": nickname},  # 跳邀请页(welfare/invite.html?from=notifications)
-    }
-
-
-def _card_invite_remind(nickname: str = "阿泽") -> dict:
-    return {
-        "info_rows": [
-            {
-                "label": "说明文案",
-                "value": f"好友「{nickname}」已注册，还没完成比价下单，提醒TA完成后你可得2元现金",
-            },
-        ],
-        # scrollTo=remind:跳邀请页并自动滚动到底部「提醒好友」模块(PRD §2 #13)
-        "extra": {"inviteeNickname": nickname, "scrollTo": "remind"},
-    }
-
-
-def build_sample_card(type_key: str, sent_at: datetime | None = None) -> dict:
-    """按类型生成一份样例卡片内容({coins?, cash_cents?, info_rows, extra}),/push/test 联调用。"""
-    catalog.get_type(type_key)  # 校验 type 合法
-    now = sent_at or datetime.now(_CST)
-    builders = {
-        "reward_expiring": lambda: _card_reward_expiring(now),
-        "reward_expired": lambda: _card_reward_expired(now),
-        "withdraw_success": lambda: _card_withdraw_success(now),
-        "withdraw_failed": lambda: _card_withdraw_failed(now),
-        "perm_accessibility": lambda: _card_permission("accessibility"),
-        "perm_battery": lambda: _card_permission("battery"),
-        "perm_autostart": lambda: _card_permission("autostart"),
-        "perm_overlay": lambda: _card_permission("overlay"),
-        "feedback_reply": lambda: _card_feedback_reply("3001"),
-        "feedback_reward": lambda: _card_feedback_reward(now),
-        "report_approved": lambda: _card_report_approved(now),
-        "invite_order_reward": lambda: _card_invite_order_reward(now),
-        "invite_remind": lambda: _card_invite_remind(),
-    }
-    return builders[type_key]()
-
-
-def insert_sample(db: Session, user_id: int, type_key: str) -> Notification:
-    """插入一条该类型的样例未读通知并落库(/push/test createNotification 联调:push extras 带上
-    它的 id,客户端点击 push 后调 POST /notifications/read {ids:[id]} 即闭环验证已读联动)。"""
-    return create_notification(db, user_id=user_id, type_key=type_key, **build_sample_card(type_key))

app/repositories/phone_rebind.py

@@ -1,39 +0,0 @@
-"""手机号换绑台账(phone_rebind_log)的查询与写入。见 M2 spec §4.1。"""
-from __future__ import annotations
-
-import math
-from datetime import datetime, timedelta, timezone
-
-from sqlalchemy import func, select
-from sqlalchemy.orm import Session
-
-from app.models.phone_rebind_log import PhoneRebindLog
-
-
-def rebound_within_days(db: Session, phone: str, days: int) -> bool:
-    """该手机号在最近 days 天内是否换绑过(命中 → 禁止再次换绑)。"""
-    since = datetime.now(timezone.utc) - timedelta(days=days)
-    stmt = (
-        select(PhoneRebindLog.id)
-        .where(PhoneRebindLog.phone == phone, PhoneRebindLog.rebound_at >= since)
-        .limit(1)
-    )
-    return db.execute(stmt).first() is not None
-
-
-def remaining_block_days(db: Session, phone: str, days: int) -> int:
-    """距离该手机号可再次换绑还剩几天(向上取整;无记录返回 0)。"""
-    last = db.execute(
-        select(func.max(PhoneRebindLog.rebound_at)).where(PhoneRebindLog.phone == phone)
-    ).scalar_one_or_none()
-    if last is None:
-        return 0
-    if last.tzinfo is None:  # SQLite 取回 naive datetime,按 UTC 归一
-        last = last.replace(tzinfo=timezone.utc)
-    remaining = (last + timedelta(days=days) - datetime.now(timezone.utc)).total_seconds()
-    return max(0, math.ceil(remaining / 86400))
-
-
-def add_rebind_log(db: Session, *, phone: str, old_user_id: int | None, new_user_id: int, source: str) -> None:
-    """写一条换绑台账(**不 commit**,交给调用方 rebind_account 的单事务)。"""
-    db.add(PhoneRebindLog(phone=phone, old_user_id=old_user_id, new_user_id=new_user_id, source=source))

app/repositories/user.py

@@ -12,7 +12,6 @@ from sqlalchemy import select
 from sqlalchemy.orm import Session
 
 from app.models.user import User
-from app.repositories import phone_rebind
 
 
 # ===== 创建时分配的标识:用户名(对外展示账号 ID)+ 默认昵称 =====
@@ -59,17 +58,6 @@ def is_default_nickname(nickname: str | None) -> bool:
     )
 
 
-def apply_wechat_display_identity(
-    user: User, *, wechat_nickname: str | None, wechat_avatar_url: str | None
-) -> None:
-    """§10:用已有账号绑微信时,仅当展示字段仍为默认才用微信昵称/头像替换(两规则独立);
-    自定义(改过昵称/传过头像)则保留。只改内存对象,由调用方 commit。"""
-    if is_default_nickname(user.nickname) and wechat_nickname:
-        user.nickname = wechat_nickname
-    if user.avatar_url is None and wechat_avatar_url:
-        user.avatar_url = wechat_avatar_url
-
-
 def get_user_by_username(db: Session, username: str) -> User | None:
     return db.execute(
         select(User).where(User.username == username)
@@ -98,85 +86,6 @@ def get_user_by_phone(db: Session, phone: str) -> User | None:
     return db.execute(stmt).scalar_one_or_none()
 
 
-def get_user_by_wechat_openid(db: Session, openid: str) -> User | None:
-    stmt = select(User).where(User.wechat_openid == openid)
-    return db.execute(stmt).scalar_one_or_none()
-
-
-def touch_last_login(db: Session, user: User) -> User:
-    """openid 命中登录时更新 last_login_at(手机号登录在 upsert_user_for_login 里已更新)。"""
-    user.last_login_at = datetime.now(timezone.utc)
-    db.commit()
-    db.refresh(user)
-    return user
-
-
-def attach_wechat_to_user(
-    db: Session, user: User, *, openid: str, wechat_nickname: str | None, wechat_avatar_url: str | None
-) -> User:
-    """继续绑定:把微信 openid + 微信源字段并入已存在账号(调用方保证 user.wechat_openid 为空)。
-
-    写 wechat_openid / wechat_nickname / wechat_avatar_url,并按 §10 规则回填展示字段:
-    仅当昵称仍为默认值(is_default_nickname)时用微信昵称替换,仅当头像为 null 时用微信头像替换;
-    用户已自定义的展示昵称/头像始终保留,两规则相互独立。
-    撞 openid 唯一约束(O 期间被别处绑走,极罕见)时由调用方捕获 IntegrityError 兜底降级为"只登入不绑"。
-    """
-    user.wechat_openid = openid
-    user.wechat_nickname = wechat_nickname
-    user.wechat_avatar_url = wechat_avatar_url
-    user.last_login_at = datetime.now(timezone.utc)
-    apply_wechat_display_identity(user, wechat_nickname=wechat_nickname, wechat_avatar_url=wechat_avatar_url)
-    db.commit()
-    db.refresh(user)
-    return user
-
-
-def _build_wechat_user(
-    db: Session,
-    *,
-    phone: str,
-    openid: str,
-    wechat_nickname: str | None,
-    wechat_avatar_url: str | None,
-) -> User:
-    """构造并 db.add 一个微信账号行(register_channel='wechat',展示昵称头像取微信,缺则默认),
-    **不 commit**。create_wechat_user 与 rebind_account 共用,保证建号逻辑单一来源。"""
-    user = User(
-        phone=phone,
-        username=_gen_unique_username(db),
-        nickname=wechat_nickname or _gen_nickname(),
-        avatar_url=wechat_avatar_url,
-        register_channel="wechat",
-        wechat_openid=openid,
-        wechat_nickname=wechat_nickname,
-        wechat_avatar_url=wechat_avatar_url,
-        last_login_at=datetime.now(timezone.utc),
-    )
-    db.add(user)
-    return user
-
-
-def create_wechat_user(
-    db: Session,
-    *,
-    phone: str,
-    openid: str,
-    wechat_nickname: str | None,
-    wechat_avatar_url: str | None,
-) -> User:
-    """微信登录新建账号(未占用分支)。见 _build_wechat_user。
-
-    openid 唯一约束是并发/重复绑定的最终防线(极罕见,openid 在 wechat-login 刚查过为空)。
-    """
-    user = _build_wechat_user(
-        db, phone=phone, openid=openid,
-        wechat_nickname=wechat_nickname, wechat_avatar_url=wechat_avatar_url,
-    )
-    db.commit()
-    db.refresh(user)
-    return user
-
-
 def upsert_user_for_login(
     db: Session,
     *,
@@ -245,44 +154,3 @@ def soft_delete_account(db: Session, user: User) -> None:
     # 释放邀请码唯一槽
     user.invite_code = None
     db.commit()
-
-
-def rebind_account(
-    db: Session,
-    *,
-    phone: str,
-    openid: str,
-    wechat_nickname: str | None,
-    wechat_avatar_url: str | None,
-    source: str = "wechat_conflict",
-) -> User:
-    """换绑:**单事务内**注销老账号 X(腾出手机号)+ 用该号建全新微信账号 Y + 写换绑台账。
-
-    - 老账号可能已不存在(P 被腾空)→ old_user_id=None,直接建 Y(幂等更稳)。
-    - 手机号唯一约束靠时序:先把 X.phone 改名并 flush 腾号,再插 Y。
-    - 全程不中途 commit,任一步失败整体回滚,绝不出现"X 删了 Y 没建"。
-    X 的字段变更等价 soft_delete_account(软删 + 匿名化 + 释放 openid/邀请码唯一槽),但不在此 commit。
-    """
-    old = get_user_by_phone(db, phone)
-    old_id = old.id if old is not None else None
-    if old is not None:
-        old.status = "deleted"
-        old.phone = f"deleted_{old.id}"
-        old.nickname = None
-        old.avatar_url = None
-        old.wechat_openid = None
-        old.wechat_nickname = None
-        old.wechat_avatar_url = None
-        old.invite_code = None
-        db.flush()  # 先落 phone 改名,腾出手机号唯一约束,才能给 Y 用
-    new_user = _build_wechat_user(
-        db, phone=phone, openid=openid,
-        wechat_nickname=wechat_nickname, wechat_avatar_url=wechat_avatar_url,
-    )
-    db.flush()  # 拿 new_user.id
-    phone_rebind.add_rebind_log(
-        db, phone=phone, old_user_id=old_id, new_user_id=new_user.id, source=source
-    )
-    db.commit()
-    db.refresh(new_user)
-    return new_user

app/repositories/wallet.py

@@ -11,7 +11,7 @@ import unicodedata
 import uuid
 from datetime import datetime, timedelta, timezone
 
-from sqlalchemy import func, select, update
+from sqlalchemy import select, update
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import Session
 
@@ -20,7 +20,6 @@ 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,17 +28,12 @@ from app.models.wallet import (
     WechatTransferAuthorization,
     WithdrawOrder,
 )
-from app.services import notification_events
 
 # 微信转账终态:成功 / 失败(失败/取消/关闭都退款)
 _WX_STATE_SUCCESS = "SUCCESS"
 _WX_STATE_FAILED = {"FAIL", "CANCELLED", "CLOSED"}
 _WX_STATE_WAIT_CONFIRM = "WAIT_USER_CONFIRM"  # 用户还没在微信确认页确认
 _WITHDRAW_ACTIVE_STATUSES = {"reviewing", "pending"}
-# 占用新人档「一次性」资格的提现状态:进行中(reviewing/pending)或成功打款(success)。
-# 被拒/转账失败/解绑退回(rejected/failed,均已退款、钱没到手)不在此列 → 新人档恢复可提
-# (2026-07-16 修正:此前判定不看状态,解绑微信退回后 0.1 被误判已用、资格永久锁死)。
-_NEWBIE_TIER_HELD_STATUSES = {"reviewing", "pending", "success"}
 # 免确认收款授权状态
 _WX_AUTH_ACTIVE = "TAKING_EFFECT"   # 已生效,可免确认转账
 _WX_AUTH_CLOSED = "CLOSED"          # 已关闭(用户/商户/风控),需重新开启
@@ -73,10 +67,6 @@ class WithdrawTooFrequentError(Exception):
     """提现申请过于频繁,或已有未完成提现单。"""
 
 
-class WithdrawTierUnavailableError(Exception):
-    """该档位今日不可提:次数已满,或今天已选了其他额度(7-9 福利页档位规则)。"""
-
-
 class WithdrawTransferError(Exception):
     """调用微信转账失败(已退回余额)。"""
 
@@ -380,7 +370,6 @@ def bind_wechat_openid(db: Session, user_id: int, code: str) -> dict:
     user.wechat_openid = info["openid"]
     user.wechat_nickname = info["nickname"]
     user.wechat_avatar_url = info["avatar_url"]
-    apply_wechat_display_identity(user, wechat_nickname=info["nickname"], wechat_avatar_url=info["avatar_url"])
     db.commit()
     return info
 
@@ -526,8 +515,6 @@ def _refund_withdraw(
         order.status = final_status
         order.fail_reason = reason[:256]
         db.commit()
-        # 上次退款后没走完终态(如中途崩溃)的补账路径:这里补发通知(dedup 防重)
-        notification_events.notify_withdraw_failed(db, order)
         return
     bal = _add_cash(db, order.user_id, order.amount_cents, order.source)
     db.add(
@@ -571,11 +558,6 @@ def _refund_withdraw(
             fresh_order.status = final_status
             fresh_order.fail_reason = reason[:256]
             db.commit()
-            notification_events.notify_withdraw_failed(db, fresh_order)
-        return
-    # PRD #4 提现失败通知:所有退款终态(failed/rejected)在此收口下发;
-    # dedup=out_bill_no,与上面并发路径重复触发时未读期间只落一条。
-    notification_events.notify_withdraw_failed(db, order)
 
 
 def _wx_not_found(result: dict) -> bool:
@@ -616,7 +598,6 @@ def _settle_after_ambiguous(db: Session, order: WithdrawOrder, reason: str) -> N
         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=reason)
     else:
@@ -624,91 +605,6 @@ def _settle_after_ambiguous(db: Session, order: WithdrawOrder, reason: str) -> N
         db.commit()
 
 
-def _beijing_today_start_utc() -> datetime:
-    """北京时今日 0 点(转 UTC)。WithdrawOrder.created_at 是 func.now()(UTC)存储,
-    比较时统一转 UTC,与 admin 看板 today_start 同口径(admin/repositories/queries.py)。"""
-    return (
-        datetime.now(rewards.CN_TZ)
-        .replace(hour=0, minute=0, second=0, microsecond=0)
-        .astimezone(timezone.utc)
-    )
-
-
-def withdraw_tier_states(db: Session, user_id: int, source: str = "coin_cash") -> list[dict]:
-    """福利页(coin_cash)提现档位的可提现状态。withdraw-info 下发与 create_withdraw 校验共用此口径。
-
-    规则(2026-07-09 拍板,7-9提现ui对齐;新人档判定 2026-07-16 修正):
-      - 新人档(0.1/0.3):账号历史一次性——进行中(reviewing/pending)或成功打款(success)即视为
-        已用,直接**从返回列表消失**;被拒/转账失败/解绑退回(均已退款、钱没到手)则恢复可提,不永久
-        占用资格。两档各自独立互不影响,不参与"每日选一个额度"互斥。
-      - 常规档(0.5×3 / 10×1 / 20×1):按北京日计次,"发起就算占用"(当天创建的单不论最终状态
-        都计入,被拒/失败不退当天名额);三档每天只能选一个,选定后其余两档当天 other_tier_selected。
-      - invite_cash 本轮无档位概念 → 返回空列表(邀请页客户端仍用本地写死档位,行为不变)。
-    余额是否足够由客户端本地判断(余额随兑换实时变化,不在此快照)。
-    """
-    if source != "coin_cash":
-        return []
-    tiers = rewards.WITHDRAW_TIERS_COIN_CASH
-    amounts = [t.amount_cents for t in tiers]
-    newbie_amounts = [t.amount_cents for t in tiers if t.is_newbie]
-    # 新人档历史是否用过:进行中或已成功打款的单占用资格;被拒/失败/解绑退回(已退款)不算(恢复可提)
-    used_newbie: set[int] = set(
-        db.execute(
-            select(WithdrawOrder.amount_cents)
-            .distinct()
-            .where(
-                WithdrawOrder.user_id == user_id,
-                WithdrawOrder.source == "coin_cash",
-                WithdrawOrder.amount_cents.in_(newbie_amounts),
-                WithdrawOrder.status.in_(_NEWBIE_TIER_HELD_STATUSES),
-            )
-        ).scalars()
-    ) if newbie_amounts else set()
-    # 今日(北京日)每档已发起次数(任意状态)
-    today_counts: dict[int, int] = {
-        int(amount): int(cnt)
-        for amount, cnt in db.execute(
-            select(WithdrawOrder.amount_cents, func.count(WithdrawOrder.id))
-            .where(
-                WithdrawOrder.user_id == user_id,
-                WithdrawOrder.source == "coin_cash",
-                WithdrawOrder.amount_cents.in_(amounts),
-                WithdrawOrder.created_at >= _beijing_today_start_utc(),
-            )
-            .group_by(WithdrawOrder.amount_cents)
-        )
-    }
-    # "每日选一个额度":今天发起过的常规档(新人档不算)
-    selected_regular = next(
-        (t.amount_cents for t in tiers if not t.is_newbie and today_counts.get(t.amount_cents, 0) > 0),
-        None,
-    )
-    out: list[dict] = []
-    for t in tiers:
-        if t.is_newbie:
-            if t.amount_cents in used_newbie:
-                continue  # 用过即消失,不再下发
-            out.append({
-                "amount_cents": t.amount_cents, "label": t.label, "badge": t.badge,
-                "is_newbie": True, "available": True, "disabled_reason": None,
-                "remaining_today": 1,
-            })
-            continue
-        used = today_counts.get(t.amount_cents, 0)
-        if selected_regular is not None and selected_regular != t.amount_cents:
-            available, reason, remaining = False, "other_tier_selected", 0
-        elif used >= t.daily_limit:
-            available, reason, remaining = False, "quota_exhausted", 0
-        else:
-            available, reason, remaining = True, None, t.daily_limit - used
-        out.append({
-            "amount_cents": t.amount_cents, "label": t.label, "badge": t.badge,
-            "is_newbie": False, "available": available, "disabled_reason": reason,
-            "remaining_today": remaining,
-        })
-    return out
-
-
 def create_withdraw(
     db: Session,
     user_id: int,
@@ -764,19 +660,6 @@ def create_withdraw(
     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(
-            (t for t in withdraw_tier_states(db, user_id, source) if t["amount_cents"] == amount_cents),
-            None,
-        )
-        if tier_state is None:  # 非预设档位金额,或新人档已用过(已从列表消失)
-            raise InvalidWithdrawAmountError
-        if not tier_state["available"]:
-            raise WithdrawTierUnavailableError
-
     # 账户须存在(原子扣款的 UPDATE 不会建账户)
     get_or_create_account(db, user_id, commit=True)
 
@@ -990,8 +873,6 @@ def _apply_transfer_result(db: Session, order: WithdrawOrder, data: dict) -> Wit
         order.status = "success"
     db.commit()
     db.refresh(order)
-    if order.status == "success":  # 免确认转账直接到账 → PRD #3 提现到账
-        notification_events.notify_withdraw_success(db, order)
     return order
 
 
@@ -1141,7 +1022,6 @@ def refresh_withdraw_status(
     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=f"微信转账状态 {state}")
     elif state == _WX_STATE_WAIT_CONFIRM and cancel_if_unconfirmed:

app/schemas/ad.py

@@ -63,12 +63,6 @@ class EcpmReportIn(BaseModel):
         description="点位场景:comparison(比价等待) / coupon(领券) / welfare(福利页);"
         "比价与领券共用同一 Draw 代码位,需客户端在各调用点显式标注,供收益报表区分比价/领券;激励视频为空",
     )
-    trace_id: str | None = Field(
-        None,
-        max_length=64,
-        description="本次比价/领券 trace_id(信息流场景带上):把这条展示收益归属到对应比价/领券,"
-        "供领券数据/比价记录看板聚合本场广告收益;激励视频/福利为空",
-    )
     app_env: str | None = Field(
         None, max_length=16, description="我们的穿山甲应用环境:prod(傻瓜比价正式) / test(测试应用)"
     )

app/schemas/auth.py

@@ -102,64 +102,3 @@ class RefreshRequest(BaseModel):
 
 class LogoutResponse(BaseModel):
     ok: bool = True
-
-
-# ===== 微信登录 =====
-
-class WechatLoginRequest(BaseModel):
-    code: str = Field(..., min_length=1, description="微信 App 授权拿到的 code(单次有效)")
-    device_id: str = Field(
-        "", max_length=64,
-        description="硬件级设备标识(Android ANDROID_ID),用于新手引导按 设备+账号 去重;空=按未完成处理",
-    )
-
-
-class WechatLoginResponse(BaseModel):
-    # status="logged_in" → openid 命中,token 有值;"need_bind_phone" → 未命中,bind_ticket 有值
-    status: str
-    token: TokenWithUser | None = None
-    bind_ticket: str | None = None
-    wechat_nickname: str | None = None
-    wechat_avatar_url: str | None = None
-
-
-class OccupiedAccountInfo(BaseModel):
-    """手机号被占用时返回的原账号脱敏展示信息(供冲突页)。"""
-    nickname: str | None = None
-    avatar_url: str | None = None
-    created_at: datetime
-    has_wechat: bool = False
-
-
-class WechatBindResultResponse(BaseModel):
-    # status="logged_in" → 未占用,已建号登入,token 有值;
-    # "phone_occupied" → 手机号被占用,occupied_account + conflict_ticket 有值,token 为 None
-    status: str
-    token: TokenWithUser | None = None
-    occupied_account: OccupiedAccountInfo | None = None
-    conflict_ticket: str | None = None            # 占用时签发,换绑/继续绑定只认它
-    rebind_available: bool | None = None          # 该手机号 30 天内是否还能换绑(给换绑按钮预置禁用态)
-    rebind_blocked_days: int | None = None        # 被限时剩余天数(rebind_available=False 时>0)
-
-
-class WechatBindPhoneSmsRequest(BaseModel):
-    bind_ticket: str = Field(..., min_length=1)
-    phone: str = Field(..., min_length=11, max_length=11, pattern=r"^1\d{10}$")
-    code: str = Field(..., min_length=4, max_length=8)
-    device_id: str = Field("", max_length=64)
-
-
-class WechatBindPhoneJverifyRequest(BaseModel):
-    bind_ticket: str = Field(..., min_length=1)
-    login_token: str = Field(..., min_length=1, description="客户端 loginAuth 拿到的 loginToken")
-    device_id: str = Field("", max_length=64)
-
-
-class WechatConflictContinueRequest(BaseModel):
-    conflict_ticket: str = Field(..., min_length=1)
-    device_id: str = Field("", max_length=64)
-
-
-class WechatConflictRebindRequest(BaseModel):
-    conflict_ticket: str = Field(..., min_length=1)
-    device_id: str = Field("", max_length=64)

app/schemas/device.py

@@ -3,15 +3,12 @@ from __future__ import annotations
 
 from datetime import datetime
 
-from pydantic import BaseModel, ConfigDict, Field
+from pydantic import BaseModel, ConfigDict
 
 
 class DeviceRegisterRequest(BaseModel):
     device_id: str
-    # registration_id 为旧极光字段,新推送链路统一使用 push_vendor + push_token。
     registration_id: str | None = None
-    push_vendor: str | None = None
-    push_token: str | None = None
     platform: str = "android"
     app_version: str | None = None
 
@@ -21,8 +18,6 @@ class HeartbeatRequest(BaseModel):
     source: str = "service"          # service | app
     accessibility_enabled: bool = True
     registration_id: str | None = None
-    push_vendor: str | None = None
-    push_token: str | None = None
 
 
 class DeviceOut(BaseModel):
@@ -31,8 +26,6 @@ class DeviceOut(BaseModel):
     id: int
     device_id: str
     registration_id: str | None
-    push_vendor: str | None
-    push_token: str | None
     ever_protected: bool
     liveness_state: str
     last_heartbeat_at: datetime | None
@@ -53,17 +46,3 @@ class LivenessOut(BaseModel):
 
 class LivenessAckRequest(BaseModel):
     device_id: str
-
-
-class PushTestRequest(BaseModel):
-    device_id: str
-    delay_seconds: int = Field(default=10, ge=0, le=60)
-    push_vendor: str | None = None
-    push_token: str | None = None
-    registration_id: str | None = None
-
-
-class PushTestOut(BaseModel):
-    ok: bool = True
-    delay_seconds: int
-    has_push_token: bool

app/schemas/notification.py

@@ -1,128 +0,0 @@
-"""消息通知中心 请求/响应契约。
-
-⚠️ 命名约定:本组接口按 PRD 前端契约使用 **camelCase**(sentAt / isRead / pageSize …),
-与库内其他 snake_case 接口不同——PRD 与前端原型(notifications.html)按 camelCase 对接,
-需求方接口清单亦明确写作 sentAt / isRead,故整组遵循之。响应序列化走 pydantic alias。
-
-字段说明都写在 Field(description=...) 里,起服务后打开 /docs 即是给前端的在线文档。
-"""
-from __future__ import annotations
-
-from datetime import datetime
-from typing import Any
-
-from pydantic import BaseModel, ConfigDict, Field
-from pydantic.alias_generators import to_camel
-
-
-class _CamelModel(BaseModel):
-    """出参统一 camelCase(alias);populate_by_name 允许服务端代码仍用 snake_case 构造。"""
-
-    model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)
-
-
-class InfoRow(_CamelModel):
-    """卡片信息行(PRD §3「信息行」列),前端按 label: value 逐行渲染。"""
-
-    label: str = Field(description="行标签,如「过期说明」「到账账户」「失败原因」")
-    value: str = Field(description="行内容(已按 PRD 文案拼好变量,前端直接展示)")
-
-
-class NotificationItem(_CamelModel):
-    """一条通知卡片。
-
-    卡片头部三要素:categoryLabel(分类标签)+ 未读红点(isRead=false 时展示)+ 时间(sentAt)。
-    时间显示规则(前端处理):今天→「今天」;昨天→「昨天」;当年→「M月D日」;跨年→「YYYY年M月D日」。
-    """
-
-    id: int = Field(description="通知 id(未读消除、push 联动都用它)")
-    category: str = Field(
-        description="分类 key:withdraw_assistant=提现助手 / system=系统通知 / "
-                    "feedback=我的反馈 / report=我的爆料 / invite=好友邀请"
-    )
-    category_label: str = Field(description="分类中文标签(卡片头部直接展示)")
-    type: str = Field(
-        description="类型 key(13 种,决定点击行为,见 PRD §2):reward_expiring 即将失效 / "
-                    "reward_expired 已失效 / withdraw_success 提现成功 / withdraw_failed 提现失败 / "
-                    "perm_accessibility 无障碍异常 / perm_battery 省电策略异常 / "
-                    "perm_autostart 自启动异常 / perm_overlay 悬浮窗异常 / "
-                    "feedback_reply 官方回复 / feedback_reward 反馈奖励 / "
-                    "report_approved 爆料审核通过 / invite_order_reward 好友下单奖励 / "
-                    "invite_remind 好友催单提醒"
-    )
-    card_style: str = Field(
-        description="卡片版式:dual_amount 双金额卡 / withdraw 提现卡 / plain_text 纯文本卡 / "
-                    "coin_reward 金币奖励卡 / friend_cash 好友现金卡"
-    )
-    title: str = Field(description="卡片标题(双金额/提现/金币奖励/好友现金卡标题居中)")
-    coins: int | None = Field(
-        default=None,
-        description="金币数(整数,不带小数)。dual_amount / coin_reward 卡有值,其余 null",
-    )
-    cash_cents: int | None = Field(
-        default=None,
-        description="现金金额,单位【分】。dual_amount / withdraw / friend_cash 卡有值,其余 null",
-    )
-    cash_yuan: str | None = Field(
-        default=None,
-        description="现金金额展示串(元,保留两位小数,如 \"12.80\"),与 cashCents 同源,可直接展示",
-    )
-    info_rows: list[InfoRow] = Field(
-        description="信息行列表(label: value),内容已按 PRD §3 拼好,前端逐行渲染即可"
-    )
-    action_text: str | None = Field(
-        default=None,
-        description="操作行文案(如「立即激活您的收益」「去开启」);null=无操作行(提现成功卡)。"
-                    "注意:点击目标是整张卡片,不区分卡片主体和操作行",
-    )
-    extra: dict[str, Any] = Field(
-        description="点击跳转所需业务参数,按 type 取用:perm_* → {permission: accessibility|battery|"
-                    "autostart|overlay}(点击时实时检测该权限);feedback_* → {feedbackId};"
-                    "report_approved → {reportId};withdraw_failed → {withdrawId};"
-                    "invite_order_reward → {inviteeNickname};invite_remind → "
-                    "{inviteeNickname, scrollTo:\"remind\"};reward_expiring → {batchId}"
-    )
-    sent_at: datetime = Field(description="下发时间(ISO8601 带 +08:00 时区),前端按显示规则格式化")
-    is_read: bool = Field(description="是否已读;false 时分类标签右侧展示 6px 红点(#E53935)")
-
-
-class NotificationListOut(_CamelModel):
-    """GET /api/v1/notifications 出参。列表已按时间倒序排好(最新在前,**不分组**;
-    PRD §1 的"按分类分组"为笔误,已确认取消),前端无需再排。"""
-
-    items: list[NotificationItem] = Field(description="当前页通知卡片")
-    page: int = Field(description="当前页码(1 起)")
-    page_size: int = Field(description="每页条数")
-    total: int = Field(description="全部通知总条数(含已读)")
-    has_more: bool = Field(description="是否还有下一页")
-    unread_count: int = Field(description="当前未读总数(与 /notifications/unread-count 同口径,省一次请求)")
-
-
-class UnreadCountOut(_CamelModel):
-    """GET /api/v1/notifications/unread-count 出参(首页铃铛角标)。"""
-
-    count: int = Field(description="未读总条数(精确值)")
-    badge_text: str | None = Field(
-        description="角标展示文案:超过 99 返回 \"99+\";等于 0 返回 null(整个角标隐藏,不展示空红点)"
-    )
-
-
-class MarkReadRequest(_CamelModel):
-    """POST /api/v1/notifications/read 入参,两种模式二选一:
-
-    - `{"ids": [90001, 90002]}` 单条/多条置读——点击某张卡片、点击 push 落地后同步置读;
-    - `{"all": true}`           全量清零——进入通知中心(或退出时)自动清零(PRD §4)。
-
-    同时传时 all=true 优先;不存在/已读的 id 自动忽略(幂等,可放心重试)。
-    """
-
-    ids: list[int] | None = Field(default=None, description="要置为已读的通知 id 列表")
-    all: bool = Field(default=False, description="true=清空该用户全部未读")
-
-
-class MarkReadOut(_CamelModel):
-    """POST /api/v1/notifications/read 出参。"""
-
-    ok: bool = Field(description="固定 true(参数非法时走 400,不会到这里)")
-    marked_count: int = Field(description="本次实际由未读变为已读的条数(重复请求会是 0)")
-    unread_count: int = Field(description="处理后的剩余未读总数,可直接刷新铃铛角标")

app/schemas/push.py

@@ -1,99 +0,0 @@
-"""厂商推送(测试/联调)接口契约。与消息中心同族,出参统一 camelCase。"""
-from __future__ import annotations
-
-from typing import Any
-
-from pydantic import BaseModel, ConfigDict, Field
-from pydantic.alias_generators import to_camel
-
-
-class _CamelModel(BaseModel):
-    model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)
-
-
-class PushVendorStatus(_CamelModel):
-    vendor: str = Field(description="厂商 key:honor / huawei / xiaomi / oppo / vivo")
-    label: str = Field(description="厂商中文名")
-    configured: bool = Field(description="服务端凭据是否齐全(齐全才能真发,mock 不受影响)")
-    missing_keys: list[str] = Field(description="缺失的 .env 配置键;configured=true 时为空")
-
-
-class PushVendorsOut(_CamelModel):
-    vendors: list[PushVendorStatus] = Field(description="5 个厂商的配置状态")
-
-
-class PushTemplateOut(_CamelModel):
-    type: str = Field(description="通知类型 key(13 种,与消息中心 type 一致)")
-    category: str = Field(description="分类 key")
-    category_label: str = Field(description="分类中文标签")
-    card_style: str = Field(description="站内卡片版式")
-    push_title: str = Field(description="push 标题(≤11 字固定文案,PRD §5)")
-    push_body_sample: str = Field(description="push 正文示例(模板用 PRD 示例值渲染后的效果)")
-    push_body_template: str = Field(description="push 正文模板原文,{var} 为变量占位")
-    variables: list[str] = Field(description="模板变量名列表(调 /push/test 时可在 vars 里覆盖)")
-    sample_vars: dict[str, str] = Field(description="各变量的 PRD 示例值(vars 未覆盖时的缺省)")
-
-
-class PushTemplatesOut(_CamelModel):
-    templates: list[PushTemplateOut] = Field(description="13 种通知类型的 push 模板(PRD 编号顺序)")
-
-
-class PushTestRequest(_CamelModel):
-    """POST /api/v1/push/test 入参。三种发送内容来源(优先级从高到低):
-
-    1. 直接指定 title + content;
-    2. 指定 type(13 种之一)→ 按 PRD §5 模板渲染,vars 可覆盖模板变量;
-    3. 都不传 → 发一条通用测试文案。
-
-    推送目标:pushToken 直填,或 deviceId 反查该用户已注册设备(/api/v1/device/register 上报过的)。
-    """
-
-    vendor: str = Field(
-        default="",
-        description="厂商:honor/huawei/xiaomi/oppo/vivo(中文「华为」「小米」等别名也识别)。"
-                    "留空时用 deviceId 对应设备上报的 push_vendor",
-    )
-    push_token: str = Field(default="", description="厂商 push token / regId;留空则走 deviceId 反查")
-    device_id: str = Field(default="", description="设备 id(客户端 DeviceId.get());用于反查 token")
-    type: str = Field(
-        default="",
-        description="通知类型 key(13 种,见 GET /push/templates);留空且未直接给 title/content 时发通用测试文案",
-    )
-    vars: dict[str, str] = Field(
-        default_factory=dict,
-        description="覆盖 push 模板变量,如 {\"coins\":\"520\",\"cash\":\"6.66\"};缺省用 PRD 示例值",
-    )
-    title: str = Field(default="", description="直接指定标题(优先于 type 模板)")
-    content: str = Field(default="", description="直接指定正文(优先于 type 模板)")
-    create_notification: bool = Field(
-        default=False,
-        description="true=同时往该用户的消息中心 mock 列表插入一条同类型未读通知,push extras 带上它的"
-                    " notificationId → 可闭环验证「点 push → 落地 → 调 /notifications/read 消红点」联动"
-                    "(仅 type 为 13 种类型之一时生效)",
-    )
-    mock: bool = Field(
-        default=True,
-        description="true(默认)=不真调厂商 API,返回渲染结果(联调安全);false=真发,要求该厂商凭据已配置",
-    )
-
-
-class PushTestOut(_CamelModel):
-    ok: bool = Field(description="发送(或 mock 渲染)成功")
-    mock: bool = Field(description="本次是否 mock(未真调厂商 API)")
-    vendor: str = Field(description="实际使用的厂商 key(已归一化)")
-    title: str = Field(description="实际下发的 push 标题")
-    body: str = Field(description="实际下发的 push 正文")
-    extras: dict[str, str] = Field(
-        description="随 push 下发的自定义键值(客户端深链用):type 必有;createNotification=true 时带"
-                    " notificationId 及该通知的业务参数(feedbackId / permission / …)"
-    )
-    notification_id: int | None = Field(
-        default=None, description="createNotification=true 时新插入的站内 mock 通知 id"
-    )
-    missing_keys: list[str] = Field(
-        default_factory=list,
-        description="该厂商仍缺失的配置键(mock 发送时提示「真发前还需配什么」;真发时必为空)",
-    )
-    vendor_response: dict[str, Any] | None = Field(
-        default=None, description="真发时厂商 API 的原始响应(mock 时为 null)"
-    )

app/schemas/welfare.py

@@ -75,21 +75,6 @@ class ExchangeResultOut(BaseModel):
 
 # ===== 提现(现金 → 微信零钱) =====
 
-class WithdrawTierOut(BaseModel):
-    """提现档位(福利页 coin_cash;7-9 对齐原型)。served by rewards.WITHDRAW_TIERS_COIN_CASH。"""
-
-    amount_cents: int = Field(..., description="档位金额(分)")
-    label: str = Field(..., description="档位方块展示文案,如 0.1 / 10")
-    badge: str | None = Field(None, description="角标文案(如 新人福利);无则空")
-    is_newbie: bool = Field(False, description="新人档:历史一次性,用过后不再下发;免广告直提")
-    available: bool = Field(True, description="当前是否可提(次数/选一额度口径;余额由客户端自判)")
-    disabled_reason: str | None = Field(
-        None,
-        description="不可提原因:quota_exhausted(今日次数满) / other_tier_selected(今日已选其他额度)",
-    )
-    remaining_today: int = Field(0, description="今日剩余可提次数")
-
-
 class WithdrawInfoOut(BaseModel):
     min_cents: int = Field(..., description="单次最低提现(分)")
     max_cents: int = Field(..., description="单次最高提现(分)")
@@ -99,10 +84,6 @@ class WithdrawInfoOut(BaseModel):
     transfer_auth_enabled: bool = Field(
         False, description="是否已开启免确认到账(开启后提现免跳微信确认,直接到账)"
     )
-    tiers: list[WithdrawTierOut] = Field(
-        default_factory=list,
-        description="提现档位(source=coin_cash 下发;invite_cash 为空,客户端走旧逻辑)",
-    )
 
 
 # ===== 免确认收款授权(用户授权免确认模式)=====

app/services/llm_cost.py

@@ -1,53 +0,0 @@
-"""LLM 调用成本计算(纯逻辑,无 DB):按 model 分桶累加 token × 单价,返回总成本(元)+ 价格快照。
-
-用量取自 comparison_record.llm_calls[].usage(pricebot 已归一为 prompt/completion_tokens);
-error / 无 usage 的调用跳过。price_cfg = {per_model:{model:{input_per_1m,output_per_1m}}, default:{...}}。
-成本单位「元」——单次亚分级,用 float(不用 *_cents);snapshot 只含本次用到的模型的价(审计用,
-不存整张价表)。用到但没配价(既无 per_model 又无 default)的模型 → 快照标 unpriced,成本按 0 计。
-"""
-from __future__ import annotations
-
-_PRICE_KEY = "llm_token_price"
-
-
-def get_llm_prices(db) -> dict:
-    """读 LLM 单价配置(app_config;表内无则回退 CONFIG_DEFS 默认)。返回 compute_llm_cost 的 price_cfg。"""
-    from app.repositories import app_config  # 延迟 import:compute_llm_cost 纯逻辑不牵连 DB 层
-    return app_config.get_value(db, _PRICE_KEY)
-
-
-def compute_llm_cost(calls: list[dict], price_cfg: dict) -> tuple[float | None, dict | None]:
-    """遍历 calls 按 model 分桶,cost = Σ(入/1e6*入价 + 出/1e6*出价);无有效调用 → (None, None)。"""
-    if not calls:
-        return None, None
-    per_model = price_cfg.get("per_model") or {}
-    default = price_cfg.get("default")
-    buckets: dict[str, list[int]] = {}  # model -> [Σprompt_tokens, Σcompletion_tokens]
-    for c in calls:
-        if c.get("error"):
-            continue
-        usage = c.get("usage") or {}
-        model = c.get("model") or "unknown"
-        b = buckets.setdefault(model, [0, 0])
-        b[0] += usage.get("prompt_tokens") or 0
-        b[1] += usage.get("completion_tokens") or 0
-    if not buckets:  # 全是 error / 无 usage
-        return None, None
-    total = 0.0
-    prices: dict[str, dict] = {}
-    for model, (tin, tout) in buckets.items():
-        price = per_model.get(model, default)
-        in_p = price.get("input_per_1m") if isinstance(price, dict) else None
-        out_p = price.get("output_per_1m") if isinstance(price, dict) else None
-        # 没配价 / 无 default / 单价残缺或非法(配置页手改 JSON 可能存出脏数据)→ 标记待补价、
-        # 不计入成本;绝不抛异常,以免连累同一回填里的 token/llm_calls 落库。
-        if not isinstance(in_p, (int, float)) or not isinstance(out_p, (int, float)):
-            prices[model] = {"input_per_1m": in_p, "output_per_1m": out_p, "unpriced": True}
-            continue
-        total += tin / 1e6 * in_p + tout / 1e6 * out_p
-        prices[model] = {
-            "input_per_1m": in_p,
-            "output_per_1m": out_p,
-            "_source": "per_model" if model in per_model else "default",
-        }
-    return round(total, 6), {"mode": "per_model", "prices": prices}

app/services/notification_events.py

@@ -1,269 +0,0 @@
-"""消息通知中心:业务事件 → 站内消息 + 厂商 push 的统一下发口。
-
-PRD《消息通知中心》真实业务触发在此收口(替代 /push/test 的样例数据),已接入:
-  #3  withdraw_success    提现到账(repositories/wallet 各「pending→success」转换点)
-  #4  withdraw_failed     提现失败/退回(repositories/wallet._refund_withdraw,含审核拒绝)
-  #9  feedback_reply      官方回复(admin 反馈审核「拒绝」,带用户可见原因/留言)
-  #10 feedback_reward     反馈奖励(admin 反馈审核「采纳」发金币,必带官方留言)
-  #11 report_approved     爆料审核通过(admin 上报更低价「通过」发金币)
-  #12 invite_order_reward 好友下单到账(repositories/invite.try_reward_on_compare 发奖后)
-
-行为约定(调用方唯一需要知道的两条):
-  1. **绝不抛异常**——通知只是业务的副产物,站内消息落库失败/推送失败只 log,
-     绝不让提现退款、审核发奖等主流程回滚或报错。
-  2. **必须在业务事务 commit 之后调用**——内部会再 commit(写 notification 表);
-     若在业务半途调用,会把调用方未提交的脏状态一并提交。
-
-去重:各事件用业务主键做 dedup_key(提现单号/反馈 id/爆料 id/被邀请人 id),配合
-notification 表的部分唯一索引,同一事件并发重复触发时未读期间只落一条、只推一次。
-
-推送:向该用户所有已上报厂商 token 的设备直推(integrations/vendor_push);
-厂商凭据未配置(本地/测试环境)时自动跳过推送、只落站内消息。extras 按
-PRD §4 约定带 {type, notificationId, ...跳转参数},客户端点击 push 深链落地
-并调 POST /notifications/read 同步置读。
-"""
-from __future__ import annotations
-
-import logging
-from datetime import datetime
-from typing import TYPE_CHECKING
-
-from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm import Session
-
-from app.core import notification_catalog as catalog
-from app.core.rewards import CN_TZ
-from app.integrations import vendor_push
-from app.models.user import User
-from app.repositories import device as device_repo
-from app.repositories import notification as notif_repo
-
-if TYPE_CHECKING:
-    from app.models.feedback import Feedback
-    from app.models.notification import Notification
-    from app.models.price_report import PriceReport
-    from app.models.wallet import WithdrawOrder
-
-logger = logging.getLogger("shagua.notification_events")
-
-
-def _fmt_time(dt: datetime) -> str:
-    """信息行「到账时间」的展示格式(与 repositories/notification 样例卡一致)。"""
-    return dt.strftime("%Y-%m-%d %H:%M")
-
-
-def _yuan_trim(cents: int) -> str:
-    """分 → 元,去掉多余的 0(200→"2"、1280→"12.80")。push 正文用(PRD §5 示例口径:
-    「{2}元现金已到账」);卡片数值仍走 cash_cents 由前端按两位小数渲染。"""
-    yuan = cents / 100
-    return f"{yuan:.2f}".rstrip("0").rstrip(".")
-
-
-def _display_name(user: User | None) -> str:
-    """好友昵称展示:昵称 → 微信昵称 → 手机尾号,全无则「好友」。"""
-    name = ((user.nickname if user else None) or (user.wechat_nickname if user else None) or "").strip()
-    if not name and user and user.phone:
-        name = f"用户{user.phone[-4:]}"
-    return name or "好友"
-
-
-# ---------------------------------------------------------------------------
-# 内核:落站内消息 + 厂商推送(全程吞异常)
-# ---------------------------------------------------------------------------
-
-
-def _dispatch(
-    db: Session,
-    *,
-    user_id: int,
-    type_key: str,
-    coins: int | None = None,
-    cash_cents: int | None = None,
-    info_rows: list[dict[str, str]] | None = None,
-    extra: dict[str, str] | None = None,
-    dedup_key: str | None = None,
-    push_vars: dict[str, str] | None = None,
-) -> Notification | None:
-    """落一条站内消息并向该用户设备直推。返回落库行;去重命中/失败返回 None。"""
-    try:
-        row = notif_repo.create_notification(
-            db,
-            user_id=user_id,
-            type_key=type_key,
-            coins=coins,
-            cash_cents=cash_cents,
-            info_rows=info_rows,
-            extra=extra,
-            dedup_key=dedup_key,
-        )
-    except IntegrityError:
-        # 同 (user, type, dedup_key) 已有未读消息 = 同一事件并发/重复触发 → 不重复落、不重复推
-        db.rollback()
-        logger.info(
-            "notification dedup hit user_id=%s type=%s dedup_key=%s", user_id, type_key, dedup_key
-        )
-        return None
-    except Exception:  # noqa: BLE001 — 通知失败绝不影响业务主流程
-        logger.exception("create notification failed user_id=%s type=%s", user_id, type_key)
-        try:
-            db.rollback()
-        except Exception:  # noqa: BLE001 — 回滚失败也不外抛,session 由请求生命周期兜底
-            logger.exception("rollback after notification failure also failed")
-        return None
-
-    _push_to_user_devices(db, row, push_vars)
-    return row
-
-
-def _push_to_user_devices(db: Session, row: Notification, push_vars: dict[str, str] | None) -> None:
-    """向消息归属用户的全部厂商推送目标直推(best-effort,单设备失败不影响其余)。"""
-    try:
-        title, body = catalog.render_push(row.type, push_vars)
-        # PRD §4 push 联动:extras 至少带 type + notificationId,外加该类型的跳转参数(extra 列)
-        extras: dict[str, str] = {"type": row.type}
-        extras.update({str(k): str(v) for k, v in (row.extra or {}).items()})
-        extras["notificationId"] = str(row.id)
-
-        for dev in device_repo.list_push_targets(db, user_id=row.user_id):
-            vendor = vendor_push.normalize_vendor(dev.push_vendor)
-            if not vendor or vendor not in vendor_push.SUPPORTED_VENDORS:
-                continue
-            if vendor_push.missing_settings(vendor):
-                # 本地/测试环境凭据不齐 → 只落站内消息,不发真推送(与 push/vendors 的报缺口径一致)
-                logger.info(
-                    "skip push (vendor %s not configured) user_id=%s type=%s",
-                    vendor, row.user_id, row.type,
-                )
-                continue
-            try:
-                vendor_push.send_notification(
-                    vendor, dev.push_token, title=title, body=body, extras=extras
-                )
-                logger.info(
-                    "push sent user_id=%s type=%s vendor=%s notification_id=%s",
-                    row.user_id, row.type, vendor, row.id,
-                )
-            except vendor_push.VendorPushError as e:
-                logger.warning(
-                    "push failed user_id=%s type=%s vendor=%s: %s", row.user_id, row.type, vendor, e
-                )
-    except Exception:  # noqa: BLE001 — 渲染/查设备等意外失败同样不外抛
-        logger.exception("push notification failed user_id=%s type=%s", row.user_id, row.type)
-
-
-# ---------------------------------------------------------------------------
-# 六个业务事件(PRD §1/§3/§5 编号见文件头)
-# ---------------------------------------------------------------------------
-
-
-def notify_withdraw_success(db: Session, order: WithdrawOrder) -> None:
-    """#3 提现成功:款项已存入微信零钱。点击无跳转仅消红点(extra 空)。"""
-    _dispatch(
-        db,
-        user_id=order.user_id,
-        type_key="withdraw_success",
-        cash_cents=order.amount_cents,
-        info_rows=[
-            {"label": "到账账户", "value": "微信钱包"},
-            {"label": "到账时间", "value": _fmt_time(datetime.now(CN_TZ))},
-        ],
-        extra={},
-        dedup_key=order.out_bill_no,
-        push_vars={"amount": notif_repo.cash_yuan(order.amount_cents)},
-    )
-
-
-def notify_withdraw_failed(db: Session, order: WithdrawOrder) -> None:
-    """#4 提现失败/退回:含微信侧失败、审核拒绝、解绑退回。点击跳提现页重新提现。
-
-    失败原因用 order.fail_reason(与 /withdraw/status 下发的用户可读原因同源)。
-    """
-    reason = (order.fail_reason or "").strip() or "提现未成功"
-    _dispatch(
-        db,
-        user_id=order.user_id,
-        type_key="withdraw_failed",
-        cash_cents=order.amount_cents,
-        info_rows=[
-            {"label": "失败原因", "value": reason},
-            {"label": "退回说明", "value": "款项已原路退回现金余额"},
-        ],
-        extra={"withdrawId": order.out_bill_no},
-        dedup_key=order.out_bill_no,
-        push_vars={"amount": notif_repo.cash_yuan(order.amount_cents), "reason": reason},
-    )
-
-
-def notify_feedback_reply(db: Session, feedback: Feedback) -> None:
-    """#9 官方回复:运营审核了反馈且未采纳(用户可见原因/留言落在反馈记录上)。
-    点击跳反馈历史页滚动高亮该条(extra.feedbackId)。"""
-    _dispatch(
-        db,
-        user_id=feedback.user_id,
-        type_key="feedback_reply",
-        info_rows=[{"label": "说明文案", "value": "快去看看官方给您的回复吧～"}],
-        extra={"feedbackId": str(feedback.id)},
-        dedup_key=str(feedback.id),
-    )
-
-
-def notify_feedback_reward(db: Session, feedback: Feedback) -> None:
-    """#10 反馈奖励:反馈被采纳,金币已到账。PRD 约定发奖必带官方留言(admin_reply);
-    运营漏填时省略该信息行,不硬造文案。"""
-    coins = int(feedback.reward_coins or 0)
-    info_rows = [{"label": "奖励说明", "value": "感谢您的反馈，您的金币奖励已到账"}]
-    reply = (feedback.admin_reply or "").strip()
-    if reply:
-        info_rows.append({"label": "官方留言", "value": reply})
-    info_rows.append({"label": "到账时间", "value": _fmt_time(datetime.now(CN_TZ))})
-    _dispatch(
-        db,
-        user_id=feedback.user_id,
-        type_key="feedback_reward",
-        coins=coins,
-        info_rows=info_rows,
-        extra={"feedbackId": str(feedback.id)},
-        dedup_key=str(feedback.id),
-        push_vars={"coins": str(coins)},
-    )
-
-
-def notify_report_approved(db: Session, report: PriceReport) -> None:
-    """#11 爆料审核通过:上报的更低价过审,金币已到账。点击跳爆料记录页高亮该条。"""
-    coins = int(report.reward_coins or 0)
-    store = (report.store_name or "").strip() or "该店铺"
-    _dispatch(
-        db,
-        user_id=report.user_id,
-        type_key="report_approved",
-        coins=coins,
-        info_rows=[
-            {"label": "奖励说明", "value": f"您爆料的「{store}」更低价已通过审核，金币奖励已到账"},
-            {"label": "到账时间", "value": _fmt_time(datetime.now(CN_TZ))},
-        ],
-        extra={"reportId": str(report.id)},
-        dedup_key=str(report.id),
-        push_vars={"store": store, "coins": str(coins)},
-    )
-
-
-def notify_invite_order_reward(
-    db: Session, *, inviter_user_id: int, invitee_user_id: int, cash_cents: int
-) -> None:
-    """#12 好友下单到账:被邀请好友完成首次下单(比价),现金奖励已入邀请人账户。
-    通知发给【邀请人】;每个好友只发一次奖 → dedup 按被邀请人。"""
-    invitee = db.get(User, invitee_user_id)
-    nickname = _display_name(invitee)
-    _dispatch(
-        db,
-        user_id=inviter_user_id,
-        type_key="invite_order_reward",
-        cash_cents=cash_cents,
-        info_rows=[
-            {"label": "奖励说明", "value": f"好友「{nickname}」完成首次下单"},
-            {"label": "到账时间", "value": _fmt_time(datetime.now(CN_TZ))},
-        ],
-        extra={"inviteeNickname": nickname},
-        dedup_key=str(invitee_user_id),
-        push_vars={"nickname": nickname, "amount": _yuan_trim(cash_cents)},
-    )

deploy/nginx/app-api.shaguabijia.com.conf

@@ -19,11 +19,7 @@ server {
     ssl_ciphers         HIGH:!aNULL:!MD5;
     ssl_session_cache   shared:SSL:10m;
 
-    # 上传接口(反馈/上报截图、头像)业务上限 = 最多 6 张 × 每张 5MB
-    # (见 app _MAX_IMAGES / AVATAR_MAX_BYTES)≈ 30MB,留余量设 32m。
-    # 低于此值时带截图的反馈会在到达 uvicorn 前就被 nginx 413,表现为「提交经常失败」
-    # (纯文字反馈体积小、不受影响 → 呈现为「时好时坏」)。根治仍需客户端上传前压缩。
-    client_max_body_size 32m;
+    client_max_body_size 4m;
 
     location / {
         proxy_pass http://127.0.0.1:8770;

deploy/nginx/observe.shaguabijia.com.conf

@@ -1,57 +0,0 @@
-# OpenObserve 监控台反代(observe.shaguabijia.com)。证书走 Certbot/Let's Encrypt,与 admin-web 一致。
-#
-# 前置(一次性):
-#   1) DNS:  observe.shaguabijia.com  A 记录 → 本服务器公网 IP
-#   2) 证书: sudo certbot certonly --nginx -d observe.shaguabijia.com
-#            (options-ssl-nginx.conf / ssl-dhparams.pem 首次跑 certbot 时已生成,admin-web 在用即已存在)
-#   3) OpenObserve 只绑 127.0.0.1:5080(见 docker-compose.prod.yml),本文件把它反代出公网
-#   4) nginx -t 通过后 systemctl reload nginx
-#
-# 安全:OO 有自身登录。监控台不必对全网裸开——本机办公网无固定出口 IP,故在 nginx 层加 Basic Auth 兜底;
-#      将来有固定 IP 可改用【IP 白名单】块(更省事,可去掉 Basic Auth)。
-
-server {
-    server_name observe.shaguabijia.com;
-
-    client_max_body_size 10m;
-
-    # —— IP 白名单:办公网无固定出口 IP,暂不用;将来有固定 IP 可改用这块(比 Basic Auth 省事)——
-    # allow 1.2.3.4;      # ← 换成你的真实出口 IP,可多行
-    # deny  all;
-
-    # —— Basic Auth:无固定 IP 的兜底密码(生成 .htpasswd_observe 的命令见 README/下方)——
-    auth_basic           "OpenObserve";
-    auth_basic_user_file /etc/nginx/conf.d/.htpasswd_observe;
-
-    location / {
-        proxy_pass http://127.0.0.1:5080;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        # OpenObserve 有实时/流式面板,需透传 WebSocket
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-        proxy_read_timeout 300s;
-    }
-
-    # IPv6 这行不带 ipv6only=on:该选项对 [::]:443 全局只能设一次,admin-web 那个 server 块已设(否则 nginx 报 duplicate listen options)
-    listen [::]:443 ssl; # managed by Certbot
-    listen 443 ssl; # managed by Certbot
-    ssl_certificate /etc/letsencrypt/live/observe.shaguabijia.com/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsencrypt/live/observe.shaguabijia.com/privkey.pem; # managed by Certbot
-    include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
-    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
-}
-
-server {
-    if ($host = observe.shaguabijia.com) {
-        return 301 https://$host$request_uri;
-    } # managed by Certbot
-
-    listen 80;
-    listen [::]:80;
-    server_name observe.shaguabijia.com;
-    return 404; # managed by Certbot
-}

deploy/openobserve/.gitignore

@@ -1,4 +0,0 @@
-# OpenObserve 落盘数据(parquet/索引/元数据),运行时产生,不入库。
-data/
-# 生产 compose 的密码文件(OO_ROOT_PASSWORD),含机密,不入库。
-.env

deploy/openobserve/README.md

@@ -1,126 +0,0 @@
-# OpenObserve 本地部署（接口 QPS / 耗时可观测）
-
-app-server 通过中间件采集每个接口的 QPS + 耗时 + 错误率，批量上报到这里。
-设计见 [../../docs/superpowers/specs/2026-07-06-openobserve-api-metrics-design.md](../../docs/superpowers/specs/2026-07-06-openobserve-api-metrics-design.md)。
-
-## 启动
-
-```bash
-cd deploy/openobserve
-docker compose up -d
-```
-
-- Web UI：http://localhost:5080
-- 登录：`admin@shaguabijia.local` / `Complexpass#123`（见 `docker-compose.yml`）
-- 数据落 `deploy/openobserve/data/`（已挂卷持久化；该目录已 gitignore）
-
-## 让 app-server 上报
-
-在项目根的 `.env` 打开观测（`OBSERVE_*`，账号密码与 compose 里 root 一致）：
-
-```dotenv
-OBSERVE_ENABLED=true
-OBSERVE_ENDPOINT=http://localhost:5080
-OBSERVE_ORG=default
-OBSERVE_STREAM=app_requests
-OBSERVE_USER=admin@shaguabijia.local
-OBSERVE_PASSWORD=Complexpass#123
-```
-
-重启 app-server，随便打几个接口。stream `app_requests` **首次上报自动创建**，
-在 UI 的 Logs → 选 `app_requests` 就能看到逐条请求事件（字段：`method` / `route` /
-`status` / `duration_ms` / `service` / `env`）。
-
-> 未开 `OBSERVE_ENABLED` 或缺账号密码时，中间件透传、worker 不启动，整套 no-op，不影响业务。
-
-## 查询（Logs 页 SQL，或建 Dashboard 面板）
-
-各接口 QPS（1 分钟分桶，面板里再除 60 得每秒）：
-
-```sql
-SELECT route, histogram(_timestamp, '1 minute') AS ts, count(*) AS cnt
-FROM app_requests GROUP BY route, ts ORDER BY ts
-```
-
-各接口 P95 耗时（毫秒）：
-
-```sql
-SELECT route, approx_percentile_cont(duration_ms, 0.95) AS p95_ms
-FROM app_requests GROUP BY route ORDER BY p95_ms DESC
-```
-
-各接口错误率（5xx 占比）：
-
-```sql
-SELECT route,
-       count(*) FILTER (WHERE status >= 500) * 100.0 / count(*) AS err_pct
-FROM app_requests GROUP BY route ORDER BY err_pct DESC
-```
-
-## 一键导入现成仪表盘（QPS / P95 / 分位 / 错误率）
-
-备好了 [dashboard-api-metrics.json](dashboard-api-metrics.json)，4 个面板：各接口每分钟请求数(QPS 源)、
-P95 耗时折线、P50/P95/P99 分位表、5xx 错误率表。
-
-- **UI 导入**：Dashboards → 右上 **Import** → 选该 JSON 文件 → Import（每次导入新建，不覆盖）。
-- **或 API 导入**：
-  ```bash
-  curl -u admin@shaguabijia.local:Complexpass#123 -H 'Content-Type: application/json' \
-    -X POST 'http://localhost:5080/api/default/dashboards?folder=default' \
-    --data-binary @deploy/openobserve/dashboard-api-metrics.json
-  ```
-
-导入后进仪表盘，右上角时间调到「最近 15 分钟 / 1 小时」、开自动刷新即可。低流量下 QPS 面板看「每分钟请求数」比「每秒」直观。
-
-## 停止 / 清数据
-
-```bash
-docker compose down            # 停止(保留数据)
-docker compose down -v && rm -rf data   # 停止并清空数据
-```
-
-## 生产部署（单机）+ UI 访问
-
-前提:app-server 与 OpenObserve **同机**,app→OO 走 localhost(`127.0.0.1:5080`)、不出网、无需 TLS。
-唯一要防的是**别把 :5080 裸暴露公网**。硬化版编排见 [docker-compose.prod.yml](docker-compose.prod.yml)。
-
-### 部署步骤
-
-```bash
-# 1) 密码文件(本目录,已 gitignore)
-echo "OO_ROOT_PASSWORD=$(python -c 'import secrets;print(secrets.token_urlsafe(24))')" > deploy/openobserve/.env
-
-# 2) 起 OpenObserve(只绑 127.0.0.1、命名卷持久化、mem 1g)
-cd deploy/openobserve && docker compose -f docker-compose.prod.yml up -d
-sudo systemctl enable docker            # 开机自起
-```
-
-3) app-server 的 `.env` 打开观测并**重启**(用非 root 的专用 ingest 账号):
-```dotenv
-OBSERVE_ENABLED=true
-OBSERVE_ENDPOINT=http://127.0.0.1:5080
-OBSERVE_ORG=default
-OBSERVE_STREAM=app_requests
-OBSERVE_USER=ingest@shaguabijia.com     # UI → Users 建的非 root 账号
-OBSERVE_PASSWORD=<该账号密码>
-```
-```bash
-sudo systemctl restart shaguabijia-app-server   # 日志出现 "observe worker started" 即生效
-```
-
-4) 两个必做收口(磁盘/安全):
-- **保留期**:UI → Streams → `app_requests` → Data Retention 设 14/30 天(一请求一行,不封顶迟早撑爆盘)。
-- **专用账号**:UI → Users 建非 root 账号给 app 上报,root 只留人工登 UI。
-
-### UI 访问(二选一)
-
-**A. SSH 隧道(推荐,零暴露、不用域名/证书):**
-```bash
-ssh -L 5080:127.0.0.1:5080  用户@服务器IP
-# 然后本机浏览器开 http://localhost:5080
-```
-
-**B. nginx 子域名反代(要固定 URL / 团队常看):** 见 [../nginx/observe.shaguabijia.com.conf](../nginx/observe.shaguabijia.com.conf)。
-需 DNS `observe.shaguabijia.com` → 本机 + 证书放 `/etc/nginx/ssl/`;含 IP 白名单 + TLS + WebSocket 透传。
-
-> ⚠️ prod compose 必须保持 `127.0.0.1:5080:5080`;写成 `5080:5080`(绑 0.0.0.0)= 裸暴露公网,这是唯一真正的坑。

deploy/openobserve/dashboard-api-metrics.json

@@ -1,302 +0,0 @@
-{
-  "version": 8,
-  "dashboardId": "api-metrics",
-  "title": "接口监控 (QPS / 耗时 / 错误率)",
-  "description": "app-server 接口 QPS、P50/P95/P99 耗时、5xx 错误率。数据流 app_requests。",
-  "role": "",
-  "tabs": [
-    {
-      "tabId": "default",
-      "name": "Default",
-      "panels": [
-        {
-          "id": "panel_qps",
-          "type": "line",
-          "title": "各接口 每分钟请求数 (QPS 源)",
-          "description": "",
-          "config": {
-            "show_legends": true,
-            "legends_position": null,
-            "decimals": 2.0,
-            "axis_border_show": false,
-            "base_map": null,
-            "map_view": null
-          },
-          "queryType": "sql",
-          "queries": [
-            {
-              "query": "SELECT histogram(_timestamp, '1 minute') as ts, route, count(*) as reqs FROM app_requests GROUP BY ts, route ORDER BY ts",
-              "vrlFunctionQuery": "",
-              "customQuery": true,
-              "fields": {
-                "stream": "app_requests",
-                "stream_type": "logs",
-                "x": [
-                  {
-                    "label": "ts",
-                    "alias": "ts",
-                    "column": "ts",
-                    "color": null,
-                    "sortBy": "ASC"
-                  }
-                ],
-                "y": [
-                  {
-                    "label": "reqs",
-                    "alias": "reqs",
-                    "column": "reqs",
-                    "color": null
-                  }
-                ],
-                "z": [],
-                "breakdown": [
-                  {
-                    "label": "route",
-                    "alias": "route",
-                    "column": "route",
-                    "color": null
-                  }
-                ],
-                "filter": {
-                  "filterType": "group",
-                  "logicalOperator": "AND",
-                  "conditions": []
-                }
-              },
-              "config": {
-                "promql_legend": "",
-                "layer_type": "scatter",
-                "weight_fixed": 1.0
-              }
-            }
-          ],
-          "layout": {
-            "x": 0,
-            "y": 0,
-            "w": 24,
-            "h": 9,
-            "i": 1
-          }
-        },
-        {
-          "id": "panel_p95",
-          "type": "line",
-          "title": "各接口 P95 耗时 (ms)",
-          "description": "",
-          "config": {
-            "show_legends": true,
-            "legends_position": null,
-            "decimals": 2.0,
-            "axis_border_show": false,
-            "base_map": null,
-            "map_view": null
-          },
-          "queryType": "sql",
-          "queries": [
-            {
-              "query": "SELECT histogram(_timestamp, '1 minute') as ts, route, approx_percentile_cont(duration_ms, 0.95) as p95_ms FROM app_requests GROUP BY ts, route ORDER BY ts",
-              "vrlFunctionQuery": "",
-              "customQuery": true,
-              "fields": {
-                "stream": "app_requests",
-                "stream_type": "logs",
-                "x": [
-                  {
-                    "label": "ts",
-                    "alias": "ts",
-                    "column": "ts",
-                    "color": null,
-                    "sortBy": "ASC"
-                  }
-                ],
-                "y": [
-                  {
-                    "label": "p95_ms",
-                    "alias": "p95_ms",
-                    "column": "p95_ms",
-                    "color": null
-                  }
-                ],
-                "z": [],
-                "breakdown": [
-                  {
-                    "label": "route",
-                    "alias": "route",
-                    "column": "route",
-                    "color": null
-                  }
-                ],
-                "filter": {
-                  "filterType": "group",
-                  "logicalOperator": "AND",
-                  "conditions": []
-                }
-              },
-              "config": {
-                "promql_legend": "",
-                "layer_type": "scatter",
-                "weight_fixed": 1.0
-              }
-            }
-          ],
-          "layout": {
-            "x": 24,
-            "y": 0,
-            "w": 24,
-            "h": 9,
-            "i": 2
-          }
-        },
-        {
-          "id": "panel_pctl",
-          "type": "table",
-          "title": "各接口 耗时分位 P50/P95/P99 (ms)",
-          "description": "",
-          "config": {
-            "show_legends": true,
-            "legends_position": null,
-            "decimals": 2.0,
-            "axis_border_show": false,
-            "base_map": null,
-            "map_view": null
-          },
-          "queryType": "sql",
-          "queries": [
-            {
-              "query": "SELECT route, approx_percentile_cont(duration_ms,0.5) as p50, approx_percentile_cont(duration_ms,0.95) as p95, approx_percentile_cont(duration_ms,0.99) as p99, count(*) as cnt FROM app_requests GROUP BY route ORDER BY p95 DESC",
-              "vrlFunctionQuery": "",
-              "customQuery": true,
-              "fields": {
-                "stream": "app_requests",
-                "stream_type": "logs",
-                "x": [
-                  {
-                    "label": "route",
-                    "alias": "route",
-                    "column": "route",
-                    "color": null
-                  }
-                ],
-                "y": [
-                  {
-                    "label": "p50",
-                    "alias": "p50",
-                    "column": "p50",
-                    "color": null
-                  },
-                  {
-                    "label": "p95",
-                    "alias": "p95",
-                    "column": "p95",
-                    "color": null
-                  },
-                  {
-                    "label": "p99",
-                    "alias": "p99",
-                    "column": "p99",
-                    "color": null
-                  },
-                  {
-                    "label": "cnt",
-                    "alias": "cnt",
-                    "column": "cnt",
-                    "color": null
-                  }
-                ],
-                "z": [],
-                "breakdown": [],
-                "filter": {
-                  "filterType": "group",
-                  "logicalOperator": "AND",
-                  "conditions": []
-                }
-              },
-              "config": {
-                "promql_legend": "",
-                "layer_type": "scatter",
-                "weight_fixed": 1.0
-              }
-            }
-          ],
-          "layout": {
-            "x": 0,
-            "y": 9,
-            "w": 24,
-            "h": 9,
-            "i": 3
-          }
-        },
-        {
-          "id": "panel_err",
-          "type": "table",
-          "title": "各接口 错误率 (5xx %)",
-          "description": "",
-          "config": {
-            "show_legends": true,
-            "legends_position": null,
-            "decimals": 2.0,
-            "axis_border_show": false,
-            "base_map": null,
-            "map_view": null
-          },
-          "queryType": "sql",
-          "queries": [
-            {
-              "query": "SELECT route, count(*) FILTER (WHERE status >= 500) * 100.0 / count(*) as err_pct, count(*) as cnt FROM app_requests GROUP BY route ORDER BY err_pct DESC",
-              "vrlFunctionQuery": "",
-              "customQuery": true,
-              "fields": {
-                "stream": "app_requests",
-                "stream_type": "logs",
-                "x": [
-                  {
-                    "label": "route",
-                    "alias": "route",
-                    "column": "route",
-                    "color": null
-                  }
-                ],
-                "y": [
-                  {
-                    "label": "err_pct",
-                    "alias": "err_pct",
-                    "column": "err_pct",
-                    "color": null
-                  },
-                  {
-                    "label": "cnt",
-                    "alias": "cnt",
-                    "column": "cnt",
-                    "color": null
-                  }
-                ],
-                "z": [],
-                "breakdown": [],
-                "filter": {
-                  "filterType": "group",
-                  "logicalOperator": "AND",
-                  "conditions": []
-                }
-              },
-              "config": {
-                "promql_legend": "",
-                "layer_type": "scatter",
-                "weight_fixed": 1.0
-              }
-            }
-          ],
-          "layout": {
-            "x": 24,
-            "y": 9,
-            "w": 24,
-            "h": 9,
-            "i": 4
-          }
-        }
-      ]
-    }
-  ],
-  "variables": {
-    "list": []
-  }
-}

deploy/openobserve/docker-compose.prod.yml

@@ -1,33 +0,0 @@
-# 生产用 OpenObserve(单机)。相对本地版 docker-compose.yml 的区别:
-#   - 端口只绑 127.0.0.1 → 公网/外网都到不了(UI 访问走 SSH 隧道或 nginx 反代,见 README)
-#   - root 密码走环境变量(放同目录 .env,已 gitignore,勿提交)
-#   - 数据 bind-mount 到宿主 /data 分区(需预建目录 + 确认容器可写)+ CPU/内存上限(与 app/PG 共存防抢内存)
-#
-# 用法:
-#   1) 本目录建 .env(已 gitignore):
-#        OO_ROOT_PASSWORD=<强随机串>     # 生成: python -c "import secrets;print(secrets.token_urlsafe(24))"
-#   2) docker compose -f docker-compose.prod.yml up -d
-#   3) 开机自起: sudo systemctl enable docker
-services:
-  openobserve:
-    image: public.ecr.aws/zinclabs/openobserve:v0.91.2
-    container_name: openobserve
-    ports:
-      - "127.0.0.1:5080:5080"          # 只绑本机，安全
-    environment:
-      ZO_ROOT_USER_EMAIL: "admin@shaguabijia.com"
-      ZO_ROOT_USER_PASSWORD: "${OO_ROOT_PASSWORD:?请先在 deploy/openobserve/.env 里设 OO_ROOT_PASSWORD}"
-      ZO_DATA_DIR: "/data"
-      ZO_COMPACT_DATA_RETENTION_DAYS: "30"                # 超 30 天自动删,防爆盘(默认 3650 天=10年)
-      ZO_TELEMETRY: "false"                               # 关匿名遥测(内网自用);变量名是 ZO_TELEMETRY,不是 *_ENABLED
-    volumes:
-      - /data/openobserve/data:/data   # 绑定挂载到宿主机的 /data/openobserve/data 目录（建议该目录所在分区有 20G+ 空间）
-    restart: unless-stopped
-    deploy:
-      resources:
-        limits:                        # 硬上限:防 OO 查询/ingest 抢爆 CPU/内存,拖垮同机 PG+app
-          cpus: '2.0'                  
-          memory: 3G                   
-    logging:                                              # 容器 stdout 日志上限,防爆盘
-      driver: json-file
-      options: { max-size: "10m", max-file: "3" }

deploy/openobserve/docker-compose.yml

@@ -1,16 +0,0 @@
-# 本地开发用 OpenObserve(单容器 = local 模式)。用于接收 app-server 的接口指标(QPS/耗时/错误率)。
-# 启动: cd deploy/openobserve && docker compose up -d
-# Web UI: http://localhost:5080  (账号见下方 env)
-services:
-  openobserve:
-    image: public.ecr.aws/zinclabs/openobserve:latest
-    container_name: openobserve
-    ports:
-      - "5080:5080"
-    environment:
-      ZO_ROOT_USER_EMAIL: "admin@shaguabijia.local"
-      ZO_ROOT_USER_PASSWORD: "Complexpass#123"
-      ZO_DATA_DIR: "/data"
-    volumes:
-      - ./data:/data
-    restart: unless-stopped

docs/api/README.md

@@ -1,13 +1,9 @@
 # 傻瓜比价 App 后端 — API 接口文档（索引）
 
 > Base URL:生产 `https://app-api.shaguabijia.com`;本地联调 `http://<开发机>:8770`
-> 协议:HTTP / JSON,请求与响应体均 `application/json`,字段统一 **snake_case**(⚠️ 例外:消息通知中心 `notifications` 族与厂商推送 `push` 族按 PRD 前端契约用 **camelCase**,见各自文档)
+> 协议:HTTP / JSON,请求与响应体均 `application/json`,字段统一 **snake_case**
 > 鉴权:需鉴权的接口在请求头带 `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
+> 最后更新:2026-07-03（补全缺失文档:ad/watch-report, wallet/transfer-auth 族, coupon/session+stats+completed-today+prompt 族, invite 族, user/onboarding, platform/flags+ad-config+app-version, intent/step+precoupon/step, analytics/events, order/report, report 族, feedback/config+records, trace/finalize。文档移至分类子目录,新增 mock 入参/出参示例）
 > 架构:`app/api/v1/` 只放很轻的接口层;穿山甲/微信支付/极光/短信/美团等 SDK 集成的重逻辑在 `app/integrations/`,实现细节见 [docs/integrations/](../integrations/README.md)。
 
 ---
@@ -31,18 +27,17 @@
 | 8e | `GET /api/v1/coupon/completed-today` | 无 | [详情](./coupon/coupon-completed-today.md)（这台设备今天是否已跑完整轮领券） |
 | 8f | `POST /api/v1/coupon/completed-today/reset` | 无 | [详情](./coupon/coupon-completed-today.md)（重置今日已完成,开发用） |
 | 8g | `GET /api/v1/coupon/stats` | Bearer | [详情](./coupon/coupon-stats.md)（累计领券数,「我的」页战绩卡） |
-| 8h | `POST /api/v1/coupon/session` | 无 | [详情](./coupon/coupon-session.md)（领券流水上报,admin 看板数据源） |
+| 8h | `POST /api/v1/coupon/session` | 无 | [详情](./coupon/coupon/coupon-session.md)（领券流水上报,admin 看板数据源） |
 | 9 | `POST /api/v1/meituan/coupons` | 无 | [详情](./meituan/meituan-coupons.md) |
-| 10 | `POST /api/v1/meituan/feed` | 无 | [详情](./meituan/meituan-feed.md)（`rec` tab 离线库 + **按城市过滤** #116） |
+| 10 | `POST /api/v1/meituan/feed` | 无 | [详情](./meituan/meituan-feed.md) |
 | 11 | `POST /api/v1/meituan/referral-link` | 无 | [详情](./meituan/meituan-referral-link.md) |
-| 11a | `POST /api/v1/meituan/top-sales` | 无 | [详情](./meituan/meituan-top-sales.md)（同城销量榜:离线库按销量降序 + 跨源去重 + 城市过滤 #116,不实时打美团） |
-| **比价透传**（前缀 `/api/v1`,透传 pricebot-backend;**软鉴权 OptionalUser** + 首帧签发 trace_id + harvest 落 `comparison_record`,2026-07 起不再是纯透传） |||
-| 12 | `POST /api/v1/intent/recognize` | 软 | [详情](./intent/compare-intent-recognize.md)（Phase 1 意图识别,单次,多数源;mint 帧建 running 行） |
-| 12a | `POST /api/v1/intent/precoupon/step` | 软 | [详情](./intent/intent-step.md)（Phase 0 意图识别前先用券,仅美团源） |
-| 12b | `POST /api/v1/intent/step` | 软 | [详情](./intent/intent-step.md)（Phase 1 多帧意图识别,仅淘宝源,循环到 done） |
-| 13 | `POST /api/v1/price/step` | 软 | [详情](./intent/compare-price-step.md)（Phase 2 步进;done 帧 harvest 写终态） |
-| 13a | `POST /api/v1/trace/finalize` | 软 | [详情](./other/trace-finalize.md)（比价 trace 收尾上云 + 夭折落库,终止/未识别拿 trace_url） |
-| 13b | `POST /api/v1/trace/epilogue` | 软 | [详情](./other/trace-finalize.md)（结果页尾声帧:App 结果页截图入 trace,纯透传不落库,#112） |
+| 11a | `POST /api/v1/meituan/top-sales` | 无 | [详情](./meituan/meituan-top-sales.md)（销量榜:离线库 `meituan_coupon` 按销量降序 + 跨源去重,不实时打美团） |
+| **比价透传**（前缀 `/api/v1`,外卖 MVP；与 `coupon/step` 同为透传 pricebot-backend；下按 Phase 流程列,均不鉴权） |||
+| 12 | `POST /api/v1/intent/recognize` | 无 | [详情](./intent/compare-intent-recognize.md)（Phase 1 意图识别,单次,多数源） |
+| 12a | `POST /api/v1/intent/precoupon/step` | 无 | [详情](./intent/intent-step.md)（Phase 0 意图识别前先用券,仅美团源） |
+| 12b | `POST /api/v1/intent/step` | 无 | [详情](./intent/intent-step.md)（Phase 1 多帧意图识别,仅淘宝源,循环到 done） |
+| 13 | `POST /api/v1/price/step` | 无 | [详情](./intent/compare-price-step.md)（Phase 2 步进） |
+| 13a | `POST /api/v1/trace/finalize` | 无 | [详情](./other/trace-finalize.md)（比价 trace 收尾上云,终止/未识别拿 trace_url） |
 | **比价记录**（前缀 `/api/v1/compare`；按用户落库，**鉴权**，区别于上面不鉴权的透传） |||
 | 12a | `POST /api/v1/compare/record` | Bearer | [详情](./compare/compare-record-report.md) |
 | 12b | `GET /api/v1/compare/records` | Bearer | [详情](./compare/compare-records.md) |
@@ -59,7 +54,7 @@
 | **上报更低价**（前缀 `/api/v1/report`；众包纠偏,人工审核发奖） |||
 | R1 | `POST /api/v1/report` | Bearer | [详情](./other/report-submit.md)（提交上报更低价,multipart:比价记录ID+平台+价格+截图1-4张） |
 | R2 | `GET /api/v1/report/records` | Bearer | [详情](./other/report-records.md)（上报记录列表,?status=pending/approved/rejected 可选筛选） |
-| **好友邀请**（前缀 `/api/v1/invite`；绑定注册即生效但**不发奖**,#113 起好友「比价并下单」才给邀请人发**邀请奖励金**,经 `POST /order/report` 触发） |||
+| **好友邀请**（前缀 `/api/v1/invite`；注册即生效,双方各发 1 万金币） |||
 | I1 | `GET /api/v1/invite/me` | Bearer | [详情](./invite/invite-me.md)（我的邀请码+分享链接+已邀人数/已得金币） |
 | I2 | `GET /api/v1/invite/invitees` | Bearer | [详情](./invite/invite-invitees.md)（我邀请的人列表,limit/offset 分页） |
 | I3 | `POST /api/v1/invite/landing-track` | 无 | [详情](./invite/invite-bind.md)（落地页 dl.html 访问上报指纹,剪贴板归因兜底;浏览器无 token） |
@@ -73,9 +68,9 @@
 | 19 | `POST /api/v1/wallet/bind-wechat` | Bearer | [详情](./wallet/wallet-bind-wechat.md) |
 | 20 | `POST /api/v1/wallet/unbind-wechat` | Bearer | [详情](./wallet/wallet-unbind-wechat.md) |
 | 21 | `GET /api/v1/wallet/withdraw-info` | Bearer | [详情](./wallet/wallet-withdraw-info.md) |
-| 22 | `POST /api/v1/wallet/withdraw` | Bearer | [详情](./wallet/wallet-withdraw.md)（`source` 分账:coin_cash / invite_cash,#121） |
+| 22 | `POST /api/v1/wallet/withdraw` | Bearer | [详情](./wallet/wallet-withdraw.md) |
 | 23 | `GET /api/v1/wallet/withdraw/status` | Bearer | [详情](./wallet/wallet-withdraw-status.md) |
-| 24 | `GET /api/v1/wallet/withdraw-orders` | Bearer | [详情](./wallet/wallet-withdraw-orders.md)（可按 `source` 过滤） |
+| 24 | `GET /api/v1/wallet/withdraw-orders` | Bearer | [详情](./wallet/wallet-withdraw-orders.md) |
 | 24a | `POST /api/v1/wallet/transfer-auth` | Bearer | [详情](./wallet/wallet-transfer-auth.md)（开启免确认到账,申请授权,返回拉起微信授权页的 package） |
 | 24b | `GET /api/v1/wallet/transfer-auth/status` | Bearer | [详情](./wallet/wallet-transfer-auth.md)（查免确认授权状态,从微信授权页返回后轮询） |
 | 24c | `POST /api/v1/wallet/transfer-auth/close` | Bearer | [详情](./wallet/wallet-transfer-auth.md)（关闭免确认到账,解除授权） |
@@ -104,29 +99,14 @@
 | 36 | `POST /api/v1/user/avatar` | Bearer | [详情](./user/user-avatar.md) |
 | 36a | `POST /api/v1/user/onboarding/complete` | Bearer | [详情](./user/user-onboarding.md)（标记新手引导完成,按 账号+device_id 幂等,跨卸载重装持久） |
 | 36b | `GET /api/v1/user/onboarding/status` | Bearer | [详情](./user/user-onboarding.md)（查该 账号+设备 是否走过引导,运营在 admin 删记录即触发重走） |
-| 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 不强制登录） |||
 | E1 | `POST /api/v1/analytics/events` | 无 | [详情](./other/analytics-events.md)（批量上报埋点事件,不强制登录,每批最多200条） |
 | E2 | `POST /api/v1/order/report` | Bearer | [详情](./other/order-report.md)（上报归因订单,比价后5分钟内点链接+支付金额与比价价相差≤1元） |
->>>>>>> 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) |
@@ -147,37 +127,43 @@
 | N4 | `POST /internal/store-mapping/invalidate` | 内部密钥 | [详情](./internal/internal.md)（标记某平台 shopId 缓存 deeplink 失效） |
 | N5 | `POST /internal/launch-confirm-sample` | 内部密钥 | [详情](./internal/internal.md)（启动确认窗兜底样本落 `launch_confirm_sample`） |
 | N6 | `POST /internal/app-version` | 内部密钥 | [详情](./internal/internal.md)（发布流程写最新 App 版本,落 `app_config`） |
-| N7 | `GET /internal/launch-confirm-samples` | 内部密钥 | [详情](./internal/internal.md)（样本列表,供 pricebot distill 脚本聚合沉淀回静态规则,#91） |
 | **静态资源**（StaticFiles 挂载,见下方 `/media` 静态服务） |||
 | - | `GET /media/avatars/<file>` | 无 | 用户头像;返回二进制图片 |
 | - | `GET /media/feedback/<file>` | 无 | 反馈截图;返回二进制图片 |
-| **运营后台 Admin**（独立子应用 `app/admin/`,前缀 `/admin/api`,独立进程 + 独立 admin JWT。鉴权列:`admin`=任意已登录管理员,`operator`/`finance`/`super_admin`=需对应角色;#117 起可见页由 [admin_role](../database/admin_role.md) 数据驱动,`super_admin` 恒通过） |||
-| A1 | `POST /admin/api/auth/login` · `GET /auth/me` | 无 / admin | [详情](./admin/auth/admin-auth-login.md) / [me](./admin/auth/admin-auth-me.md)（me 返回有效可见页 `pages`） |
-| A2 | `GET /admin/api/stats/overview` | admin | [详情](./admin/admin-stats-overview.md)（大盘核心指标;#103 按 trace 聚合 + 京东收益 #90 + feed_scene 口径 #125） |
-| A3 | `GET /admin/api/event-logs` | admin | [详情](./admin/admin-event-logs.md)（埋点日志检索,#83） |
-| **A·用户**:`GET /users`(筛选排序分页)、`GET /users/{id}`(360 详情)、`GET /{id}/reward-stats` + `GET /{id}/coin-records`(提现详情联查)、`POST /{id}/status`(封禁)、`POST /{id}/debug-trace`(调试链接权限)、`POST /{id}/coins`、`POST /{id}/cash`(#95 `account` 目标账户) ||| [列表](./admin/users/admin-users-list.md) / [详情](./admin/users/admin-user-detail.md) / [状态+debug-trace](./admin/users/admin-user-status.md) / [金币](./admin/users/admin-user-coins.md) / [现金](./admin/users/admin-user-cash.md) |
-| A4 | `GET /admin/api/wallet/coin-transactions` / `cash-transactions` | admin | [金币](./admin/wallet/admin-wallet-coin-transactions.md) / [现金](./admin/wallet/admin-wallet-cash-transactions.md) |
-| **A·提现审核台**:`GET /withdraws`(列表)、`/summary`、`/health-check`(finance)、`/ledger-check`(#121 分账对账)、`/{out_bill_no}`(详情)、`POST /reconcile`、单笔 `refresh`/`approve`/`reject`、批量 `bulk/refresh`/`bulk/approve`/`bulk/reject` ||| [列表](./admin/withdraws/admin-withdraws-list.md) / [审核族](./admin/withdraws/admin-withdraw-review.md) / [对账](./admin/withdraws/admin-withdraw-reconcile.md) / [查单](./admin/withdraws/admin-withdraw-refresh.md) |
-| **A·反馈**:`GET /feedbacks`、`/summary`、`POST /{id}/approve`(采纳发币 #94)、`/{id}/reject`、`/{id}/handle` ||| [列表](./admin/feedbacks/admin-feedbacks-list.md) / [审核族](./admin/feedbacks/admin-feedback-handle.md) |
-| A5 | `GET`/`PATCH` `/admin/api/feedback-config`,`POST`/`DELETE` `…/image` | operator | 反馈页「加群二维码」卡配置(admin 侧;C 端读见 38a)(无单独文档,见 `app/admin/routers/feedback_qr.py`) |
-| **A·上报更低价**:`GET /price-reports`、`/summary`、`POST /{id}/approve|reject`(#94) ||| [审核族](./admin/admin-price-reports.md) |
-| A6 | `GET /admin/api/comparison-records`(+`/{id}` 详情) | admin | 比价记录检索(按 user/phone/**店与商品名模糊搜** #117 筛;详情含 LLM 调用明细)(无单独文档,见 `app/admin/routers/comparison.py`) |
-| A7 | `GET /admin/api/coupon-data`(+`/user-records`) | admin | [详情](./admin/admin-coupon-data.md)(领券数据看板,#99) |
-| A8 | `GET /admin/api/device-liveness`(+`/stats`) | admin | [详情](./admin/admin-device-liveness.md)(设备存活监控,#80) |
-| A9 | `GET /onboarding/devices`、`POST /devices/{id}/reset`、`POST /reset-all` | operator | 新手引导记录管理(按设备聚合/重置)(无单独文档,见 `app/admin/routers/onboarding.py`) |
-| **A·轮播**:`GET /marquee-seeds`、`/preview`、`/real-records`(#123)、`GET`/`PATCH` `/mode`(#122,模式落 `app_config`)、`POST`(+`/bulk`、`/batch-delete`、`/batch-enable`)、`PATCH`/`DELETE` `/{seed_id}` ||| [详情](./admin/admin-marquee-seeds.md) |
-| A10 | `GET / PATCH /admin/api/dashboard-display` | admin / operator | [详情](./admin/admin-dashboard-display.md)(首页三统计配置) |
-| A11 | `GET /admin/api/ad-coin-audit` | admin | [详情](./admin/ad/admin-ad-coin-audit.md)(看广告金币公式复算对账,只读) |
-| 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`) |
-| **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) |
+| **运营后台 Admin**（独立子应用 `app/admin/`,前缀 `/admin/api`,独立进程 + 独立 admin JWT。鉴权列:`admin`=任意已登录管理员,`operator`/`finance`/`super_admin`=需对应角色（`super_admin` 恒通过）） |||
+| A1 | `POST /admin/api/auth/login` | 无 | [详情](./admin/auth/admin-auth-login.md) |
+| A2 | `GET /admin/api/auth/me` | admin | [详情](./admin/auth/admin-auth-me.md) |
+| A3 | `GET /admin/api/stats/overview` | admin | [详情](./admin/admin-stats-overview.md) |
+| A4 | `GET /admin/api/users` | admin | [详情](./admin/users/admin-users-list.md) |
+| A5 | `GET /admin/api/users/{user_id}` | admin | [详情](./admin/users/admin-user-detail.md) |
+| A6 | `POST /admin/api/users/{user_id}/status` | operator | [详情](./admin/users/admin-user-status.md) |
+| A7 | `POST /admin/api/users/{user_id}/coins` | finance | [详情](./admin/users/admin-user-coins.md) |
+| A8 | `POST /admin/api/users/{user_id}/cash` | finance | [详情](./admin/users/admin-user-cash.md) |
+| A9 | `GET /admin/api/wallet/coin-transactions` | admin | [详情](./admin/wallet/admin-wallet-coin-transactions.md) |
+| A10 | `GET /admin/api/wallet/cash-transactions` | admin | [详情](./admin/wallet/admin-wallet-cash-transactions.md) |
+| A11 | `GET /admin/api/withdraws` | admin | [详情](./admin/withdraws/admin-withdraws-list.md) |
+| A12 | `POST /admin/api/withdraws/reconcile` | finance | [详情](./admin/withdraws/admin-withdraw-reconcile.md) |
+| A13 | `POST /admin/api/withdraws/{out_bill_no}/refresh` | finance | [详情](./admin/withdraws/admin-withdraw-refresh.md) |
+| A14 | `GET /admin/api/feedbacks` | admin | [详情](./admin/feedbacks/admin-feedbacks-list.md) |
+| A15 | `POST /admin/api/feedbacks/{feedback_id}/handle` | operator | [详情](./admin/feedbacks/admin-feedback-handle.md) |
+| A16 | `GET /admin/api/admins` | super_admin | [详情](./admin/admins/admin-admins-list.md) |
+| A17 | `POST /admin/api/admins` | super_admin | [详情](./admin/admins/admin-admin-create.md) |
+| A18 | `PATCH /admin/api/admins/{admin_id}` | super_admin | [详情](./admin/admins/admin-admin-update.md) |
+| A19 | `GET /admin/api/audit-logs` | admin | [详情](./admin/admin-audit-logs.md) |
+| A20 | `GET /admin/api/dashboard-display` | admin | [详情](./admin/admin-dashboard-display.md) |
+| A21 | `PATCH /admin/api/dashboard-display/{metric}` | operator | [详情](./admin/admin-dashboard-display.md) |
+| A22 | `GET /admin/api/marquee-seeds` | admin | [详情](./admin/admin-marquee-seeds.md) |
+| A23 | `POST /admin/api/marquee-seeds` | operator | [详情](./admin/admin-marquee-seeds.md) |
+| A24 | `PATCH /admin/api/marquee-seeds/{seed_id}` | operator | [详情](./admin/admin-marquee-seeds.md) |
+| A25 | `DELETE /admin/api/marquee-seeds/{seed_id}` | operator | [详情](./admin/admin-marquee-seeds.md) |
+| A26 | `POST /admin/api/marquee-seeds/bulk` | operator | [详情](./admin/admin-marquee-seeds.md) |
+| A27 | `GET /admin/api/marquee-seeds/preview` | admin | [详情](./admin/admin-marquee-seeds.md) |
+| A28 | `GET /admin/api/ad-coin-audit` | admin | [详情](./admin/ad/admin-ad-coin-audit.md)(看广告金币公式复算对账,只读) |
+| A29 | `GET /admin/api/ad-revenue-report` | admin | [详情](./admin/ad/admin-ad-revenue-report.md)(广告收益报表:按用户/日期/类型/应用/代码位 聚合 条数/收益/金币,只读) |
 | - | `GET /admin/api/health` | 无 | admin 健康检查(无单独文档) |
 
 > ⚠️ 美团三个接口当前**无鉴权**,且 `referral-link` 的 `sid` 允许客户端传值覆盖默认渠道——见各接口"备注"。
-> `coupon/step` 透传到 pricebot-backend,**仍不鉴权**(device_id 区分设备,待补 JWT)。外卖比价透传族(`intent/*`、`price/step`、`trace/finalize|epilogue`)2026-07 起改**软鉴权 OptionalUser**:带 Bearer 则比价记录绑 `user_id`,不带也放行;并由 app-server 首帧签发 `trace_id` + harvest 落 `comparison_record`(见 `app/api/v1/compare.py` 模块注释)。
+> `coupon/step` 及外卖比价的 `intent/recognize`、`intent/precoupon/step`、`intent/step`、`price/step`、`trace/finalize` 都透传到 pricebot-backend,**MVP 阶段均不鉴权**(device_id 透传,待补 JWT——见 `app/api/v1/compare.py`)。
 > 福利相关业务接口（wallet/signin/tasks/savings、`ad/reward-status`、`ad/feed-reward`）均需 **Bearer**;`wallet/exchange-info` 是静态规则无鉴权;`ad/pangle-callback` 不走 JWT、靠穿山甲**验签**;`ad/test-grant` **仅本地联调**(开关控制,生产 404)。
 > 金额字段一律以**分**为单位（`*_cents`）。
 

docs/api/admin/admin-coupon-data.md

@@ -1,17 +0,0 @@
-# /admin/api/coupon-data — 领券数据看板(#99)
-
-> 所属:Admin 子应用(前缀 `/admin/api`) | 鉴权:admin(任意已登录管理员) | 表 [coupon_session](../../database/coupon_session.md) | [← 返回 API 索引](../README.md)
-
-数据源是客户端两段上报的 `coupon_session`(一次领券任务一行:发起建行/收尾更新)。看板量化:发起数、完成率、**中途流失**(started 无终态)、平均/分位耗时、各平台耗时、机型/ROM 维度。
-
-## 端点
-
-| 方法 + 路径 | 说明 |
-|---|---|
-| `GET /admin/api/coupon-data` | 看板聚合:发起/完成数 + 耗时分位 + 按天趋势 + 逐条明细(按 `started_date` 区间 + `app_env` 筛,默认只看 prod 防测试数据串台) |
-| `GET /admin/api/coupon-data/user-records` | 某用户全部领券记录(用户列表点手机号抽屉:领券次数 + 记录列表) |
-
-## 说明
-- 明细行 LEFT JOIN `user` 出手机号/昵称(匿名领券行 user 列为空)。
-- 「发起平台」列按 `origin_package` 区分:空=App 内首页发起,包名=从对应外卖 App 弹券引导发起。
-- 耗时口径:`elapsed_ms` 客户端全程计时(只统计 completed)。

docs/api/admin/admin-cps.md

@@ -1,28 +0,0 @@
-# /admin/api/cps — CPS 群发联盟运营台(群/活动/短链/对账)
-
-> 所属:Admin 子应用(前缀 `/admin/api/cps`) | 鉴权:读=admin,写=operator/finance(对账) | 表 [cps_group](../../database/cps_group.md) / [cps_activity](../../database/cps_activity.md) / [cps_link](../../database/cps_link.md) / [cps_click](../../database/cps_click.md) / [cps_order](../../database/cps_order.md) / [cps_wx_user](../../database/cps_wx_user.md) | [← 返回 API 索引](../README.md)
->
-> 业务与授权流程详见 [guides/CPS发券分发与微信授权](../../guides/CPS发券分发与微信授权.md);C 端落地短链见 [cps-redirect](../other/cps-redirect.md)。
-
-私域社群 CPS 的完整运营链:建群(拿 `sid`)→ 建活动(券/物料)→ 生成群发短链 `/c/{code}` → 用户点击/复制口令 → 联盟订单按 `sid` 归群对账,汇成「点击→下单→佣金」漏斗。
-
-## 端点
-
-| 方法 + 路径 | 说明 |
-|---|---|
-| `GET / POST /admin/api/cps/groups`,`PATCH / DELETE /groups/{id}` | 推广群 CRUD;含美团平台的群自动分配 `sid` |
-| `GET / POST /admin/api/cps/activities`,`PATCH / DELETE /activities/{id}` | 可推广活动 CRUD(美团 actId / 淘宝淘口令 / 京东链接) |
-| `POST /admin/api/cps/upload-image`、`GET /activity-images` | 活动落地页图上传 / 已有图列表(新建复用) |
-| `POST /admin/api/cps/referral-links` | 批量生成群×活动短链(美团经 sid 转链) |
-| `POST /admin/api/cps/orders/reconcile` | 拉联盟订单对账(美团 `query_order` + 京东联盟 #90,`order_id` 幂等 upsert;finance) |
-| `GET /admin/api/cps/orders` | 订单明细(游标分页,可按 sid / 状态筛) |
-| `GET /admin/api/cps/stats` | 按群对账统计(点击/订单/GMV/预估与结算佣金) |
-| `GET /admin/api/cps/groups/{id}/timeseries` | 群点击时序(天/小时级 PV/UV/复制,折线图) |
-| `GET /admin/api/cps/groups/{id}/daily` | 群每天明细大表格(点击+订单按天合并;#79 起支持按天下钻) |
-| `GET /admin/api/cps/groups/{id}/wx-users` | 群内微信用户(领券画像:头像/昵称/领券次数) |
-| `GET /admin/api/cps/groups/{id}/day-users` | 某天该群按用户的领券/点击 + 每人点过的券(#79) |
-
-## 说明
-- 订单与点击**只能在群(sid)维度汇合**,无法对到单笔(联盟只回传 sid)。
-- 京东单有效性按 `jd_valid_code`,美团按 `mt_status`(4 取消/5 风控不计佣,6 结算才到账);淘宝无对账 API,对账列显示 `-`。
-- #119 修美团 `pay_time` 入库为空导致大盘时间窗漏算。

docs/api/admin/admin-device-liveness.md

@@ -1,15 +0,0 @@
-# /admin/api/device-liveness — 设备存活监控(#80)
-
-> 所属:Admin 子应用(前缀 `/admin/api`) | 鉴权:admin | 表 [device_liveness](../../database/device_liveness.md) | [← 返回 API 索引](../README.md)
-
-无障碍保护存活的后台视角:哪些设备开过保护(`ever_protected`)、现在在线还是掉线(心跳超时,#107 起阈值 1 小时)、首次开启时间(`first_protected_at`)。
-
-## 端点
-
-| 方法 + 路径 | 说明 |
-|---|---|
-| `GET /admin/api/device-liveness/stats` | 顶部卡片统计:设备总数 / 开过保护 / 当前在线 / 掉线数 |
-| `GET /admin/api/device-liveness` | 设备存活列表(游标分页):在线情况/设备 id/归属用户 筛选 + 排序,**默认掉线置顶**;行含最近心跳、首次开启、App 版本、push token 有无 |
-
-## 说明
-- 「在线」= `last_heartbeat_at` 距今 < 超时阈值;掉线召回链路(worker 置 `kill_alert_pending` → 客户端 pull)见表文档。

docs/api/admin/admin-event-logs.md

@@ -1,15 +0,0 @@
-# /admin/api/event-logs — 埋点日志(#83)
-
-> 所属:Admin 子应用(前缀 `/admin/api`) | 鉴权:admin | 表 [analytics_event](../../database/analytics_event.md) | [← 返回 API 索引](../README.md)
-
-客户端埋点(`POST /api/v1/analytics/events` 批量上报)的后台检索页。
-
-## 端点
-
-| 方法 + 路径 | 说明 |
-|---|---|
-| `GET /admin/api/event-logs` | 埋点事件列表(游标分页):可按 `event` / `device_id` / `user_id` 筛;行含事件名、props、页面、机型/系统/网络、client_ts |
-
-## 说明
-- 纯只读;无聚合报表(要分析导出后自己算)。
-- 时间轴用 `client_ts`(事件真实发生时刻),入库时间受客户端攒批影响。

docs/api/admin/admin-marquee-seeds.md

@@ -2,7 +2,7 @@
 
 > 所属:Admin 组（前缀 `/admin/api/marquee-seeds`） | 鉴权:Admin Bearer（改需 operator/super) | [← 返回 API 索引](../README.md)
 
-管理首页轮播「真实+种子混播」的兜底种子。种子是「生成规则」:`masked_user` 可空(空→feed 随机合成名)、金额是 `[min_cents, max_cents]` 区间(feed 每次随机取值)。用户侧 feed 见 [platform-savings-feed](../savings/platform-savings-feed.md);表见 [ops_marquee_seed](../../database/ops_marquee_seed.md)。金额单位:分(前端 ÷100 显示元)。
+管理首页轮播「真实+种子混播」的兜底种子。种子是「生成规则」:`masked_user` 可空(空→feed 随机合成名)、金额是 `[min_cents, max_cents]` 区间(feed 每次随机取值)。用户侧 feed 见 [platform-savings-feed](./platform-savings-feed.md);表见 [ops_marquee_seed](../database/ops_marquee_seed.md)。金额单位:分(前端 ÷100 显示元)。
 
 ## 复用结构 OpsMarqueeSeedOut
 | 字段 | 类型 | 说明 |
@@ -19,20 +19,9 @@
 出参 `200`:`list[OpsMarqueeSeedOut]`(按 `sort_order,id`)。
 
 ## GET /admin/api/marquee-seeds/preview — 预览实际混播 feed
-预览客户端实际会看到的轮播(真实记录会插队、种子随机抽取 / 金额随机 / 名字合成),供运营对效果。**含随机,每次结果不同**;#122 起按**当前数据源模式**实时预览(mixed/real/seed 各自的真实产出)。
+预览客户端实际会看到的轮播(真实记录会插队、种子随机抽取 / 金额随机 / 名字合成),供运营对效果。**含随机,每次结果不同**。
 - 入参:`limit`(query,1~30,默认 8)
-- 出参 `200`:`{"items": [{masked_user, saved_amount_cents, time}]}`(条目同 [platform-savings-feed](../savings/platform-savings-feed.md))
-
-## GET /admin/api/marquee-seeds/real-records — 分页浏览当前模式下可展示的真实记录(#123)
-审核用:看「真实条」到底会拿哪些 `comparison_record` 上轮播(真实条**不按用户去重**,打乱+去连簇后混播;默认昵称归「无昵称」脱敏档,#122)。
-- 入参:`limit` / `cursor`(游标分页)
-- 出参 `200`:`{"items": [...], "next_cursor": int|null}`
-
-## GET /admin/api/marquee-seeds/mode — 首页轮播数据源模式
-出参:`{"mode": "mixed" | "real" | "seed"}`(混播 / 只真实 / 只种子)。
-
-## PATCH /admin/api/marquee-seeds/mode — 改数据源模式(带审计)
-- 入参:`{"mode": "mixed" | "real" | "seed"}`;operator 起。改动客户端重拉 feed 生效。
+- 出参 `200`:`{"items": [{masked_user, saved_amount_cents, time}]}`(条目同 [platform-savings-feed](./platform-savings-feed.md))
 
 ## POST /admin/api/marquee-seeds — 新增(带审计)
 入参 `OpsMarqueeSeedCreate`:`masked_user`(可选,空 / 不传 → 随机合成)、`min_cents`(必填,≥0)、`max_cents`(必填,≥min,≤1000 元)、`enabled`(默认 true)、`sort_order`(默认 0)。出参:新建的 `OpsMarqueeSeedOut`。`400`=金额非法。

docs/api/admin/admin-price-reports.md

@@ -1,16 +0,0 @@
-# /admin/api/price-reports — 上报更低价审核(#94)
-
-> 所属:Admin 子应用(前缀 `/admin/api/price-reports`) | 鉴权:读=admin,审=operator | 表 [price_report](../../database/price_report.md) | [← 返回 API 索引](../README.md)
->
-> C 端提交/查询见 [report-submit](../other/report-submit.md) / [report-records](../other/report-records.md)。
-
-用户众包「上报更低价」的人工审核台:审截图与价格,通过发固定金币。
-
-## 端点
-
-| 方法 + 路径 | 说明 |
-|---|---|
-| `GET /admin/api/price-reports` | 上报列表(状态筛选 + 游标分页,含截图、关联比价记录快照) |
-| `GET /admin/api/price-reports/summary` | 审核统计(pending/approved/rejected 计数) |
-| `POST /admin/api/price-reports/{report_id}/approve` | 通过 → 发固定金币(`grant_coins` 同事务)+ 带审计 |
-| `POST /admin/api/price-reports/{report_id}/reject` | 拒绝(填原因,用户端可见)+ 带审计 |

docs/api/admin/admin-roles.md

@@ -1,19 +0,0 @@
-# /admin/api/roles — 角色与可见页管理(RBAC,#117/#126)
-
-> 所属:Admin 子应用(前缀 `/admin/api`,独立 admin JWT) | 鉴权:**super_admin** | 表 [admin_role](../../database/admin_role.md) | [← 返回 API 索引](../README.md)
-
-后台 RBAC 的数据驱动层:内建三角色(`super_admin`/`finance`/`operator`,`is_builtin=true` 不可删)+ **自定义角色**(勾任意页面组合)。管理员的有效可见页 = `admin_user.pages_override`(个人覆盖,非空优先)∪ 否则取其角色 `pages`;`super_admin` 恒全通。
-
-## 端点
-
-| 方法 + 路径 | 说明 |
-|---|---|
-| `GET /admin/api/roles` | 角色列表:`[{id, name, label, pages, is_builtin, admin_count}]`(含每个角色的使用人数) |
-| `GET /admin/api/roles/catalog` | 页面权限目录(分组):全部可勾选的页面 key(来自 `app/admin/permissions.py` 常量,不落库),前端渲染勾选面板用 |
-| `POST /admin/api/roles` | 新增自定义角色 `{name, pages}`(**name(key)= label = 输入名称**;不能叫 `super_admin`,重名 `409`);带审计 |
-| `PATCH /admin/api/roles/{role_id}` | 改展示名/可见页(内建角色的 `pages` 也可调);带审计 |
-| `DELETE /admin/api/roles/{role_id}` | 删角色;**内建(`is_builtin`)与在用(有 `admin_user.role` 引用)不可删**(400);带审计 |
-
-## 说明
-- 管理员个人覆盖在 [`PATCH /admin/api/admins/{id}`](./admins/admin-admin-update.md) 的 `pages_override` 字段改,不在本组。
-- 加新后台页面要同步登记 `permissions.py` 目录,表里只存勾选结果(目录变更无需迁移)。

docs/api/admin/admins/admin-admin-update.md

@@ -8,13 +8,12 @@
 |---|---|---|---|
 | `admin_id` | int | ✓ | 目标管理员 id |
 
-**application/json**(字段都可选,只改传了的;至少传一个):
+**application/json**(三字段都可选,只改传了的;至少传一个):
 | 字段 | 类型 | 必填 | 说明 |
 |---|---|---|---|
-| `role` | string | ✗ | 改角色:内建 `super_admin` / `finance` / `operator` **或自定义角色 name**(#117/#126,见 [admin-roles](../admin-roles.md)) |
-| `pages_override` | list[string] \| null | ✗ | 个人可见页覆盖(#126):非空优先于角色 pages;传 `null` 清覆盖回归角色 |
+| `role` | string | ✗ | 改角色,枚举:`super_admin` / `finance` / `operator` |
 | `status` | string | ✗ | 启停,枚举:`active`(启用)/ `disabled`(禁用) |
-| `password` | string | ✗ | 重置密码,8–72 字(传则覆盖原密码,同时更新 `plain_password` 明文副本) |
+| `password` | string | ✗ | 重置密码,8–72 字(传则覆盖原密码) |
 
 ## 出参
 响应 `200`:`AdminOut`（更新后的管理员)
@@ -25,15 +24,9 @@
 | `username` | string | 账号 |
 | `role` | string | 角色 |
 | `status` | string | 状态 |
-| `pages` | list[string] | **有效可见页**(pages_override 优先,否则角色 pages;super_admin 全量) |
 | `created_at` | datetime | 创建时间(UTC) |
 | `last_login_at` | datetime \| null | 上次登录时间 |
 
----
-
-## DELETE /admin/api/admins/{admin_id} — 删除管理员(#126)
-物理删除(区别于禁用);**不可删自己**(`400`);带审计(`action=admin.delete`)。鉴权同本组(super_admin)。出参 `{"deleted": true}`。
-
 ## 错误码
 - `400` 不能禁用自己(`admin_id == 当前 admin.id` 且 `status=disabled`) / 无任何变更字段(三字段全空)
 - `401` 未带 admin token / token 无效或过期 / 管理员被禁用
@@ -42,5 +35,5 @@
 - `422` `role`/`status` 非法枚举 / `password` 长度不在 8–72
 
 ## 说明
-- 更新成功后写一条审计:`action=admin.update`、`target_type=admin`、`target_id=admin_id`、`detail` 为本次实际变更字段(如 `{"role": "...", "status": "...", "password": "reset"}`,密码只记 `reset` 不记明文)。见 [admin_audit_log](../../../database/admin_audit_log.md)。
-- 数据表见 [admin_user](../../../database/admin_user.md)。
+- 更新成功后写一条审计:`action=admin.update`、`target_type=admin`、`target_id=admin_id`、`detail` 为本次实际变更字段(如 `{"role": "...", "status": "...", "password": "reset"}`,密码只记 `reset` 不记明文)。见 [admin_audit_log](../database/admin_audit_log.md)。
+- 数据表见 [admin_user](../database/admin_user.md)。

docs/api/admin/feedbacks/admin-feedback-handle.md

@@ -1,24 +1,6 @@
-# /admin/api/feedbacks — 反馈审核族(采纳/拒绝/标记处理/统计)
+# POST /admin/api/feedbacks/{feedback_id}/handle — 标记反馈已处理
 
-> 所属:Admin·反馈 组（前缀 `/admin/api/feedbacks`） | 鉴权:Bearer admin_token（角色:`operator`,`super_admin` 恒通过,`require_role("operator")`;summary 任意 admin） | [← 返回 API 索引](../../README.md)
->
-> 列表见 [admin-feedbacks-list](./admin-feedbacks-list.md)。#94 引入 采纳(发金币)/拒绝 审核语义,#105 加运营回复 `admin_reply`;旧「标记已处理」保留。
-
-## POST /admin/api/feedbacks/{feedback_id}/approve — 采纳并发金币(#94)
-- body:`{reward_coins?(int,可 0), admin_reply?(string,用户可见), review_note?(string,内部)}`
-- 行为:`status → adopted`;`reward_coins > 0` 时走 `grant_coins` 同事务发币(流水 `coin_transaction`);写审计(`detail.after="adopted"`)。已终态(非 pending/new)→ `400`。
-- 出参:更新后的 FeedbackOut。
-
-## POST /admin/api/feedbacks/{feedback_id}/reject — 拒绝采纳(#94)
-- body:`{reject_reason(string,用户可见), admin_reply?, review_note?}`
-- 行为:`status → rejected`;写审计(`detail.after="rejected"`)。已终态 → `400`。
-
-## GET /admin/api/feedbacks/summary — 审核统计
-- 出参:各状态计数(`pending` / `adopted` / `rejected` / `handled`),审核台顶部卡片用;任意 admin 可读。
-
----
-
-## POST /admin/api/feedbacks/{feedback_id}/handle — 标记反馈已处理(旧口径)
+> 所属:Admin·反馈 组（前缀 `/admin/api/feedbacks`） | 鉴权:Bearer admin_token（角色:`operator`,`super_admin` 恒通过,`require_role("operator")`） | [← 返回 API 索引](../../README.md)
 
 ## 入参
 - 路径:`feedback_id`(int)
@@ -36,6 +18,6 @@
 - `422` `feedback_id` 非合法 int
 
 ## 说明
-- 写操作记审计 [admin_audit_log](../../../database/admin_audit_log.md):`action="feedback.handle"`、`target_type="feedback"`、`target_id=<feedback_id>`、`detail={"before": <原 status>, "after": "handled"}`、`ip=<客户端 IP>`。
+- 写操作记审计 [admin_audit_log](../database/admin_audit_log.md):`action="feedback.handle"`、`target_type="feedback"`、`target_id=<feedback_id>`、`detail={"before": <原 status>, "after": "handled"}`、`ip=<客户端 IP>`。
 - 状态变更与审计写入在同一事务(`commit=False` 后统一 `db.commit()`)。
-- 关联表 [feedback](../../../database/feedback.md)。
+- 关联表 [feedback](../database/feedback.md)。

docs/api/admin/users/admin-user-cash.md

@@ -10,7 +10,6 @@
 | 字段 | 类型 | 必填 | 说明 |
 |---|---|---|---|
 | `mode` | string | ✗ | `delta`(默认)=增减 / `set`=设为指定值 |
-| `account` | string | ✗ | 目标账户(#95):`coin_cash`(默认,金币兑换的现金)/ `invite_cash`(邀请奖励金)。两本账物理隔离、各调各 |
 | `amount_cents` | int | ✓ | `delta` 模式:现金变动(分,正=发放,负=扣减,不可为 0);`set` 模式:目标现金值(分,须 ≥ 0) |
 | `reason` | string | ✓ | 操作原因,1–128 字(必填,入审计与流水备注) |
 
@@ -29,7 +28,7 @@
 - 金额单位一律为**分**(`*_cents`);本接口只动现金余额,不涉及金币。
 - **set 模式**:读当前余额算出差值 `delta = target - 当前余额`,再复用同一套写入逻辑(故只写一笔差值流水)。目标值须 ≥ 0;差值为 0(已等于目标)直接拒绝。
 - 扣减保护:实际写入的 `delta < 0` 时若扣减后现金余额 < 0 直接拒绝(运营误操作保护);set 模式目标值 ≥ 0 天然不会扣成负。
-- 现金变动按 `account` 写对应账本流水:`coin_cash` → [cash_transaction](../../../database/cash_transaction.md),`invite_cash` → [invite_cash_transaction](../../../database/invite_cash_transaction.md)(#95);`biz_type` 实际差值为正记 `admin_grant`、为负记 `admin_deduct`(set 模式同理,不新增流水类型),`remark = admin:<reason>`(截断至 128 字)。
-- 写操作记审计 [admin_audit_log](../../../database/admin_audit_log.md):`action = user.cash.grant`,`target_type = user`,`target_id = user_id`,`detail = {amount_cents(=实际差值), balance_after_cents, reason}`;set 模式额外带 `{mode:"set", target_cents, before_cents}`。并记录操作 IP。
+- 现金变动写流水 [cash_transaction](../database/cash_transaction.md):`biz_type` 实际差值为正记 `admin_grant`、为负记 `admin_deduct`(set 模式同理,不新增流水类型),`remark = admin:<reason>`(截断至 128 字)。
+- 写操作记审计 [admin_audit_log](../database/admin_audit_log.md):`action = user.cash.grant`,`target_type = user`,`target_id = user_id`,`detail = {amount_cents(=实际差值), balance_after_cents, reason}`;set 模式额外带 `{mode:"set", target_cents, before_cents}`。并记录操作 IP。
 - 现金变动 + 审计在同一事务原子提交(改钱必留痕)。
-- 关联用户表 [user](../../../database/user.md);现金账户 [coin_account](../../../database/coin_account.md);现金流水 [cash_transaction](../../../database/cash_transaction.md)。
+- 关联用户表 [user](../database/user.md);现金账户 [coin_account](../database/coin_account.md);现金流水 [cash_transaction](../database/cash_transaction.md)。

docs/api/admin/users/admin-user-detail.md

@@ -38,15 +38,6 @@
 - `422` `user_id` 非整数
 
 ## 说明
-- 金币三项(`coin_balance` / `cash_balance_cents` / `total_coin_earned`)读 [coin_account](../../../database/coin_account.md);从未发生金币动作(账户不存在)时统一返回 0。
+- 金币三项(`coin_balance` / `cash_balance_cents` / `total_coin_earned`)读 [coin_account](../database/coin_account.md);从未发生金币动作(账户不存在)时统一返回 0。
 - 各 count 为聚合数,明细历史走带 `user_id` 过滤的分页接口(金币流水 / 现金流水 / 提现 / 比价 / 反馈)。
-- 关联用户表 [user](../../../database/user.md);金币账户 [coin_account](../../../database/coin_account.md);提现单 [withdraw_order](../../../database/withdraw_order.md);比价记录 [comparison_record](../../../database/comparison_record.md);反馈 [feedback](../../../database/feedback.md)。
-
----
-
-## 族内配套端点(提现详情页联查用)
-
-| 方法 + 路径 | 说明 |
-|---|---|
-| `GET /admin/api/users/{user_id}/reward-stats` | 用户提现/看广告统计(按时间窗口):提现审核时评估该用户金币来源是否健康 |
-| `GET /admin/api/users/{user_id}/coin-records` | 用户金币发放记录(按时间窗口分页):提现详情底部表,逐笔看发币来源 |
+- 关联用户表 [user](../database/user.md);金币账户 [coin_account](../database/coin_account.md);提现单 [withdraw_order](../database/withdraw_order.md);比价记录 [comparison_record](../database/comparison_record.md);反馈 [feedback](../database/feedback.md)。

docs/api/admin/users/admin-user-status.md

@@ -21,11 +21,5 @@
 
 ## 说明
 - 业务写(改用户状态)与审计写在同一事务原子提交:改了就有痕、有痕就真改了。
-- 写操作记审计 [admin_audit_log](../../../database/admin_audit_log.md):`action = user.status.set`,`target_type = user`,`target_id = user_id`,`detail = {before, after}`,并记录操作 IP。
-- 关联用户表 [user](../../../database/user.md)。
-
----
-
-## POST /admin/api/users/{user_id}/debug-trace — 开关调试链接权限
-- body:`{"enabled": true|false}` → 写 `user.debug_trace_enabled`(带审计 `action=user.debug_trace.set`)。
-- 开了的用户在比价完成弹窗 + 比价记录页可见「复制调试链接」按钮(trace_url);运营按用户灰度排障用。鉴权同本组(operator)。
+- 写操作记审计 [admin_audit_log](../database/admin_audit_log.md):`action = user.status.set`,`target_type = user`,`target_id = user_id`,`detail = {before, after}`,并记录操作 IP。
+- 关联用户表 [user](../database/user.md)。

docs/api/admin/withdraws/admin-withdraw-review.md

@@ -1,25 +0,0 @@
-# /admin/api/withdraws — 提现审核台(审核/批量/对账族)
-
-> 所属:Admin 子应用(前缀 `/admin/api/withdraws`) | 鉴权:读=admin,写=**finance** | 表 [withdraw_order](../../../database/withdraw_order.md) | [← 返回 API 索引](../../README.md)
->
-> 列表见 [admin-withdraws-list](./admin-withdraws-list.md);单笔查单见 [admin-withdraw-refresh](./admin-withdraw-refresh.md);超时对账见 [admin-withdraw-reconcile](./admin-withdraw-reconcile.md)。本文覆盖其余审核台端点。
-
-提现状态机:`reviewing`(发起即扣款待审)→ 通过 `pending`(微信转账在途)→ `success`/`failed`(失败退款);拒绝 `rejected`(退款)。**#121 起按 `withdraw_order.source` 分账**:退款/流水落 `cash_transaction`(coin_cash)或 `invite_cash_transaction`(invite_cash)。
-
-## 端点
-
-| 方法 + 路径 | 鉴权 | 说明 |
-|---|---|---|
-| `GET /admin/api/withdraws/summary` | admin | 审核台统计:各状态计数(待审/在途/成功/失败/拒绝) |
-| `GET /admin/api/withdraws/health-check` | finance | 提现配置健康检查(证书/密钥路径/商户配置就位与否;暴露路径故限 finance+super) |
-| `GET /admin/api/withdraws/ledger-check` | admin | **资金账本校验**(#121):按 `source` 分账核对「提现单 ↔ 流水」金额闭环,邀请奖励金提现纳入对账 |
-| `GET /admin/api/withdraws/{out_bill_no}` | admin | 提现单详情(审核台抽屉;用户维度联查另走 `users/{id}/reward-stats` + `coin-records`) |
-| `POST /admin/api/withdraws/{out_bill_no}/approve` | finance | 审核通过 → 发起微信打款(`reviewing`→`pending`→查单归一化);带审计 |
-| `POST /admin/api/withdraws/{out_bill_no}/reject` | finance | 审核拒绝 → 按 source 退款 + `rejected`;带审计 |
-| `POST /admin/api/withdraws/bulk/refresh` | finance | 批量刷新查单(勾选多笔) |
-| `POST /admin/api/withdraws/bulk/approve` | finance | 批量审核通过并打款 |
-| `POST /admin/api/withdraws/bulk/reject` | finance | 批量审核拒绝并退款 |
-
-## 说明
-- 批量接口逐单处理、逐单落审计,单笔失败不中断整批(返回逐单结果)。
-- 结果不明时先查单再定夺、绝不盲目退款(防退款后又到账),同 C 端口径。

docs/api/intent/compare-intent-recognize.md

@@ -1,13 +1,13 @@
-# POST /api/v1/intent/recognize — 外卖比价 Phase 1 意图识别（透传 + 首帧 harvest 建行）
+# POST /api/v1/intent/recognize — 外卖比价 Phase 1 意图识别（透传到 pricebot）
 
-> 所属:Compare 组（前缀 `/api/v1`,外卖比价） | 鉴权:**软鉴权 OptionalUser**（带 JWT 则绑 `user_id`,不带也放行） | [← 返回 API 索引](../README.md)
+> 所属:Compare 组（前缀 `/api/v1`,外卖比价） | 鉴权:**无（MVP 阶段不鉴权）** | [← 返回 API 索引](../README.md)
 
 ## 入参
-任意 JSON body,**不做 schema 校验**,原样透传给上游。后端从中读 `device_id`、`trace_id`、`step`、`device_info` 用于日志与落库。
+任意 JSON body,**不做 schema 校验**,原样透传给上游。后端仅从中读 `device_id`、`trace_id`、`step` 用于日志。
 客户端实际传源平台购物车页的无障碍树采集结果（pricebot 协议里的 `screens`:`cart_page_1` / `cart_page_2`）。
 
 ## 出参
-pricebot-backend 的响应**原样返回**（JSON object）,并在顶层补 `trace_id`。典型含 `result`（店名）、`calibration`（含 `source_platform_id` / `items` / `price`），客户端在 `step=0` 把它透传进 `/price/step`。
+pricebot-backend 的响应**原样返回**（JSON object）。典型含 `result`（店名）、`calibration`（含 `source_platform_id` / `items` / `price`），客户端在 `step=0` 把它透传进 `/price/step`。
 
 ## 错误码
 - `400` body 不是合法 JSON
@@ -18,7 +18,7 @@ pricebot-backend 的响应**原样返回**（JSON object）,并在顶层补 `tra
 
 外卖比价由客户端无障碍引擎在源平台（淘宝闪购 / 美团 / 京东外卖）购物车页点悬浮球触发 → 调本接口拿 `query` + `calibration` → 进入 `/price/step` 循环。
 
-**trace_id 签发 + harvest 建行(2026-07 起,`compare.py`)**:客户端首帧可不带 `trace_id`——app-server 用 uuid 签发、注入转发 body、回填响应顶层;**仅签发那帧**按 `trace_id` 建 [comparison_record](../../database/comparison_record.md) 的 `running` 行(幂等,best-effort),done / finalize 帧再补终态。**软鉴权**:带 Bearer 则记录绑 `user_id`,匿名行 `user_id` 暂空、由后续 `/compare/record` 上报补。
+⚠️ **MVP 阶段不鉴权**（同 `coupon/step`）:`device_id` 透传给 pricebot 区分设备,后端拿不到 `user_id` → 行为暂绑不到登录用户。待补 JWT,见 [待办与技术债.md](../guides/待办与技术债.md) P1。
 
 **相关配置**:
 - `PRICEBOT_BASE_URL`（默认 `http://localhost:8000`）

docs/api/intent/compare-price-step.md

@@ -1,26 +1,22 @@
-# POST /api/v1/price/step — 外卖比价 Phase 2 步进（透传 + done 帧 harvest 落库）
+# POST /api/v1/price/step — 外卖比价 Phase 2 步进（透传到 pricebot）
 
-> 所属:Compare 组（前缀 `/api/v1`,外卖比价） | 鉴权:**软鉴权 OptionalUser**（带 JWT 则绑 `user_id`,不带也放行） | [← 返回 API 索引](../README.md)
+> 所属:Compare 组（前缀 `/api/v1`,外卖比价） | 鉴权:**无（MVP 阶段不鉴权）** | [← 返回 API 索引](../README.md)
 
 ## 入参
-任意 JSON body,**不做 schema 校验**,原样透传给上游。后端从中读 `device_id`、`trace_id`、`step`、`device_info` 用于日志与落库。
+任意 JSON body,**不做 schema 校验**,原样透传给上游。后端仅从中读 `device_id`、`trace_id`、`step` 用于日志。
 客户端逐帧上报 `screen_state` + 上一步 `action_result`;`step=0` 还带 `query` + `calibration`（来自 Phase 1）。
 
 ## 出参
-pricebot-backend 的响应**原样返回**（JSON object）,并在顶层补 `trace_id`（见下「trace_id 签发」）。含 `action`（tap / set_text / launch / wait / done…）、`continue`、`status`、每帧顶层 `trace_url`;最终 `done` 帧带 `comparison_results`（源 + 各目标平台到手价,按价升序）。
+pricebot-backend 的响应**原样返回**（JSON object）。含 `action`（tap / set_text / launch / wait / done…）、`continue`、`status`;最终 `done` 帧带 `comparison_results`（源 + 各目标平台到手价,按价升序）。
 
 ## 错误码
 - `400` body 不是合法 JSON
 - `502` pricebot 上游不可达（网络错误）或返回 5xx
 
 ## 说明
-把请求体原样转发到 `PRICEBOT_BASE_URL` 的 `/api/price/step`（去掉 `/v1`,共享 httpx 单例）。**多轮循环**:客户端按返回的 `action` 操作手机、再上报下一帧,直到 `continue=false`。真正的目标驱动比价逻辑（多目标平台串行复现订单、读到手价、聚合排序）在 **pricebot-backend**。
+把请求体原样转发到 `PRICEBOT_BASE_URL` 的 `/api/price/step`（去掉 `/v1`,async httpx）。**多轮循环**:客户端按返回的 `action` 操作手机、再上报下一帧,直到 `continue=false`。真正的目标驱动比价逻辑（多目标平台串行复现订单、读到手价、聚合排序）在 **pricebot-backend**,本接口只是"透传壳"。
 
-**不再是纯透传壳(2026-07 起,`compare.py`)**:
-- **trace_id 签发**:客户端首帧可不带 `trace_id`——app-server 用 uuid 签发、注入转发 body、回填进响应顶层 `trace_id`,客户端后续帧都带它(老客户端自带则原样用)。
-- **harvest 落库**([comparison_record](../../database/comparison_record.md)):首帧(mint 时)建 `running` 行 → **done 帧** `harvest_done` 写 `success`/`failed` + 派生 `best_*`/`saved_amount_cents`。写库 best-effort(threadpool 独立 session),失败不连累透传。
-- **软鉴权**:新客户端带 Bearer → 记录绑 `user_id`;老客户端/匿名 → `user_id` 暂空,由其后续 `POST /compare/record` 上报补(灰度期两条写路径按 `trace_id` reconcile,success 不降级)。
-- 邀请发奖**不在这里**:#113 起口径为好友「比价并下单」,发放在 `POST /order/report`。
+⚠️ **MVP 阶段不鉴权**（同 `coupon/step`）。
 
 **相关配置**:
 - `PRICEBOT_BASE_URL`（默认 `http://localhost:8000`;生产部署应与 pricebot-backend 同内网——比价一单 30~80 步、逐帧多一跳,走公网延迟会累积）

docs/api/internal/internal.md

@@ -14,13 +14,12 @@
 
 | 方法 + 路径 | 落库 | 说明 |
 |---|---|---|
-| `POST /internal/price-observation` | [`price_observation`](../../database/price_observation.md) | 比价 done 帧整批价格事实上报;`(trace_id, platform, scope)` 幂等,返回 `{inserted, skipped}` |
-| `GET /internal/store-mapping/lookup` | (只读 [`store_mapping`](../../database/store_mapping.md)) | 比价前按 `source_platform`+`name`(+`lat`/`lng`)反查各目标平台已沉淀的店铺 id/deeplink;命中→pricebot 直接 deeplink 省现场搜店 |
+| `POST /internal/price-observation` | [`price_observation`](../database/price_observation.md) | 比价 done 帧整批价格事实上报;`(trace_id, platform, scope)` 幂等,返回 `{inserted, skipped}` |
+| `GET /internal/store-mapping/lookup` | (只读 [`store_mapping`](../database/store_mapping.md)) | 比价前按 `source_platform`+`name`(+`lat`/`lng`)反查各目标平台已沉淀的店铺 id/deeplink;命中→pricebot 直接 deeplink 省现场搜店 |
 | `POST /internal/store-mapping` | `store_mapping` | 跨平台「同一家店」身份映射上报;`trace_id` 幂等、填空合并,返回 `{inserted, row_id}` |
 | `POST /internal/store-mapping/invalidate` | `store_mapping` | 标记某平台 `shop_id` 的缓存 deeplink 失效(pricebot 撞错误页回退时报);当前支持 `taobao`/`jd`,其它平台 no-op,返回 `{ok, affected}` |
-| `POST /internal/launch-confirm-sample` | [`launch_confirm_sample`](../../database/launch_confirm_sample.md) | 启动确认窗 LLM 兜底放行后回写样本(host 包 + 弹窗树 + plan + locale);**都上报、不去重**,返回 `{id}` |
-| `GET /internal/launch-confirm-samples` | (只读 `launch_confirm_sample`) | 样本列表(#91,供 pricebot `distill_launch_confirm.py` 聚合沉淀回静态规则);可选筛 `exec_success` / `host_package` / `since_days`,`limit` 默认 1000 |
-| `POST /internal/app-version` | [`app_config`](../../database/app_config.md)(key=`latest_app_version`) | **发布流程**(非 pricebot)出 APK 后写最新版本号/下载链接/sha256;客户端再 `GET /api/v1/platform/app-version` 读做 OTA。也是应急改版本信息(紧急下线/改 `apk_url`)入口 |
+| `POST /internal/launch-confirm-sample` | [`launch_confirm_sample`](../database/launch_confirm_sample.md) | 启动确认窗 LLM 兜底放行后回写样本(host 包 + 弹窗树 + plan + locale);**都上报、不去重**,返回 `{id}` |
+| `POST /internal/app-version` | [`app_config`](../database/app_config.md)(key=`latest_app_version`) | **发布流程**(非 pricebot)出 APK 后写最新版本号/下载链接/sha256;客户端再 `GET /api/v1/platform/app-version` 读做 OTA。也是应急改版本信息(紧急下线/改 `apk_url`)入口 |
 
 ## 错误
 - `401` 密钥不匹配 / 缺失。

docs/api/invite/invite-bind.md

@@ -6,7 +6,7 @@
 
 ## POST /bind — 绑定邀请人
 
-把当前登录用户（被邀请人）绑定到某邀请码。支持三种归因路径：clipboard（首启读剪贴板）、manual（手动输入邀请码）、fingerprint（指纹兜底反查）。**#113 起绑定只建关系、不发奖**——发奖后置到被邀请人「比价并实际下单」（`POST /order/report` 触发，给邀请人发**邀请奖励金**，`compare_reward_granted` 幂等闸一人一次）。
+把当前登录用户（被邀请人）绑定到某邀请码。支持三种归因路径：clipboard（首启读剪贴板）、manual（手动输入邀请码）、fingerprint（指纹兜底反查）。绑定成功双方各发 1 万金币。
 
 ### 入参
 
@@ -46,14 +46,14 @@ Mock 入参（指纹兜底）:
 | 字段 | 类型 | 说明 |
 |---|---|---|
 | `status` | string | `success` / `already_bound` / `invalid_code` / `self_invite` / `not_eligible` / `fp_not_found` |
-| `coins_awarded` | int | 兼容保留字段（#113 前"绑定即发金币"口径）。**#113 起新绑定恒 0**，前端不应再据此展示发奖 |
+| `coins_awarded` | int | 本次给当前用户（被邀请人）发的金币 |
 | `message` | string | 给前端直接展示的文案 |
 
 Mock 出参:
 ```json
 {
   "status": "success",
-  "coins_awarded": 0,
+  "coins_awarded": 10000,
   "message": "邀请绑定成功"
 }
 ```

docs/api/invite/invite-invitees.md

@@ -25,8 +25,7 @@ GET /api/v1/invite/invitees?limit=5&offset=0
 | `items` | list[InviteeItem] | 被邀请人列表 |
 | `items[].display_name` | string | 显示名（昵称 → 微信昵称 → 脱敏手机号，后端已兜底） |
 | `items[].avatar_url` | string \| null | 头像 URL；null = 前端画默认色块 |
-| `items[].coins` | int | 这次邀请给邀请人发的金币（**历史留痕**：#113 前旧口径的发放额；新绑定恒 0） |
-| `items[].is_compared` | bool | 该好友是否已完成过一次比价（#113：好友列表据此分「邀请成功 / 去提醒」，在途列表只取 `false` 的） |
+| `items[].coins` | int | 这次邀请给邀请人发的金币 |
 | `items[].invited_at` | datetime | 邀请绑定时间（ISO 8601 UTC） |
 | `total` | int | 我邀请的总人数 |
 | `has_more` | bool | 还有下一页吗 |
@@ -38,15 +37,13 @@ Mock 出参:
     {
       "display_name": "省钱小王",
       "avatar_url": "/media/avatars/u2_f1e2d3c4b5a60708.jpg",
-      "coins": 0,
-      "is_compared": true,
+      "coins": 10000,
       "invited_at": "2026-06-28T14:30:00Z"
     },
     {
       "display_name": "138****1234",
       "avatar_url": null,
-      "coins": 0,
-      "is_compared": false,
+      "coins": 10000,
       "invited_at": "2026-07-01T09:15:00Z"
     }
   ],

docs/api/meituan/meituan-top-sales.md

@@ -2,21 +2,20 @@
 
 > 所属:美团 CPS 组(前缀 `/api/v1/meituan`,**全部无鉴权**) | 鉴权:无 | [← 返回 API 索引](../README.md)
 >
-> 数据来自离线库 [database/meituan_coupon](../../database/meituan_coupon.md);**不实时打美团**(美团搜索对销量排序支持差、且有 402 限流)。
+> 数据来自离线库 [database/meituan_coupon](../database/meituan_coupon.md);**不实时打美团**(美团搜索对销量排序支持差、且有 402 限流)。
 
 ## 入参
 | 字段 | 类型 | 必填 | 默认 | 说明 |
 |---|---|---|---|---|
 | `page` | int | ❌ | 1 | ≥1 |
 | `page_size` | int | ❌ | 20 | 1–50 |
-| `platform` | int \| null | ❌ | null | 1 只外卖 / 2 只到店 / 不填=全部 |
-| `longitude` / `latitude` | float \| null | ❌(实际必带) | null | 设备坐标(#116):服务端离线反查城市(`utils/geo` + `meituan_city`)→ **只返回同城券**;老客户端不带坐标 → 返空 + `status=degraded`(不 422、不误返全城) |
+| `platform` | int \| null | ❌ | null | 1 只外卖 / 2 只到店 / 不填=全部(全城销量) |
 
 ## 出参
-响应 `200`:`{ items: CouponCard[], has_next: bool, search_id: null, status: "ok"|"empty"|"degraded" }`。`CouponCard` 见 [API 索引](../README.md#复用数据结构);`status` 语义见 [feed 接口](./meituan-feed.md#status-字段前端据此显示占位)。
+响应 `200`:`{ items: CouponCard[], has_next: bool, search_id: null, status: "ok"|"empty"|"degraded" }`。`CouponCard` 见 [API 索引](./README.md#复用数据结构);`status` 语义见 [feed 接口](./meituan-feed.md#status-字段前端据此显示占位)。
 
 ## 说明
-- 从 `meituan_coupon` 取 `sale_volume_num` 非空 **且 `city_id` = 反查城市** 的券(#116,同城销量榜),`DISTINCT ON(dedup_key)` 跨源去重(每个「品牌|名|价」只留销量最高一条,同销量再按佣金),按销量降序分页;每页只对当前 ~20 条做 `from_raw` 解析(翻页快,不全表拉取)。
+- 从 `meituan_coupon` 取 `sale_volume_num` 非空的券,`DISTINCT ON(dedup_key)` 跨源去重(每个「品牌|名|价」只留销量最高一条,同销量再按佣金),按销量降序分页;每页只对当前 ~20 条做 `from_raw` 解析(翻页快,不全表拉取)。
 - **不依赖 MT 凭证**(纯库查询)。库为空(prod 刚部署 / ETL 未跑完)→ `status=empty`;库查询异常 → `status=degraded`。均返 `200`、不抛 5xx。
 - **仅 PostgreSQL**(`DISTINCT ON` 为 PG 专用)。
 

docs/api/notifications.md

@@ -1,132 +0,0 @@
-# 消息通知中心(notifications 族)
-
-> 所属:notifications 组(前缀 `/api/v1/notifications`,源 `app/api/v1/notifications.py`) | 鉴权:**全部 Bearer**(消息按用户隔离) | [← 返回 API 索引](./README.md)
->
-> 对应 PRD《消息通知中心》(通知类型清单 / 点击跳转 / 字段元素 / 未读红点 / Push 文案)。
-> Push 侧(厂商直推 + 测试)见 [push-vendor-test.md](./push-vendor-test.md)。
->
-> **数据落库**:消息存 `notification` 表(`app/repositories/notification.py`,按用户隔离,`sentAt` 倒序)。业务事件统一走 `app/services/notification_events.py` 下发(站内消息 + 厂商 push 一条链路,业务事务 commit 后触发、失败只 log 不影响业务)。**已接入 6 类真实触发**:
->
-> | type | 触发点 |
-> |---|---|
-> | `withdraw_success` | 提现单转账到账(免确认直达 / 查单归一化 / 对账兜底,`repositories/wallet.py`) |
-> | `withdraw_failed` | 提现退款收口 `_refund_withdraw`(微信侧失败、审核拒绝、解绑退回) |
-> | `feedback_reply` | admin 反馈审核「拒绝」(原因/留言用户可见,`admin/routers/feedback.py`) |
-> | `feedback_reward` | admin 反馈审核「采纳」发金币(必带官方留言) |
-> | `report_approved` | admin 上报更低价「通过」发金币(`admin/routers/price_report.py`) |
-> | `invite_order_reward` | 被邀请好友首次成功比价 → 邀请人发 2 元(`repositories/invite.try_reward_on_compare`) |
->
-> 其余类型(奖励过期 ×2、权限异常 ×4、好友催单)业务侧尚未接入。要造联调数据,用 [POST /api/v1/push/test](./push-vendor-test.md) 的 `createNotification:true` 逐条插入。
->
-> ⚠️ **字段命名**:本组接口(含 push 测试组)对外为 **camelCase**(`sentAt` / `isRead` / `pageSize`…),与库内其他 snake_case 接口不同——按 PRD 前端契约对接,勿混用。
-
-## 通知类型速查(13 种)
-
-列表**服务端已排好序:全列表按时间倒序**(最新在前,**不做分类分组**——PRD §1 的"按分类分组"为笔误,2026-07-14 需求方确认取消),前端按返回顺序渲染即可。category 仅用于卡片头部的分类标签展示。
-
-| category | 分类标签 | type | 类型 | cardStyle 版式 | actionText 操作行 | extra 里带什么 |
-|---|---|---|---|---|---|---|
-| withdraw_assistant | 提现助手 | `reward_expiring` | 金币现金奖励即将失效 | dual_amount 双金额卡 | 立即激活您的收益 | `batchId` |
-| withdraw_assistant | 提现助手 | `reward_expired` | 金币现金奖励已失效 | dual_amount 双金额卡 | 立即赚取新收益 | — |
-| withdraw_assistant | 提现助手 | `withdraw_success` | 提现成功 | withdraw 提现卡 | **null(无操作行,点击仅消红点)** | — |
-| withdraw_assistant | 提现助手 | `withdraw_failed` | 提现失败,款项已退回 | withdraw 提现卡 | 重新提现 | `withdrawId` |
-| system | 系统通知 | `perm_accessibility` | 比价功能异常(无障碍) | plain_text 纯文本卡 | 去开启 | `permission:"accessibility"` |
-| system | 系统通知 | `perm_battery` | 比价续航保护异常(省电策略) | plain_text 纯文本卡 | 去开启 | `permission:"battery"` |
-| system | 系统通知 | `perm_autostart` | 比价启动保护异常(自启动) | plain_text 纯文本卡 | 去开启 | `permission:"autostart"` |
-| system | 系统通知 | `perm_overlay` | 比价按钮异常(悬浮窗) | plain_text 纯文本卡 | 去开启 | `permission:"overlay"` |
-| feedback | 我的反馈 | `feedback_reply` | 官方回复 | plain_text 纯文本卡 | 查看详情 | `feedbackId` |
-| feedback | 我的反馈 | `feedback_reward` | 反馈奖励(必带官方留言行) | coin_reward 金币奖励卡 | 查看反馈详情 | `feedbackId` |
-| report | 我的爆料 | `report_approved` | 爆料审核通过 | coin_reward 金币奖励卡 | 查看爆料详情 | `reportId` |
-| invite | 好友邀请 | `invite_order_reward` | 好友下单奖励到账 | friend_cash 好友现金卡 | 邀请更多好友赚现金 | `inviteeNickname` |
-| invite | 好友邀请 | `invite_remind` | 好友催单提醒 | plain_text 纯文本卡 | 去提醒 TA | `inviteeNickname`, `scrollTo:"remind"` |
-
-点击跳转逻辑按 PRD §2 由客户端按 `type` 分发;点击目标 = 整张卡片(不区分主体和操作行),任何点击都先调 `POST /read` 消该条红点。
-
-## GET /api/v1/notifications — 消息列表(分页)
-
-**入参(query)**
-
-| 参数 | 类型 | 必填 | 说明 |
-|---|---|---|---|
-| `page` | int | ❌ | 页码,1 起,默认 1 |
-| `pageSize` | int | ❌ | 每页条数,默认 20,最大 100 |
-
-**出参**
-
-```jsonc
-{
-  "items": [
-    {
-      "id": 90001,
-      "category": "withdraw_assistant",   // 分类 key(5 种,见上表)
-      "categoryLabel": "提现助手",         // 卡片头部左上角分类标签
-      "type": "reward_expiring",          // 类型 key(13 种,决定点击行为)
-      "cardStyle": "dual_amount",         // 版式:dual_amount/withdraw/plain_text/coin_reward/friend_cash
-      "title": "金币现金奖励即将失效",      // 卡片标题
-      "coins": 86,                        // 金币数,整数;无金币的版式为 null
-      "cashCents": 1280,                  // 现金金额(分);无现金的版式为 null
-      "cashYuan": "12.80",                // 现金展示串(元,两位小数),与 cashCents 同源
-      "infoRows": [                       // 信息行,已按 PRD 拼好文案,逐行 label: value 渲染
-        { "label": "过期说明", "value": "您有86金币和12.80元现金即将失效，完成一次一键领券或一键比价即可激活收益" },
-        { "label": "过期时间", "value": "3天后失效" }
-      ],
-      "actionText": "立即激活您的收益",    // 操作行;null = 无操作行(提现成功卡)
-      "extra": { "batchId": "batch_20260714" },  // 跳转/联动参数,按 type 取用(见上表)
-      "sentAt": "2026-07-14T14:59:58+08:00",     // ISO8601 带时区
-      "isRead": false                     // false → 分类标签右侧显示 6px 红点(#E53935)
-    }
-  ],
-  "page": 1,
-  "pageSize": 20,
-  "total": 16,
-  "hasMore": false,
-  "unreadCount": 12    // 与 /unread-count 同口径,进页面可顺手刷角标
-}
-```
-
-**时间显示规则(前端处理 `sentAt`)**:今天 →「今天」;昨天 →「昨天」;当年 →「M月D日」(不补零);跨年 →「YYYY年M月D日」。`sentAt` 恒带 +08:00(服务端已归一,与库底层用 SQLite/PostgreSQL 无关)。
-
-**数值约束(PRD §3)**:金币整数不带小数;现金/提现金额两位小数(直接用 `cashYuan`)。
-
-## GET /api/v1/notifications/unread-count — 未读总数(首页铃铛角标)
-
-无入参。**出参**:
-
-```jsonc
-{ "count": 12, "badgeText": "12" }   // count>99 时 badgeText="99+";count=0 时 badgeText=null → 整个角标隐藏
-```
-
-刷新时机(PRD §4):进入首页时、从通知中心/其他页面返回首页时(原型监听 `pageshow`)。
-
-## POST /api/v1/notifications/read — 标记已读
-
-**入参(JSON),两种模式二选一(同时传时 `all` 优先)**
-
-| 模式 | body | 使用场景 |
-|---|---|---|
-| 单条/多条 | `{ "ids": [90001, 90003] }` | ① 点击某张消息卡片(点击后无论跳转/弹窗/无动作都算已读);② 用户点击 push 直达落地页后,客户端拿 push extras 里的 `notificationId` 同步置读 |
-| 全量清零 | `{ "all": true }` | 进入通知中心自动清零(只浏览列表就消红点,无需逐条点击;退出通知中心时也可再调一次兜底) |
-
-**出参**
-
-```jsonc
-{ "ok": true, "markedCount": 2, "unreadCount": 10 }   // unreadCount = 处理后剩余未读,可直接刷新角标
-```
-
-幂等:不存在/已读的 id 忽略,重复调用 `markedCount=0` 不报错。
-
-**错误**:`400` ids 与 all 都没传(或 ids 为空数组);`401` 未鉴权。
-
-## 联调小抄
-
-```bash
-# 1. 登录拿 token(SMS mock:任意手机号 + 任意 6 位验证码)
-curl -X POST :8770/api/v1/auth/sms/send  -d '{"phone":"13800001234"}'
-curl -X POST :8770/api/v1/auth/sms/login -d '{"phone":"13800001234","code":"123456"}'
-# 2. 列表 / 角标 / 置读
-curl ":8770/api/v1/notifications?page=1&pageSize=20" -H "Authorization: Bearer $TOKEN"
-curl ":8770/api/v1/notifications/unread-count"        -H "Authorization: Bearer $TOKEN"
-curl -X POST ":8770/api/v1/notifications/read" -d '{"all":true}' -H "Authorization: Bearer $TOKEN"
-```
-
-列表初始为空,登录后先用 [POST /api/v1/push/test](./push-vendor-test.md) 的 `createNotification:true` 插几条(可指定 `type` 覆盖不同版式),再验列表 / 角标 / 置读全流程;它同时把 `notificationId` 放进 push extras,可闭环验证「push → 站内已读联动」。