接入厂商直推服务端并补充推送验收接口

- 新增荣耀、vivo、小米、OPPO 服务端推送分发 - 设备注册和心跳支持 push_vendor/push_token - 增加 /api/v1/device/push-test 延迟验收接口 - 补充数据库迁移、配置示例和厂商推送测试 - 保留本分支已有微信登录联调改动验证：python -m pytest tests/test_device_push.py tests/test_auth.py tests/test_health.py
fix: 修复美团订单时间入库并校准金币大盘口径
2026-07-02 22:44:58 +08:00 · 2026-07-01 14:56:22 +08:00 · 2026-06-30 19:49:49 +08:00 · 2026-06-30 15:50:32 +08:00 · 2026-06-28 17:25:25 +08:00
65 changed files with 1419 additions and 2064 deletions
@@ -18,7 +18,7 @@ JWT_ACCESS_TOKEN_EXPIRE_MINUTES=120
 # refresh token 有效期(天),默认 30 天
 JWT_REFRESH_TOKEN_EXPIRE_DAYS=30

-# ===== 极光一键登录 =====
+# ===== 极光一键登录 / 短信 =====
 # 控制台 → 应用设置 → 应用信息 拿到
 JG_APP_KEY=
 JG_MASTER_SECRET=
@@ -27,7 +27,43 @@ JG_PRIVATE_KEY_PATH=./secrets/jverify_rsa_private.pem
 JG_VERIFY_ENDPOINT=https://api.verification.jpush.cn/v1/web/loginTokenVerify
 JG_REQUEST_TIMEOUT_SEC=15

-# ===== 无障碍保护存活监控(pull 后置检测;本期不接推送)=====
+# ===== 厂商直推(无障碍保护存活告警)=====
+# 敏感密钥只放 .env / 服务器环境变量,不要提交到 git。
+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
+
+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
+
+# ===== 无障碍保护存活监控(推送 + pull 后置兜底)=====
 HEARTBEAT_MONITOR_ENABLED=true
 HEARTBEAT_TIMEOUT_MINUTES=10
 HEARTBEAT_SCAN_INTERVAL_SEC=60
@@ -89,8 +125,9 @@ INTERNAL_API_SECRET=
 # 逗号分隔,生产留空(只让 app 调,不开放 web)。本地开发可加 http://localhost:5173 之类
 CORS_ALLOW_ORIGINS=

-# ===== 微信支付(商家转账到零钱 / 提现)=====
-# appid/secret 来自微信开放平台移动应用;mch/序列号/公钥ID 来自微信支付商户平台。
+# ===== 微信开放平台 App + 微信支付(登录 / 商家转账到零钱 / 提现)=====
+# WECHAT_APP_ID/WECHAT_APP_SECRET 来自微信开放平台移动应用,用于 App 微信一键登录(code 换 openid)。
+# mch/序列号/公钥ID 来自微信支付商户平台,仅提现/转账需要。
 # 证书 .pem 放 secrets/(已 gitignore)。
 WECHAT_APP_ID=wxxxxxxxxxxxxxxxxx
 WECHAT_APP_SECRET=your_app_secret
@@ -124,16 +161,3 @@ PANGLE_REWARD_SECRET=
 # ⚠️ 仅本地联调:true 时开放 POST /api/v1/ad/test-grant,让 debug 客户端看完广告直接发奖,
 # 验证"看广告→金币到账"全链路(未部署公网、穿山甲 S2S 打不到本地时用)。生产必须 false(绕过反作弊)。
 AD_REWARD_TEST_GRANT_ENABLED=false
-
-# ===== 穿山甲 GroMore 数据 API(按天拉收益报表,供后台广告收益报表的「穿山甲后台收益」)=====
-# ⚠️ 与上面发奖回调的 m-key 是【两套不同凭证】:这三样在穿山甲后台「接入中心 → GroMore-API →
-# 聚合数据报告 API」文档页领取。只读拉取 GroMore 天级 revenue(预估)/ api_revenue(收益Api),
-# 不参与发奖。三样齐全才生效;留空 = scripts/sync_pangle_revenue 直接 no-op。
-# 子账号(role_id≠user_id)需主账号在「角色管理」授予「查看全部数据」权限,否则查不到收益(接口 118);
-# role_id 填成 = user_id 即查主账号数据。同步:线上每天 ~10:30 由 timer 跑 python -m scripts.sync_pangle_revenue。
-PANGLE_REPORT_USER_ID=0
-PANGLE_REPORT_ROLE_ID=0
-PANGLE_REPORT_SECURITY_KEY=
-# GroMore AppId(报表 site_id 维度)→ 应用环境;默认取现网两个应用,按需覆盖。
-PANGLE_REPORT_SITE_ID_PROD=5830519
-PANGLE_REPORT_SITE_ID_TEST=5832303
@@ -23,17 +23,14 @@ dist/
 *.db-journal
 *.db-shm
 *.db-wal
-# data/ 整体不入库(运行时数据/上传文件/大二进制)。例外:邀请落地页 dl.html 及其
-# 引用的静态插画(coupon-page-bg.png 底图 + sb-brand.png logo)——既是生产落地页资产
-# 又是本地测试资产,纳入 git 便于同事一致测试、且随部署进生产 /media(否则线上 404→落地页毛坯)。
+# data/ 整体不入库(运行时数据/上传文件/大二进制)。例外:邀请落地页 dl.html——
+# 它既是生产落地页又是本地测试资产,纳入 git 便于同事一致测试
 # (见 docs/邀请功能-实现原理与本地测试.md)。其余(avatars/ / *.apk / app.db 等)仍忽略。
 data/*
 !data/media/
 data/media/*
 !data/media/dl.html
 !data/media/taobao_landing.jpg
-!data/media/coupon-page-bg.png
-!data/media/sb-brand.png

 secrets/*
 !secrets/.gitkeep
@@ -1,63 +0,0 @@
-"""ad_pangle_daily_revenue: 穿山甲 GroMore 天级收益报表(后台结算口径)
-
-新建表存放从 GroMore 数据 API 按天拉取的收益(revenue 预估 + api_revenue 收益Api),
-粒度 = 日期 × 应用(app_env) × 代码位(our_code_id) × 广告源(adn)。供广告收益报表的
-汇总/趋势级展示「穿山甲后台收益」,与客户端自报 eCPM 折算的预估互为对照。
-
-Revision ID: ad_pangle_daily_revenue
-Revises: 7db22acee504
-Create Date: 2026-06-28
-"""
-
-from __future__ import annotations
-
-from alembic import op
-import sqlalchemy as sa
-
-
-revision = "ad_pangle_daily_revenue"
-down_revision = "7db22acee504"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    op.create_table(
-        "ad_pangle_daily_revenue",
-        sa.Column("id", sa.Integer(), primary_key=True, autoincrement=True),
-        sa.Column("report_date", sa.String(length=10), nullable=False),
-        sa.Column("app_env", sa.String(length=16), nullable=False),
-        sa.Column("site_id", sa.String(length=32), nullable=True),
-        sa.Column("our_code_id", sa.String(length=64), nullable=False),
-        sa.Column("adn", sa.String(length=16), nullable=False, server_default=""),
-        sa.Column("revenue_yuan", sa.Float(), nullable=False, server_default="0"),
-        sa.Column("api_revenue_yuan", sa.Float(), nullable=True),
-        sa.Column("ecpm", sa.String(length=32), nullable=True),
-        sa.Column("impressions", sa.Integer(), nullable=False, server_default="0"),
-        sa.Column("currency", sa.String(length=8), nullable=False, server_default="cny"),
-        sa.Column(
-            "synced_at",
-            sa.DateTime(timezone=True),
-            server_default=sa.func.now(),
-            nullable=False,
-        ),
-        sa.UniqueConstraint(
-            "report_date", "app_env", "our_code_id", "adn", name="uq_ad_pangle_daily"
-        ),
-    )
-    op.create_index(
-        "ix_ad_pangle_daily_revenue_report_date",
-        "ad_pangle_daily_revenue",
-        ["report_date"],
-    )
-    op.create_index(
-        "ix_ad_pangle_daily_revenue_our_code_id",
-        "ad_pangle_daily_revenue",
-        ["our_code_id"],
-    )
-
-
-def downgrade() -> None:
-    op.drop_index("ix_ad_pangle_daily_revenue_our_code_id", table_name="ad_pangle_daily_revenue")
-    op.drop_index("ix_ad_pangle_daily_revenue_report_date", table_name="ad_pangle_daily_revenue")
-    op.drop_table("ad_pangle_daily_revenue")
@@ -1,32 +0,0 @@
-"""coupon_session 加 origin_package 列(发起来源 App 包名 → admin「发起平台」)
-
-null=App 内(傻瓜比价首页)发起,非空=从美团/淘宝/京东弹券发起。与 trace_url 同理单独成迁移,
-已建表环境靠它补列、全新环境顺序应用,不重复加列。
-
-Revision ID: coupon_session_origin_package
-Revises: coupon_session_trace_url
-Create Date: 2026-06-30 00:00:00.000000
-
-"""
-
-from collections.abc import Sequence
-
-import sqlalchemy as sa
-
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision: str = "coupon_session_origin_package"
-down_revision: str | Sequence[str] | None = "coupon_session_trace_url"
-branch_labels: str | Sequence[str] | None = None
-depends_on: str | Sequence[str] | None = None
-
-
-def upgrade() -> None:
-    with op.batch_alter_table("coupon_session", schema=None) as batch_op:
-        batch_op.add_column(sa.Column("origin_package", sa.String(length=64), nullable=True))
-
-
-def downgrade() -> None:
-    with op.batch_alter_table("coupon_session", schema=None) as batch_op:
-        batch_op.drop_column("origin_package")
@@ -1,81 +0,0 @@
-"""coupon session table(领券任务全程流水 → admin「领券数据」看板数据源)
-
-一次领券一行(trace_id 唯一):客户端 POST /api/v1/coupon/session 两段上报 —— 发起建行
-(status=started)、收尾(completed/failed/abandoned)按 trace_id 更新同一行。记全程耗时
-elapsed_ms + 各平台耗时 platform_elapsed + 机型/ROM,供 admin 算发起/完成数、耗时分位、机型维度。
-
-Revision ID: coupon_session_table
-Revises: feedback_submit_env
-Create Date: 2026-06-30 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_table"
-down_revision: str | Sequence[str] | None = "feedback_submit_env"
-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:
-    op.create_table(
-        "coupon_session",
-        sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
-        sa.Column("trace_id", sa.String(length=64), nullable=False),
-        sa.Column("device_id", sa.String(length=64), nullable=False),
-        sa.Column("user_id", sa.Integer(), nullable=True),
-        sa.Column("status", sa.String(length=16), nullable=False),
-        sa.Column("app_env", sa.String(length=16), nullable=True),
-        sa.Column("platforms", _JSON, nullable=True),
-        sa.Column("device_model", sa.String(length=128), nullable=True),
-        sa.Column("rom", sa.String(length=64), nullable=True),
-        sa.Column("started_at", sa.DateTime(timezone=True), nullable=False),
-        sa.Column("started_date", sa.Date(), nullable=False),
-        sa.Column("finished_at", sa.DateTime(timezone=True), nullable=True),
-        sa.Column("elapsed_ms", sa.Integer(), nullable=True),
-        sa.Column("platform_elapsed", _JSON, nullable=True),
-        sa.Column("claimed_count", sa.Integer(), nullable=True),
-        sa.Column(
-            "created_at",
-            sa.DateTime(timezone=True),
-            server_default=sa.text("(CURRENT_TIMESTAMP)"),
-            nullable=False,
-        ),
-        sa.Column(
-            "updated_at",
-            sa.DateTime(timezone=True),
-            server_default=sa.text("(CURRENT_TIMESTAMP)"),
-            nullable=False,
-        ),
-        sa.PrimaryKeyConstraint("id"),
-        sa.UniqueConstraint("trace_id", name="uq_coupon_session_trace"),
-    )
-    with op.batch_alter_table("coupon_session", schema=None) as batch_op:
-        batch_op.create_index(
-            batch_op.f("ix_coupon_session_user_id"), ["user_id"], unique=False
-        )
-        batch_op.create_index(
-            batch_op.f("ix_coupon_session_app_env"), ["app_env"], unique=False
-        )
-        # admin 主聚合/筛选:按上海自然日 + 环境。
-        batch_op.create_index(
-            "ix_coupon_session_date_env", ["started_date", "app_env"], unique=False
-        )
-
-
-def downgrade() -> None:
-    with op.batch_alter_table("coupon_session", schema=None) as batch_op:
-        batch_op.drop_index("ix_coupon_session_date_env")
-        batch_op.drop_index(batch_op.f("ix_coupon_session_app_env"))
-        batch_op.drop_index(batch_op.f("ix_coupon_session_user_id"))
-    op.drop_table("coupon_session")
@@ -1,32 +0,0 @@
-"""coupon_session 加 trace_url 列(pricebot done 帧公网调试链接)
-
-建表迁移 coupon_session_table 落地后才追加本列,故单独成一个迁移:已建表的环境(本地/已 upgrade 过)
-靠它补列,全新环境则「建表(无 trace_url)→ 本迁移加列」,两条路一致、不重复加列。
-
-Revision ID: coupon_session_trace_url
-Revises: coupon_session_table
-Create Date: 2026-06-30 00:00:00.000000
-
-"""
-
-from collections.abc import Sequence
-
-import sqlalchemy as sa
-
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision: str = "coupon_session_trace_url"
-down_revision: str | Sequence[str] | None = "coupon_session_table"
-branch_labels: str | Sequence[str] | None = None
-depends_on: str | Sequence[str] | None = None
-
-
-def upgrade() -> None:
-    with op.batch_alter_table("coupon_session", schema=None) as batch_op:
-        batch_op.add_column(sa.Column("trace_url", sa.String(length=512), nullable=True))
-
-
-def downgrade() -> None:
-    with op.batch_alter_table("coupon_session", schema=None) as batch_op:
-        batch_op.drop_column("trace_url")
@@ -0,0 +1,30 @@
+"""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")
@@ -1,34 +0,0 @@
-"""feedback 加提交端环境快照(app_version / device_model / rom_name / android_version)
-
-Revision ID: feedback_submit_env
-Revises: ad_pangle_daily_revenue
-Create Date: 2026-06-29 00:00:00.000000
-
-admin 用户反馈页要展示「提交版本号」「机型OS版本」,需在提交时落库端环境。仅新增可空列,
-SQLite 原生支持 add_column、不用 batch;downgrade 的 drop_column 在 SQLite 走 batch 兜底。
-历史反馈无此快照 → 留 NULL(无法回填);客户端改版带上后的新反馈才有值。
-"""
-from typing import Sequence, Union
-
-import sqlalchemy as sa
-from alembic import op
-
-revision: str = "feedback_submit_env"
-down_revision: Union[str, Sequence[str], None] = "ad_pangle_daily_revenue"
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    op.add_column("feedback", sa.Column("app_version", sa.String(length=32), nullable=True))
-    op.add_column("feedback", sa.Column("device_model", sa.String(length=64), nullable=True))
-    op.add_column("feedback", sa.Column("rom_name", sa.String(length=32), nullable=True))
-    op.add_column("feedback", sa.Column("android_version", sa.String(length=16), nullable=True))
-
-
-def downgrade() -> None:
-    with op.batch_alter_table("feedback") as batch_op:
-        batch_op.drop_column("android_version")
-        batch_op.drop_column("rom_name")
-        batch_op.drop_column("device_model")
-        batch_op.drop_column("app_version")
@@ -21,7 +21,6 @@ from app.admin.routers.audit import router as audit_router
 from app.admin.routers.auth import router as auth_router
 from app.admin.routers.comparison import router as comparison_router
 from app.admin.routers.config import router as config_router
-from app.admin.routers.coupon_data import router as coupon_data_router
 from app.admin.routers.cps import router as cps_router
 from app.admin.routers.dashboard import router as dashboard_router
 from app.admin.routers.device_liveness import router as device_liveness_router
@@ -102,7 +101,6 @@ admin_app.include_router(audit_router)
 admin_app.include_router(config_router)
 admin_app.include_router(comparison_router)
 admin_app.include_router(cps_router)
-admin_app.include_router(coupon_data_router)
 admin_app.include_router(ad_audit_router)
 admin_app.include_router(ad_config_router)
 admin_app.include_router(ad_revenue_router)
@@ -20,7 +20,7 @@ report_date / reward_date 归日。
 """
 from __future__ import annotations

-from datetime import UTC, datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from datetime import date as _date

 from sqlalchemy import select
@@ -31,13 +31,12 @@ from app.admin.repositories import stats as admin_stats
 from app.core import rewards
 from app.models.ad_ecpm import AdEcpmRecord
 from app.models.user import User
-from app.repositories import ad_pangle_revenue


 def _cn_hour(dt: datetime) -> int:
    """created_at(UTC 口径)→ 北京时间小时(0–23)。naive 当 UTC 处理(sqlite),tz-aware 直接换算(pg)。"""
    if dt.tzinfo is None:
-        dt = dt.replace(tzinfo=UTC)
+        dt = dt.replace(tzinfo=timezone.utc)
    return dt.astimezone(rewards.CN_TZ).hour


@@ -87,7 +86,6 @@ def ad_revenue_report(
    user_id: int | None = None,
    ad_type: str | None = None,
    feed_scene: str | None = None,
-    app_env: str | None = None,
    granularity: str = "day",
    limit: int = 500,
    offset: int = 0,
@@ -157,12 +155,8 @@ def ad_revenue_report(
            "has_impression": True,
            "impressions": 1,
            "ecpm": rec.ecpm_raw,
-            # 单次展示收益(元)= eCPM元 ÷ 1000(每千次→单次)。eCPM 先钳到 AD_ECPM_MAX_FEN(¥500 CPM)
-            # 再折收益,与发奖口径 [rewards.calculate_ad_reward_coin] 一致(2026-06-29 修:原裸 parse_ecpm_yuan
-            # 不钳,伪造/异常天价 eCPM 会把报表预估收益冲到任意大;金币侧已钳、收益侧漏钳)。
-            "revenue_yuan": round(
-                min(rewards.parse_ecpm_yuan(rec.ecpm_raw), rewards.AD_ECPM_MAX_FEN / 100.0) / 1000.0, 6,
-            ),
+            # 单次展示收益(元)= eCPM元 ÷ 1000(每千次→单次);与发奖同源解析,口径一致。
+            "revenue_yuan": round(rewards.parse_ecpm_yuan(rec.ecpm_raw) / 1000.0, 6),
            "adn": rec.adn,
            "slot_id": rec.slot_id,
        }
@@ -218,14 +212,6 @@ def ad_revenue_report(
    if feed_scene is not None:
        events = [e for e in events if e.get("feed_scene") == feed_scene]

-    # app_env 过滤(2026-06-29 新增能力,修隐患:测试应用上报的假 eCPM 如 ¥678 CPM 会污染正式收益合计/平均):
-    # 显式传 "prod"/"test" 只看该环境;不传=全部(维持现状)。**不擅自把默认改成排除 test**——本地 dev 库多为
-    # test 数据、默认排除会使本地报表空,且「正式报表是否含 test」属产品口径。建议前端报表页加 app_env 筛选器
-    # (默认选 prod),或产品确认后再把默认改成排除 test。注:穿山甲后台收益列(total_pangle_*)暂未联动此过滤
-    # (它是独立对照列,且 pangle 的 test 是真实小额、非客户端那种假值)。
-    if app_env is not None:
-        events = [e for e in events if e.get("app_env") == app_env]
-
    # 排序:time=按时间倒序(新→旧);ecpm=按 eCPM 数值倒序(eCPM 原值是字符串「分」,转数值排;
    # 纯发奖行用其发奖采用的 eCPM,缺失/非法计 0 排末尾)。
    if sort == "ecpm":
@@ -269,25 +255,6 @@ def ad_revenue_report(
        for d in sorted(daily_map.values(), key=lambda x: x["date"])
    ]

-    # 穿山甲后台收益(GroMore 数据 API,T+1 入库 ad_pangle_daily_revenue):汇总 + 按天趋势级展示,
-    # 与上面客户端自报 eCPM 折算的预估并列对照(看 gap)。穿山甲数据**无用户/场景/类型维度**,故仅在
-    # 「全量视图」(未按 user_id / ad_type / feed_scene 过滤)给值;一旦带这些过滤,穿山甲数无法对应口径
-    # → 置 None,前端显示「-」并提示。逐条事件行不动(仍是客户端预估)。
-    pangle_filterable = user_id is None and ad_type is None and feed_scene is None
-    total_pangle_revenue_yuan: float | None = None
-    total_pangle_api_revenue_yuan: float | None = None
-    if pangle_filterable:
-        pangle_aggs = ad_pangle_revenue.aggregate_by_date(db, date_from=date_from, date_to=date_to)
-        if pangle_aggs:
-            by_date = {a["date"]: a for a in pangle_aggs}
-            for d in daily:
-                pa = by_date.get(d["date"])
-                d["pangle_revenue_yuan"] = pa["revenue_yuan"] if pa else None
-                d["pangle_api_revenue_yuan"] = pa["api_revenue_yuan"] if pa else None
-            total_pangle_revenue_yuan = round(sum(a["revenue_yuan"] for a in pangle_aggs), 6)
-            api_vals = [a["api_revenue_yuan"] for a in pangle_aggs if a["api_revenue_yuan"] is not None]
-            total_pangle_api_revenue_yuan = round(sum(api_vals), 6) if api_vals else None
-
    # 按小时汇总(全量,不受分页 limit/offset 影响):供前端按小时趋势图(单日 granularity=hour 时用)。
    # 只在 by_hour 下聚合(此时每个 event 带 hour);否则空。前端按天趋势仍用 daily。
    hourly: list[dict] = []
@@ -336,10 +303,6 @@ def ad_revenue_report(
        "truncated": len(events) > offset + limit,
        "total_impressions": total_impressions,
        "total_revenue_yuan": total_revenue_yuan,
-        # 穿山甲后台收益合计(元):预估 revenue + 收益Api;非全量视图(带 user/类型/场景过滤)或无数据为 None。
-        "total_pangle_revenue_yuan": total_pangle_revenue_yuan,
-        "total_pangle_api_revenue_yuan": total_pangle_api_revenue_yuan,
-        "pangle_revenue_available": total_pangle_revenue_yuan is not None,
        "total_expected_coin": total_expected_coin,
        "total_actual_coin": total_actual_coin,
        "mismatch_count": mismatch_count,
@@ -1,225 +0,0 @@
-"""admin「领券数据」看板聚合:发起/完成数、耗时均值与分位、按天/小时趋势、逐条明细。
-
-数据源 coupon_session(一次领券一行,客户端 /api/v1/coupon/session 两段上报)。量级不大,全量拉
-区间数据后 Python 聚合(分位 SQLite 无 percentile,统一 Python 算,PG 上也一致)。
- 发起数 = 区间内全部 session(含 started/completed/failed/abandoned),= 流失统计的基数。
- 完成数 / 耗时均值 / 分位 = 仅 status==completed 子集(成功跑完才有可比的"领券耗时")。
- summary/daily/hourly/total 在全量上算,不受分页;items 为排序后当前页。
-"""
-from __future__ import annotations
-
-from datetime import UTC, date as _date, datetime
-
-from sqlalchemy import func, or_, select
-from sqlalchemy.orm import Session
-
-from app.core import rewards
-from app.models.coupon_state import CouponSession
-from app.models.user import User
-
-
-def _cn_hour(dt: datetime) -> int:
-    """started_at(UTC 口径)→ 北京时间小时(0–23)。naive 当 UTC(sqlite),tz-aware 直接换算(pg)。"""
-    if dt.tzinfo is None:
-        dt = dt.replace(tzinfo=UTC)
-    return dt.astimezone(rewards.CN_TZ).hour
-
-
-def _percentile(sorted_vals: list[int], q: float) -> int | None:
-    """线性插值分位(q=0..100,numpy 默认法)。sorted_vals 须已升序;空返回 None。"""
-    if not sorted_vals:
-        return None
-    if len(sorted_vals) == 1:
-        return sorted_vals[0]
-    idx = (len(sorted_vals) - 1) * q / 100.0
-    lo = int(idx)
-    hi = min(lo + 1, len(sorted_vals) - 1)
-    frac = idx - lo
-    return round(sorted_vals[lo] * (1 - frac) + sorted_vals[hi] * frac)
-
-
-def _avg(vals: list[int]) -> int | None:
-    return round(sum(vals) / len(vals)) if vals else None
-
-
-def _session_to_row(r, phone: str | None = None, nickname: str | None = None) -> dict:
-    """CouponSession ORM → 明细行 dict(主表「领券数据」与「用户全部领券」抽屉共用)。"""
-    return {
-        "id": r.id,
-        "trace_id": r.trace_id,
-        "user_id": r.user_id,
-        "user_phone": phone,
-        "user_nickname": nickname,
-        "status": r.status,
-        "platforms": r.platforms,
-        "origin_package": r.origin_package,
-        "elapsed_ms": r.elapsed_ms,
-        "platform_elapsed": r.platform_elapsed,
-        "device_model": r.device_model,
-        "rom": r.rom,
-        "app_env": r.app_env,
-        "started_at": r.started_at,
-        "claimed_count": r.claimed_count,
-        "trace_url": r.trace_url,
-    }
-
-
-def _empty_result() -> dict:
-    return {
-        "summary": {
-            "started_count": 0, "completed_count": 0, "avg_elapsed_ms": None,
-            "p5_ms": None, "p50_ms": None, "p95_ms": None, "p99_ms": None,
-        },
-        "daily": [],
-        "hourly": [],
-        "total": 0,
-        "items": [],
-    }
-
-
-def coupon_data_report(
-    db: Session,
-    *,
-    date_from: str,
-    date_to: str,
-    user: str | None = None,
-    app_env: str | None = None,
-    granularity: str = "day",
-    limit: int = 500,
-    offset: int = 0,
-    sort: str = "time",
-) -> dict:
-    """日期区间(北京自然日 started_date,闭区间)领券数据:汇总卡 + 趋势 + 逐条明细。
-
-    - user:手机号/昵称模糊搜(匹配不到任何用户 → 空结果)。
-    - app_env:prod/dev 精确;None=全部。
-    - sort:time=发起时刻倒序(默认) / elapsed=全程耗时倒序(None 末尾)。
-    """
-    by_hour = granularity == "hour"
-    d_from = _date.fromisoformat(date_from)
-    d_to = _date.fromisoformat(date_to)
-
-    # user 模糊 → 先定位匹配用户 id;匹配不到直接空结果(不全表扫)。
-    user_ids: set[int] | None = None
-    if user:
-        like = f"%{user}%"
-        user_ids = set(db.execute(
-            select(User.id).where(or_(User.phone.like(like), User.nickname.like(like)))
-        ).scalars().all())
-        if not user_ids:
-            return _empty_result()
-
-    stmt = select(CouponSession).where(
-        CouponSession.started_date >= d_from,
-        CouponSession.started_date <= d_to,
-    )
-    if app_env is not None:
-        stmt = stmt.where(CouponSession.app_env == app_env)
-    if user_ids is not None:
-        stmt = stmt.where(CouponSession.user_id.in_(user_ids))
-    rows = list(db.execute(stmt).scalars())
-
-    # ── 汇总卡 ──
-    completed_elapsed = sorted(
-        r.elapsed_ms for r in rows if r.status == "completed" and r.elapsed_ms is not None
-    )
-    summary = {
-        "started_count": len(rows),
-        "completed_count": sum(1 for r in rows if r.status == "completed"),
-        "avg_elapsed_ms": _avg(completed_elapsed),
-        "p5_ms": _percentile(completed_elapsed, 5),
-        "p50_ms": _percentile(completed_elapsed, 50),
-        "p95_ms": _percentile(completed_elapsed, 95),
-        "p99_ms": _percentile(completed_elapsed, 99),
-    }
-
-    # ── 按天趋势(柱=发起/完成数,线=平均耗时)──
-    daily_map: dict[str, dict] = {}
-    for r in rows:
-        d = r.started_date.isoformat()
-        b = daily_map.get(d)
-        if b is None:
-            b = {"date": d, "started_count": 0, "completed_count": 0, "_elapsed": []}
-            daily_map[d] = b
-        b["started_count"] += 1
-        if r.status == "completed":
-            b["completed_count"] += 1
-            if r.elapsed_ms is not None:
-                b["_elapsed"].append(r.elapsed_ms)
-    daily = [
-        {
-            "date": b["date"],
-            "started_count": b["started_count"],
-            "completed_count": b["completed_count"],
-            "avg_elapsed_ms": _avg(b["_elapsed"]),
-        }
-        for b in sorted(daily_map.values(), key=lambda x: x["date"])
-    ]
-
-    # ── 按小时趋势(单日 hour 粒度)──
-    hourly: list[dict] = []
-    if by_hour:
-        hour_map: dict[int, dict] = {}
-        for r in rows:
-            h = _cn_hour(r.started_at)
-            b = hour_map.get(h)
-            if b is None:
-                b = {"hour": h, "started_count": 0, "completed_count": 0, "_elapsed": []}
-                hour_map[h] = b
-            b["started_count"] += 1
-            if r.status == "completed":
-                b["completed_count"] += 1
-                if r.elapsed_ms is not None:
-                    b["_elapsed"].append(r.elapsed_ms)
-        hourly = [
-            {
-                "hour": b["hour"],
-                "started_count": b["started_count"],
-                "completed_count": b["completed_count"],
-                "avg_elapsed_ms": _avg(b["_elapsed"]),
-            }
-            for b in sorted(hour_map.values(), key=lambda x: x["hour"])
-        ]
-
-    # ── 明细:排序 + 分页 + 补用户手机号/昵称(批量,防 N+1)──
-    if sort == "elapsed":
-        rows.sort(key=lambda r: (r.elapsed_ms is None, -(r.elapsed_ms or 0)))
-    else:  # time:发起时刻倒序
-        rows.sort(key=lambda r: r.started_at, reverse=True)
-    page = rows[offset:offset + limit]
-
-    uids = {r.user_id for r in page if r.user_id is not None}
-    user_map: dict[int, tuple[str | None, str | None]] = {}
-    if uids:
-        user_map = {
-            uid: (phone, nickname)
-            for uid, phone, nickname in db.execute(
-                select(User.id, User.phone, User.nickname).where(User.id.in_(uids))
-            ).all()
-        }
-    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))
-
-    return {
-        "summary": summary,
-        "daily": daily,
-        "hourly": hourly,
-        "total": len(rows),
-        "items": items,
-    }
-
-
-def coupon_user_records(db: Session, *, user_id: int, limit: int = 100) -> dict:
-    """某用户全部领券记录(点手机号抽屉用):按发起时刻倒序、不限日期,total=该用户领券总次数。"""
-    rows = list(db.execute(
-        select(CouponSession)
-        .where(CouponSession.user_id == user_id)
-        .order_by(CouponSession.started_at.desc())
-        .limit(limit)
-    ).scalars())
-    total = db.execute(
-        select(func.count()).select_from(CouponSession).where(CouponSession.user_id == user_id)
-    ).scalar_one()
-    return {"items": [_session_to_row(r) for r in rows], "total": int(total)}
@@ -51,7 +51,27 @@ def _yuan_to_cents(v: object) -> int | None:

 def _ts_to_dt(ts: object) -> datetime | None:
    """秒级时间戳 → tz-aware UTC datetime(绝对时刻,前端按北京展示)。"""
-    if not ts:
+    if ts is None:
+        return None
+    if isinstance(ts, datetime):
+        return ts if ts.tzinfo else ts.replace(tzinfo=_BJ_TZ).astimezone(timezone.utc)
+    s = str(ts).strip()
+    if not s or s.lower() == "null":
+        return None
+    try:
+        seconds = float(Decimal(s))
+    except (InvalidOperation, ValueError):
+        return None
+    if seconds == 0:
+        return None
+    # 美团文档是秒级时间戳，这里顺手兼容毫秒/微秒，避免上游格式变化导致时间再次落空。
+    if abs(seconds) > 10_000_000_000_000:
+        seconds /= 1_000_000
+    elif abs(seconds) > 10_000_000_000:
+        seconds /= 1_000
+    try:
+        return datetime.fromtimestamp(seconds, tz=timezone.utc)
+    except (OverflowError, OSError, ValueError):
        return None


@@ -125,9 +125,8 @@ def list_users(
    return offset_paginate(db, stmt, (order_fn(sort_col), id_order), limit=limit, cursor=cursor)


-def _attach_user_info(db: Session, records: list[ComparisonRecord | Feedback | PriceReport]) -> None:
-    """给每条记录瞬态挂 phone/nickname(非 DB 列,供 admin schema from_attributes 读)。
-    按 user_id 鸭子类型,比价记录/反馈/上报通用。"""
+def _attach_user_info(db: Session, records: list[ComparisonRecord]) -> None:
+    """给每条比价记录瞬态挂 phone/nickname(非 DB 列,供 admin schema from_attributes 读)。"""
    uids = {r.user_id for r in records}
    if not uids:
        return
@@ -563,25 +562,7 @@ def list_feedbacks(
    sort_col = sort_cols.get(sort_by, Feedback.id)
    order_fn = asc if sort_order == "asc" else desc
    id_order = asc(Feedback.id) if sort_order == "asc" else desc(Feedback.id)
-    items, next_cursor, total = offset_paginate(
-        db, stmt, (order_fn(sort_col), id_order), limit=limit, cursor=cursor
-    )
-    _attach_user_info(db, items)  # 列表展示完整手机号(点手机号查该用户全部反馈)
-    return items, next_cursor, total
-
-
-def feedback_summary(db: Session) -> dict:
-    """反馈审核台各状态计数(待审核/已采纳/未采纳/合计)。待审核含历史 new 态(与前端 isPending 一致)。"""
-    rows = db.execute(
-        select(Feedback.status, func.count(Feedback.id)).group_by(Feedback.status)
-    ).all()
-    by_status = {status: int(count) for status, count in rows}
-    return {
-        "pending": by_status.get("pending", 0) + by_status.get("new", 0),
-        "adopted": by_status.get("adopted", 0),
-        "rejected": by_status.get("rejected", 0),
-        "total": sum(by_status.values()),
-    }
+    return offset_paginate(db, stmt, (order_fn(sort_col), id_order), limit=limit, cursor=cursor)


 def list_analytics_events(
@@ -788,7 +769,6 @@ def get_user_overview(db: Session, user_id: int) -> dict | None:
        "user": user,
        "coin_balance": acc.coin_balance if acc else 0,
        "cash_balance_cents": acc.cash_balance_cents if acc else 0,
-        "invite_cash_balance_cents": acc.invite_cash_balance_cents if acc else 0,
        "total_coin_earned": acc.total_coin_earned if acc else 0,
        "comparison_total": _count(ComparisonRecord, ComparisonRecord.user_id == user_id),
        "comparison_success": _count(
@@ -998,66 +978,21 @@ def user_coin_records(
    return rows[offset:offset + limit], (offset + limit if has_more else None), total


-def _attach_price_report_comparison(db: Session, records: list[PriceReport]) -> None:
-    """给每条上报瞬态挂关联比价记录的 trace + 设备/版本快照:
-    trace_id/trace_url(点 Trace 看完整比价过程)、device_model/rom_name/android_version(机型OS版本列)、
-    app_version(提交版本号列,= 提交时我们 app 的 versionName)。
-    comparison_record_id 为空 / 关联记录查不到 → 全 None。"""
-    cids = {r.comparison_record_id for r in records if r.comparison_record_id is not None}
-    rows = (
-        db.execute(
-            select(
-                ComparisonRecord.id,
-                ComparisonRecord.trace_id,
-                ComparisonRecord.trace_url,
-                ComparisonRecord.device_model,
-                ComparisonRecord.rom_name,
-                ComparisonRecord.android_version,
-                ComparisonRecord.app_version,
-            ).where(ComparisonRecord.id.in_(cids))
-        ).all()
-        if cids
-        else []
-    )
-    cmap = {row.id: row for row in rows}
-    for r in records:
-        row = cmap.get(r.comparison_record_id)
-        r.trace_id = row.trace_id if row else None
-        r.trace_url = row.trace_url if row else None
-        r.device_model = row.device_model if row else None
-        r.rom_name = row.rom_name if row else None
-        r.android_version = row.android_version if row else None
-        r.app_version = row.app_version if row else None
-
-
 def list_price_reports(
    db: Session,
    *,
    status: str | None = None,
    user_id: int | None = None,
-    sort_by: str = "id",
-    sort_order: str = "desc",
    limit: int = 20,
    cursor: int | None = None,
 ) -> tuple[list[PriceReport], int | None, int]:
-    """上报更低价列表(admin 全量,可按状态/用户筛)。offset 分页 + total,按 id·提交时间排序。
-    join User 取 phone 瞬态挂(列表展示完整手机号);按 comparison_record_id 挂 trace_id/trace_url。"""
+    """上报更低价列表(admin 全量,可按状态/用户筛)。offset 分页 + total,id 倒序。"""
    stmt = select(PriceReport)
    if status:
        stmt = stmt.where(PriceReport.status == status)
    if user_id is not None:
        stmt = stmt.where(PriceReport.user_id == user_id)
-
-    sort_cols = {"id": PriceReport.id, "created_at": PriceReport.created_at}
-    sort_col = sort_cols.get(sort_by, PriceReport.id)
-    order_fn = asc if sort_order == "asc" else desc
-    id_order = asc(PriceReport.id) if sort_order == "asc" else desc(PriceReport.id)
-    items, next_cursor, total = offset_paginate(
-        db, stmt, (order_fn(sort_col), id_order), limit=limit, cursor=cursor
-    )
-    _attach_user_info(db, items)
-    _attach_price_report_comparison(db, items)
-    return items, next_cursor, total
+    return offset_paginate(db, stmt, (PriceReport.id.desc(),), limit=limit, cursor=cursor)


 def price_report_summary(db: Session) -> dict:
@@ -24,11 +24,13 @@ from app.models.user import User
 from app.models.wallet import CoinTransaction, WithdrawOrder

 _BEIJING = timezone(timedelta(hours=8))
-COUPON_REWARD_BIZ_TYPES = ("reward_video", "ad_reward", "coupon", "coupon_reward")
+REWARD_VIDEO_BIZ_TYPES = ("reward_video", "ad_reward")
+COUPON_REWARD_BIZ_TYPES = ("coupon", "coupon_reward")
 COMPARISON_REWARD_BIZ_TYPES = ("comparison", "compare_reward", "comparison_reward")
 EXCLUDED_REWARD_BIZ_TYPES = ("invite_inviter", "invite_invitee", "admin_grant")
 UNCLASSIFIED_FEED_BIZ_TYPES = ("feed_ad_reward",)
 REGULAR_TASK_EXCLUDED_BIZ_TYPES = (
+    *REWARD_VIDEO_BIZ_TYPES,
    *COUPON_REWARD_BIZ_TYPES,
    *COMPARISON_REWARD_BIZ_TYPES,
    *EXCLUDED_REWARD_BIZ_TYPES,
@@ -339,13 +341,28 @@ def dashboard_overview(
    period_reward_video_coin_total = _sum(
        CoinTransaction.amount,
        *period_coin_conds,
-        CoinTransaction.biz_type.in_(("reward_video", "ad_reward")),
+        CoinTransaction.biz_type.in_(REWARD_VIDEO_BIZ_TYPES),
    )
    period_feed_ad_coin_total = _sum(
        CoinTransaction.amount,
        *period_coin_conds,
        CoinTransaction.biz_type == "feed_ad_reward",
    )
+    period_feed_ad_conds = (
+        AdFeedRewardRecord.created_at >= start_utc,
+        AdFeedRewardRecord.created_at < end_utc,
+        AdFeedRewardRecord.status == "granted",
+    )
+    period_coupon_feed_coin_total = _sum(
+        AdFeedRewardRecord.coin,
+        *period_feed_ad_conds,
+        AdFeedRewardRecord.feed_scene == "coupon",
+    )
+    period_comparison_feed_coin_total = _sum(
+        AdFeedRewardRecord.coin,
+        *period_feed_ad_conds,
+        AdFeedRewardRecord.feed_scene == "comparison",
+    )
    period_signin_coin_total = _sum(
        CoinTransaction.amount,
        *period_coin_conds,
@@ -365,17 +382,23 @@ def dashboard_overview(
        CoinTransaction.amount,
        *period_coin_conds,
        CoinTransaction.biz_type.in_(COUPON_REWARD_BIZ_TYPES),
-    )
+    ) + period_coupon_feed_coin_total
    period_comparison_reward_coin_total = _sum(
        CoinTransaction.amount,
        *period_coin_conds,
        CoinTransaction.biz_type.in_(COMPARISON_REWARD_BIZ_TYPES),
-    )
+    ) + period_comparison_feed_coin_total
    period_regular_task_coin_total = _sum(
        CoinTransaction.amount,
        *period_coin_conds,
        CoinTransaction.biz_type.notin_(REGULAR_TASK_EXCLUDED_BIZ_TYPES),
    )
+    period_classified_coin_total = (
+        period_coupon_reward_coin_total
+        + period_comparison_reward_coin_total
+        + period_reward_video_coin_total
+        + period_regular_task_coin_total
+    )
    period_cps_orders = list(
        db.execute(
            select(CpsOrder).where(
@@ -413,6 +436,41 @@ def dashboard_overview(
        else None
    )

+    total_reward_video_coin_total = _sum(
+        CoinTransaction.amount,
+        CoinTransaction.amount > 0,
+        CoinTransaction.biz_type.in_(REWARD_VIDEO_BIZ_TYPES),
+    )
+    total_coupon_reward_coin_total = _sum(
+        CoinTransaction.amount,
+        CoinTransaction.amount > 0,
+        CoinTransaction.biz_type.in_(COUPON_REWARD_BIZ_TYPES),
+    ) + _sum(
+        AdFeedRewardRecord.coin,
+        AdFeedRewardRecord.status == "granted",
+        AdFeedRewardRecord.feed_scene == "coupon",
+    )
+    total_comparison_reward_coin_total = _sum(
+        CoinTransaction.amount,
+        CoinTransaction.amount > 0,
+        CoinTransaction.biz_type.in_(COMPARISON_REWARD_BIZ_TYPES),
+    ) + _sum(
+        AdFeedRewardRecord.coin,
+        AdFeedRewardRecord.status == "granted",
+        AdFeedRewardRecord.feed_scene == "comparison",
+    )
+    total_regular_task_coin_total = _sum(
+        CoinTransaction.amount,
+        CoinTransaction.amount > 0,
+        CoinTransaction.biz_type.notin_(REGULAR_TASK_EXCLUDED_BIZ_TYPES),
+    )
+    total_classified_coin_total = (
+        total_coupon_reward_coin_total
+        + total_comparison_reward_coin_total
+        + total_reward_video_coin_total
+        + total_regular_task_coin_total
+    )
+
    return {
        "users": {
            "total": _count(User),
@@ -423,12 +481,12 @@ def dashboard_overview(
            "dau": today_dau(db),
        },
        "coins": {
-            # 累计发放金币(coin_transaction 里所有 amount>0 之和;负数是兑换/扣减不计)
-            "granted_total": _sum(CoinTransaction.amount, CoinTransaction.amount > 0),
+            # 累计发放金币按大盘 4 个展示分类加总;未分类/运营手动/邀请奖励不进入本指标。
+            "granted_total": total_classified_coin_total,
            "reward_video_coin_total": _sum(
                CoinTransaction.amount,
                CoinTransaction.amount > 0,
-                CoinTransaction.biz_type.in_(("reward_video", "ad_reward")),
+                CoinTransaction.biz_type.in_(REWARD_VIDEO_BIZ_TYPES),
            ),
            "reward_video_watch_count": _count(
                AdRewardRecord,
@@ -456,6 +514,10 @@ def dashboard_overview(
                CoinTransaction.biz_type == "signin_boost",
            ),
            "signin_boost_watch_count": _count(SigninBoostRecord),
+            "task_coin_total": total_regular_task_coin_total,
+            "coupon_reward_coin_total": total_coupon_reward_coin_total,
+            "comparison_reward_coin_total": total_comparison_reward_coin_total,
+            "regular_task_coin_total": total_regular_task_coin_total,
        },
        "cash": {
            "withdraw_success_cents": _sum(
@@ -492,7 +554,7 @@ def dashboard_overview(
                "average_saved_cents": period_avg_saved_cents,
            },
            "coins": {
-                "granted_total": _sum(CoinTransaction.amount, *period_coin_conds),
+                "granted_total": period_classified_coin_total,
                "reward_video_coin_total": period_reward_video_coin_total,
                "feed_ad_coin_total": period_feed_ad_coin_total,
                "signin_coin_total": period_signin_coin_total,
@@ -56,13 +56,6 @@ def get_ad_revenue_report(
            "全局筛选,同时影响明细 / 合计 / 趋势"
        ),
    ] = None,
-    app_env: Annotated[
-        str | None,
-        Query(
-            description="prod(正式应用) / test(测试应用);不传=全部。"
-            "建议正式收益报表选 prod,避免测试应用的假 eCPM 污染收益合计/平均"
-        ),
-    ] = None,
    granularity: Annotated[
        str, Query(description="day=按天 / hour=按小时(北京时间);区间>1 天建议用 day")
    ] = "day",
@@ -82,7 +75,7 @@ def get_ad_revenue_report(

    result = ad_revenue.ad_revenue_report(
        db, date_from=d_from.isoformat(), date_to=d_to.isoformat(),
-        user_id=user_id, ad_type=ad_type, feed_scene=feed_scene, app_env=app_env,
+        user_id=user_id, ad_type=ad_type, feed_scene=feed_scene,
        granularity=granularity, limit=limit, offset=offset, sort=sort,
    )
    return AdRevenueReportOut(
@@ -96,9 +89,6 @@ def get_ad_revenue_report(
        truncated=result["truncated"],
        total_impressions=result["total_impressions"],
        total_revenue_yuan=result["total_revenue_yuan"],
-        total_pangle_revenue_yuan=result["total_pangle_revenue_yuan"],
-        total_pangle_api_revenue_yuan=result["total_pangle_api_revenue_yuan"],
-        pangle_revenue_available=result["pangle_revenue_available"],
        total_expected_coin=result["total_expected_coin"],
        total_actual_coin=result["total_actual_coin"],
        mismatch_count=result["mismatch_count"],
@@ -1,106 +0,0 @@
-"""admin「领券数据」看板:发起/完成数 + 领券耗时(均值 + P5/P50/P95/P99)+ 按天趋势 + 逐条明细。
-
-任意已登录 admin 可看(只读)。聚合逻辑在 app/admin/repositories/coupon_data.py。
-数据源 coupon_session(客户端 /api/v1/coupon/session 两段上报)。
-"""
-from __future__ import annotations
-
-from datetime import date as _date
-from typing import Annotated
-
-from fastapi import APIRouter, Depends, HTTPException, Query
-
-from app.admin.deps import AdminDb, get_current_admin
-from app.admin.repositories import coupon_data
-from app.admin.schemas.coupon_data import (
-    CouponDataDaily,
-    CouponDataHourly,
-    CouponDataOut,
-    CouponDataRow,
-    CouponDataSummary,
-    CouponUserRecordsOut,
-)
-from app.core.rewards import cn_today
-
-router = APIRouter(
-    prefix="/admin/api/coupon-data",
-    tags=["admin-coupon-data"],
-    dependencies=[Depends(get_current_admin)],
-)
-
-# 区间最大跨度(天);超出拒绝,避免一次拉过多天拖垮接口(对齐广告收益报表)。
-_MAX_RANGE_DAYS = 92
-
-
-def _parse_day(value: str | None, *, field: str, default: _date) -> _date:
-    if value is None:
-        return default
-    try:
-        return _date.fromisoformat(value)
-    except ValueError as e:
-        raise HTTPException(status_code=422, detail=f"{field} 需为 YYYY-MM-DD") from e
-
-
-@router.get(
-    "",
-    response_model=CouponDataOut,
-    summary="领券数据看板(发起/完成数 + 耗时分位 + 按天趋势 + 逐条明细)",
-)
-def get_coupon_data(
-    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,
-    user: Annotated[str | None, Query(description="用户手机号/昵称模糊搜;不传=全部")] = None,
-    app_env: Annotated[str, Query(description="prod(默认) / dev / all(全部环境)")] = "prod",
-    granularity: Annotated[
-        str, Query(description="day=按天 / hour=按小时(北京);区间>1 天建议 day")
-    ] = "day",
-    limit: Annotated[int, Query(ge=1, le=1000, description="每页条数(分页大小)")] = 500,
-    offset: Annotated[int, Query(ge=0, description="分页偏移(已跳过条数)=(页码-1)×每页条数")] = 0,
-    sort: Annotated[
-        str, Query(description="排序:time=发起时间倒序(默认) / elapsed=耗时倒序")
-    ] = "time",
-) -> CouponDataOut:
-    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} 天")
-
-    # 报表默认只看 prod(对齐广告报表防串台口径);app_env=all 时不过滤、看全部环境。
-    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, granularity=granularity,
-        limit=limit, offset=offset, sort=sort,
-    )
-    return CouponDataOut(
-        date_from=d_from.isoformat(),
-        date_to=d_to.isoformat(),
-        summary=CouponDataSummary(**result["summary"]),
-        daily=[CouponDataDaily(**d) for d in result["daily"]],
-        hourly=[CouponDataHourly(**h) for h in result["hourly"]],
-        total=result["total"],
-        items=[CouponDataRow(**r) for r in result["items"]],
-    )
-
-
-@router.get(
-    "/user-records",
-    response_model=CouponUserRecordsOut,
-    summary="某用户全部领券记录(点手机号抽屉:领券次数 + 记录列表)",
-)
-def get_user_coupon_records(
-    db: AdminDb,
-    user_id: Annotated[int, Query(description="用户 id")],
-    limit: Annotated[int, Query(ge=1, le=500, description="最多返回条数")] = 100,
-    sort_by: Annotated[str, Query(description="兼容 UserRecordsDrawer 参数;固定按发起时间倒序")] = "created_at",
-    sort_order: Annotated[str, Query(description="兼容参数,忽略")] = "desc",
-) -> CouponUserRecordsOut:
-    result = coupon_data.coupon_user_records(db, user_id=user_id, limit=limit)
-    return CouponUserRecordsOut(
-        items=[CouponDataRow(**r) for r in result["items"]],
-        total=result["total"],
-    )
@@ -10,12 +10,7 @@ from app.admin.audit import write_audit
 from app.admin.deps import AdminDb, get_client_ip, get_current_admin, require_role
 from app.admin.repositories import mutations, queries
 from app.admin.schemas.common import CursorPage, OkResponse
-from app.admin.schemas.feedback import (
-    FeedbackApproveRequest,
-    FeedbackOut,
-    FeedbackRejectRequest,
-    FeedbackSummary,
-)
+from app.admin.schemas.feedback import FeedbackApproveRequest, FeedbackOut, FeedbackRejectRequest
 from app.models.admin import AdminUser
 from app.models.feedback import Feedback
 from app.repositories import wallet as wallet_repo
@@ -64,11 +59,6 @@ def list_feedbacks(
    )


-@router.get("/summary", response_model=FeedbackSummary, summary="反馈审核统计(各状态计数)")
-def feedback_summary(db: AdminDb) -> FeedbackSummary:
-    return FeedbackSummary.model_validate(queries.feedback_summary(db))
-
-
@router.post("/{feedback_id}/handle", response_model=OkResponse, summary="标记反馈已处理")
 def handle_feedback(
    feedback_id: int,
@@ -37,14 +37,11 @@ def list_price_reports(
    db: AdminDb,
    status: Annotated[str | None, Query()] = None,
    user_id: Annotated[int | None, Query()] = None,
-    sort_by: Annotated[str, Query(pattern="^(id|created_at)$")] = "id",
-    sort_order: Annotated[str, Query(pattern="^(asc|desc)$")] = "desc",
    limit: Annotated[int, Query(ge=1, le=100)] = 20,
    cursor: Annotated[int | None, Query()] = None,
 ) -> CursorPage[PriceReportOut]:
    items, next_cursor, total = queries.list_price_reports(
-        db, status=status, user_id=user_id,
-        sort_by=sort_by, sort_order=sort_order, limit=limit, cursor=cursor,
+        db, status=status, user_id=user_id, limit=limit, cursor=cursor,
    )
    return CursorPage(
        items=[PriceReportOut.model_validate(r) for r in items],
@@ -210,28 +210,22 @@ def grant_user_cash(
    db: AdminDb,
 ) -> OkResponse:
    """给指定用户增/减或设值现金(分)。delta:正=发放、负=扣减;set:直接设为目标值。
-    account=coin_cash(金币兑现金)/ invite_cash(邀请奖励金):两本账物理隔离、各调各的。
    主要用于让无现金用户直接测试提现。"""
    user = user_repo.get_user_by_id(db, user_id)
    if user is None:
        raise HTTPException(status_code=404, detail="用户不存在")
-    # 按目标账户选「余额字段 + 变动入口」(grant_invite_cash 与 grant_cash 同构)
-    is_invite = body.account == "invite_cash"
-    balance_attr = "invite_cash_balance_cents" if is_invite else "cash_balance_cents"
-    grant_fn = wallet_repo.grant_invite_cash if is_invite else wallet_repo.grant_cash
-    acct_label = "邀请奖励金" if is_invite else "现金"
-    before: int | None = None
-    # set=设为目标值:读当前余额算差值,仍复用 grant 写一笔流水(沿用原子/审计/扣负保护)
+    # set=设为目标值:读当前余额算差值,仍复用 grant_cash 写一笔流水(沿用原子/审计/扣负保护)
    if body.mode == "set":
        if body.amount_cents < 0:
-            raise HTTPException(status_code=400, detail=f"目标{acct_label}值不能为负")
+            raise HTTPException(status_code=400, detail="目标现金值不能为负")
        # lock=True:锁账户行,防连点/并发各读同一 before 算同一 delta 双写,余额错位
-        acc_locked = wallet_repo.get_or_create_account(db, user_id, commit=False, lock=True)
-        before = getattr(acc_locked, balance_attr)
+        before = wallet_repo.get_or_create_account(
+            db, user_id, commit=False, lock=True
+        ).cash_balance_cents
        delta = body.amount_cents - before
        if delta == 0:
            raise HTTPException(
-                status_code=400, detail=f"当前{acct_label}已为 {body.amount_cents} 分,无需调整"
+                status_code=400, detail=f"当前现金已为 {body.amount_cents} 分,无需调整"
            )
    else:
        if body.amount_cents == 0:
@@ -240,20 +234,18 @@ def grant_user_cash(
        # 负数扣减时不允许扣成负余额(运营误操作保护);lock=True 防并发扣穿
        if delta < 0:
            acc_now = wallet_repo.get_or_create_account(db, user_id, commit=False, lock=True)
-            if getattr(acc_now, balance_attr) + delta < 0:
+            if acc_now.cash_balance_cents + delta < 0:
                raise HTTPException(
-                    status_code=400,
-                    detail=f"扣减后{acct_label}为负(当前余额 {getattr(acc_now, balance_attr)} 分)",
+                    status_code=400, detail=f"扣减后现金为负(当前余额 {acc_now.cash_balance_cents} 分)"
                )
    biz_type = "admin_grant" if delta > 0 else "admin_deduct"
-    # grant 只 flush 不 commit;审计同 commit=False;最后一起 commit → 原子(改钱+留痕)
-    acc, _ = grant_fn(
+    # grant_cash 只 flush 不 commit;审计同 commit=False;最后一起 commit → 原子(改钱+留痕)
+    acc, _ = wallet_repo.grant_cash(
        db, user_id, delta, biz_type=biz_type, remark=f"admin:{body.reason}"[:128],
    )
    detail = {
-        "account": body.account,
        "amount_cents": delta,
-        "balance_after_cents": getattr(acc, balance_attr),
+        "balance_after_cents": acc.cash_balance_cents,
        "reason": body.reason,
    }
    if body.mode == "set":
@@ -44,13 +44,7 @@ class AdRevenueDaily(BaseModel):

    date: str = Field(..., description="北京时间 YYYY-MM-DD")
    impressions: int = Field(..., description="当天展示条数合计")
-    revenue_yuan: float = Field(..., description="当天客户端预估收益合计(元;eCPM 折算)")
-    pangle_revenue_yuan: float | None = Field(
-        None, description="当天穿山甲后台预估收益(元;GroMore revenue);非全量视图/无数据为空"
-    )
-    pangle_api_revenue_yuan: float | None = Field(
-        None, description="当天穿山甲收益Api(元;GroMore api_revenue,更接近结算);未配/当天/无数据为空"
-    )
+    revenue_yuan: float = Field(..., description="当天预估收益合计(元)")
    expected_coin: int = Field(..., description="当天应发金币合计")
    actual_coin: int = Field(..., description="当天实发金币合计")

@@ -129,21 +123,7 @@ class AdRevenueReportOut(BaseModel):
    total: int = Field(..., description="广告事件总数(全量,不受分页影响;= 当前筛选下的分页总条数)")
    truncated: bool = Field(..., description="当前页之后是否还有更多事件(len(events) > offset + limit)")
    total_impressions: int = Field(..., description="全量展示条数合计")
-    total_revenue_yuan: float = Field(..., description="全量客户端预估收益合计(元;eCPM 折算)")
-    total_pangle_revenue_yuan: float | None = Field(
-        None,
-        description="全量穿山甲后台预估收益合计(元;GroMore revenue)。穿山甲无用户/类型/场景维度,"
-        "仅「全量视图」(未按 user_id/ad_type/feed_scene 过滤)时有值,否则为 null",
-    )
-    total_pangle_api_revenue_yuan: float | None = Field(
-        None,
-        description="全量穿山甲收益Api合计(元;GroMore api_revenue,各 ADN 回传、更接近结算);"
-        "未配 Reporting / 查当天 / 非全量视图 时为 null",
-    )
-    pangle_revenue_available: bool = Field(
-        False,
-        description="本次结果是否带穿山甲后台收益(=全量视图且已同步到数据)。false 时前端「穿山甲收益」显示「-」",
-    )
+    total_revenue_yuan: float = Field(..., description="全量收益合计(元)")
    total_expected_coin: int = Field(..., description="全量应发金币合计")
    total_actual_coin: int = Field(..., description="全量实发金币合计")
    mismatch_count: int = Field(..., description="应发≠实发的发奖条数(=0 说明全部按公式发放)")
@@ -1,83 +0,0 @@
-"""admin「领券数据」看板 schemas:汇总卡 + 按天/小时趋势 + 逐条领券明细。
-
-数据源 coupon_session(一次领券一行)。耗时单位 ms(前端按需折秒);均值/分位只统计 completed。
-"""
-from __future__ import annotations
-
-from datetime import datetime
-
-from pydantic import BaseModel, Field
-
-
-class CouponDataSummary(BaseModel):
-    """汇总卡:发起/完成数 + 耗时均值与分位(P5/P50/P95/P99,基于 completed 的 elapsed_ms)。"""
-
-    started_count: int = Field(..., description="发起数(区间内所有领券 session)")
-    completed_count: int = Field(..., description="完成数(status=completed)")
-    avg_elapsed_ms: int | None = Field(None, description="平均耗时(ms,仅 completed;无数据为空)")
-    p5_ms: int | None = Field(None, description="耗时 5 分位(ms)")
-    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)")
-
-
-class CouponDataDaily(BaseModel):
-    """按天趋势(全量,不受分页影响):柱=发起/完成数,线=平均耗时。"""
-
-    date: str = Field(..., description="北京时间 YYYY-MM-DD")
-    started_count: int
-    completed_count: int
-    avg_elapsed_ms: int | None = Field(None, description="当天平均耗时(ms,仅 completed)")
-
-
-class CouponDataHourly(BaseModel):
-    """按北京小时(0–23)趋势(单日 granularity=hour 时非空)。"""
-
-    hour: int = Field(..., description="北京时间小时 0–23")
-    started_count: int
-    completed_count: int
-    avg_elapsed_ms: int | None = None
-
-
-class CouponDataRow(BaseModel):
-    """一条领券明细(一次领券任务)。"""
-
-    id: int = Field(..., description="coupon_session 主键(抽屉 rowKey 用)")
-    trace_id: str
-    user_id: int | None = None
-    user_phone: str | None = Field(None, description="手机号(admin 展示;匿名领券/查不到为空)")
-    user_nickname: str | None = Field(None, description="昵称")
-    status: str = Field(..., description="started / completed / failed / abandoned")
-    platforms: list[str] | None = Field(None, description="发起勾选平台")
-    origin_package: str | None = Field(None, description="发起来源 App 包名;null=App 内(傻瓜比价首页)发起")
-    elapsed_ms: int | None = Field(None, description="全程耗时(ms)")
-    platform_elapsed: dict[str, int] | None = Field(
-        None, description="各平台耗时 {meituan-waimai/taobao-shanguang/jd-waimai: ms}"
-    )
-    device_model: str | None = None
-    rom: str | None = None
-    app_env: str | None = None
-    started_at: datetime = Field(..., description="发起时刻(明细「时间」列)")
-    claimed_count: int | None = None
-    trace_url: str | None = Field(None, description="pricebot 公网 trace 链接(仅 completed 有);admin 渲染可点链接,无则显示可复制 trace_id")
-
-
-class CouponDataOut(BaseModel):
-    """领券数据看板响应:汇总卡 + 趋势 + 明细分页。"""
-
-    date_from: str
-    date_to: str
-    summary: CouponDataSummary
-    daily: list[CouponDataDaily] = Field(default_factory=list, description="按天趋势(全量)")
-    hourly: list[CouponDataHourly] = Field(
-        default_factory=list, description="按小时趋势(单日 hour 粒度时非空)"
-    )
-    total: int = Field(..., description="明细总条数(全量,不受分页)")
-    items: list[CouponDataRow] = Field(..., description="逐条领券明细(当前页)")
-
-
-class CouponUserRecordsOut(BaseModel):
-    """某用户全部领券记录(点手机号抽屉用):total=该用户领券总次数,items=记录列表(UserRecordsDrawer 渲染)。"""
-
-    items: list[CouponDataRow]
-    total: int
@@ -24,7 +24,9 @@ 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  # 非空 = 拿到极光 token、可推送
+    registration_id: str | None = None  # 旧极光字段,仅兼容历史数据
+    push_vendor: str | None = None
+    push_token: str | None = None

    ever_protected: bool                 # 是否开过无障碍(=该设备对功能有意义)
    first_protected_at: datetime | None = None   # 首次开无障碍时刻(老设备为 null)
@@ -23,14 +23,6 @@ class FeedbackOut(BaseModel):
    reviewed_by_admin_id: int | None = None
    reviewed_at: datetime | None = None
    created_at: datetime
-    # 提交端环境快照(feedback 表列):提交版本号 / 机型OS版本;改版前的历史反馈为 None
-    app_version: str | None = None
-    device_model: str | None = None
-    rom_name: str | None = None
-    android_version: str | None = None
-    # 联表瞬态字段(queries._attach_user_info 挂):列表展示完整手机号,点手机号查该用户全部反馈
-    phone: str | None = None
-    nickname: str | None = None


 class FeedbackApproveRequest(BaseModel):
@@ -45,12 +37,3 @@ class FeedbackApproveRequest(BaseModel):
 class FeedbackRejectRequest(BaseModel):
    reason: str = Field(min_length=1, max_length=256, description="未采纳原因,用户端可见")
    note: str | None = Field(default=None, max_length=256, description="运营内部审核备注")
-
-
-class FeedbackSummary(BaseModel):
-    """审核台顶部各状态计数(pending 含历史 new 态)。"""
-
-    pending: int
-    adopted: int
-    rejected: int
-    total: int
@@ -31,17 +31,6 @@ class PriceReportOut(BaseModel):
    reward_coins: int | None = None
    reviewed_at: datetime | None = None
    created_at: datetime
-    # 联表瞬态字段:phone/nickname 由 _attach_user_info 挂(展示完整手机号、点击查该用户全部上报);
-    # 其余由 _attach_price_report_comparison 从关联比价记录挂:trace_*(Trace 列点跳调试链接)、
-    # device_model/rom_name/android_version(机型OS版本列)、app_version(提交版本号列)
-    phone: str | None = None
-    nickname: str | None = None
-    trace_id: str | None = None
-    trace_url: str | None = None
-    device_model: str | None = None
-    rom_name: str | None = None
-    android_version: str | None = None
-    app_version: str | None = None


 class PriceReportRejectRequest(BaseModel):
@@ -29,7 +29,6 @@ class AdminUserOverview(BaseModel):
    user: AdminUserListItem
    coin_balance: int
    cash_balance_cents: int
-    invite_cash_balance_cents: int  # 邀请奖励金余额(与 cash_balance_cents 物理隔离)
    total_coin_earned: int
    comparison_total: int
    comparison_success: int
@@ -89,11 +88,6 @@ class GrantCoinsRequest(BaseModel):


 class GrantCashRequest(BaseModel):
-    # 目标账户:金币兑换的现金(cash_balance_cents)与邀请奖励金(invite_cash_balance_cents)物理隔离,
-    # 各调各的、不可串。默认 coin_cash 兼容旧调用。
-    account: Literal["coin_cash", "invite_cash"] = Field(
-        "coin_cash", description="目标账户:coin_cash=金币兑现金账户 / invite_cash=邀请奖励金账户"
-    )
    mode: Literal["delta", "set"] = Field(
        "delta", description="delta=增减(amount_cents 为变动量) / set=设为(amount_cents 为目标值,须≥0)"
    )
@@ -11,7 +11,6 @@ from __future__ import annotations

 import hmac
 import logging
-from datetime import datetime, timedelta, timezone
 from typing import Annotated

 from fastapi import APIRouter, Header, HTTPException, status
@@ -22,7 +21,6 @@ from app.repositories import launch_confirm_sample as repo
 from app.schemas.launch_confirm_sample import (
    LaunchConfirmSampleIn,
    LaunchConfirmSampleOut,
-    LaunchConfirmSampleRow,
 )

 logger = logging.getLogger("shagua.internal.launch_confirm")
@@ -63,34 +61,3 @@ def report_launch_confirm_sample(
        payload.exec_success, payload.trace_id,
    )
    return LaunchConfirmSampleOut(id=sid)
-
-
-@router.get(
-    "/launch-confirm-samples",
-    response_model=list[LaunchConfirmSampleRow],
-    summary="启动确认窗兜底样本列表(沉淀脚本 distill 读; server→server, 不走 JWT)",
-)
-def list_launch_confirm_samples(
-    db: DbSession,
-    x_internal_secret: Annotated[str | None, Header()] = None,
-    exec_success: bool | None = None,
-    host_package: str | None = None,
-    since_days: int | None = None,
-    limit: int = 1000,
-) -> list[LaunchConfirmSampleRow]:
-    """读样本供 pricebot 的 distill_launch_confirm.py 聚合沉淀回 PROFILES。
-
-    与上报端点同一把共享密钥;exec_success/host_package/since_days 均可选,limit 默认 1000。
-    """
-    _check_secret(x_internal_secret)
-    since = None
-    if since_days and since_days > 0:
-        since = datetime.now(timezone.utc) - timedelta(days=since_days)
-    rows = repo.list_samples(
-        db,
-        exec_success=exec_success,
-        host_package=host_package,
-        since=since,
-        limit=limit,
-    )
-    return [LaunchConfirmSampleRow.model_validate(r) for r in rows]
@@ -2,6 +2,7 @@

 路由前缀 `/api/v1/auth`,包含:
  POST /jverify-login         极光一键登录(loginToken → 手机号 → 注册即登录 → 签 JWT)
+  POST /wechat-login          微信 App 授权登录(code → openid → 注册即登录 → 签 JWT)
  POST /sms/send              发短信验证码(mock 阶段任意 6 位通过)
  POST /sms/login             手机号 + 验证码登录
  POST /refresh               用 refresh_token 换新的 token 对
@@ -20,6 +21,7 @@ from app.core.ratelimit import enforce_rate_limit, 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.integrations.wechat_login import WechatLoginError, code_to_userinfo
 from app.repositories import onboarding as onboarding_repo
 from app.repositories import user as user_repo
 from app.schemas.auth import (
@@ -32,6 +34,7 @@ from app.schemas.auth import (
    TokenPair,
    TokenWithUser,
    UserOut,
+    WechatLoginRequest,
 )

 logger = logging.getLogger("shagua.auth")
@@ -84,6 +87,40 @@ def jverify_login(req: JverifyLoginRequest, db: DbSession) -> TokenWithUser:
    return _login_response(user, onboarding_completed=completed)


+# ===================== 微信一键登录 =====================
+
+@router.post(
+    "/wechat-login",
+    response_model=TokenWithUser,
+    summary="微信一键登录",
+    dependencies=[Depends(rate_limit(20, 60, "wechat-login"))],
+)
+def wechat_login(req: WechatLoginRequest, db: DbSession) -> TokenWithUser:
+    try:
+        info = code_to_userinfo(req.code)
+    except WechatLoginError as e:
+        logger.warning("wechat_login failed: %s", e)
+        raise HTTPException(status_code=502, detail=str(e)) from e
+
+    user = user_repo.upsert_user_for_wechat_login(
+        db,
+        openid=info["openid"],
+        nickname=info.get("nickname"),
+        avatar_url=info.get("avatar_url"),
+    )
+    if user.status != "active":
+        raise HTTPException(status_code=403, detail="account disabled")
+
+    completed = onboarding_repo.is_completed(db, user_id=user.id, device_id=req.device_id)
+    logger.info(
+        "wechat_login ok user_id=%d openid=%s*** onboarded=%s",
+        user.id,
+        info["openid"][:6],
+        completed,
+    )
+    return _login_response(user, onboarding_completed=completed)
+
+
 # ===================== 短信登录 =====================

@router.post(
@@ -29,7 +29,6 @@ from app.schemas.coupon_state import (
    CouponPromptDismissIn,
    CouponPromptShouldShowOut,
    CouponPromptShownIn,
-    CouponSessionIn,
    CouponStatsOut,
 )

@@ -195,34 +194,6 @@ async def coupon_step(
    return resp_json


-@router.post("/session", summary="领券任务流水上报(admin 领券数据看板数据源)")
-def coupon_session(payload: CouponSessionIn, db: DbSession) -> dict[str, bool]:
-    """客户端两段上报一次领券流水(发起 started / 收尾 completed-failed-abandoned),按 trace_id upsert
-    到 coupon_session。不鉴权(同领券循环 MVP,按 device_id/trace_id);供 admin「领券数据」看板算
-    发起/完成数、耗时分位、机型维度。写库失败不应连累客户端(本就 fire-and-forget),吞掉返回 ok。"""
-    try:
-        coupon_repo.upsert_coupon_session(
-            db,
-            trace_id=payload.trace_id,
-            device_id=payload.device_id,
-            status=payload.status,
-            started_at_ms=payload.started_at_ms,
-            user_id=payload.user_id,
-            platforms=payload.platforms,
-            origin_package=payload.origin_package,
-            device_model=payload.device_model,
-            rom=payload.rom,
-            app_env=payload.app_env,
-            elapsed_ms=payload.elapsed_ms,
-            platform_elapsed=payload.platform_elapsed,
-            claimed_count=payload.claimed_count,
-            trace_url=payload.trace_url,
-        )
-    except Exception as e:  # noqa: BLE001
-        logger.warning("coupon session write failed: %s", e)
-    return {"ok": True}
-
-
@router.post("/prompt/shown", summary="领券引导窗弹出即上报(按 App 记 shown)")
 def coupon_prompt_shown(payload: CouponPromptShownIn, db: DbSession) -> dict[str, bool]:
    """客户端弹出引导窗那刻调 → 记一条今日 engagement(shown),今天**这个 App** 不再自动弹。
@@ -1,19 +1,22 @@
 """设备注册 / 心跳 endpoint(无障碍保护存活检测)。

 路由前缀 /api/v1/device,需 Bearer 鉴权(设备绑登录用户)。
-  POST /register   注册设备 / 更新 registration_id(App 前台、拿到 push token 时调)
+  POST /register   注册设备 / 更新厂商 push token(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
+from fastapi import APIRouter, BackgroundTasks, HTTPException, status

 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,
@@ -22,6 +25,8 @@ from app.schemas.device import (
    LivenessAckRequest,
    LivenessOut,
    OkResponse,
+    PushTestOut,
+    PushTestRequest,
 )

 logger = logging.getLogger("shagua.device")
@@ -29,6 +34,37 @@ 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,
@@ -40,13 +76,17 @@ 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 reg=%s",
+        "device register user_id=%d device_id=%s vendor=%s token=%s legacy_reg=%s",
        user.id,
        req.device_id,
+        req.push_vendor,
+        bool(req.push_token),
        bool(req.registration_id),
    )
    return DeviceOut.model_validate(device)
@@ -64,10 +104,59 @@ 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,
@@ -61,11 +61,6 @@ async def submit_feedback(
    content: str = Form(...),
    # 原型改版后客户端不再采集联系方式;保留字段以兼容旧端 + 后续可能复用,默认空串。
    contact: str = Form(default=""),
-    # 提交端环境快照(admin 反馈页展示「提交版本号」「机型OS版本」);旧端不带 → 空串 → 存 NULL。
-    app_version: str = Form(default=""),
-    device_model: str = Form(default=""),
-    rom_name: str = Form(default=""),
-    android_version: str = Form(default=""),
    images: list[UploadFile] = File(default=[]),
 ) -> FeedbackOut:
    content = content.strip()
@@ -91,8 +86,6 @@ async def submit_feedback(

    fb = feedback_repo.create_feedback(
        db, user_id=user.id, content=content, contact=contact, images=urls,
-        app_version=app_version.strip(), device_model=device_model.strip(),
-        rom_name=rom_name.strip(), android_version=android_version.strip(),
    )
    logger.info("feedback id=%d user_id=%d images=%d", fb.id, user.id, len(urls))
    return FeedbackOut.model_validate(fb)
@@ -202,9 +202,6 @@ def withdraw(req: WithdrawRequest, user: CurrentUser, db: DbSession) -> Withdraw
        order = crud_wallet.create_withdraw(
            db, user.id, req.amount_cents, source=req.source,
            user_name=req.user_name, out_bill_no=req.out_bill_no,
-            # 0.01 元调试提现:放行低于最低额的小额。双闸——客户端仅 debug 包在「0.01 元提现」开关开时
-            # 连同 skip_review 一起下发;服务端仅非 prod 才认。生产恒 False,最低额校验照常。
-            allow_sub_min=(req.skip_review and not settings.is_prod),
        )
    except crud_wallet.InvalidWithdrawAmountError as e:
        raise HTTPException(
@@ -9,7 +9,7 @@ from functools import lru_cache
 from pathlib import Path
 from typing import Literal

-from pydantic import Field, model_validator
+from pydantic import model_validator
 from pydantic_settings import BaseSettings, SettingsConfigDict

 _PROJECT_ROOT = Path(__file__).resolve().parent.parent.parent
@@ -59,14 +59,51 @@ class Settings(BaseSettings):
            return []
        return [ip.strip() for ip in self.ADMIN_IP_ALLOWLIST.split(",") if ip.strip()]

-    # ===== 极光 =====
+    # ===== 极光一键登录 / 短信 =====
    JG_APP_KEY: str = ""
    JG_MASTER_SECRET: str = ""
    JG_PRIVATE_KEY_PATH: str = "./secrets/jverify_rsa_private.pem"
    JG_VERIFY_ENDPOINT: str = "https://api.verification.jpush.cn/v1/web/loginTokenVerify"
    JG_REQUEST_TIMEOUT_SEC: int = 15

-    # 无障碍保护存活监控后台任务(pull 后置检测;本期不接推送)
+    # ===== 厂商直推(无障碍保护存活告警)=====
+    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"
+    )
+
+    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"
+    )
+
+    # 无障碍保护存活监控后台任务(推送 + pull 后置兜底)
    HEARTBEAT_MONITOR_ENABLED: bool = True       # 总开关
    HEARTBEAT_TIMEOUT_MINUTES: int = 10          # 多久没心跳算掉线(≈3 个客户端心跳周期)
    HEARTBEAT_SCAN_INTERVAL_SEC: int = 60        # 扫描周期
@@ -226,41 +263,6 @@ class Settings(BaseSettings):
        """回调开关打开且至少配了一个验签密钥,才接受发奖回调。"""
        return bool(self.PANGLE_CALLBACK_ENABLED and self.pangle_reward_secrets)

-    # ===== 穿山甲 GroMore 数据 API(报表收益拉取,T+1)=====
-    # ⚠️ 与上面发奖回调的 m-key 是【两套完全不同的凭证】:这三样在穿山甲后台
-    # 「接入中心 → GroMore-API → 聚合数据报告 API」文档页领取(user_id / role_id / Security Key),
-    # 仅用于按天拉 GroMore 收益报表(revenue 预估收益 + api_revenue 收益Api),不参与发奖。
-    # 该 API 只能查【GroMore 聚合代码位】的数据(=我们 useMediation 的口径),非穿山甲 SDK 数据;
-    # 且不提供用户/设备维度(官方明确),故收益只能落到 日期×代码位 汇总,不能挂到逐条事件。
-    # 子账号(role_id≠user_id)需主账号在「角色管理」授予「查看全部数据」权限,否则查不到
-    # ecpm/revenue(接口返回 118);role_id 填成与 user_id 一致 = 查主账号数据。
-    PANGLE_REPORT_USER_ID: int = 0        # 媒体账号 user_id
-    PANGLE_REPORT_ROLE_ID: int = 0        # 子账号 role_id(=user_id 时查主账号)
-    PANGLE_REPORT_SECURITY_KEY: str = ""  # 该账号的 Security Key(secure_key,≠ 发奖 m-key)
-    # GroMore 聚合 AppId(报表 site_id 维度)→ 我们的应用环境。报表按 site_id 区分两个穿山甲应用,
-    # 用它把每行归到 prod(傻瓜比价正式)/ test(测试应用)。默认值取自现网两个应用,部署时按需覆盖。
-    PANGLE_REPORT_SITE_ID_PROD: str = "5830519"   # 傻瓜比价正式应用 AppId
-    PANGLE_REPORT_SITE_ID_TEST: str = "5832303"   # 测试应用 AppId
-
-    @property
-    def pangle_report_configured(self) -> bool:
-        """三样齐全(user_id / role_id / security_key)才能拉 GroMore 报表;缺任一 → 同步脚本 no-op。"""
-        return bool(
-            self.PANGLE_REPORT_USER_ID
-            and self.PANGLE_REPORT_ROLE_ID
-            and self.PANGLE_REPORT_SECURITY_KEY
-        )
-
-    @property
-    def pangle_report_site_id_to_env(self) -> dict[str, str]:
-        """site_id(穿山甲 AppId)→ app_env(prod/test);供同步脚本把报表行归到我们的应用。留空项忽略。"""
-        out: dict[str, str] = {}
-        if self.PANGLE_REPORT_SITE_ID_PROD.strip():
-            out[self.PANGLE_REPORT_SITE_ID_PROD.strip()] = "prod"
-        if self.PANGLE_REPORT_SITE_ID_TEST.strip():
-            out[self.PANGLE_REPORT_SITE_ID_TEST.strip()] = "test"
-        return out
-
    # ===== Pricebot 上游 (领券/比价业务透传目标) =====
    # pricebot-backend 默认跑在 8000。/api/v1/coupon/step 会透传到这里的 /api/coupon/step
    PRICEBOT_BASE_URL: str = "http://localhost:8000"
@@ -322,7 +324,7 @@ class Settings(BaseSettings):
        return self.APP_ENV == "prod"

    @model_validator(mode="after")
-    def _enforce_prod_secrets(self) -> "Settings":
+    def _enforce_prod_secrets(self) -> Settings:
        """prod 下强校验 JWT secret,弱/默认/空即启动报错(fail-fast,挡住 token 被伪造)。

        只校验两个签发凭证:App 用户的 JWT_SECRET_KEY、后台的 ADMIN_JWT_SECRET——它们沿用默认值
@@ -1,7 +1,7 @@
 """无障碍保护存活监控后台任务。

 周期扫描「曾经保护过、当前 alive、心跳超时」的设备 = App 被彻底杀掉/无障碍已停(心跳断了),
-**命中即在服务器终端打印告警**(本期先不接推送,工程量大,用终端打印代替真实通知);并把状态机
+**命中即在服务器终端打印告警并尝试厂商直推**;并把状态机
 推进到 notified 防每轮重复打印(心跳恢复时由 repositories.device.touch_heartbeat 重置回 alive)。
 结构仿 withdraw_reconcile_worker(单实例锁 + asyncio 轮询 + 优雅退出)。

@@ -22,6 +22,7 @@ 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")
@@ -71,32 +72,66 @@ 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()
+    ref = datetime.now(timezone.utc) if last.tzinfo is not None else datetime.utcnow()  # noqa: UP017
    return int((ref - last).total_seconds())


 def _scan_once(timeout_minutes: int) -> dict:
-    """扫描一轮:找出心跳超时(App 被彻底杀掉/无障碍已停)的设备,在**服务器终端打印**告警代替真实推送。
+    """扫描一轮:找出心跳超时(App 被彻底杀掉/无障碍已停)的设备并召回。

-    本期不接推送(极光/厂商通道工程量大),只做服务端掉线检测:命中即 logger.warning 打印到终端,
-    并把状态机推进到 notified 防每轮重复打印(心跳恢复时 touch_heartbeat 会重置回 alive)。
+    有 push_vendor + push_token 时先发厂商直推,无 token 或推送失败时仍置
+    kill_alert_pending,客户端下次进 App 继续走后置提醒兜底。
    """
    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 已被杀/无障碍已停。【已置 kill_alert_pending: 用户下次进 App 将弹「开启自启动」引导(后置检测);推送本期未接】",
+                " → 判定 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}
+        return {
+            "checked": len(overdue),
+            "notified": notified,
+            "pushed": pushed,
+            "push_failed": push_failed,
+        }


 async def _run_loop() -> None:
@@ -1,148 +0,0 @@
-"""穿山甲 GroMore「聚合数据报告 API」客户端 —— 按天拉取收益报表(只读、T+1)。
-
-⚠️ 这是 **GroMore 数据拉取 API**,与发奖回调验签(integrations/pangle.py 的 m-key)是
-两套完全不同的凭证与用途。凭证在后台「接入中心 → GroMore-API → 聚合数据报告 API」领取:
-媒体账号 user_id、子账号 role_id、Security Key(secure_key)。
-
-鉴权(文档 v2.x「方法一」):
-  1. 去掉请求参数里的 `sign` 字段与值为空的字段;
-  2. 其余参数按 key 字典序升序,拼成 `k1=v1&k2=v2&...&kn=vn`;
-  3. 末尾直接拼接 security_key(无分隔符),对整串做 MD5,取 32 位小写十六进制 = sign。
-  签名有 3 分钟过期(天级用 `timestamp` 秒级时间戳;小时级才用 `current_time` 字符串)。
-
-数据口径要点(来自官方文档):
-  - 只返回【GroMore 聚合代码位】在 GroMore 内的数据(=我们 useMediation 的口径),
-    查不到穿山甲 SDK 自身的数据;
-  - **不提供分用户/设备维度**(官方 FAQ 明确拒绝),最细到 日期×应用×代码位×广告源;
-  - `revenue` = 预估收益(元,所有 ADN 都有);`api_revenue` = 收益Api(各 ADN 经 Reporting
-    回传、按实时汇率折算账号币种,更接近结算),需后台为该 ADN 配置 Reporting 才有、且不支持当天;
-  - 「今天」与「今天以前」必须分开查;天级跨度 ≤ 1 个月、不早于 12 个月。
-"""
-from __future__ import annotations
-
-import hashlib
-import logging
-import time
-from collections.abc import Mapping
-from typing import Any
-
-import httpx
-
-from app.core.config import settings
-
-logger = logging.getLogger("shagua.pangle_report")
-
-HOST = "https://www.csjplatform.com"
-# 天级收益报表(路径与文档代码示例一致;另有小时级 get_hour_report_data,本服务只用天级)。
-DAILY_PATH = "/union_media/open/api/mediation/get_daily_income_report_data"
-VERSION = "2.0"
-SIGN_TYPE = "MD5"
-PAGE_LIMIT = 5000          # 文档上限;一次尽量多取,减少翻页
-DEFAULT_TIMEOUT = 30.0
-_MAX_PAGES = 200           # 翻页安全阀(5000×200=100w 行,远超我们规模),防异常 has_next 死循环
-
-
-class PangleReportError(Exception):
-    """GroMore 报表接口调用失败(未配置 / 网络 / 业务码非 100)。"""
-
-
-def build_sign(params: Mapping[str, Any], security_key: str) -> str:
-    """按文档「方法一」生成 sign:去 sign/空值 → key 升序 → k=v& 拼接 → 末尾接 secure_key → MD5(32 位小写)。
-
-    与官方 Python/Java 示例逐字节一致(见 tests/test_pangle_report.py 的两个测试向量)。
-    """
-    items = [
-        (str(k), str(v))
-        for k, v in params.items()
-        if k != "sign" and v is not None and str(v) != ""
-    ]
-    items.sort(key=lambda kv: kv[0])
-    raw = "&".join(f"{k}={v}" for k, v in items)
-    return hashlib.md5((raw + security_key).encode("utf-8")).hexdigest()
-
-
-def fetch_daily_report(
-    *,
-    start_date: str,
-    end_date: str,
-    # ⚠️ 用 ad_unit_id(GroMore 广告位ID = 我们的 104xxx),不要用 code_id(底层各 ADN 代码位,对不上)
-    dimensions: str = "date,site_id,ad_unit_id",
-    metrics: str = "revenue,api_revenue,ecpm,imp_cnt",
-    site_ids: str | None = None,
-    code_ids: str | None = None,
-    os: str | None = None,
-    network: str | None = None,
-    time_zone: int = 8,
-    limit: int = PAGE_LIMIT,
-    timeout: float = DEFAULT_TIMEOUT,
-) -> list[dict[str, Any]]:
-    """拉一个日期区间(北京时间,time_zone=8)的天级收益报表,自动翻页,返回 report_list 全量行。
-
-    每行是字符串字典(接口原值),形如
-    {"start_date": "2026-06-27", "site_id": "5830519", "ad_unit_id": "104142227",
-     "revenue": "1.23", "api_revenue": "1.05", "ecpm": "0.80", "imp_cnt": "1537", ...}。
-    业务码非 100 直接抛 PangleReportError(由调用方/脚本兜底,不静默吞)。
-    """
-    if not settings.pangle_report_configured:
-        raise PangleReportError(
-            "PANGLE_REPORT_USER_ID / ROLE_ID / SECURITY_KEY 未配置,无法拉取 GroMore 报表"
-        )
-
-    base_params: dict[str, Any] = {
-        "user_id": settings.PANGLE_REPORT_USER_ID,
-        "role_id": settings.PANGLE_REPORT_ROLE_ID,
-        "version": VERSION,
-        "sign_type": SIGN_TYPE,
-        "start_date": start_date,
-        "end_date": end_date,
-        "dimensions": dimensions,
-        "metrics": metrics,
-        "time_zone": time_zone,
-        "limit": limit,
-    }
-    # 可选过滤(空则不传,避免进签名串)
-    for key, val in (
-        ("site_ids", site_ids), ("code_ids", code_ids),
-        ("os", os), ("network", network),
-    ):
-        if val:
-            base_params[key] = val
-
-    rows: list[dict[str, Any]] = []
-    offset = 0
-    try:
-        with httpx.Client(timeout=timeout) as client:
-            for _ in range(_MAX_PAGES):
-                params = dict(base_params)
-                params["offset"] = offset
-                # timestamp 每页临请求时取最新(3 分钟过期),并参与签名
-                params["timestamp"] = int(time.time())
-                params["sign"] = build_sign(params, settings.PANGLE_REPORT_SECURITY_KEY)
-
-                resp = client.get(HOST + DAILY_PATH, params=params)
-                resp.raise_for_status()
-                body = resp.json()
-
-                code = str(body.get("code"))
-                if code != "100":
-                    raise PangleReportError(
-                        f"GroMore 报表业务失败 code={code} message={body.get('message')!r} "
-                        f"(101=验签失败/102=userid无效/107=无权限/118=无收益查看权限,详见文档状态码)"
-                    )
-
-                data = body.get("data") or {}
-                page = data.get("report_list") or []
-                rows.extend(page)
-
-                # has_next=1 还有下一页;无该字段则按本页是否取满判断
-                has_next = str(data.get("has_next", "")) == "1"
-                if not page or not has_next:
-                    break
-                offset += len(page)
-    except httpx.HTTPError as e:
-        raise PangleReportError(f"GroMore 报表请求异常: {e}") from e
-
-    logger.info(
-        "GroMore 天级报表拉取完成 %s~%s dims=%s 行数=%d", start_date, end_date, dimensions, len(rows)
-    )
-    return rows
@@ -0,0 +1,380 @@
+"""厂商直推集成。
+
+服务端不再经由 JPush Push API 发送无障碍召回通知,而是按客户端上报的
+push_vendor + push_token 分发到各手机厂商的服务端 API。
+"""
+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
+
+import httpx
+
+from app.core.config import settings
+
+logger = logging.getLogger("shagua.vendor_push")
+
+TYPE_ACCESSIBILITY_DISABLED = "accessibility_disabled"
+SUPPORTED_VENDORS = frozenset({"honor", "vivo", "xiaomi", "oppo"})
+
+
+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",
+        "mi": "xiaomi",
+        "小米": "xiaomi",
+        "oneplus": "oppo",
+        "realme": "oppo",
+    }
+    return aliases.get(vendor, vendor)
+
+
+def send_accessibility_disabled(
+    push_vendor: str,
+    push_token: str,
+    *,
+    title: str = "保护已关闭",
+    alert: str = "傻瓜比价的无障碍保护被关了，点此重新开启，继续帮你自动比价省钱。",
+) -> dict[str, Any]:
+    """按厂商 token 向单台设备发送无障碍掉线通知。"""
+    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")
+
+    dispatch: dict[str, Callable[[str, str, str], dict[str, Any]]] = {
+        "honor": _send_honor,
+        "vivo": _send_vivo,
+        "xiaomi": _send_xiaomi,
+        "oppo": _send_oppo,
+    }
+    return dispatch[vendor](token, title, alert)
+
+
+def _extras() -> dict[str, str]:
+    return {"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, alert: str) -> dict[str, Any]:
+    app_id = _require(settings.HONOR_PUSH_APP_ID, "HONOR_PUSH_APP_ID")
+    access_token = _honor_access_token()
+    payload = {
+        "data": json.dumps(_extras(), ensure_ascii=False),
+        "notification": {"title": title, "body": alert},
+        "android": {
+            "ttl": f"{settings.PUSH_TIME_TO_LIVE_SEC}s",
+            "targetUserType": 1,
+            "notification": {
+                "title": title,
+                "body": alert,
+                "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 _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, alert: str) -> dict[str, Any]:
+    app_id = _require(settings.VIVO_PUSH_APP_ID, "VIVO_PUSH_APP_ID")
+    auth_token = _vivo_auth_token()
+    body: dict[str, Any] = {
+        "appId": app_id,
+        "regId": token,
+        "notifyType": settings.VIVO_PUSH_NOTIFY_TYPE,
+        "title": title,
+        "content": alert,
+        "timeToLive": settings.PUSH_TIME_TO_LIVE_SEC,
+        "skipType": 1,
+        "requestId": uuid.uuid4().hex,
+        "pushMode": settings.VIVO_PUSH_MODE,
+        "clientCustomMap": _extras(),
+    }
+    if settings.VIVO_PUSH_CATEGORY:
+        body["category"] = settings.VIVO_PUSH_CATEGORY
+    data = _request_json(
+        "POST",
+        settings.VIVO_PUSH_SEND_ENDPOINT,
+        json=body,
+        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, alert: 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 alert
+    body = {
+        "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),
+        "extra.notify_effect": "1",
+    }
+    if settings.XIAOMI_PUSH_CHANNEL_ID:
+        body["extra.channel_id"] = settings.XIAOMI_PUSH_CHANNEL_ID.strip()
+    if settings.XIAOMI_PUSH_TEMPLATE_ID:
+        body["extra.template_id"] = settings.XIAOMI_PUSH_TEMPLATE_ID.strip()
+    if settings.XIAOMI_PUSH_TEMPLATE_PARAM_JSON:
+        body["extra.template_param"] = _xiaomi_template_param(title, alert)
+    data = _request_form(
+        "POST",
+        settings.XIAOMI_PUSH_SEND_ENDPOINT,
+        data=body,
+        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 _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, alert: str) -> dict[str, Any]:
+    auth_token = _oppo_auth_token()
+    ttl_hours = max(1, min(72, settings.PUSH_TIME_TO_LIVE_SEC // 3600))
+    message = {
+        "target_type": 2,
+        "target_value": token,
+        "notification": {
+            "app_message_id": f"accessibility_disabled_{uuid.uuid4().hex}",
+            "title": title,
+            "content": alert,
+            "click_action_type": 0,
+            "off_line": True,
+            "off_line_ttl": ttl_hours,
+            "action_parameters": json.dumps(_extras(), ensure_ascii=False),
+        },
+    }
+    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
@@ -0,0 +1,89 @@
+"""微信开放平台 App 登录集成。
+
+客户端只把微信 SDK 回调拿到的临时 code 传给服务端;AppSecret、access_token
+与用户 openid 都留在服务端处理,避免敏感凭证落到 APK 里。
+"""
+from __future__ import annotations
+
+import certifi
+import httpx
+
+from app.core.config import settings
+
+_API_BASE = "https://api.weixin.qq.com"
+
+
+class WechatLoginError(Exception):
+    """微信授权换取用户信息失败。"""
+
+
+def _ensure_configured() -> None:
+    if not settings.WECHAT_APP_ID or not settings.WECHAT_APP_SECRET:
+        raise WechatLoginError("wechat app not configured")
+
+
+def _http_client() -> httpx.Client:
+    return httpx.Client(verify=certifi.where())
+
+
+def code_to_userinfo(code: str) -> dict:
+    """用授权 code 换 openid/unionid,尽力补昵称头像。
+
+    返回字段:
+      - openid: 同一开放平台移动应用下的用户唯一标识
+      - unionid: 同一开放平台主体下的用户唯一标识,微信可能不返回
+      - nickname/avatar_url: sns/userinfo 可用时返回,失败不阻断登录
+      - raw: userinfo 原始响应,便于排障
+    """
+    _ensure_configured()
+    try:
+        with _http_client() as client:
+            token_resp = client.get(
+                f"{_API_BASE}/sns/oauth2/access_token",
+                params={
+                    "appid": settings.WECHAT_APP_ID,
+                    "secret": settings.WECHAT_APP_SECRET,
+                    "code": code,
+                    "grant_type": "authorization_code",
+                },
+                timeout=settings.WXPAY_REQUEST_TIMEOUT_SEC,
+            )
+        token_data = token_resp.json()
+    except Exception as e:  # noqa: BLE001
+        raise WechatLoginError("微信授权请求失败,请稍后重试") from e
+    if "openid" not in token_data or "access_token" not in token_data:
+        raise WechatLoginError(f"微信授权失败: {token_data.get('errmsg', token_data)}")
+
+    openid = token_data["openid"]
+    unionid = token_data.get("unionid")
+    nickname = None
+    avatar_url = None
+    raw: dict = {}
+
+    try:
+        with _http_client() as client:
+            info_resp = client.get(
+                f"{_API_BASE}/sns/userinfo",
+                params={
+                    "access_token": token_data["access_token"],
+                    "openid": openid,
+                    "lang": "zh_CN",
+                },
+                timeout=settings.WXPAY_REQUEST_TIMEOUT_SEC,
+            )
+        raw = info_resp.json()
+        if "errcode" not in raw:
+            nickname = raw.get("nickname") or None
+            avatar_url = raw.get("headimgurl") or None
+            unionid = unionid or raw.get("unionid")
+    except Exception:  # noqa: BLE001
+        # openid 已拿到即可登录;昵称头像只是展示增强。
+        pass
+
+    return {
+        "openid": openid,
+        "unionid": unionid,
+        "nickname": nickname,
+        "avatar_url": avatar_url,
+        "raw": raw,
+    }
@@ -2,23 +2,18 @@

 通过 `uvicorn app.main:app --reload` 启动。
 """
-
 from __future__ import annotations

 import logging
 from collections.abc import AsyncIterator
 from contextlib import asynccontextmanager
+
 from pathlib import Path

 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
-from fastapi.responses import FileResponse
 from fastapi.staticfiles import StaticFiles

-from app.api.internal.app_version import router as internal_app_version_router
-from app.api.internal.launch_confirm import router as internal_launch_confirm_router
-from app.api.internal.price import router as internal_price_router
-from app.api.internal.store import router as internal_store_router
 from app.api.v1.ad import router as ad_router
 from app.api.v1.analytics import router as analytics_router
 from app.api.v1.auth import router as auth_router
@@ -26,8 +21,12 @@ from app.api.v1.compare import router as compare_router
 from app.api.v1.compare_milestone import router as compare_milestone_router
 from app.api.v1.compare_record import router as compare_record_router
 from app.api.v1.coupon import router as coupon_router
-from app.api.v1.cps_redirect import router as cps_redirect_router
 from app.api.v1.device import router as device_router
+from app.api.v1.cps_redirect import router as cps_redirect_router
+from app.api.internal.app_version import router as internal_app_version_router
+from app.api.internal.launch_confirm import router as internal_launch_confirm_router
+from app.api.internal.price import router as internal_price_router
+from app.api.internal.store import router as internal_store_router
 from app.api.v1.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
@@ -41,14 +40,14 @@ from app.api.v1.user import router as user_router
 from app.api.v1.wallet import router as wallet_router
 from app.api.v1.wxpay import router as wxpay_router
 from app.core.config import settings
-from app.core.daily_exchange_worker import (
-    start_daily_exchange_worker,
-    stop_daily_exchange_worker,
-)
 from app.core.heartbeat_monitor_worker import (
    start_heartbeat_monitor,
    stop_heartbeat_monitor,
 )
+from app.core.daily_exchange_worker import (
+    start_daily_exchange_worker,
+    stop_daily_exchange_worker,
+)
 from app.core.logging import setup_logging
 from app.core.pricebot_client import aclose_pricebot_client, get_pricebot_client
 from app.core.withdraw_reconcile_worker import (
@@ -138,30 +137,6 @@ app.include_router(cps_redirect_router)
 # 用户上传文件(头像)静态服务。生产可改由 nginx 直接 serve MEDIA_ROOT。
 _media_root = Path(settings.MEDIA_ROOT)
 _media_root.mkdir(parents=True, exist_ok=True)
-
-
-# 官网下载的 APK 直链(落地页 dl.html「官网下载」按钮指向 /media/shaguabijia.apk)。
-# 必须在 StaticFiles 挂载【之前】注册,否则被静态挂载吃掉。
-# StaticFiles 给 .apk 的 Content-Type 不对、且无 attachment 头 → 部分国产浏览器不触发下载、转甩应用市场;
-# 这里显式回 application/vnd.android.package-archive + Content-Disposition:attachment 强制浏览器下载。
-# 文件由 scripts/publish_apk.sh 编 release 包后放到 data/media/shaguabijia.apk(*.apk 不入 git,需部署时放)。
-_APK_PATH = _media_root / "shaguabijia.apk"
-
-
-@app.get(f"{settings.MEDIA_URL_PREFIX}/shaguabijia.apk", tags=["meta"], include_in_schema=False)
-def download_apk() -> FileResponse:
-    if not _APK_PATH.is_file():
-        from fastapi import HTTPException
-
-        raise HTTPException(status_code=404, detail="安装包未就绪")
-    return FileResponse(
-        _APK_PATH,
-        media_type="application/vnd.android.package-archive",
-        filename="shaguabijia.apk",
-        headers={"Content-Disposition": 'attachment; filename="shaguabijia.apk"'},
-    )
-
-
 app.mount(
    settings.MEDIA_URL_PREFIX,
    StaticFiles(directory=str(_media_root)),
@@ -1,7 +1,6 @@
 """所有 ORM model 必须在这里 import 一次,Alembic / metadata 才能扫到。"""
 from app.models.ad_ecpm import AdEcpmRecord  # noqa: F401
 from app.models.ad_feed_reward import AdFeedRewardRecord  # noqa: F401
-from app.models.ad_pangle_revenue import AdPangleDailyRevenue  # noqa: F401
 from app.models.ad_reward import AdRewardRecord  # noqa: F401
 from app.models.ad_watch_log import AdWatchLog  # noqa: F401
 from app.models.admin import AdminAuditLog, AdminUser  # noqa: F401
@@ -19,8 +18,8 @@ from app.models.coupon_state import (  # noqa: F401
    CouponClaimRecord,
    CouponDailyCompletion,
    CouponPromptEngagement,
-    CouponSession,
 )
+from app.models.cps_order import CpsOrder  # noqa: F401
 from app.models.feedback import Feedback  # noqa: F401
 from app.models.invite import InviteRelation  # noqa: F401
 from app.models.invite_fingerprint import InviteFingerprint  # noqa: F401
@@ -1,73 +0,0 @@
-"""穿山甲 GroMore 天级收益报表(后台结算口径,定时拉取入库)。
-
-每行 = GroMore 数据 API 返回的一条「日期 × 应用 × 代码位」聚合收益(`integrations/pangle_report`
-+ `scripts/sync_pangle_revenue` 落库)。**权威/预估收益的来源**,与 `ad_ecpm_record`(客户端自报
-eCPM 折算的预估)互为对照:
-
- `revenue_yuan` ← 接口 `revenue`(预估收益,元;排序价×展示/1000,所有 ADN 都有);
- `api_revenue_yuan` ← 接口 `api_revenue`(收益Api,元;各 ADN 经 Reporting 回传、更接近结算;
-  未配置该 ADN 的 Reporting 或查当天时为空)。
-
-⚠️ 穿山甲不提供分用户/设备维度,故本表最细只到 日期×应用×代码位,**无法挂到逐条广告事件**;
-广告收益报表里只用于汇总/趋势级的「穿山甲后台收益」,不改逐条行的客户端预估。
-"""
-from __future__ import annotations
-
-from datetime import datetime
-
-from sqlalchemy import (
-    DateTime,
-    Float,
-    Integer,
-    String,
-    UniqueConstraint,
-    func,
-)
-from sqlalchemy.orm import Mapped, mapped_column
-
-from app.db.base import Base
-
-
-class AdPangleDailyRevenue(Base):
-    __tablename__ = "ad_pangle_daily_revenue"
-    __table_args__ = (
-        # 一行 = (日期, 应用, 代码位, 广告源);adn 用 "" 表示「未分广告源、该代码位汇总」,
-        # 避免 NULL 在唯一约束里被视为各不相同导致 upsert 重复(SQLite/PG 行为一致)。
-        UniqueConstraint(
-            "report_date", "app_env", "our_code_id", "adn",
-            name="uq_ad_pangle_daily",
-        ),
-    )
-
-    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
-    # 北京时间日期串 'YYYY-MM-DD'(拉取时 time_zone=8),与 ad_ecpm_record.report_date 同口径,可直接 join。
-    report_date: Mapped[str] = mapped_column(String(10), index=True, nullable=False)
-    # 我们的应用环境:prod(傻瓜比价正式)/ test(测试);由 site_id 经 settings 映射而来。
-    app_env: Mapped[str] = mapped_column(String(16), nullable=False)
-    # 原始 GroMore AppId(site_id),留痕便于排查映射。
-    site_id: Mapped[str | None] = mapped_column(String(32), nullable=True)
-    # 广告位 ID(= 接口 ad_unit_id = 我们客户端配的 104xxx = ad_ecpm_record.our_code_id),join key。
-    # ⚠️ 不是接口的 code_id —— 那是底层各 ADN 的代码位(如 983674557),对不上我们的口径。
-    our_code_id: Mapped[str] = mapped_column(String(64), index=True, nullable=False)
-    # 广告源(接口 network 数字→名,如 pangle/gdt);"" = 未分广告源的代码位汇总行(当前默认口径)。
-    adn: Mapped[str] = mapped_column(String(16), nullable=False, default="")
-    # 预估收益(元)← 接口 revenue。
-    revenue_yuan: Mapped[float] = mapped_column(Float, nullable=False, default=0.0)
-    # 收益Api(元)← 接口 api_revenue;未配 Reporting / 当天 等情况接口不返回 → NULL。
-    api_revenue_yuan: Mapped[float | None] = mapped_column(Float, nullable=True)
-    # 预估 eCPM 原值(接口 ecpm,单位元/千次,**与客户端 getEcpm 的「分」不同**),参考用原样存。
-    ecpm: Mapped[str | None] = mapped_column(String(32), nullable=True)
-    # 展示次数 ← 接口 imp_cnt。
-    impressions: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
-    # 货币类型(接口 currency,正常为 cny)。
-    currency: Mapped[str] = mapped_column(String(8), nullable=False, default="cny")
-    # 最近一次同步写入时间(同一行可被多次回补覆盖;T+1 数据穿山甲会订正)。
-    synced_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"<AdPangleDailyRevenue {self.report_date} {self.app_env} "
-            f"code={self.our_code_id} revenue={self.revenue_yuan}>"
-        )
@@ -181,79 +181,3 @@ class CouponPromptEngagement(Base):
            f"<CouponPromptEngagement device={self.device_id} "
            f"date={self.engage_date} type={self.engage_type}>"
        )
-
-
-class CouponSession(Base):
-    """一次领券任务的全程流水(admin「领券数据」看板数据源,2026-06-30)。
-
-    与 coupon_claim_record(按券一天一条去重)、coupon_daily_completion(按设备一天一条)都不同:
-    本表**一次领券一条**(trace_id 唯一),记从发起(started)到收尾(completed/failed/abandoned)的
-    全程耗时 + 各平台耗时 + 机型/ROM。客户端 POST /api/v1/coupon/session 两段上报:发起建行、
-    收尾按 trace_id 更新同一行。发起即落库 → admin 可算「发起数」与中途流失(started 无终态=未完成)。
-
-    口径:elapsed_ms 由客户端全程计时(点发起→收尾)、权威;started_at/finished_at 为时刻留痕。
-    started_date = started_at 的 Asia/Shanghai 自然日,供 admin 按天聚合 / 日期筛选(索引)。
-    """
-
-    __tablename__ = "coupon_session"
-    __table_args__ = (
-        # 一次领券一行:trace_id 幂等 upsert(发起建、收尾更新同一行)。
-        UniqueConstraint("trace_id", name="uq_coupon_session_trace"),
-        # admin 主聚合/筛选:按上海自然日 + 环境(报表默认只看 prod,避免测试数据串台)。
-        Index("ix_coupon_session_date_env", "started_date", "app_env"),
-    )
-
-    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
-
-    # 一次领券唯一 id(客户端 UUID,全程贯穿),upsert 键。
-    trace_id: Mapped[str] = mapped_column(String(64), nullable=False)
-    device_id: Mapped[str] = mapped_column(String(64), nullable=False)
-    # 登录态才带(admin join 用户表出手机号/昵称);匿名领券为空。
-    user_id: Mapped[int | None] = mapped_column(Integer, index=True, nullable=True)
-
-    # started / completed / failed / abandoned。started 无终态 = 中途流失(未完成)。
-    status: Mapped[str] = mapped_column(String(16), nullable=False)
-    # prod / dev(客户端 BuildConfig.DEBUG)。admin 报表默认只看 prod(对齐广告报表防串台口径)。
-    app_env: Mapped[str | None] = mapped_column(String(16), index=True, nullable=True)
-
-    # 发起勾选平台 ["meituan-waimai", ...](空=全领)。
-    platforms: Mapped[list | None] = mapped_column(_JSON, nullable=True)
-    # 发起来源外卖 App 包名;null=App 内(傻瓜比价首页)发起,非空=从美团/淘宝/京东弹券发起。
-    # admin「发起平台」列据此区分(空→傻瓜比价,包名→对应平台)。
-    origin_package: Mapped[str | None] = mapped_column(String(64), nullable=True)
-    # 机型(Build.MANUFACTURER + MODEL)与 ROM(OemDetector,如 "ColorOS 14")。明细「机型/ROM」列 + 维度筛选。
-    device_model: Mapped[str | None] = mapped_column(String(128), nullable=True)
-    rom: Mapped[str | None] = mapped_column(String(64), nullable=True)
-
-    # 发起时刻(客户端墙钟):明细「时间」列、趋势 X 轴。
-    started_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
-    # 发起的 Asia/Shanghai 自然日:按天聚合 / 日期范围筛选(索引)。
-    started_date: Mapped[date] = mapped_column(Date, nullable=False)
-    # 收尾时刻(服务端 now);未收尾(流失)为空。
-    finished_at: Mapped[datetime | None] = mapped_column(
-        DateTime(timezone=True), nullable=True
-    )
-
-    # 全程耗时(ms,客户端点发起→收尾):平均 / 分位都基于它(只统计 completed)。
-    elapsed_ms: Mapped[int | None] = mapped_column(Integer, nullable=True)
-    # 各平台领券耗时 {"meituan-waimai":3200,...}(ms)。明细美团/淘宝/京东耗时列。
-    platform_elapsed: Mapped[dict | None] = mapped_column(_JSON, nullable=True)
-    # 领到总张数(收尾帧带)。
-    claimed_count: Mapped[int | None] = mapped_column(Integer, 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)
-
-    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"<CouponSession trace={self.trace_id} status={self.status} "
-            f"elapsed_ms={self.elapsed_ms}>"
-        )
@@ -1,9 +1,9 @@
-"""设备表(无障碍保护存活检测 + 极光推送)。
+"""设备表(无障碍保护存活检测 + 厂商直推)。

 每条 = 一个用户的一台设备(per-install,device_id 由客户端 DeviceId.get() 生成)。
 客户端的无障碍服务存活时周期上报心跳刷新 last_heartbeat_at;App 前台/登录时上报
-registration_id(极光推送目标)。后端 heartbeat_monitor_worker 扫描「曾经保护过、
-现在心跳超时」的设备,通过极光推送提醒用户重开无障碍。
+push_vendor + push_token(厂商推送目标)。后端 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 + 推送目标 registration_id),故名 device_liveness。
+    # (心跳 last_heartbeat_at + liveness_state + kill_alert_pending + 厂商推送目标),故名 device_liveness。
    __tablename__ = "device_liveness"
    __table_args__ = (
        UniqueConstraint("user_id", "device_id", name="uq_device_liveness_user_device"),
@@ -42,8 +42,12 @@ 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;拿到才填(JCollectionAuth 同意后才下发)
+    # 旧极光推送 registration id,仅为兼容历史客户端/数据保留;新链路使用 push_vendor + push_token。
    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)

@@ -25,11 +25,6 @@ class Feedback(Base):
    contact: Mapped[str] = mapped_column(String(128), nullable=False)
    # 截图 URL 列表(相对路径,如 ["/media/feedback/u1_ab12.jpg"]);无图为 None
    images: Mapped[list[str] | None] = mapped_column(JSON, nullable=True)
-    # 提交时的端环境快照(admin 排查用;客户端改版带上后的新反馈才有,历史数据为 NULL)
-    app_version: Mapped[str | None] = mapped_column(String(32), nullable=True)  # 我们 app versionName
-    device_model: Mapped[str | None] = mapped_column(String(64), nullable=True)  # Build.MODEL
-    rom_name: Mapped[str | None] = mapped_column(String(32), nullable=True)  # OemDetector os:ColorOS/MIUI/...
-    android_version: Mapped[str | None] = mapped_column(String(16), nullable=True)  # Build.VERSION.RELEASE
    # pending(审核中) / adopted(已采纳) / rejected(未采纳)
    status: Mapped[str] = mapped_column(String(16), nullable=False, default="pending", index=True)
    reject_reason: Mapped[str | None] = mapped_column(String(256), nullable=True)
@@ -1,109 +0,0 @@
-"""穿山甲 GroMore 天级收益 读写(`ad_pangle_daily_revenue` 表)。
-
-`scripts/sync_pangle_revenue` 拉数后调 `upsert_daily_rows` 落库(同一(日期×应用×代码位×广告源)
-幂等覆盖,T+1 订正可重跑);admin 广告收益报表调 `aggregate_by_date` 取「穿山甲后台收益」做
-汇总/趋势级展示。穿山甲无用户维度,故这里不涉及 user_id。
-"""
-from __future__ import annotations
-
-from typing import Any, TypedDict
-
-from sqlalchemy import func, select
-from sqlalchemy.orm import Session
-
-from app.models.ad_pangle_revenue import AdPangleDailyRevenue
-
-# upsert 时可被覆盖更新的列(唯一键之外的业务列)。
-_UPDATABLE = ("site_id", "revenue_yuan", "api_revenue_yuan", "ecpm", "impressions", "currency")
-
-
-class PangleDateAgg(TypedDict):
-    date: str
-    revenue_yuan: float
-    api_revenue_yuan: float | None
-    impressions: int
-
-
-def upsert_daily_rows(db: Session, rows: list[dict[str, Any]]) -> dict[str, int]:
-    """按唯一键 (report_date, app_env, our_code_id, adn) 逐行 upsert。
-
-    每个 row 须含:report_date, app_env, our_code_id;可选 adn(默认"")、site_id、
-    revenue_yuan、api_revenue_yuan、ecpm、impressions、currency。返回 {inserted, updated}。
-    规模很小(代码位数×天数),逐行 select-then-write 足够,且 SQLite/PG 通用。
-    """
-    inserted = updated = 0
-    for row in rows:
-        adn = row.get("adn") or ""
-        existing = db.execute(
-            select(AdPangleDailyRevenue).where(
-                AdPangleDailyRevenue.report_date == row["report_date"],
-                AdPangleDailyRevenue.app_env == row["app_env"],
-                AdPangleDailyRevenue.our_code_id == row["our_code_id"],
-                AdPangleDailyRevenue.adn == adn,
-            )
-        ).scalar_one_or_none()
-
-        if existing is None:
-            db.add(AdPangleDailyRevenue(
-                report_date=row["report_date"],
-                app_env=row["app_env"],
-                site_id=row.get("site_id"),
-                our_code_id=row["our_code_id"],
-                adn=adn,
-                revenue_yuan=float(row.get("revenue_yuan") or 0.0),
-                api_revenue_yuan=row.get("api_revenue_yuan"),
-                ecpm=row.get("ecpm"),
-                impressions=int(row.get("impressions") or 0),
-                currency=row.get("currency") or "cny",
-            ))
-            inserted += 1
-        else:
-            for col in _UPDATABLE:
-                if col in row:
-                    setattr(existing, col, row[col])
-            updated += 1
-    db.commit()
-    return {"inserted": inserted, "updated": updated}
-
-
-def aggregate_by_date(
-    db: Session,
-    *,
-    date_from: str,
-    date_to: str,
-    app_env: str | None = None,
-    our_code_id: str | None = None,
-) -> list[PangleDateAgg]:
-    """按日期汇总穿山甲收益(闭区间,北京时间),供报表趋势 + 合计。
-
-    revenue_yuan = Σrevenue;api_revenue_yuan = Σapi_revenue(SQL SUM 忽略 NULL,
-    全为空则返回 None,前端显示「-」)。可选按应用 / 代码位过滤。返回按日期升序。
-    """
-    stmt = (
-        select(
-            AdPangleDailyRevenue.report_date,
-            func.sum(AdPangleDailyRevenue.revenue_yuan),
-            func.sum(AdPangleDailyRevenue.api_revenue_yuan),
-            func.sum(AdPangleDailyRevenue.impressions),
-        )
-        .where(
-            AdPangleDailyRevenue.report_date >= date_from,
-            AdPangleDailyRevenue.report_date <= date_to,
-        )
-        .group_by(AdPangleDailyRevenue.report_date)
-        .order_by(AdPangleDailyRevenue.report_date)
-    )
-    if app_env is not None:
-        stmt = stmt.where(AdPangleDailyRevenue.app_env == app_env)
-    if our_code_id is not None:
-        stmt = stmt.where(AdPangleDailyRevenue.our_code_id == our_code_id)
-
-    out: list[PangleDateAgg] = []
-    for report_date, rev, api_rev, imp in db.execute(stmt).all():
-        out.append(PangleDateAgg(
-            date=report_date,
-            revenue_yuan=round(float(rev or 0.0), 6),
-            api_revenue_yuan=(round(float(api_rev), 6) if api_rev is not None else None),
-            impressions=int(imp or 0),
-        ))
-    return out
@@ -6,7 +6,7 @@
 from __future__ import annotations

 import logging
-from datetime import date, datetime, timezone
+from datetime import date, datetime
 from zoneinfo import ZoneInfo

 from sqlalchemy import delete, func, select
@@ -17,7 +17,6 @@ from app.models.coupon_state import (
    CouponClaimRecord,
    CouponDailyCompletion,
    CouponPromptEngagement,
-    CouponSession,
 )

 logger = logging.getLogger("shagua.coupon_state")
@@ -233,91 +232,3 @@ def sum_claimed_count(db: Session, user_id: int) -> int:
        )
    ).scalar_one()
    return int(total or 0)
-
-
-# ===== 领券任务流水(coupon_session,admin「领券数据」看板数据源)=====
-
-def upsert_coupon_session(
-    db: Session,
-    *,
-    trace_id: str,
-    device_id: str,
-    status: str,
-    started_at_ms: int,
-    user_id: int | None = None,
-    platforms: list[str] | None = None,
-    origin_package: str | None = None,
-    device_model: str | None = None,
-    rom: str | None = None,
-    app_env: str | None = None,
-    elapsed_ms: int | None = None,
-    platform_elapsed: dict | None = None,
-    claimed_count: int | None = None,
-    trace_url: str | None = None,
-) -> None:
-    """一条领券流水按 trace_id 幂等 upsert(发起 started 建行、收尾终态更新同一行)。
-
-    - 乱序/重复兜底:终态(completed/failed/abandoned)先到也建行;started 重复到不覆盖已有终态
-      (状态只前进,不降级)。
-    - started_at 由客户端墙钟毫秒转;started_date 取其 Asia/Shanghai 自然日(admin 按天聚合/筛选)。
-    - 终态帧补 finished_at=服务端 now;各字段非空才写(避免 started 帧的 None 抹掉收尾值,反之亦然)。
-    并发 IntegrityError 回滚忽略(本就幂等)。
-    """
-    started_at = datetime.fromtimestamp(started_at_ms / 1000, tz=timezone.utc)
-    started_date = started_at.astimezone(_CN_TZ).date()
-    is_terminal = status in ("completed", "failed", "abandoned")
-
-    row = db.execute(
-        select(CouponSession).where(CouponSession.trace_id == trace_id)
-    ).scalar_one_or_none()
-
-    if row is None:
-        db.add(CouponSession(
-            trace_id=trace_id,
-            device_id=device_id,
-            user_id=user_id,
-            status=status,
-            app_env=app_env,
-            platforms=platforms,
-            origin_package=origin_package,
-            device_model=device_model,
-            rom=rom,
-            started_at=started_at,
-            started_date=started_date,
-            finished_at=datetime.now(timezone.utc) if is_terminal else None,
-            elapsed_ms=elapsed_ms,
-            platform_elapsed=platform_elapsed,
-            claimed_count=claimed_count,
-            trace_url=trace_url,
-        ))
-    else:
-        # 状态只前进:started 帧重复到(如 START_STICKY 重启)不把已有终态降级回 started。
-        if not (status == "started" and row.status in ("completed", "failed", "abandoned")):
-            row.status = status
-        if is_terminal:
-            row.finished_at = datetime.now(timezone.utc)
-        if user_id is not None:
-            row.user_id = user_id
-        if platforms is not None:
-            row.platforms = platforms
-        if origin_package is not None:
-            row.origin_package = origin_package
-        if device_model is not None:
-            row.device_model = device_model
-        if rom is not None:
-            row.rom = rom
-        if app_env is not None:
-            row.app_env = app_env
-        if elapsed_ms is not None:
-            row.elapsed_ms = elapsed_ms
-        if platform_elapsed is not None:
-            row.platform_elapsed = platform_elapsed
-        if claimed_count is not None:
-            row.claimed_count = claimed_count
-        if trace_url is not None:
-            row.trace_url = trace_url
-    try:
-        db.commit()
-    except IntegrityError:
-        # 并发下另一请求刚插了同 trace_id → 唯一约束撞,回滚忽略(本就幂等)。
-        db.rollback()
@@ -21,17 +21,23 @@ def register_or_update(
    *,
    user_id: int,
    device_id: str,
-    registration_id: str | None,
+    registration_id: str | None = None,
+    push_vendor: str | None = None,
+    push_token: str | None = None,
    platform: str = "android",
    app_version: str | None = None,
 ) -> DeviceLiveness:
-    """注册设备或更新其 registration_id / 元信息。upsert by (user_id, device_id)。"""
+    """注册设备或更新其厂商 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
    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,
        )
@@ -39,6 +45,10 @@ 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:
@@ -54,7 +64,9 @@ def touch_heartbeat(
    user_id: int,
    device_id: str,
    accessibility_enabled: bool,
-    registration_id: str | None,
+    registration_id: str | None = None,
+    push_vendor: str | None = None,
+    push_token: str | None = None,
 ) -> DeviceLiveness:
    """处理一次心跳(心跳也能自注册)。

@@ -69,6 +81,12 @@ 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:
@@ -87,7 +105,7 @@ def touch_heartbeat(
 def list_overdue(db: Session, *, timeout_minutes: int) -> list[DeviceLiveness]:
    """掉线设备:曾经保护过、当前 alive、心跳超时。

-    本期只做终端打印检测、不推送 → 不再要求有 registration_id(没接极光 token 的设备也要检出)。
+    即使没有厂商 token 也要检出,后续由 kill_alert_pending 走客户端进 App 后兜底提醒。
    """
    cutoff = datetime.now(timezone.utc) - timedelta(minutes=timeout_minutes)
    stmt = select(DeviceLiveness).where(
@@ -124,3 +142,27 @@ 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 _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)
@@ -17,20 +17,12 @@ def create_feedback(
    content: str,
    contact: str,
    images: list[str] | None,
-    app_version: str | None = None,
-    device_model: str | None = None,
-    rom_name: str | None = None,
-    android_version: str | None = None,
 ) -> Feedback:
    fb = Feedback(
        user_id=user_id,
        content=content,
        contact=contact,
        images=images or None,
-        app_version=app_version or None,
-        device_model=device_model or None,
-        rom_name=rom_name or None,
-        android_version=android_version or None,
        status="pending",
        created_at=datetime.now(CN_TZ).replace(tzinfo=None),
    )
@@ -216,21 +216,13 @@ def try_reward_on_compare(db: Session, invitee_user_id: int) -> CompareRewardRes
 def get_stats(db: Session, inviter_id: int) -> tuple[int, int]:
    """返回 (已成功邀请人数, 累计从邀请获得的金币)。

-    "已邀请好友数"口径 = 完成一次比价(已触发邀请奖励金)的被邀请人数,即 compare_reward_granted=True。
-    不再数"仅绑定未比价"的关系——否则会出现"已邀请 1、可提现余额 0"(好友下载登录但没比价),
-    与产品口径"已邀请好友数 × 2元 = 累计提现 + 可提现余额"对不上。过滤后该恒等式天然成立
-    (每个计入的好友都恰好发过 1 笔 2 元,钱要么在余额要么已提现)。
-
    金币口径(inviter_coin 之和)自 v3 起恒 0(邀请人收益改走邀请奖励金,见 get_reward_stats /
    try_reward_on_compare);保留返回位兼容旧响应字段 coins_earned。
    """
    count = db.execute(
        select(func.count())
        .select_from(InviteRelation)
-        .where(
-            InviteRelation.inviter_user_id == inviter_id,
-            InviteRelation.compare_reward_granted.is_(True),
-        )
+        .where(InviteRelation.inviter_user_id == inviter_id)
    ).scalar_one()
    coins = db.execute(
        select(func.coalesce(func.sum(InviteRelation.inviter_coin), 0))
@@ -2,10 +2,8 @@
 from __future__ import annotations

 import logging
-from datetime import datetime
 from typing import Optional

-from sqlalchemy import select
 from sqlalchemy.orm import Session

 from app.models.launch_confirm_sample import LaunchConfirmSample
@@ -35,27 +33,3 @@ def insert_sample(db: Session, payload: LaunchConfirmSampleIn) -> int:
    db.commit()
    db.refresh(row)
    return row.id
-
-
-def list_samples(
-    db: Session,
-    *,
-    exec_success: Optional[bool] = None,
-    host_package: Optional[str] = None,
-    since: Optional[datetime] = None,
-    limit: int = 1000,
-) -> list[LaunchConfirmSample]:
-    """按条件查样本(pricebot 的 distill_launch_confirm.py 沉淀工具读)。created_at 升序。
-
-    过滤项都可空:exec_success(只看放行成功的)/ host_package(只看某宿主包)/
-    since(>= created_at)。limit 兜底防一次拉爆全表。
-    """
-    stmt = select(LaunchConfirmSample)
-    if exec_success is not None:
-        stmt = stmt.where(LaunchConfirmSample.exec_success == exec_success)
-    if host_package:
-        stmt = stmt.where(LaunchConfirmSample.host_package == host_package)
-    if since is not None:
-        stmt = stmt.where(LaunchConfirmSample.created_at >= since)
-    stmt = stmt.order_by(LaunchConfirmSample.created_at.asc()).limit(limit)
-    return list(db.execute(stmt).scalars().all())
@@ -6,6 +6,7 @@ from __future__ import annotations

 import secrets
 import string
+import hashlib
 from datetime import datetime, timezone

 from sqlalchemy import select
@@ -70,6 +71,21 @@ 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 _wechat_placeholder_phone(openid: str) -> str:
+    """给纯微信注册用户生成内部登录号。
+
+    当前 user.phone 非空唯一,而微信 App 授权不会返回手机号。这里生成一个不可能
+    命中手机号正则的内部值,只用于满足既有表结构和客户端登录态判断。
+    """
+    digest = hashlib.sha256(openid.encode("utf-8")).hexdigest()[:16]
+    return f"wx_{digest}"
+
+
 def upsert_user_for_login(
    db: Session,
    *,
@@ -99,6 +115,52 @@ def upsert_user_for_login(
    return user


+def upsert_user_for_wechat_login(
+    db: Session,
+    *,
+    openid: str,
+    nickname: str | None = None,
+    avatar_url: str | None = None,
+) -> User:
+    """微信 App 登录:openid 已存在则回到原账号,不存在则注册新账号。
+
+    如果用户之前在提现页绑定过微信,该 openid 已在 user.wechat_openid 上,因此会
+    直接登录到同一账号;新微信用户则创建 register_channel=wechat 的账号。
+    """
+    user = get_user_by_wechat_openid(db, openid)
+    now = datetime.now(timezone.utc)
+    if user is None:
+        phone = _wechat_placeholder_phone(openid)
+        # 极小概率 hash 前缀碰撞时,后缀追加随机段兜底。
+        if get_user_by_phone(db, phone) is not None:
+            phone = f"wx_{secrets.token_hex(8)}"
+        user = User(
+            phone=phone,
+            username=_gen_unique_username(db),
+            nickname=nickname or _gen_nickname(),
+            avatar_url=avatar_url,
+            register_channel="wechat",
+            wechat_openid=openid,
+            wechat_nickname=nickname,
+            wechat_avatar_url=avatar_url,
+            last_login_at=now,
+        )
+        db.add(user)
+    else:
+        user.last_login_at = now
+        if nickname:
+            user.wechat_nickname = nickname
+            if not user.nickname:
+                user.nickname = nickname
+        if avatar_url:
+            user.wechat_avatar_url = avatar_url
+            if not user.avatar_url:
+                user.avatar_url = avatar_url
+    db.commit()
+    db.refresh(user)
+    return user
+
+
 def update_nickname(db: Session, user: User, *, nickname: str) -> User:
    user.nickname = nickname
    db.commit()
@@ -610,7 +610,6 @@ def create_withdraw(
    source: str = "coin_cash",
    user_name: str | None = None,
    out_bill_no: str | None = None,
-    allow_sub_min: bool = False,
 ) -> WithdrawOrder:
    """发起提现:原子扣款 + 建单 reviewing(待人工审核),**不打款**。

@@ -620,13 +619,8 @@ def create_withdraw(
       重复发起多笔提现(审核拒绝再退回)。
    #2 out_bill_no 客户端幂等键:同号重试返回该单现状(reviewing 等审核),不重复扣款建单。
    实名 user_name 在此存下(WithdrawOrder.user_name),供异步审核打款时传给微信(达额需实名)。
-
-    allow_sub_min:放行低于"提现最低额"的小额(用于 0.01 元调试提现)。仅由 endpoint 在
-    `skip_review and not is_prod`(debug 包 + 非生产双闸)时置 True;仍受 schema gt=0 与 max 上限约束。
-    生产恒为 False → 最低额校验照常,绝不可能提 0.01。
    """
-    min_c = 0 if allow_sub_min else rewards.get_withdraw_min_cents(db)
-    if amount_cents < min_c or amount_cents > rewards.get_withdraw_max_cents(db):
+    if amount_cents < rewards.get_withdraw_min_cents(db) or amount_cents > rewards.get_withdraw_max_cents(db):
        raise InvalidWithdrawAmountError

    # 提现即要求已绑微信:否则审核通过也打不了款,提前拦更友好
@@ -67,6 +67,14 @@ class JverifyLoginRequest(BaseModel):
    )


+class WechatLoginRequest(BaseModel):
+    code: str = Field(..., min_length=1, description="微信 SDK SendAuth.Resp 返回的一次性授权 code")
+    device_id: str = Field(
+        "", max_length=64,
+        description="硬件级设备标识(Android ANDROID_ID),用于新手引导按 设备+账号 去重;空=按未完成处理",
+    )
+
+
 # ===== 短信验证码 =====

 class SmsSendRequest(BaseModel):
@@ -49,28 +49,3 @@ class CouponStatsOut(BaseModel):
    """

    coupon_count: int
-
-
-class CouponSessionIn(BaseModel):
-    """客户端领券流水上报体(admin「领券数据」看板数据源,POST /api/v1/coupon/session)。
-
-    一次领券两段上报,按 trace_id upsert 到 coupon_session:
-    - 发起(status=started):带勾选平台 + 机型/ROM/app_env + started_at_ms(发起墙钟毫秒)。
-    - 收尾(completed/failed/abandoned):带 elapsed_ms(全程耗时)+ platform_elapsed(各平台耗时)+ claimed_count。
-    不鉴权(同领券循环 MVP,按 device_id/trace_id),user_id 登录态带上做留痕(可空)。
-    """
-
-    trace_id: str
-    device_id: str
-    status: str  # started / completed / failed / abandoned
-    started_at_ms: int  # 发起墙钟毫秒(客户端 System.currentTimeMillis)
-    user_id: int | None = None
-    platforms: list[str] | None = None
-    origin_package: str | None = None
-    device_model: str | None = None
-    rom: str | None = None
-    app_env: str | None = None
-    elapsed_ms: int | None = None
-    platform_elapsed: dict[str, int] | None = None
-    claimed_count: int | None = None
-    trace_url: str | None = None
@@ -3,12 +3,15 @@ from __future__ import annotations

 from datetime import datetime

-from pydantic import BaseModel, ConfigDict
+from pydantic import BaseModel, ConfigDict, Field


 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

@@ -18,6 +21,8 @@ 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):
@@ -26,6 +31,8 @@ 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
@@ -46,3 +53,17 @@ 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
@@ -1,9 +1,7 @@
 """启动确认窗兜底样本的内部上报模型(pricebot → app-server)。"""
 from __future__ import annotations

-from datetime import datetime
-
-from pydantic import BaseModel, ConfigDict
+from pydantic import BaseModel


 class LaunchConfirmSampleIn(BaseModel):
@@ -26,20 +24,3 @@ class LaunchConfirmSampleOut(BaseModel):
    """落库结果。"""

    id: int
-
-
-class LaunchConfirmSampleRow(BaseModel):
-    """单条样本(列表读出;沉淀脚本 distill 用,payload 原样带出)。"""
-
-    model_config = ConfigDict(from_attributes=True)
-
-    id: int
-    created_at: datetime
-    trace_id: str | None = None
-    device_id: str | None = None
-    host_package: str | None = None
-    target_app: str | None = None
-    system_locale: str | None = None
-    exec_success: bool = False
-    dialog_title: str | None = None
-    payload: dict | None = None
@@ -198,7 +198,7 @@
      选择「<span class="guide-highlight">在浏览器打开</span>」
      <span class="guide-final">在浏览器里按提示<span class="guide-target">去应用商店下载</span></span>
    </h2>
-    <!-- <div class="guide-dismiss" id="wxGuideDismiss">我知道了 ✕</div> -->
+    <div class="guide-dismiss" id="wxGuideDismiss">我知道了 ✕</div>
  </div>

  <div class="toast" id="toast" role="status" aria-live="polite"></div>
@@ -263,7 +263,7 @@
  var wxGuide = document.getElementById("wxGuide");
  function showWxGuide() { wxGuide.classList.add("show"); }
  function hideWxGuide() { wxGuide.classList.remove("show"); }
-  // document.getElementById("wxGuideDismiss").addEventListener("click", hideWxGuide);  // 「我知道了 ✕」已注释隐藏
+  document.getElementById("wxGuideDismiss").addEventListener("click", hideWxGuide);
  if (isWeChat) showWxGuide();   // 微信里一进页面就提示去浏览器（微信内下载必被拦）

  function showToast(text) {
@@ -273,24 +273,15 @@
    showToast.timer = setTimeout(function () { toast.classList.remove("show"); }, 1400);
  }

-  // ===== 应用商店下载：微信内引导去浏览器；iOS 提示；安卓写邀请码 + 跳应用商店 =====
+  // ===== 下载按钮：微信内引导去浏览器；iOS 提示；安卓写邀请码 + 跳应用商店 =====
  function handleDownload() {
    if (isWeChat) { showWxGuide(); return; }
    if (isIOS)    { alert("iOS 版即将上线，请前往 App Store 搜索「傻瓜比价」"); return; }
    copyInviteCode();   // 先把邀请码写进剪贴板（供 App 首启归因），链路丢了还有 landing-track 指纹兜底
    openStore();
  }
-  // ===== 官网下载：微信/iOS 同上引导；安卓直接跳 APK 直链 → 弹系统下载弹窗 =====
-  // APK_URL 跟随页面 host：本地走 LAN、生产走 app-api.shaguabijia.com（见邀请功能文档约定）。
-  var APK_URL = location.origin + "/media/shaguabijia.apk";
-  function handleWebsiteDownload() {
-    if (isWeChat) { showWxGuide(); return; }
-    if (isIOS)    { alert("iOS 版即将上线，请前往 App Store 搜索「傻瓜比价」"); return; }
-    copyInviteCode();   // 同样先写邀请码进剪贴板（供 App 首启归因）
-    window.location.href = APK_URL;
-  }
  document.getElementById("dlbtn").addEventListener("click", handleDownload);
-  document.getElementById("dlbtn2").addEventListener("click", handleWebsiteDownload);
+  document.getElementById("dlbtn2").addEventListener("click", handleDownload);
 </script>
 </body>
 </html>
@@ -46,10 +46,7 @@
  | `total` | int | 当前筛选下的**分页总条数**(全量,不受分页影响;= 前端分页器 total) |
  | `truncated` | bool | 当前页之后是否还有更多事件(`len(events) > offset + limit`) |
  | `total_impressions` | int | 全量展示条数合计 |
-  | `total_revenue_yuan` | float | 全量**客户端预估**收益合计(元;eCPM 折算) |
-  | `total_pangle_revenue_yuan` | float \| null | 全量**穿山甲后台预估**收益合计(元;GroMore `revenue`)。穿山甲无用户/类型/场景维度,**仅全量视图**(未按 `user_id`/`ad_type`/`feed_scene` 过滤)有值,否则 `null` |
-  | `total_pangle_api_revenue_yuan` | float \| null | 全量**穿山甲收益Api**合计(元;GroMore `api_revenue`,各 ADN 回传更接近结算);未配 Reporting / 查当天 / 非全量视图为 `null` |
-  | `pangle_revenue_available` | bool | 本次是否带穿山甲后台收益(=全量视图且对应日期已同步到 `ad_pangle_daily_revenue`) |
+  | `total_revenue_yuan` | float | 全量收益合计(元) |
  | `total_expected_coin` | int | 全量应发金币合计 |
  | `total_actual_coin` | int | 全量实发金币合计 |
  | `mismatch_count` | int | 应发≠实发的组数(=0 说明全部按公式发放) |
@@ -60,9 +57,7 @@
 |---|---|---|
 | `date` | string | 北京时间 `YYYY-MM-DD` |
 | `impressions` | int | 当天展示条数合计 |
-| `revenue_yuan` | float | 当天客户端预估收益合计(元;eCPM 折算) |
-| `pangle_revenue_yuan` | float \| null | 当天穿山甲后台预估收益(元;GroMore `revenue`);非全量视图 / 无数据为 `null` |
-| `pangle_api_revenue_yuan` | float \| null | 当天穿山甲收益Api(元;GroMore `api_revenue`);未配 / 当天 / 无数据为 `null` |
+| `revenue_yuan` | float | 当天预估收益合计(元) |
 | `expected_coin` | int | 当天应发金币合计 |
 | `actual_coin` | int | 当天实发金币合计 |

@@ -130,6 +125,5 @@
 - **展示 vs 发奖分离**:信息流轮播一会话可展示多条(都计入 `impressions`),但发奖仍按现规则(一会话发一次),`coin` 不因展示条数变化——这是有意设计(用户中途关只记展示不发奖)。
 - **历史 Draw 不可拆**:迁移(Draw→普通信息流)前,Draw 发奖混在 `ad_feed_reward_record` 且无类型标记,金币侧统一记 `feed`;迁移后 Draw 不再产生新数据。展示侧 `ad_type` 由客户端上报区分,故 `draw` 桶基本为空。
 - **来源字段从上线起齐全**:`app_env`/`our_code_id` 是本期新增列,历史记录为 NULL(报表来源列留空)。
- **逐条/明细的收益是预估**:`items[].revenue_yuan` 基于客户端上报的 eCPM 折算,非穿山甲后台结算值。
- **穿山甲后台收益(汇总/趋势级)**:`total_pangle_revenue_yuan`(预估 `revenue`)与 `total_pangle_api_revenue_yuan`(收益Api `api_revenue`,更接近结算)来自穿山甲 **GroMore 数据 API**(`integrations/pangle_report` + `scripts/sync_pangle_revenue` 按天 T+1 拉取入 [ad_pangle_daily_revenue](../database/ad_pangle_daily_revenue.md))。穿山甲**不提供分用户/设备/类型/场景维度**(官方明确),最细到 日期×应用×代码位,故只用于汇总与按天趋势的对照,**不挂到逐条事件行**;且仅在全量视图(未按 user/类型/场景过滤)展示。配置见 `.env` 的 `PANGLE_REPORT_*`。
+- **收益是预估**:基于客户端上报的 eCPM,非穿山甲后台结算值;以后台报表为结算权威。
 - **对账聚合级 + 逐条下钻**:行级 `matched` 给出该组(用户×类型×应用×代码位)应发是否==实发;**展开 `records` 即可看该组逐条明细**(eCPM/因子1/份数/LT/因子2/应发/实发/一致)定位到具体记录。独立逐条审计接口 [admin-ad-coin-audit](./admin-ad-coin-audit.md) 仍保留(同一复算口径,可全局按场景/只看不符筛选)。
@@ -1,45 +0,0 @@
-# ad_pangle_daily_revenue — 穿山甲 GroMore 天级收益
-
-> 模型:[app/models/ad_pangle_revenue.py](../../app/models/ad_pangle_revenue.py) | 读写:[app/repositories/ad_pangle_revenue.py](../../app/repositories/ad_pangle_revenue.py) | 拉取:[app/integrations/pangle_report.py](../../app/integrations/pangle_report.py) + [scripts/sync_pangle_revenue.py](../../scripts/sync_pangle_revenue.py)
-
-存放从穿山甲 **GroMore 数据 API**(聚合数据报告 API,天级、T+1)按天拉取的收益,供 admin
-[广告收益报表](../api/admin-ad-revenue-report.md) 的「穿山甲后台收益」做汇总/趋势级展示,
-与客户端自报 eCPM 折算的预估互为对照(看 gap)。
-
-**粒度 = 日期 × 应用(app_env) × 代码位(our_code_id) × 广告源(adn)**。穿山甲**不提供分用户/设备维度**
-(官方明确),故本表无 `user_id`,也无法挂到逐条广告事件;报表逐条行仍用客户端预估。
-
-## 数据流
-
- **写**:`scripts/sync_pangle_revenue`(线上每天 ~10:30 由 systemd timer 跑)调
-  `pangle_report.fetch_daily_report` 拉昨天(可 `--days N` 回补),维度 `date,site_id,ad_unit_id`,
-  映射 `site_id→app_env`、`ad_unit_id→our_code_id` 后 `upsert_daily_rows` 落库。按唯一键幂等,T+1 订正可重跑。
-  ⚠️ 用 `ad_unit_id`(广告位ID=104xxx)而非 `code_id`:实测 `code_id` 返回底层各 ADN 代码位(如 `983674557`),对不上我们的口径。
- **读**:`ad_pangle_revenue.aggregate_by_date` 按日期汇总 → admin 报表
-  `total_pangle_revenue_yuan` / `total_pangle_api_revenue_yuan` / `daily[].pangle_*`。
-
-## 字段
-
-| 列 | 类型 | 说明 |
-|---|---|---|
-| `id` | int PK | |
-| `report_date` | str(10) idx | 北京时间 `YYYY-MM-DD`(拉取 `time_zone=8`),与 `ad_ecpm_record.report_date` 同口径可 join |
-| `app_env` | str(16) | `prod`(傻瓜比价正式)/ `test`(测试);由 `site_id` 经 `settings.pangle_report_site_id_to_env` 映射;未映射记 `site:<id>` |
-| `site_id` | str(32) \| null | 原始 GroMore AppId(留痕) |
-| `our_code_id` | str(64) idx | 广告位 ID(= 接口 `ad_unit_id` = 客户端配的 104xxx = `ad_ecpm_record.our_code_id`),join key。⚠️ **非** `code_id`(那是底层各 ADN 代码位,对不上);`-1` 为 GroMore 未归因桶 |
-| `adn` | str(16) | 广告源(接口 `network`);当前默认口径不分广告源(按 `ad_unit_id` 汇总),统一 `""` |
-| `revenue_yuan` | float | 预估收益(元)← 接口 `revenue`(排序价×展示/1000,所有 ADN) |
-| `api_revenue_yuan` | float \| null | 收益Api(元)← 接口 `api_revenue`(各 ADN 经 Reporting 回传、更接近结算);未配 / 当天为 `null` |
-| `ecpm` | str(32) \| null | 预估 eCPM 原值(接口 `ecpm`,单位**元/千次**,与客户端 getEcpm 的「分」不同) |
-| `impressions` | int | 展示次数 ← 接口 `imp_cnt` |
-| `currency` | str(8) | 货币(接口 `currency`,正常 `cny`) |
-| `synced_at` | datetime | 最近同步写入时间(可被回补覆盖) |
-
-唯一约束 `uq_ad_pangle_daily (report_date, app_env, our_code_id, adn)`;`adn` 用 `""` 而非
-NULL,避免 NULL 在唯一约束里互不相同导致 upsert 重复。
-
-## 局限
-
- **T+1**:当天数据穿山甲不出 `api_revenue`,`revenue` 也次日才稳;报表「今天」此两列多为空。
- **`revenue` vs `api_revenue`**:前者所有 ADN 都有(预估口径);后者需后台为该 ADN 配置 Reporting
-  才回传,部分 ADN 可能长期为空。结算仍以各 ADN 结算单 / 穿山甲后台为准。
@@ -1,45 +0,0 @@
-#!/usr/bin/env bash
-# 编 release 正式包并发布到官网下载位 data/media/shaguabijia.apk。
-#
-# 背景:落地页 dl.html「官网下载」按钮指向 /media/shaguabijia.apk(见 app/main.py download_apk 路由)。
-# 该 apk 不入 git(.gitignore 忽略 *.apk),也没有 CI 自动放 —— 以前全靠手动 cp,常忘/放成 debug 包。
-# 本脚本把"编 release + 放到位"固化成一条命令。发版时跑一次即可。
-#
-# 用法:  bash scripts/publish_apk.sh
-# 产物:  <app-server>/data/media/shaguabijia.apk(release 签名、指向生产后端的正式包)
-#
-# 注意:① 需要 app/jishisongfu-release.jks 存在(release 签名,仅 CTO 持有);缺失会编译失败。
-#       ② 服务器部署不在本脚本职责内 —— 它只把 apk 放到本仓 data/media/;上线由部署流程把
-#          data/media/ 同步到生产(或 nginx serve 同目录)。
-set -euo pipefail
-
-# 路径全部相对脚本位置算,跟 CWD 无关。
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-SERVER_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
-ANDROID_DIR="$(cd "$SERVER_DIR/../shaguabijia-app-android" && pwd)"
-DEST="$SERVER_DIR/data/media/shaguabijia.apk"
-APK_OUT="$ANDROID_DIR/app/build/outputs/apk/release/app-release.apk"
-
-# Android Studio 自带 JBR(本机构建环境约定)。已设 JAVA_HOME 则尊重现有值。
-export JAVA_HOME="${JAVA_HOME:-D:/android-studio/jbr}"
-
-echo "[publish_apk] Android 工程: $ANDROID_DIR"
-if [ ! -f "$ANDROID_DIR/app/jishisongfu-release.jks" ]; then
-  echo "[publish_apk] ✗ 缺 app/jishisongfu-release.jks(release 签名),无法出正式包。" >&2
-  exit 1
-fi
-
-echo "[publish_apk] 编 release 包(assembleRelease,R8+release 签名,BASE_URL=生产)…"
-( cd "$ANDROID_DIR" && ./gradlew :app:assembleRelease )
-
-if [ ! -f "$APK_OUT" ]; then
-  echo "[publish_apk] ✗ 没找到产物 $APK_OUT" >&2
-  exit 1
-fi
-
-mkdir -p "$(dirname "$DEST")"
-cp "$APK_OUT" "$DEST"
-SIZE_MB=$(( $(wc -c < "$DEST") / 1024 / 1024 ))
-echo "[publish_apk] ✓ 已发布 → $DEST (${SIZE_MB}MB)"
-echo "[publish_apk]   官网下载链接(生产):https://app-api.shaguabijia.com/media/shaguabijia.apk"
-echo "[publish_apk]   部署:把 data/media/ 同步到生产服务器(本脚本不负责上线)。"
@@ -1,151 +0,0 @@
-"""每日拉取穿山甲 GroMore 天级收益报表入库(供 admin 广告收益报表的「穿山甲后台收益」)。
-
-GroMore 数据 API 为 T+1:次日穿山甲约 10:00 出数。建议线上每天 ~10:30 由 systemd timer 跑一次
-(默认拉【昨天】);穿山甲对历史数据可能订正,故支持回补近 N 天(幂等 upsert,重跑无害)。
-
-用法:
-    python -m scripts.sync_pangle_revenue                 # 拉昨天(北京时间)
-    python -m scripts.sync_pangle_revenue --days 3        # 回补昨天起往前 3 天
-    python -m scripts.sync_pangle_revenue --date 2026-06-27           # 指定单天
-    python -m scripts.sync_pangle_revenue --start 2026-06-01 --end 2026-06-27  # 指定区间
-
-约束(来自官方文档):天级跨度 ≤ 1 个月、不早于 12 个月;「今天」与「今天以前」必须分开查,
-本脚本默认只拉昨天及更早,不混查今天。未配置 PANGLE_REPORT_* 时直接 no-op 退出。
-"""
-from __future__ import annotations
-
-import argparse
-import sys
-from datetime import date, timedelta
-
-# Windows 控制台按 UTF-8 输出中文/¥
-try:
-    sys.stdout.reconfigure(encoding="utf-8")  # type: ignore[attr-defined]
-except Exception:  # noqa: BLE001
-    pass
-
-from app.core.config import settings
-from app.core.rewards import cn_today
-from app.db.session import SessionLocal
-from app.integrations import pangle_report
-from app.integrations.pangle_report import PangleReportError
-from app.repositories import ad_pangle_revenue as repo
-
-# 拉取维度固定:date×site_id×ad_unit_id。⚠️ 用 ad_unit_id(GroMore 广告位ID = 我们客户端配的 104xxx
-# = ad_ecpm_record.our_code_id)而**非** code_id —— 实测 code_id 返回的是底层各 ADN 的代码位
-# (如 983674557 / youlianghui_xinxiliu),对不上我们的口径。指标取预估 + Api 两个收益。
-_DIMENSIONS = "date,site_id,ad_unit_id"
-_METRICS = "revenue,api_revenue,ecpm,imp_cnt"
-
-
-def _to_float(v: object) -> float | None:
-    """接口数值字段都是字符串;空/非法 → None(api_revenue 缺失时即为 None,前端显示「-」)。"""
-    if v is None or str(v).strip() == "":
-        return None
-    try:
-        return float(str(v).strip())
-    except (TypeError, ValueError):
-        return None
-
-
-def _row_date(row: dict) -> str | None:
-    """报表行的日期:优先 date 维度,回退 start_date;取前 10 位 'YYYY-MM-DD'。"""
-    raw = row.get("date") or row.get("start_date") or ""
-    raw = str(raw).strip()
-    return raw[:10] if len(raw) >= 10 else None
-
-
-def _normalize(rows: list[dict]) -> tuple[list[dict], int, set[str]]:
-    """接口原始行 → 入库行;返回 (入库行, 跳过数, 未映射 site_id 集合)。
-
-    site_id 经 settings 映射成 app_env(prod/test);未映射的仍入库(app_env=site:<id>)但提示,
-    避免静默丢收益。缺 code_id / 日期的行跳过。
-    """
-    site_map = settings.pangle_report_site_id_to_env
-    out: list[dict] = []
-    skipped = 0
-    unmapped: set[str] = set()
-    for row in rows:
-        rdate = _row_date(row)
-        # 用 ad_unit_id(GroMore 广告位ID = 我们的 104xxx),不是 code_id(底层 ADN 代码位)
-        code_id = str(row.get("ad_unit_id") or "").strip()
-        if not rdate or not code_id:
-            skipped += 1
-            continue
-        site_id = str(row.get("site_id") or "").strip()
-        app_env = site_map.get(site_id)
-        if app_env is None:
-            app_env = f"site:{site_id}" if site_id else "unknown"
-            if site_id:
-                unmapped.add(site_id)
-        out.append({
-            "report_date": rdate,
-            "app_env": app_env,
-            "site_id": site_id or None,
-            "our_code_id": code_id,
-            "adn": "",
-            "revenue_yuan": _to_float(row.get("revenue")) or 0.0,
-            "api_revenue_yuan": _to_float(row.get("api_revenue")),
-            "ecpm": (str(row.get("ecpm")).strip() or None) if row.get("ecpm") is not None else None,
-            "impressions": int(_to_float(row.get("imp_cnt")) or 0),
-            "currency": "cny",
-        })
-    return out, skipped, unmapped
-
-
-def sync_range(start_date: str, end_date: str) -> None:
-    if not settings.pangle_report_configured:
-        print("PANGLE_REPORT_* 未配置,跳过(no-op)。需在后台「接入中心 → GroMore-API」领取 "
-              "user_id/role_id/Security Key 并填入 .env。")
-        return
-
-    print(f"拉取 GroMore 天级收益 {start_date} ~ {end_date} (dims={_DIMENSIONS}) ...")
-    try:
-        raw = pangle_report.fetch_daily_report(
-            start_date=start_date, end_date=end_date,
-            dimensions=_DIMENSIONS, metrics=_METRICS, time_zone=8,
-        )
-    except PangleReportError as e:
-        print(f"❌ 拉取失败:{e}")
-        sys.exit(1)
-
-    rows, skipped, unmapped = _normalize(raw)
-    if unmapped:
-        print(f"⚠️ 有未映射 site_id(收益仍入库,app_env=site:<id>):{sorted(unmapped)};"
-              f"如需归入 prod/test,补 PANGLE_REPORT_SITE_ID_* 配置。")
-    with SessionLocal() as db:
-        stats = repo.upsert_daily_rows(db, rows)
-    total_rev = round(sum(r["revenue_yuan"] for r in rows), 4)
-    print(f"✅ 完成:接口 {len(raw)} 行 → 入库 {len(rows)} 行(跳过 {skipped}),"
-          f"新增 {stats['inserted']} / 更新 {stats['updated']};预估收益合计 ¥{total_rev}")
-
-
-def main() -> None:
-    ap = argparse.ArgumentParser(description="拉取穿山甲 GroMore 天级收益报表入库")
-    ap.add_argument("--date", help="指定单天 YYYY-MM-DD")
-    ap.add_argument("--start", help="区间起始 YYYY-MM-DD(与 --end 同用)")
-    ap.add_argument("--end", help="区间结束 YYYY-MM-DD(与 --start 同用)")
-    ap.add_argument("--days", type=int, help="回补:昨天起往前 N 天(含昨天)")
-    args = ap.parse_args()
-
-    yesterday = cn_today() - timedelta(days=1)
-    if args.date:
-        start = end = args.date
-    elif args.start and args.end:
-        start, end = args.start, args.end
-    elif args.days:
-        start = (yesterday - timedelta(days=args.days - 1)).isoformat()
-        end = yesterday.isoformat()
-    else:
-        start = end = yesterday.isoformat()
-
-    # 防呆:跨度 > 31 天直接拒(接口上限 1 个月,超了会返回 114)
-    if (date.fromisoformat(end) - date.fromisoformat(start)).days > 31:
-        print("❌ 区间跨度超过 31 天(接口上限 1 个月),请分批拉。")
-        sys.exit(1)
-
-    sync_range(start, end)
-
-
-if __name__ == "__main__":
-    main()
@@ -68,6 +68,64 @@ def test_sms_login_and_me_flow(client) -> None:
    assert r.json()["ok"] is True


+def test_wechat_login_creates_and_reuses_user(client, monkeypatch) -> None:
+    """微信 code 登录:新 openid 注册,同 openid 重登回同一账号。"""
+    monkeypatch.setattr(
+        "app.api.v1.auth.code_to_userinfo",
+        lambda code: {
+            "openid": "openid_login_1",
+            "unionid": "union_1",
+            "nickname": "微信用户A",
+            "avatar_url": "https://wx/avatar-a.png",
+            "raw": {},
+        },
+    )
+
+    r = client.post("/api/v1/auth/wechat-login", json={"code": "code-a", "device_id": "dev-wx"})
+    assert r.status_code == 200, r.text
+    first = r.json()
+    assert first["user"]["register_channel"] == "wechat"
+    assert first["user"]["phone"].startswith("wx_")
+    assert first["user"]["nickname"] == "微信用户A"
+
+    r = client.post("/api/v1/auth/wechat-login", json={"code": "code-b", "device_id": "dev-wx"})
+    assert r.status_code == 200, r.text
+    second = r.json()
+    assert second["user"]["id"] == first["user"]["id"]
+
+
+def test_wechat_login_uses_existing_bound_user(client, monkeypatch) -> None:
+    """如果该微信已在提现页绑定过,微信登录应回到原手机号账号。"""
+    from app.db.session import SessionLocal
+    from app.repositories import user as user_repo
+
+    db = SessionLocal()
+    try:
+        user = user_repo.upsert_user_for_login(db, phone="13600136010", register_channel="sms")
+        user.wechat_openid = "openid_bound_1"
+        db.commit()
+        uid = user.id
+    finally:
+        db.close()
+
+    monkeypatch.setattr(
+        "app.api.v1.auth.code_to_userinfo",
+        lambda code: {
+            "openid": "openid_bound_1",
+            "unionid": None,
+            "nickname": "绑定微信",
+            "avatar_url": None,
+            "raw": {},
+        },
+    )
+
+    r = client.post("/api/v1/auth/wechat-login", json={"code": "code-bound", "device_id": "dev-wx"})
+    assert r.status_code == 200, r.text
+    body = r.json()
+    assert body["user"]["id"] == uid
+    assert body["user"]["phone"] == "13600136010"
+
+
 def test_sms_send_too_frequent(client) -> None:
    phone = "13900139000"
    assert client.post("/api/v1/auth/sms/send", json={"phone": phone}).status_code == 200
@@ -0,0 +1,317 @@
+from __future__ import annotations
+
+import json
+from datetime import datetime, timedelta, timezone
+
+from fastapi.testclient import TestClient
+
+from app.api.v1 import device as device_api
+from app.core import heartbeat_monitor_worker
+from app.db.session import SessionLocal
+from app.integrations import vendor_push
+from app.models.device import DeviceLiveness
+from app.repositories import user as user_repo
+
+
+class _Resp:
+    status_code = 200
+    text = "{}"
+
+    def __init__(self, data: dict) -> None:
+        self._data = data
+
+    def json(self) -> dict:
+        return self._data
+
+
+def test_xiaomi_accessibility_payload(monkeypatch) -> None:
+    captured: dict = {}
+
+    def _fake_request(method, url, **kwargs):  # noqa: ANN001
+        captured.update(method=method, url=url, **kwargs)
+        return _Resp({"code": 0, "result": "ok", "data": {"id": "xm-msg"}})
+
+    monkeypatch.setattr(vendor_push.settings, "XIAOMI_PUSH_APP_SECRET", "xiaomi-secret")
+    monkeypatch.setattr(vendor_push.settings, "XIAOMI_PUSH_CHANNEL_ID", "")
+    monkeypatch.setattr(vendor_push.settings, "XIAOMI_PUSH_TEMPLATE_ID", "")
+    monkeypatch.setattr(vendor_push.settings, "XIAOMI_PUSH_TEMPLATE_TITLE", "")
+    monkeypatch.setattr(vendor_push.settings, "XIAOMI_PUSH_TEMPLATE_DESCRIPTION", "")
+    monkeypatch.setattr(vendor_push.settings, "XIAOMI_PUSH_TEMPLATE_PARAM_JSON", "")
+    monkeypatch.setattr(vendor_push.httpx, "request", _fake_request)
+
+    data = vendor_push.send_accessibility_disabled("xiaomi", "xm-regid")
+
+    assert data["data"]["id"] == "xm-msg"
+    assert captured["method"] == "POST"
+    assert captured["url"] == vendor_push.settings.XIAOMI_PUSH_SEND_ENDPOINT
+    assert captured["headers"]["Authorization"] == "key=xiaomi-secret"
+    body = captured["data"]
+    assert body["registration_id"] == "xm-regid"
+    assert body["restricted_package_name"] == "com.jishisongfu.shaguabijia"
+    assert json.loads(body["payload"]) == {"type": "accessibility_disabled"}
+    assert "extra.channel_id" not in body
+
+
+def test_xiaomi_payload_with_channel_and_template(monkeypatch) -> None:
+    captured: dict = {}
+
+    def _fake_request(method, url, **kwargs):  # noqa: ANN001
+        captured.update(method=method, url=url, **kwargs)
+        return _Resp({"code": 0, "result": "ok", "data": {"id": "xm-msg"}})
+
+    monkeypatch.setattr(vendor_push.settings, "XIAOMI_PUSH_APP_SECRET", "xiaomi-secret")
+    monkeypatch.setattr(vendor_push.settings, "XIAOMI_PUSH_CHANNEL_ID", "130")
+    monkeypatch.setattr(vendor_push.settings, "XIAOMI_PUSH_TEMPLATE_ID", "1001")
+    monkeypatch.setattr(vendor_push.settings, "XIAOMI_PUSH_TEMPLATE_TITLE", "{$app_name$}提醒")
+    monkeypatch.setattr(vendor_push.settings, "XIAOMI_PUSH_TEMPLATE_DESCRIPTION", "{$content$}")
+    monkeypatch.setattr(
+        vendor_push.settings,
+        "XIAOMI_PUSH_TEMPLATE_PARAM_JSON",
+        '{"app_name":"傻瓜比价","content":"{alert}"}',
+    )
+    monkeypatch.setattr(vendor_push.httpx, "request", _fake_request)
+
+    vendor_push.send_accessibility_disabled(
+        "xiaomi",
+        "xm-regid",
+        title="测试标题",
+        alert="测试内容",
+    )
+
+    body = captured["data"]
+    assert body["title"] == "{$app_name$}提醒"
+    assert body["description"] == "{$content$}"
+    assert body["extra.channel_id"] == "130"
+    assert body["extra.template_id"] == "1001"
+    assert body["extra.template_param"] == '{"app_name":"傻瓜比价","content":"测试内容"}'
+
+
+def test_vivo_auth_and_send_payload(monkeypatch) -> None:
+    vendor_push._token_cache.clear()
+    calls: list[dict] = []
+
+    def _fake_request(method, url, **kwargs):  # noqa: ANN001
+        calls.append({"method": method, "url": url, **kwargs})
+        if url == vendor_push.settings.VIVO_PUSH_AUTH_ENDPOINT:
+            return _Resp({"result": 0, "authToken": "vivo-auth"})
+        return _Resp({"result": 0, "taskId": "vivo-task"})
+
+    monkeypatch.setattr(vendor_push.settings, "VIVO_PUSH_APP_ID", "106072775")
+    monkeypatch.setattr(vendor_push.settings, "VIVO_PUSH_APP_KEY", "vivo-key")
+    monkeypatch.setattr(vendor_push.settings, "VIVO_PUSH_APP_SECRET", "vivo-secret")
+    monkeypatch.setattr(vendor_push.httpx, "request", _fake_request)
+
+    data = vendor_push.send_accessibility_disabled("vivo", "vivo-regid")
+
+    assert data["taskId"] == "vivo-task"
+    assert calls[0]["url"] == vendor_push.settings.VIVO_PUSH_AUTH_ENDPOINT
+    assert calls[0]["json"]["appId"] == "106072775"
+    assert calls[0]["json"]["sign"]
+    assert calls[1]["url"] == vendor_push.settings.VIVO_PUSH_SEND_ENDPOINT
+    assert calls[1]["headers"]["authToken"] == "vivo-auth"
+    body = calls[1]["json"]
+    assert body["regId"] == "vivo-regid"
+    assert body["pushMode"] == vendor_push.settings.VIVO_PUSH_MODE
+    assert body["clientCustomMap"] == {"type": "accessibility_disabled"}
+
+
+def test_oppo_auth_and_send_payload(monkeypatch) -> None:
+    vendor_push._token_cache.clear()
+    calls: list[dict] = []
+
+    def _fake_request(method, url, **kwargs):  # noqa: ANN001
+        calls.append({"method": method, "url": url, **kwargs})
+        if url == vendor_push.settings.OPPO_PUSH_AUTH_ENDPOINT:
+            return _Resp({"code": 0, "data": {"auth_token": "oppo-auth"}})
+        return _Resp({"code": 0, "data": {"message_id": "oppo-msg"}})
+
+    monkeypatch.setattr(vendor_push.settings, "OPPO_PUSH_APP_KEY", "oppo-key")
+    monkeypatch.setattr(vendor_push.settings, "OPPO_PUSH_MASTER_SECRET", "oppo-master")
+    monkeypatch.setattr(vendor_push.httpx, "request", _fake_request)
+
+    data = vendor_push.send_accessibility_disabled("oppo", "oppo-regid")
+
+    assert data["data"]["message_id"] == "oppo-msg"
+    assert calls[0]["data"]["app_key"] == "oppo-key"
+    assert calls[0]["data"]["sign"]
+    message = json.loads(calls[1]["data"]["message"])
+    assert calls[1]["data"]["auth_token"] == "oppo-auth"
+    assert message["target_type"] == 2
+    assert message["target_value"] == "oppo-regid"
+    assert json.loads(message["notification"]["action_parameters"]) == {
+        "type": "accessibility_disabled"
+    }
+
+
+def test_honor_auth_and_send_payload(monkeypatch) -> None:
+    vendor_push._token_cache.clear()
+    calls: list[dict] = []
+
+    def _fake_request(method, url, **kwargs):  # noqa: ANN001
+        calls.append({"method": method, "url": url, **kwargs})
+        if url == vendor_push.settings.HONOR_PUSH_TOKEN_ENDPOINT:
+            return _Resp({"access_token": "honor-access", "expires_in": 3600})
+        return _Resp({"code": 200, "message": "successful!", "data": {"sendResult": True}})
+
+    monkeypatch.setattr(vendor_push.settings, "HONOR_PUSH_APP_ID", "104559789")
+    monkeypatch.setattr(vendor_push.settings, "HONOR_PUSH_CLIENT_ID", "honor-client")
+    monkeypatch.setattr(vendor_push.settings, "HONOR_PUSH_CLIENT_SECRET", "honor-secret")
+    monkeypatch.setattr(vendor_push.httpx, "request", _fake_request)
+
+    data = vendor_push.send_accessibility_disabled("honor", "honor-token")
+
+    assert data["code"] == 200
+    assert calls[0]["data"]["client_id"] == "honor-client"
+    assert calls[1]["headers"]["Authorization"] == "Bearer honor-access"
+    assert calls[1]["headers"]["timestamp"]
+    assert calls[1]["url"].endswith("/api/v1/104559789/sendMessage")
+    body = calls[1]["json"]
+    assert body["token"] == ["honor-token"]
+    assert body["android"]["targetUserType"] == 1
+    assert body["android"]["notification"]["clickAction"] == {"type": 3}
+    assert json.loads(body["data"]) == {"type": "accessibility_disabled"}
+
+
+def _seed_overdue_device(
+    *,
+    phone: str,
+    device_id: str,
+    push_vendor: str | None,
+    push_token: str | None,
+) -> int:
+    with SessionLocal() as db:
+        user = user_repo.upsert_user_for_login(db, phone=phone, register_channel="sms")
+        device = DeviceLiveness(
+            user_id=user.id,
+            device_id=device_id,
+            push_vendor=push_vendor,
+            push_token=push_token,
+            platform="android",
+            ever_protected=True,
+            last_heartbeat_at=datetime.now(timezone.utc) - timedelta(minutes=30),  # noqa: UP017
+            last_report_protection_on=True,
+            liveness_state="alive",
+            kill_alert_pending=False,
+        )
+        db.add(device)
+        db.commit()
+        db.refresh(device)
+        return device.id
+
+
+def _login(client: TestClient, phone: str) -> str:
+    client.post("/api/v1/auth/sms/send", json={"phone": phone})
+    r = client.post("/api/v1/auth/sms/login", json={"phone": phone, "code": "123456"})
+    assert r.status_code == 200, r.text
+    return r.json()["access_token"]
+
+
+def _auth(token: str) -> dict[str, str]:
+    return {"Authorization": f"Bearer {token}"}
+
+
+def test_heartbeat_monitor_pushes_overdue_device(monkeypatch) -> None:
+    device_pk = _seed_overdue_device(
+        phone="13900009001",
+        device_id="dev-push-honor",
+        push_vendor="honor",
+        push_token="honor-token-1",
+    )
+    calls: list[tuple[str, str]] = []
+
+    def _fake_send(push_vendor: str, push_token: str) -> dict:
+        calls.append((push_vendor, push_token))
+        return {"msg_id": "m1"}
+
+    monkeypatch.setattr(
+        heartbeat_monitor_worker.vendor_push,
+        "send_accessibility_disabled",
+        _fake_send,
+    )
+
+    result = heartbeat_monitor_worker._scan_once(timeout_minutes=10)
+
+    assert result["pushed"] >= 1
+    assert ("honor", "honor-token-1") in calls
+    with SessionLocal() as db:
+        device = db.get(DeviceLiveness, device_pk)
+        assert device is not None
+        assert device.liveness_state == "notified"
+        assert device.kill_alert_pending is True
+
+
+def test_heartbeat_monitor_skips_push_without_vendor_token(monkeypatch) -> None:
+    device_pk = _seed_overdue_device(
+        phone="13900009002",
+        device_id="dev-push-no-token",
+        push_vendor=None,
+        push_token=None,
+    )
+
+    def _fake_send(push_vendor: str, push_token: str) -> dict:
+        raise AssertionError(f"should not push without token: {push_vendor}/{push_token}")
+
+    monkeypatch.setattr(
+        heartbeat_monitor_worker.vendor_push,
+        "send_accessibility_disabled",
+        _fake_send,
+    )
+
+    result = heartbeat_monitor_worker._scan_once(timeout_minutes=10)
+
+    assert result["checked"] >= 1
+    with SessionLocal() as db:
+        device = db.get(DeviceLiveness, device_pk)
+        assert device is not None
+        assert device.liveness_state == "notified"
+        assert device.kill_alert_pending is True
+
+
+def test_push_test_endpoint_schedules_vendor_push(client: TestClient, monkeypatch) -> None:
+    token = _login(client, "13900009003")
+    calls: list[tuple[str, str, str, str]] = []
+
+    def _fake_send(push_vendor: str, push_token: str, *, title: str, alert: str) -> dict:
+        calls.append((push_vendor, push_token, title, alert))
+        return {"msg_id": "m-test"}
+
+    monkeypatch.setattr(device_api.vendor_push, "send_accessibility_disabled", _fake_send)
+
+    r = client.post(
+        "/api/v1/device/push-test",
+        json={
+            "device_id": "dev-push-test",
+            "push_vendor": "honor",
+            "push_token": "honor-test-token",
+            "delay_seconds": 0,
+        },
+        headers=_auth(token),
+    )
+
+    assert r.status_code == 200, r.text
+    assert r.json() == {
+        "ok": True,
+        "delay_seconds": 0,
+        "has_push_token": True,
+    }
+    assert calls == [
+        (
+            "honor",
+            "honor-test-token",
+            "测试推送",
+            "这是一条厂商通道测试推送。收到它说明 App 被划掉后仍可通过系统通知栏触达。",
+        )
+    ]
+
+
+def test_push_test_endpoint_requires_vendor_token(client: TestClient) -> None:
+    token = _login(client, "13900009004")
+
+    r = client.post(
+        "/api/v1/device/push-test",
+        json={"device_id": "dev-push-test-no-token", "delay_seconds": 0},
+        headers=_auth(token),
+    )
+
+    assert r.status_code == 409
+    assert r.json()["detail"] == "push vendor token not ready"
@@ -14,6 +14,7 @@ def test_openapi_loads(client) -> None:
    paths = resp.json()["paths"]
    # auth endpoints 都注册了
    assert "/api/v1/auth/jverify-login" in paths
+    assert "/api/v1/auth/wechat-login" in paths
    assert "/api/v1/auth/sms/send" in paths
    assert "/api/v1/auth/sms/login" in paths
    assert "/api/v1/auth/refresh" in paths
@@ -1,134 +0,0 @@
-"""穿山甲 GroMore 数据 API 客户端测试。
-
-重点锚定**签名算法**:用官方文档 Python / Java 示例里给出的「参数 + secure_key → sign」两个
-测试向量做断言,保证我们的 build_sign 与穿山甲服务端逐字节一致(签错=接口直接 101 验签失败)。
-另测拉取的翻页、业务码非 100 抛错、响应解析。
-"""
-from __future__ import annotations
-
-import pytest
-
-from app.core.config import settings
-from app.integrations import pangle_report
-from app.integrations.pangle_report import PangleReportError, build_sign
-
-# ---- 签名:官方文档测试向量(完整 key 与期望 sign 来自文档代码注释)----
-
-def test_build_sign_matches_doc_python_vector():
-    params = {
-        "current_time": "2022-01-06 16:10:54",
-        "sign_type": "MD5",
-        "version": "2.0",
-        "user_id": 459,
-        "role_id": 459,
-    }
-    sign = build_sign(params, "7f2ddb34d999ea61c00246ea3971529c")
-    assert sign == "57b9fed9b6c09cefdced7fa770fe341d"
-
-
-def test_build_sign_matches_doc_java_vector():
-    params = {
-        "user_id": 459,
-        "role_id": 459,
-        "version": "2.0",
-        "sign_type": "MD5",
-        "current_time": "2022-01-06 16:05:49",
-    }
-    sign = build_sign(params, "1c589c70f7bb2746027ce90c33d2544c")
-    assert sign == "4d47b3a7679448c3da5c1d05e5291533"
-
-
-def test_build_sign_drops_sign_and_empty_fields():
-    """sign 字段与空值字段不参与签名:带上它们应得到与不带时相同的 sign。"""
-    base = {"version": "2.0", "user_id": 459, "role_id": 459, "sign_type": "MD5"}
-    with_noise = {**base, "sign": "deadbeef", "code_ids": "", "os": None}
-    assert build_sign(with_noise, "key123") == build_sign(base, "key123")
-
-
-# ---- 拉取:伪造 httpx 客户端,验证翻页 / 解析 / 业务码 ----
-
-class _FakeResp:
-    def __init__(self, payload: dict):
-        self._payload = payload
-
-    def raise_for_status(self) -> None:
-        pass
-
-    def json(self) -> dict:
-        return self._payload
-
-
-class _FakeClient:
-    """按 offset 返回分页响应;记录每次请求的 params 供断言。"""
-
-    def __init__(self, pages: list[dict]):
-        self._pages = pages
-        self.calls: list[dict] = []
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, *a):
-        return False
-
-    def get(self, url: str, params: dict):
-        self.calls.append(params)
-        # 第 N 次调用取第 N 页(has_next 驱动翻页);超出用最后一页兜底
-        page = self._pages[min(len(self.calls) - 1, len(self._pages) - 1)]
-        return _FakeResp(page)
-
-
-@pytest.fixture
-def _configured(monkeypatch):
-    monkeypatch.setattr(settings, "PANGLE_REPORT_USER_ID", 459)
-    monkeypatch.setattr(settings, "PANGLE_REPORT_ROLE_ID", 459)
-    monkeypatch.setattr(settings, "PANGLE_REPORT_SECURITY_KEY", "key123")
-
-
-def test_fetch_daily_report_paginates_and_parses(monkeypatch, _configured):
-    page1 = {
-        "code": "100", "message": "",
-        "data": {
-            "has_next": "1", "currency": "cny", "total": 3,
-            "report_list": [
-                {"start_date": "2026-06-27", "site_id": "5830519", "ad_unit_id": "104142227",
-                 "revenue": "1.23", "api_revenue": "1.05", "ecpm": "0.80", "imp_cnt": "1537"},
-            ],
-        },
-    }
-    page2 = {
-        "code": "100", "message": "",
-        "data": {
-            "has_next": "0", "currency": "cny", "total": 3,
-            "report_list": [
-                {"start_date": "2026-06-27", "site_id": "5832303", "ad_unit_id": "104137445",
-                 "revenue": "0.00", "api_revenue": "", "ecpm": "0", "imp_cnt": "12"},
-            ],
-        },
-    }
-    fake = _FakeClient([page1, page2])
-    monkeypatch.setattr(pangle_report.httpx, "Client", lambda *a, **k: fake)
-
-    rows = pangle_report.fetch_daily_report(start_date="2026-06-27", end_date="2026-06-27")
-
-    assert len(rows) == 2          # 两页都被取到(has_next 驱动翻页)
-    assert rows[0]["ad_unit_id"] == "104142227"
-    assert rows[1]["api_revenue"] == ""
-    # 每次请求都带上签名与必填鉴权参数
-    assert "sign" in fake.calls[0]
-    assert fake.calls[0]["user_id"] == 459 and fake.calls[0]["version"] == "2.0"
-
-
-def test_fetch_daily_report_raises_on_business_error(monkeypatch, _configured):
-    fail = {"code": "118", "message": "no revenue permission", "data": {}}
-    monkeypatch.setattr(
-        pangle_report.httpx, "Client", lambda *a, **k: _FakeClient([fail])
-    )
-    with pytest.raises(PangleReportError):
-        pangle_report.fetch_daily_report(start_date="2026-06-27", end_date="2026-06-27")
-
-
-def test_fetch_daily_report_no_config_raises(monkeypatch):
-    monkeypatch.setattr(settings, "PANGLE_REPORT_USER_ID", 0)
-    with pytest.raises(PangleReportError):
-        pangle_report.fetch_daily_report(start_date="2026-06-27", end_date="2026-06-27")
Author	SHA1	Message	Date
lowmaster-chen	51ee9f738e	接入厂商直推服务端并补充推送验收接口 - 新增荣耀、vivo、小米、OPPO 服务端推送分发 - 设备注册和心跳支持 push_vendor/push_token - 增加 /api/v1/device/push-test 延迟验收接口 - 补充数据库迁移、配置示例和厂商推送测试 - 保留本分支已有微信登录联调改动验证：python -m pytest tests/test_device_push.py tests/test_auth.py tests/test_health.py	2026-07-02 22:44:58 +08:00
lowmaster-chen	21fc930c0a	fix: 修复美团订单时间入库并校准金币大盘口径改了什么：补全美团订单时间戳转换，避免 pay_time 为空导致昨日 CPS 收益漏算；同时让金币经济的本期/累计发放总数按领券、比价、激励视频、常规任务四项加总。为什么改：产品核对发现昨日美团有收益但大盘未显示，且发放金币总数与分类卡片不一致。验证方式：后端聚合自检确认 2026-06-30 美团佣金 86 分、有效订单 2 单，金币总数等于四项分类之和；py_compile 通过。	2026-07-01 14:56:22 +08:00
lowmaster-chen	a7d8562ddd	fix: 调整数据大盘 DAU 为开始比价和开始领券口径	2026-06-30 19:49:49 +08:00
lowmaster-chen	ad6a579ff8	fix: 数据大盘京东 CPS 仅统计实际佣金	2026-06-30 15:50:32 +08:00
lowmaster-chen	08a16c7632	feat: 接入京东联盟订单到数据大盘改了什么：新增京东联盟订单查询客户端、cps_order 京东字段迁移、CPS 对账接口 platform=all/jd、数据大盘京东订单与佣金聚合。为什么改：数据大盘需要展示京东 CPS 真实订单佣金，不再保持占位。验证方式：python -m pytest tests\\test_admin_read.py::test_dashboard_overview tests\\test_cps_admin.py::test_jd_reconcile_updates_dashboard -q；本地真实拉取 2026-06-27 京东订单 3 行，页面显示京东有效 1 单/佣金 ¥0.13。	2026-06-28 17:25:25 +08:00