feat(auth): 发码防刷统一走设备维度 — 删 IP 那道 + 阈值 10→5

- /sms/send 去掉路由上的 IP 维度限流(rate_limit 依赖):统一由设备(device_id)那道兜
  (产品决议:IP 那道会风控同 IP 的测试号,而测试号已豁免设备那道)。
- 设备发码限流阈值 10 → 5(与登录一致)。
- 同步 sms.py 防刷分层注释。
⚠️ 取舍:device_id 客户端可伪造/轮换,脚本轮换 id 可绕过发码限流;挡脚本狂发改主要靠极光控制台侧。

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

.env.example

@@ -117,16 +117,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

alembic/versions/7db22acee504_merge_invite_cash_analytics_device_heads.py

@@ -1,26 +0,0 @@
-"""merge invite_cash + analytics + device heads
-
-Revision ID: 7db22acee504
-Revises: c2874d2bf705, device_first_protected_at, invite_cash_compare_reward
-Create Date: 2026-06-27 03:06:52.594401
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = '7db22acee504'
-down_revision: Union[str, Sequence[str], None] = ('c2874d2bf705', 'device_first_protected_at', 'invite_cash_compare_reward')
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    pass
-
-
-def downgrade() -> None:
-    pass

alembic/versions/ad_pangle_daily_revenue.py

@@ -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")

alembic/versions/device_first_protected_at.py

@@ -1,31 +0,0 @@
-"""device_liveness 加 first_protected_at(首次开无障碍时刻)
-
-Revision ID: device_first_protected_at
-Revises: bcfcaf07152b
-Create Date: 2026-06-25 00:00:00.000000
-
-admin 设备存活页要展示「首次无障碍开启时间」。touch_heartbeat 在 ever_protected 首次翻 true
-时记一次(后续心跳不覆盖)。仅新增可空列,SQLite 原生支持 add_column、不用 batch;downgrade
-的 drop_column 在 SQLite 走 batch_alter_table 兜底。老设备无此时刻 → 留 NULL(无法准确回填)。
-"""
-from typing import Sequence, Union
-
-import sqlalchemy as sa
-from alembic import op
-
-revision: str = "device_first_protected_at"
-down_revision: Union[str, Sequence[str], None] = "bcfcaf07152b"
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    op.add_column(
-        "device_liveness",
-        sa.Column("first_protected_at", sa.DateTime(timezone=True), nullable=True),
-    )
-
-
-def downgrade() -> None:
-    with op.batch_alter_table("device_liveness") as batch_op:
-        batch_op.drop_column("first_protected_at")

alembic/versions/invite_cash_compare_reward.py

@@ -1,88 +0,0 @@
-"""invite cash account isolation + compare reward tracking (🅱-1)
-
-Revision ID: invite_cash_compare_reward
-Revises: feedback_review_fields
-Create Date: 2026-06-23 00:00:00.000000
-
-邀请功能 v2 账户隔离 + 比价发奖追踪:
-  - coin_account 加 invite_cash_balance_cents(邀请奖励金独立余额,与金币兑换的 cash 物理隔离)
-  - withdraw_order 加 source(标记提现扣哪个账户,退款退回对应账户;旧单默认 coin_cash)
-  - invite_relation 加比价发奖追踪三列(好友比价多次只发一次)
-  - 新增 invite_cash_transaction 表(邀请奖励金独立流水账本)
-
-加列均 NOT NULL + server_default,存量行自动填默认值,安全。
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = 'invite_cash_compare_reward'
-down_revision: Union[str, Sequence[str], None] = 'feedback_review_fields'
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    # 1. 邀请奖励金独立余额(与金币兑换的 cash_balance_cents 物理隔离;红线:两本账不可累加)
-    op.add_column(
-        'coin_account',
-        sa.Column('invite_cash_balance_cents', sa.Integer(), nullable=False, server_default='0'),
-    )
-    # 2. 提现单标记账户来源:coin_cash / invite_cash,退款退回对应账户(旧单默认 coin_cash)
-    op.add_column(
-        'withdraw_order',
-        sa.Column('source', sa.String(length=16), nullable=False, server_default='coin_cash'),
-    )
-    # 3. 邀请关系加比价发奖追踪(好友"下载+登录+比价一次"→ 给邀请人发奖,只发一次)
-    op.add_column(
-        'invite_relation',
-        sa.Column('compare_reward_granted', sa.Boolean(), nullable=False, server_default=sa.false()),
-    )
-    op.add_column(
-        'invite_relation',
-        sa.Column('compare_reward_cents', sa.Integer(), nullable=False, server_default='0'),
-    )
-    op.add_column(
-        'invite_relation',
-        sa.Column('compare_rewarded_at', sa.DateTime(timezone=True), nullable=True),
-    )
-    # 4. 邀请奖励金独立流水表(结构同 cash_transaction;balance_after 记 invite_cash_balance_cents)
-    op.create_table(
-        'invite_cash_transaction',
-        sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
-        sa.Column('user_id', sa.Integer(), nullable=False),
-        sa.Column('amount_cents', sa.Integer(), nullable=False),
-        sa.Column('balance_after_cents', sa.Integer(), nullable=False),
-        sa.Column('biz_type', sa.String(length=32), nullable=False),
-        sa.Column('ref_id', sa.String(length=64), nullable=True),
-        sa.Column('remark', sa.String(length=128), nullable=True),
-        sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.func.now(), nullable=False),
-        sa.ForeignKeyConstraint(['user_id'], ['user.id']),
-        sa.PrimaryKeyConstraint('id'),
-    )
-    op.create_index('ix_invite_cash_transaction_user_id', 'invite_cash_transaction', ['user_id'])
-    op.create_index('ix_invite_cash_transaction_created_at', 'invite_cash_transaction', ['created_at'])
-    # 提现退款幂等:一个提现单只退一次(partial unique，对齐 cash_transaction 的 withdraw_refund 去重)
-    op.create_index(
-        'ux_invite_cash_txn_refund_ref',
-        'invite_cash_transaction',
-        ['ref_id'],
-        unique=True,
-        sqlite_where=sa.text("biz_type = 'invite_withdraw_refund' AND ref_id IS NOT NULL"),
-        postgresql_where=sa.text("biz_type = 'invite_withdraw_refund' AND ref_id IS NOT NULL"),
-    )
-
-
-def downgrade() -> None:
-    op.drop_index('ux_invite_cash_txn_refund_ref', table_name='invite_cash_transaction')
-    op.drop_index('ix_invite_cash_transaction_created_at', table_name='invite_cash_transaction')
-    op.drop_index('ix_invite_cash_transaction_user_id', table_name='invite_cash_transaction')
-    op.drop_table('invite_cash_transaction')
-    op.drop_column('invite_relation', 'compare_rewarded_at')
-    op.drop_column('invite_relation', 'compare_reward_cents')
-    op.drop_column('invite_relation', 'compare_reward_granted')
-    op.drop_column('withdraw_order', 'source')
-    op.drop_column('coin_account', 'invite_cash_balance_cents')

app/admin/main.py

@@ -23,7 +23,6 @@ from app.admin.routers.comparison import router as comparison_router
 from app.admin.routers.config import router as config_router
 from app.admin.routers.cps import router as cps_router
 from app.admin.routers.dashboard import router as dashboard_router
-from app.admin.routers.device_liveness import router as device_liveness_router
 from app.admin.routers.ops_stat_config import router as ops_stat_config_router
 from app.admin.routers.event_logs import router as event_logs_router
 from app.admin.routers.feedback import router as feedback_router
@@ -85,7 +84,6 @@ def health() -> dict[str, str]:
 
 admin_app.include_router(auth_router)
 admin_app.include_router(dashboard_router)
-admin_app.include_router(device_liveness_router)
 admin_app.include_router(ops_stat_config_router)
 admin_app.include_router(ops_marquee_seed_router)
 admin_app.include_router(users_router)

app/admin/repositories/ad_audit.py

@@ -4,9 +4,9 @@
 - 看视频:每条 granted = 1 份,第 N 份 = 该用户 granted 的 reward_video **账号累计**顺序号
   (与 ad_reward.grant_ad_reward 里 `_granted_cumulative + 1` 一致;LT 因子不按天重置,
   故复算时要把当日序号叠加上该用户在本日**之前**的累计已发份数)。
-- 信息流:**每条 granted = 1 份**(与 ad_feed_reward.grant_feed_reward 同口径:看满一份即发该条
-  满额,**不按 unit_count 逐份累加**),LT 序号 = 该用户 granted **条数**账号累计
-  (与 ad_feed_reward.granted_unit_total 的 COUNT 一致;不按天重置,复算需叠加本日之前的累计条数)。
+- 信息流:每条按 unit_count 份逐份累加,LT 序号 = 该用户 granted 份数**账号累计**
+  (与 ad_feed_reward._unit_reward_total 的 existing_units 一致;同样不按天重置,
+  复算需叠加本日之前的累计份数)。
 
 非 granted(capped/ecpm_missing)不占用份序号、应发恒 0,据此校验闸口是否确实没发。
 """
@@ -108,18 +108,14 @@ def _reward_video_rows(
     return rows
 
 
-def _feed_prior_granted_count(
+def _feed_prior_granted_units(
     db: Session, *, date: str, user_id: int | None
 ) -> dict[int, int]:
-    """各用户在 date **之前** granted 的信息流**条数**累计,作为当日复算的 LT 序号起点。
-
-    与发奖侧 ad_feed_reward.granted_unit_total(COUNT status=granted)对齐:一条广告 = 1 份,
-    LT 按账号累计**条数**递进。**不再用 SUM(unit_count)**——那是「一条按时长折多份」的过时口径,
-    与现行发奖(每条 1 份)漂移,会让 unit_count>1 的记录复算虚高、对账恒「不符」。"""
+    """各用户在 date **之前** granted 的信息流份数累计,作为当日复算的 LT 序号起点。"""
     stmt = (
         select(
             AdFeedRewardRecord.user_id,
-            func.count(),
+            func.coalesce(func.sum(AdFeedRewardRecord.unit_count), 0),
         )
         .where(
             AdFeedRewardRecord.reward_date < date,
@@ -148,11 +144,10 @@ def _feed_scene_matches(rec: AdFeedRewardRecord, scene: str | None) -> bool:
 def _feed_rows(
     db: Session, *, date: str, user_id: int | None, scene: str | None = None
 ) -> list[dict]:
-    """信息流记录复算。**每条 granted = 1 份**(与发奖同口径,不按 unit_count 累加),
-    LT 序号沿用账号累计**条数**(含本日之前)。
+    """信息流记录复算。granted 记录逐份累加,LT 序号沿用账号累计份数(含本日之前)。
 
-    **关键:LT 因子账号累计按全表 granted 条数累计(feed+draw 共享同一发奖池/上限),不按 ad_type 拆分**——
-    故无论 scene 怎么筛展示,这里都遍历当日**全部**信息流记录维持 granted_count 累加;scene 只决定
+    **关键:LT 因子账号累计按全表 unit 累计(feed+draw 共享同一发奖池/上限),不按 ad_type 拆分**——
+    故无论 scene 怎么筛展示,这里都遍历当日**全部**信息流记录维持 granted_units 累加;scene 只决定
     哪些行被**留下展示**(由 _feed_scene_matches 判断),不影响累计基线,保证复算序号与正式发奖一致。
     """
     stmt = (
@@ -163,20 +158,23 @@ def _feed_rows(
     if user_id is not None:
         stmt = stmt.where(AdFeedRewardRecord.user_id == user_id)
 
-    # 本日之前的累计**条数**做起点,与发奖侧 granted_unit_total(COUNT granted)对齐
-    granted_count: dict[int, int] = _feed_prior_granted_count(db, date=date, user_id=user_id)
+    # 本日之前的累计份数做起点,与 _unit_reward_total 的 existing_units(累计)对齐
+    granted_units: dict[int, int] = _feed_prior_granted_units(db, date=date, user_id=user_id)
     rows: list[dict] = []
     for rec in db.execute(stmt).scalars():
         keep = _feed_scene_matches(rec, scene)  # 累计照常推进,这里只决定是否展示本行
         if rec.status == "granted":
-            # 一条广告 = 1 份(与 grant_feed_reward 同口径:看满一份即发该条满额,不按 unit_count 累加)。
-            # nth = 账号累计第几**条**(含本日之前),与发奖侧 granted_unit_total+1 对齐;累计照常推进
-            # (即便 scene 不匹配不展示也要 +1,保证序号与正式发奖一致)。
-            nth = granted_count.get(rec.user_id, 0) + 1
-            granted_count[rec.user_id] = nth
+            existing = granted_units.get(rec.user_id, 0)
+            units = rec.unit_count
+            granted_units[rec.user_id] = existing + units
             if not keep:
                 continue
-            expected = rewards.calculate_ad_reward_coin(rec.ecpm_raw, nth)
+            expected = sum(
+                rewards.calculate_ad_reward_coin(rec.ecpm_raw, existing + offset)
+                for offset in range(1, units + 1)
+            )
+            start = existing + 1 if units > 0 else None
+            end = existing + units if units > 0 else None
             rows.append({
                 "scene": "feed",
                 "ad_type": rec.ad_type or "feed",
@@ -190,11 +188,11 @@ def _feed_rows(
                 "status": rec.status,
                 "ecpm": rec.ecpm_raw,
                 "ecpm_factor": rewards.ad_ecpm_factor(rewards.parse_ecpm_yuan(rec.ecpm_raw)),
-                "units": 1,
-                "lt_index_start": nth,
-                "lt_index_end": nth,
-                "lt_factor_start": rewards.ad_lt_factor(nth),
-                "lt_factor_end": rewards.ad_lt_factor(nth),
+                "units": units,
+                "lt_index_start": start,
+                "lt_index_end": end,
+                "lt_factor_start": rewards.ad_lt_factor(start) if start else None,
+                "lt_factor_end": rewards.ad_lt_factor(end) if end else None,
                 "expected_coin": expected,
                 "actual_coin": rec.coin,
                 "matched": expected == rec.coin,

app/admin/repositories/ad_revenue.py

@@ -27,11 +27,9 @@ from sqlalchemy import select
 from sqlalchemy.orm import Session
 
 from app.admin.repositories import ad_audit
-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:
@@ -86,20 +84,14 @@ def ad_revenue_report(
     date_to: str,
     user_id: int | None = None,
     ad_type: str | None = None,
-    feed_scene: str | None = None,
     granularity: str = "day",
     limit: int = 500,
-    offset: int = 0,
-    sort: str = "time",
 ) -> dict:
     """日期区间(北京时间,闭区间)**逐条广告事件**列表 + 发奖对账。单日时 date_from==date_to。
 
     每个 item = 一次广告事件(展示与发奖按 ad_session_id 合并;信息流展示 / 发奖各自成行)。
-    ad_type: None=全部 / reward_video / feed / draw。feed_scene: None=全部 /
-    comparison / coupon / welfare,作为全局筛选(同时作用于明细、合计与 daily/hourly 趋势)。
-    granularity=hour 时每行带北京小时(由各自时间算),并额外返回全量 hourly 序列。
-    事件按时间倒序(新→旧)排列;limit/offset 对排序后的全量做分页切片(items 为当前页),
-    total 与 total_* / daily / hourly 在全量上统计,不受分页影响。
+    ad_type: None=全部 / reward_video / feed / draw。granularity=hour 时每行带北京小时(由各自时间算)。
+    limit 只截断 items(事件明细),total 与 total_* / daily 在全量上统计,数字始终可信。
     """
     by_hour = granularity == "hour"
 
@@ -208,17 +200,7 @@ def ad_revenue_report(
             "reward_detail": _reward_detail(row),
         })
 
-    # 「场景」作为全局筛选(与 user_id/ad_type 一致):同时作用于明细、合计与 daily/hourly 趋势。
-    # feed_scene 仅信息流 / Draw 有值,激励视频与旧数据为 None;选中后只保留该场景事件。
-    if feed_scene is not None:
-        events = [e for e in events if e.get("feed_scene") == feed_scene]
-
-    # 排序:time=按时间倒序(新→旧);ecpm=按 eCPM 数值倒序(eCPM 原值是字符串「分」,转数值排;
-    # 纯发奖行用其发奖采用的 eCPM,缺失/非法计 0 排末尾)。
-    if sort == "ecpm":
-        events.sort(key=lambda e: rewards.parse_ecpm_fen(e["ecpm"]), reverse=True)
-    else:
-        events.sort(key=lambda e: (e["report_date"], e["created_at"]), reverse=True)
+    events.sort(key=lambda e: (e["report_date"], e["user_id"], e["created_at"]))
 
     # 补手机号(admin 展示用,完整不脱敏,与用户 / 钱包 / 比价记录页一致):批量一次查,避免 N+1。
     uids = {e["user_id"] for e in events}
@@ -256,83 +238,14 @@ 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] = []
-    if by_hour:
-        hour_map: dict[int, dict] = {}
-        for e in events:
-            h = e["hour"]
-            if h is None:
-                continue
-            hd = hour_map.get(h)
-            if hd is None:
-                hd = {"hour": h, "impressions": 0, "revenue_yuan": 0.0,
-                      "expected_coin": 0, "actual_coin": 0}
-                hour_map[h] = hd
-            hd["impressions"] += e["impressions"]
-            hd["revenue_yuan"] += e["revenue_yuan"]
-            hd["expected_coin"] += e["expected_coin"]
-            hd["actual_coin"] += e["actual_coin"]
-        hourly = [
-            {**hd, "revenue_yuan": round(hd["revenue_yuan"], 6)}
-            for hd in sorted(hour_map.values(), key=lambda x: x["hour"])
-        ]
-
-    # 分广告类型小计(按 ad_type:展示条数 + 预估收益;eCPM 由前端用 收益÷展示×1000 算)。
-    # 基于全量(已按 feed_scene 过滤)events;前端只取 draw / reward_video 两类展示。
-    type_map: dict[str, dict] = {}
-    for e in events:
-        t = type_map.get(e["ad_type"])
-        if t is None:
-            t = {"impressions": 0, "revenue_yuan": 0.0}
-            type_map[e["ad_type"]] = t
-        t["impressions"] += e["impressions"]
-        t["revenue_yuan"] += e["revenue_yuan"]
-    type_stats = {
-        k: {"impressions": v["impressions"], "revenue_yuan": round(v["revenue_yuan"], 6)}
-        for k, v in type_map.items()
-    }
-
-    # DAU:复用大盘「今日活跃」口径(stats.today_dau,last_login_at)。该口径只能算今日,
-    # 故仅当查询=今日单天时给值;历史 / 多天区间返回 None,前端显示「-」。
-    is_today = date_from == date_to == rewards.cn_today().isoformat()
-    dau = admin_stats.today_dau(db) if is_today else None
-
     return {
         "total": len(events),
-        "truncated": len(events) > offset + limit,
+        "truncated": len(events) > 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,
         "daily": daily,
-        "hourly": hourly,
-        "type_stats": type_stats,
-        "dau": dau,
-        "items": events[offset:offset + limit],
+        "items": events[:limit],
     }

app/admin/repositories/cps.py

@@ -17,7 +17,7 @@ from app.integrations import meituan
 from app.repositories import cps_link as cps_link_repo
 from app.models.cps_activity import CpsActivity
 from app.models.cps_group import CpsGroup
-from app.models.cps_link import CpsClick, CpsLink
+from app.models.cps_link import CpsClick
 from app.models.cps_order import CpsOrder
 from app.models.cps_wx_user import CpsWxUser
 
@@ -524,90 +524,3 @@ def group_wx_users(db: Session, *, group_id: int, limit: int = 200) -> list[dict
     ]
     result.sort(key=lambda x: x["first_seen"], reverse=True)
     return result[:limit]
-
-
-def group_day_users(
-    db: Session, *, group_id: int, start: datetime, end: datetime, limit: int = 200,
-) -> list[dict]:
-    """该群某天(北京)以用户为单位的领券/点击 + 每人 visit 过的券。
-
-    时间窗为半开区间 [start, end)(end=次日 00:00),避免午夜双计。只统计 openid 非空
-    (可归属到人)的点击 —— 匿名点击(美团/京东 302 多为匿名)不计入。券名 = 该点击 link
-    对应活动名;活动被硬删则兜底 活动#{id}。copy=领券次数、visit=点击次数;coupons 仅
-    取 visit 事件按活动分组、按次数倒序(合计 = visit_count)。排序:领券 desc、再点击 desc。
-    与 group_wx_users 同风格(Python 侧聚合,跨 PG/SQLite 无方言坑)。
-
-    注:每日明细行的 click_pv/copy_pv 计全部点击(含匿名、UV 按 ip,ua);本函数只计 openid
-    用户,故各用户求和 <= 当天行总数,二者口径不同、不必相等。
-    """
-    rows = db.execute(
-        select(CpsClick.openid, CpsClick.event_type, CpsClick.link_id)
-        .where(CpsClick.group_id == group_id)
-        .where(CpsClick.clicked_at >= _as_utc(start))
-        .where(CpsClick.clicked_at < _as_utc(end))
-        .where(CpsClick.openid.is_not(None))
-    ).all()
-    if not rows:
-        return []
-
-    # link_id -> activity_id -> 券名(活动名)
-    link_ids = {r.link_id for r in rows}
-    link_to_act = dict(
-        db.execute(
-            select(CpsLink.id, CpsLink.activity_id).where(CpsLink.id.in_(link_ids))
-        ).all()
-    )
-    act_ids = {aid for aid in link_to_act.values() if aid is not None}
-    act_name = (
-        dict(
-            db.execute(
-                select(CpsActivity.id, CpsActivity.name).where(CpsActivity.id.in_(act_ids))
-            ).all()
-        )
-        if act_ids
-        else {}
-    )
-
-    def _coupon_name(link_id: int) -> str:
-        aid = link_to_act.get(link_id)
-        if aid is None:
-            return f"链接#{link_id}"
-        return act_name.get(aid) or f"活动#{aid}"
-
-    stat: dict[str, dict] = {}
-    for openid, event_type, link_id in rows:
-        s = stat.setdefault(openid, {"copy": 0, "visit": 0, "coupons": {}})
-        if event_type == "copy":
-            s["copy"] += 1
-        else:
-            s["visit"] += 1
-            name = _coupon_name(link_id)
-            s["coupons"][name] = s["coupons"].get(name, 0) + 1
-
-    openids = list(stat.keys())
-    users = {
-        u.openid: u
-        for u in db.execute(
-            select(CpsWxUser).where(CpsWxUser.openid.in_(openids))
-        ).scalars().all()
-    }
-
-    result = [
-        {
-            "openid": openid,
-            "nickname": users[openid].nickname if openid in users else None,
-            "headimgurl": users[openid].headimgurl if openid in users else None,
-            "copy_count": s["copy"],
-            "visit_count": s["visit"],
-            "coupons": [
-                {"name": name, "count": cnt}
-                # 次数倒序;同次数按券名升序兜底,保证 PG 无 ORDER BY 行序下输出稳定
-                for name, cnt in sorted(
-                    s["coupons"].items(), key=lambda kv: (-kv[1], kv[0])
-                )
-            ],
-        }
-        for openid, s in stat.items()
-    ]
-    result.sort(key=lambda x: (x["copy_count"], x["visit_count"]), reverse=True)
-    return result[:limit]

app/admin/repositories/queries.py

@@ -8,17 +8,15 @@ from __future__ import annotations
 from datetime import datetime, timedelta, timezone
 from zoneinfo import ZoneInfo
 
-from sqlalchemy import Select, asc, case, desc, func, or_, select
+from sqlalchemy import Select, asc, desc, func, or_, select
 from sqlalchemy.orm import Session
 
 from app.core import rewards
-from app.core.config import settings
 from app.models.ad_feed_reward import AdFeedRewardRecord
 from app.models.ad_reward import AdRewardRecord
 from app.models.admin import AdminAuditLog
 from app.models.analytics_event import AnalyticsEvent
 from app.models.comparison import ComparisonRecord
-from app.models.device import DeviceLiveness
 from app.models.feedback import Feedback
 from app.models.onboarding import OnboardingCompletion
 from app.models.price_report import PriceReport
@@ -202,156 +200,6 @@ def list_onboarding_devices(db: Session, *, limit: int = 500) -> list[dict]:
     ]
 
 
-def _heartbeat_seconds_ago(last: datetime | None) -> int | None:
-    """距上次心跳的秒数(兼容 SQLite 取回的 naive datetime,按 UTC 处理)。None = 从没心跳。"""
-    if last is None:
-        return None
-    if last.tzinfo is None:
-        last = last.replace(tzinfo=timezone.utc)
-    return int((datetime.now(timezone.utc) - last).total_seconds())
-
-
-def _device_model_from_id(device_id: str) -> str:
-    """从 device_id(格式 device_<机型>_<hash>)解析机型;不规范则回退原 id。"""
-    parts = device_id.split("_")
-    if len(parts) >= 3 and parts[0] == "device":
-        return "_".join(parts[1:-1]).replace("_", " ")
-    return device_id
-
-
-def _attach_device_derived(devices: list[DeviceLiveness]) -> None:
-    """给每台设备瞬态挂 device_model / online / display_state / offline_seconds(供 schema 读)。
-
-    在线判定:开过无障碍(ever_protected)且距上次心跳 ≤ HEARTBEAT_TIMEOUT_MINUTES。
-    从没开过无障碍(ever_protected=False)= never(不算掉线,避免把装了没用的设备误报掉线)。
-    offline_seconds 仅 offline 时给值(=掉线时长),在线/从未启用为 None。"""
-    timeout_sec = max(1, int(settings.HEARTBEAT_TIMEOUT_MINUTES)) * 60
-    for d in devices:
-        d.device_model = _device_model_from_id(d.device_id)
-        secs = _heartbeat_seconds_ago(d.last_heartbeat_at)
-        if not d.ever_protected:
-            d.online = False
-            d.display_state = "never"
-            d.offline_seconds = None
-        elif secs is not None and secs <= timeout_sec:
-            d.online = True
-            d.display_state = "online"
-            d.offline_seconds = None
-        else:
-            d.online = False
-            d.display_state = "offline"
-            d.offline_seconds = secs
-
-
-def _attach_device_user_info(db: Session, devices: list[DeviceLiveness]) -> None:
-    """给每台设备瞬态挂归属用户 phone/nickname(同 _attach_user_info,供 admin schema 读)。"""
-    uids = {d.user_id for d in devices}
-    if not uids:
-        return
-    rows = db.execute(
-        select(User.id, User.phone, User.nickname).where(User.id.in_(uids))
-    ).all()
-    umap = {uid: (phone, nick) for uid, phone, nick in rows}
-    for d in devices:
-        phone, nick = umap.get(d.user_id, (None, None))
-        d.phone = phone
-        d.nickname = nick
-
-
-def _liveness_cutoff() -> datetime:
-    """掉线判定分界:此刻 - HEARTBEAT_TIMEOUT_MINUTES。心跳早于它 = 掉线(同 list_overdue 口径)。"""
-    timeout_min = max(1, int(settings.HEARTBEAT_TIMEOUT_MINUTES))
-    return datetime.now(timezone.utc) - timedelta(minutes=timeout_min)
-
-
-def list_device_liveness(
-    db: Session,
-    *,
-    status: str | None = None,
-    device_id: str | None = None,
-    phone: str | None = None,
-    user_id: int | None = None,
-    sort_by: str = "status",
-    sort_order: str = "desc",
-    limit: int = 20,
-    cursor: int | None = None,
-) -> tuple[list[DeviceLiveness], int | None, int]:
-    """设备存活列表(admin 全量)。按 在线情况(online/offline/never)/ 设备id(包含)/
-    归属用户(手机号前缀 或 user_id)筛,offset 分页。join user 取 phone/nickname,派生
-    device_model/online/display_state/offline_seconds 挂行上。
-    默认排序 status=掉线置顶(offline → online → never;掉线组内掉得最久在前)。"""
-    cutoff = _liveness_cutoff()
-    stmt = select(DeviceLiveness)
-    # 在线情况派生筛选(口径同 _attach_device_derived:ever_protected + 心跳是否过阈值)
-    if status == "online":
-        stmt = stmt.where(
-            DeviceLiveness.ever_protected.is_(True),
-            DeviceLiveness.last_heartbeat_at.is_not(None),
-            DeviceLiveness.last_heartbeat_at >= cutoff,
-        )
-    elif status == "offline":
-        stmt = stmt.where(
-            DeviceLiveness.ever_protected.is_(True),
-            DeviceLiveness.last_heartbeat_at.is_not(None),
-            DeviceLiveness.last_heartbeat_at < cutoff,
-        )
-    elif status == "never":
-        stmt = stmt.where(DeviceLiveness.ever_protected.is_(False))
-    if device_id and device_id.strip():
-        stmt = stmt.where(DeviceLiveness.device_id.like(f"%{device_id.strip()}%"))
-    if user_id is not None:
-        stmt = stmt.where(DeviceLiveness.user_id == user_id)
-    if phone:
-        stmt = stmt.where(
-            DeviceLiveness.user_id.in_(select(User.id).where(User.phone.like(f"{phone}%")))
-        )
-
-    if sort_by in ("last_heartbeat_at", "created_at"):
-        col = (
-            DeviceLiveness.last_heartbeat_at
-            if sort_by == "last_heartbeat_at"
-            else DeviceLiveness.created_at
-        )
-        order_fn = asc if sort_order == "asc" else desc
-        id_order = asc(DeviceLiveness.id) if sort_order == "asc" else desc(DeviceLiveness.id)
-        sort_clause: tuple = (order_fn(col), id_order)
-    else:
-        # 默认「掉线置顶」:offline(0) → online(1) → never(2);掉线组内按心跳最旧(掉得最久)在前
-        rank = case(
-            (DeviceLiveness.ever_protected.is_(False), 2),
-            (DeviceLiveness.last_heartbeat_at < cutoff, 0),
-            else_=1,
-        )
-        sort_clause = (asc(rank), asc(DeviceLiveness.last_heartbeat_at), desc(DeviceLiveness.id))
-
-    items, next_cursor, total = offset_paginate(db, stmt, sort_clause, limit=limit, cursor=cursor)
-    _attach_device_user_info(db, items)
-    _attach_device_derived(items)
-    return items, next_cursor, total
-
-
-def device_liveness_stats(db: Session) -> dict:
-    """顶部卡片:总设备数 + 在线 / 已掉线 / 未启用(按心跳阈值派生,口径同列表)。"""
-    cutoff = _liveness_cutoff()
-
-    def _count(*conds) -> int:
-        return int(db.execute(select(func.count(DeviceLiveness.id)).where(*conds)).scalar_one())
-
-    total = int(db.execute(select(func.count(DeviceLiveness.id))).scalar_one())
-    never = _count(DeviceLiveness.ever_protected.is_(False))
-    online = _count(
-        DeviceLiveness.ever_protected.is_(True),
-        DeviceLiveness.last_heartbeat_at.is_not(None),
-        DeviceLiveness.last_heartbeat_at >= cutoff,
-    )
-    offline = _count(
-        DeviceLiveness.ever_protected.is_(True),
-        DeviceLiveness.last_heartbeat_at.is_not(None),
-        DeviceLiveness.last_heartbeat_at < cutoff,
-    )
-    return {"total": total, "online": online, "offline": offline, "never": never}
-
-
 def list_all_coin_transactions(
     db: Session,
     *,

app/admin/repositories/stats.py

@@ -5,8 +5,7 @@ user.last_login_at / comparison_record.status / withdraw_order.status)要加索
 """
 from __future__ import annotations
 
-from datetime import date, datetime, time, timedelta, timezone
-from decimal import Decimal, InvalidOperation
+from datetime import datetime, timedelta, timezone
 
 from sqlalchemy import func, select
 from sqlalchemy.orm import Session
@@ -14,27 +13,12 @@ from sqlalchemy.orm import Session
 from app.models.ad_feed_reward import AdFeedRewardRecord
 from app.models.ad_reward import AdRewardRecord
 from app.models.comparison import ComparisonRecord
-from app.models.coupon_state import CouponPromptEngagement
-from app.models.cps_order import CpsOrder
 from app.models.feedback import Feedback
-from app.models.savings import SavingsRecord
 from app.models.signin import SigninBoostRecord, SigninRecord
 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")
-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 = (
-    *COUPON_REWARD_BIZ_TYPES,
-    *COMPARISON_REWARD_BIZ_TYPES,
-    *EXCLUDED_REWARD_BIZ_TYPES,
-    *UNCLASSIFIED_FEED_BIZ_TYPES,
-)
-MEITUAN_CPS_INVALID_STATUSES = ("4", "5")
-MEITUAN_CPS_SETTLED_STATUS = "6"
 
 
 def _beijing_today_start_utc() -> datetime:
@@ -44,90 +28,20 @@ def _beijing_today_start_utc() -> datetime:
     return start_bj.astimezone(timezone.utc)
 
 
-def today_dau(db: Session) -> int:
-    """今日活跃用户数(DAU):北京时区今天 0 点后登录过(last_login_at)。
-
-    广告收益报表复用这个函数;历史窗口 DAU 由 dashboard_overview 的 period 口径另算。
-    """
+def dashboard_overview(db: Session) -> dict:
     today_start = _beijing_today_start_utc()
-    return int(
-        db.execute(select(func.count(User.id)).where(User.last_login_at >= today_start)).scalar_one()
-    )
-
-
-def _default_period_end() -> date:
-    """新版大盘不含今日,默认窗口结束日=北京时间昨天。"""
-    return datetime.now(_BEIJING).date() - timedelta(days=1)
-
-
-def _normalize_period(date_from: date | None, date_to: date | None) -> tuple[date, date]:
-    end = date_to or _default_period_end()
-    start = date_from or end
-    if start > end:
-        start, end = end, start
-    return start, end
-
-
-def _period_bounds(date_from: date, date_to: date) -> tuple[datetime, datetime, datetime, datetime]:
-    """返回同一北京自然日窗口的 UTC aware 边界和北京 naive 边界。
-
-    user.created_at / last_login_at 是 UTC aware 口径;比较/金币等历史上有北京 naive
-    写入,所以两套边界同时保留。
-    """
-    start_bj = datetime.combine(date_from, time.min, tzinfo=_BEIJING)
-    end_bj = datetime.combine(date_to + timedelta(days=1), time.min, tzinfo=_BEIJING)
-    start_utc = start_bj.astimezone(timezone.utc)
-    end_utc = end_bj.astimezone(timezone.utc)
-    return (
-        start_utc,
-        end_utc,
-        start_bj.replace(tzinfo=None),
-        end_bj.replace(tzinfo=None),
-    )
-
-
-def _date_range(date_from: date, date_to: date) -> list[date]:
-    days = (date_to - date_from).days
-    return [date_from + timedelta(days=i) for i in range(days + 1)]
-
-
-def _commission_rate_percent(raw: str | None) -> Decimal | None:
-    """美团 commissionRate 原值: "300"=3%, "10"=0.1%;也兼容 "3%"。"""
-    if raw is None:
-        return None
-    s = str(raw).strip()
-    if not s:
-        return None
-    try:
-        if s.endswith("%"):
-            return Decimal(s[:-1])
-        val = Decimal(s)
-    except (InvalidOperation, ValueError):
-        return None
-    return val / Decimal("100")
-
-
-def dashboard_overview(
-    db: Session, *, date_from: date | None = None, date_to: date | None = None
-) -> dict:
-    today_start = _beijing_today_start_utc()
-    period_from, period_to = _normalize_period(date_from, date_to)
-    start_utc, end_utc, start_local, end_local = _period_bounds(period_from, period_to)
 
     def _count(model, *conds) -> int:
         stmt = select(func.count(model.id))
         if conds:
             stmt = stmt.where(*conds)
-        return int(db.execute(stmt).scalar_one())
+        return db.execute(stmt).scalar_one()
 
     def _sum(col, *conds) -> int:
         stmt = select(func.coalesce(func.sum(col), 0))
         if conds:
             stmt = stmt.where(*conds)
-        return int(db.execute(stmt).scalar_one())
-
-    def _user_id_set(stmt) -> set[int]:
-        return {int(v) for v in db.execute(stmt).scalars().all() if v is not None}
+        return db.execute(stmt).scalar_one()
 
     # ===== 用户 =====
     by_status = dict(
@@ -147,204 +61,6 @@ def dashboard_overview(
     comparison_total = _count(ComparisonRecord)
     comparison_success = _count(ComparisonRecord, ComparisonRecord.status == "success")
     success_rate = round(comparison_success / comparison_total, 4) if comparison_total else 0.0
-    period_comparison_conds = (
-        ComparisonRecord.created_at >= start_local,
-        ComparisonRecord.created_at < end_local,
-    )
-    period_comparison_total = _count(ComparisonRecord, *period_comparison_conds)
-    period_comparison_success = _count(
-        ComparisonRecord,
-        *period_comparison_conds,
-        ComparisonRecord.status == "success",
-    )
-    period_comparison_success_rate = (
-        round(period_comparison_success / period_comparison_total, 4)
-        if period_comparison_total
-        else 0.0
-    )
-    period_saved_positive_count = _count(
-        ComparisonRecord,
-        *period_comparison_conds,
-        ComparisonRecord.status == "success",
-        ComparisonRecord.saved_amount_cents > 0,
-    )
-    period_saved_positive_sum = _sum(
-        ComparisonRecord.saved_amount_cents,
-        *period_comparison_conds,
-        ComparisonRecord.status == "success",
-        ComparisonRecord.saved_amount_cents > 0,
-    )
-    period_avg_saved_cents = (
-        round(period_saved_positive_sum / period_saved_positive_count)
-        if period_saved_positive_count
-        else None
-    )
-    period_avg_duration_ms = db.execute(
-        select(func.avg(ComparisonRecord.total_ms)).where(
-            *period_comparison_conds,
-            ComparisonRecord.total_ms.is_not(None),
-            ComparisonRecord.total_ms > 0,
-        )
-    ).scalar_one()
-    period_avg_duration_ms = (
-        round(float(period_avg_duration_ms))
-        if period_avg_duration_ms is not None
-        else None
-    )
-
-    ordered_exists = (
-        select(SavingsRecord.id)
-        .where(
-            SavingsRecord.user_id == ComparisonRecord.user_id,
-            SavingsRecord.source == "compare",
-            SavingsRecord.shop_name.is_not(None),
-            SavingsRecord.shop_name == ComparisonRecord.store_name,
-        )
-        .exists()
-    )
-    period_ordered_count = _count(
-        ComparisonRecord,
-        *period_comparison_conds,
-        ComparisonRecord.store_name.is_not(None),
-        ordered_exists,
-    )
-
-    # ===== 日期窗口用户 =====
-    period_new_user_ids = _user_id_set(
-        select(User.id).where(User.created_at >= start_utc, User.created_at < end_utc)
-    )
-    login_user_ids = _user_id_set(
-        select(User.id).where(User.last_login_at >= start_utc, User.last_login_at < end_utc)
-    )
-    compare_user_ids = _user_id_set(
-        select(ComparisonRecord.user_id).where(*period_comparison_conds)
-    )
-    coupon_user_ids = _user_id_set(
-        select(CouponPromptEngagement.user_id).where(
-            CouponPromptEngagement.engage_date >= period_from,
-            CouponPromptEngagement.engage_date <= period_to,
-            CouponPromptEngagement.engage_type == "claim_started",
-        )
-    )
-    period_active_user_ids = login_user_ids | compare_user_ids | coupon_user_ids
-    period_retained_new_user_ids = period_new_user_ids & period_active_user_ids
-    period_retention_rate = (
-        round(len(period_retained_new_user_ids) / len(period_new_user_ids), 4)
-        if period_new_user_ids
-        else None
-    )
-    trend_points: list[dict] = []
-    for cur_date in _date_range(period_from, period_to):
-        day_start_utc, day_end_utc, day_start_local, day_end_local = _period_bounds(
-            cur_date, cur_date
-        )
-        daily_comparison_conds = (
-            ComparisonRecord.created_at >= day_start_local,
-            ComparisonRecord.created_at < day_end_local,
-        )
-        daily_login_user_ids = _user_id_set(
-            select(User.id).where(
-                User.last_login_at >= day_start_utc,
-                User.last_login_at < day_end_utc,
-            )
-        )
-        daily_compare_user_ids = _user_id_set(
-            select(ComparisonRecord.user_id).where(*daily_comparison_conds)
-        )
-        daily_coupon_user_ids = _user_id_set(
-            select(CouponPromptEngagement.user_id).where(
-                CouponPromptEngagement.engage_date == cur_date,
-                CouponPromptEngagement.engage_type == "claim_started",
-            )
-        )
-        trend_points.append(
-            {
-                "date": cur_date,
-                "active_users": len(
-                    daily_login_user_ids | daily_compare_user_ids | daily_coupon_user_ids
-                ),
-                "new_users": _count(
-                    User,
-                    User.created_at >= day_start_utc,
-                    User.created_at < day_end_utc,
-                ),
-                "comparisons": _count(ComparisonRecord, *daily_comparison_conds),
-            }
-        )
-
-    period_coin_conds = (
-        CoinTransaction.created_at >= start_local,
-        CoinTransaction.created_at < end_local,
-        CoinTransaction.amount > 0,
-    )
-    period_reward_video_coin_total = _sum(
-        CoinTransaction.amount,
-        *period_coin_conds,
-        CoinTransaction.biz_type.in_(("reward_video", "ad_reward")),
-    )
-    period_feed_ad_coin_total = _sum(
-        CoinTransaction.amount,
-        *period_coin_conds,
-        CoinTransaction.biz_type == "feed_ad_reward",
-    )
-    period_signin_coin_total = _sum(
-        CoinTransaction.amount,
-        *period_coin_conds,
-        CoinTransaction.biz_type == "signin",
-    )
-    period_signin_boost_coin_total = _sum(
-        CoinTransaction.amount,
-        *period_coin_conds,
-        CoinTransaction.biz_type == "signin_boost",
-    )
-    period_task_coin_total = _sum(
-        CoinTransaction.amount,
-        *period_coin_conds,
-        CoinTransaction.biz_type.like("task_%"),
-    )
-    period_coupon_reward_coin_total = _sum(
-        CoinTransaction.amount,
-        *period_coin_conds,
-        CoinTransaction.biz_type.in_(COUPON_REWARD_BIZ_TYPES),
-    )
-    period_comparison_reward_coin_total = _sum(
-        CoinTransaction.amount,
-        *period_coin_conds,
-        CoinTransaction.biz_type.in_(COMPARISON_REWARD_BIZ_TYPES),
-    )
-    period_regular_task_coin_total = _sum(
-        CoinTransaction.amount,
-        *period_coin_conds,
-        CoinTransaction.biz_type.notin_(REGULAR_TASK_EXCLUDED_BIZ_TYPES),
-    )
-    period_meituan_orders = list(
-        db.execute(
-            select(CpsOrder).where(
-                CpsOrder.pay_time >= start_utc,
-                CpsOrder.pay_time < end_utc,
-            )
-        ).scalars()
-    )
-    period_meituan_valid_orders = [
-        o for o in period_meituan_orders if o.mt_status not in MEITUAN_CPS_INVALID_STATUSES
-    ]
-    period_meituan_hit_count = 0
-    period_meituan_miss_count = 0
-    period_meituan_unknown_rate_count = 0
-    for order in period_meituan_valid_orders:
-        rate = _commission_rate_percent(order.commission_rate)
-        if rate is None:
-            period_meituan_unknown_rate_count += 1
-        elif rate < Decimal("1"):
-            period_meituan_miss_count += 1
-        else:
-            period_meituan_hit_count += 1
-    period_meituan_hit_denominator = period_meituan_hit_count + period_meituan_miss_count
-    period_meituan_hit_rate = (
-        round(period_meituan_hit_count / period_meituan_hit_denominator, 4)
-        if period_meituan_hit_denominator
-        else None
-    )
 
     return {
         "users": {
@@ -353,7 +69,7 @@ def dashboard_overview(
             "disabled": by_status.get("disabled", 0),
             "deleted": by_status.get("deleted", 0),
             "new_today": _count(User, User.created_at >= today_start),
-            "dau": today_dau(db),
+            "dau": _count(User, User.last_login_at >= today_start),
         },
         "coins": {
             # 累计发放金币(coin_transaction 里所有 amount>0 之和;负数是兑换/扣减不计)
@@ -403,61 +119,7 @@ def dashboard_overview(
             "success": comparison_success,
             "success_rate": success_rate,
         },
-        "period": {
-            "date_from": period_from,
-            "date_to": period_to,
-            "users": {
-                "new": len(period_new_user_ids),
-                "active": len(period_active_user_ids),
-                "retained_new_users": len(period_retained_new_user_ids),
-                "retention_rate": period_retention_rate,
-                "retention_note": (
-                    "近似口径:登录(last_login_at)+已上报比价记录+领券claim_started;"
-                    "尚不包含未完成上报的比价开始事件"
-                ),
-            },
-            "comparison": {
-                "total": period_comparison_total,
-                "success": period_comparison_success,
-                "success_rate": period_comparison_success_rate,
-                "ordered": period_ordered_count,
-                "average_duration_ms": period_avg_duration_ms,
-                "average_saved_cents": period_avg_saved_cents,
-            },
-            "coins": {
-                "granted_total": _sum(CoinTransaction.amount, *period_coin_conds),
-                "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,
-                "signin_boost_coin_total": period_signin_boost_coin_total,
-                "task_coin_total": period_task_coin_total,
-                "coupon_reward_coin_total": period_coupon_reward_coin_total,
-                "comparison_reward_coin_total": period_comparison_reward_coin_total,
-                "regular_task_coin_total": period_regular_task_coin_total,
-            },
-            "cash": {
-                "withdraw_success_cents": _sum(
-                    WithdrawOrder.amount_cents,
-                    WithdrawOrder.status == "success",
-                    WithdrawOrder.created_at >= start_local,
-                    WithdrawOrder.created_at < end_local,
-                ),
-            },
-            "trend": trend_points,
-        },
-        "feedback": {
-            "new": _count(Feedback, Feedback.status.in_(("pending", "new"))),
-        },
-        "cps": {
-            "available": True,
-            "note": "美团 CPS 读 cps_order 对账订单;淘宝/京东佣金暂空",
-            "meituan_order_count": len(period_meituan_valid_orders),
-            "meituan_commission_cents": sum(
-                o.commission_cents or 0 for o in period_meituan_valid_orders
-            ),
-            "meituan_hit_count": period_meituan_hit_count,
-            "meituan_miss_count": period_meituan_miss_count,
-            "meituan_unknown_rate_count": period_meituan_unknown_rate_count,
-            "meituan_hit_rate": period_meituan_hit_rate,
-        },
+        "feedback": {"new": _count(Feedback, Feedback.status.in_(("pending", "new")))},
+        # CPS 收入数据源未接(referral-link 只换链接,转化/佣金未回收)→ 前端显示"待接入"。
+        "cps": {"available": False, "note": "CPS 转化数据未接入(P2)"},
     }

app/admin/routers/ad_revenue.py

@@ -11,13 +11,7 @@ from fastapi import APIRouter, Depends, HTTPException, Query
 
 from app.admin.deps import AdminDb, get_current_admin
 from app.admin.repositories import ad_revenue
-from app.admin.schemas.ad_revenue import (
-    AdRevenueDaily,
-    AdRevenueHourly,
-    AdRevenueReportOut,
-    AdRevenueRow,
-    AdRevenueTypeStat,
-)
+from app.admin.schemas.ad_revenue import AdRevenueDaily, AdRevenueReportOut, AdRevenueRow
 from app.core.rewards import cn_today
 
 router = APIRouter(
@@ -49,21 +43,10 @@ def get_ad_revenue_report(
         str | None,
         Query(description="reward_video / feed / draw;不传=全部类型"),
     ] = None,
-    feed_scene: Annotated[
-        str | None,
-        Query(
-            description="comparison(比价) / coupon(领券) / welfare(福利);不传=全部场景。"
-            "全局筛选,同时影响明细 / 合计 / 趋势"
-        ),
-    ] = None,
     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=时间倒序(默认) / ecpm=按 eCPM 数值倒序")
-    ] = "time",
+    limit: Annotated[int, Query(ge=1, le=1000)] = 500,
 ) -> AdRevenueReportOut:
     today = cn_today()
     d_from = _parse_day(date_from, field="date_from", default=today)
@@ -75,23 +58,16 @@ 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,
-        granularity=granularity, limit=limit, offset=offset, sort=sort,
+        user_id=user_id, ad_type=ad_type, granularity=granularity, limit=limit,
     )
     return AdRevenueReportOut(
         date_from=d_from.isoformat(),
         date_to=d_to.isoformat(),
         daily=[AdRevenueDaily(**d) for d in result["daily"]],
-        hourly=[AdRevenueHourly(**h) for h in result["hourly"]],
-        type_stats={k: AdRevenueTypeStat(**v) for k, v in result["type_stats"].items()},
-        dau=result["dau"],
         total=result["total"],
         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"],

app/admin/routers/cps.py

@@ -7,7 +7,7 @@
 from __future__ import annotations
 
 import time
-from datetime import date as _date, datetime, time as _dt_time, timedelta, timezone
+from datetime import datetime, timedelta, timezone
 from typing import Annotated
 
 from fastapi import APIRouter, Depends, File, HTTPException, Query, Request, UploadFile
@@ -340,77 +340,24 @@ def generate_referral_links(
 
 
 # ───────────── 订单对账 ─────────────
-_BEIJING = timezone(timedelta(hours=8))
-
-
-def _parse_day(value: str | None, *, field: str) -> _date | None:
-    if value is None:
-        return None
-    try:
-        return _date.fromisoformat(value)
-    except ValueError as e:
-        raise HTTPException(status_code=422, detail=f"{field} 需为 YYYY-MM-DD") from e
-
-
-def _reconcile_range_to_ts(
-    date_from: _date | None, date_to: _date | None, days: int
-) -> tuple[int, int]:
-    if date_from is None and date_to is None:
-        now = int(time.time())
-        return now - days * 86400, now
-
-    start_day = date_from or date_to
-    end_day = date_to or date_from
-    if start_day is None or end_day is None:
-        raise HTTPException(status_code=422, detail="日期参数不完整")
-    if start_day > end_day:
-        start_day, end_day = end_day, start_day
-    if (end_day - start_day).days + 1 > 90:
-        raise HTTPException(status_code=422, detail="美团订单查询最长 90 天")
-
-    start_dt = datetime.combine(start_day, _dt_time.min, tzinfo=_BEIJING)
-    end_dt = datetime.combine(end_day + timedelta(days=1), _dt_time.min, tzinfo=_BEIJING)
-    return int(start_dt.timestamp()), int(end_dt.timestamp())
-
-
 @router.post("/orders/reconcile", response_model=CpsReconcileResult, summary="拉取美团订单对账")
 def reconcile_orders(
     request: Request,
     admin: Annotated[AdminUser, Depends(require_role("finance"))],
     db: AdminDb,
-    date_from: Annotated[str | None, Query(description="起始日 YYYY-MM-DD")] = None,
-    date_to: Annotated[str | None, Query(description="结束日 YYYY-MM-DD")] = None,
-    days: Annotated[int, Query(ge=1, le=90, description="未传日期时默认拉近 N 天")] = 7,
+    days: Annotated[int, Query(ge=1, le=90)] = 7,
     sid: Annotated[str | None, Query(max_length=64)] = None,
-    query_time_type: Annotated[int, Query(ge=1, le=2)] = 1,
 ) -> CpsReconcileResult:
-    start_ts, end_ts = _reconcile_range_to_ts(
-        _parse_day(date_from, field="date_from"),
-        _parse_day(date_to, field="date_to"),
-        days,
-    )
+    now = int(time.time())
     try:
         result = cps_repo.reconcile_orders(
-            db,
-            start_time=start_ts,
-            end_time=end_ts,
-            query_time_type=query_time_type,
-            sid=sid,
+            db, start_time=now - days * 86400, end_time=now, sid=sid,
         )
     except MeituanCpsError as e:
         raise HTTPException(status_code=502, detail=f"美团拉单失败: {e}") from e
     write_audit(
         db, admin, action="cps.order.reconcile", target_type="cps_order", target_id=None,
-        detail={
-            "date_from": date_from,
-            "date_to": date_to,
-            "days": days,
-            "sid": sid,
-            "query_time_type": query_time_type,
-            **result,
-        },
-        ip=get_client_ip(request),
-        commit=True,
+        detail={"days": days, "sid": sid, **result}, ip=get_client_ip(request), commit=True,
     )
     return CpsReconcileResult(**result)
 
@@ -521,7 +468,7 @@ def group_daily(
     while cur <= last:
         cp = click_points[idx] if idx < len(click_points) else None
         row = {
-            "date": cur.strftime("%Y-%m-%d"),
+            "date": cur.strftime("%m-%d"),
             "click_pv": cp["click_pv"] if cp else 0,
             "click_uv": cp["click_uv"] if cp else 0,
             "copy_pv": cp["copy_pv"] if cp else 0,
@@ -549,28 +496,3 @@ def group_wx_users(group_id: int, db: AdminDb) -> dict:
     if group is None:
         raise HTTPException(status_code=404, detail="群不存在")
     return {"users": cps_repo.group_wx_users(db, group_id=group_id)}
-
-
-@router.get("/groups/{group_id}/day-users", summary="某天该群按用户的领券/点击 + 每人点过的券")
-def group_day_users(
-    group_id: int,
-    db: AdminDb,
-    date: Annotated[str, Query(description="北京日期 YYYY-MM-DD")],
-) -> dict:
-    group = cps_repo.get_group(db, group_id)
-    if group is None:
-        raise HTTPException(status_code=404, detail="群不存在")
-    bj = timezone(timedelta(hours=8))
-    try:
-        day0 = datetime.strptime(date, "%Y-%m-%d").replace(tzinfo=bj)
-    except ValueError as e:
-        raise HTTPException(status_code=400, detail="date 格式应为 YYYY-MM-DD") from e
-    start = day0.replace(hour=0, minute=0, second=0, microsecond=0)
-    end = start + timedelta(days=1)
-    users = cps_repo.group_day_users(db, group_id=group_id, start=start, end=end)
-    return {
-        "group_id": group.id,
-        "group_name": group.name,
-        "date": date,
-        "users": users,
-    }

app/admin/routers/dashboard.py

@@ -1,9 +1,7 @@
 """admin 数据大盘(只读聚合)。"""
 from __future__ import annotations
 
-from datetime import date
-
-from fastapi import APIRouter, Depends, Query
+from fastapi import APIRouter, Depends
 
 from app.admin.deps import AdminDb, get_current_admin
 from app.admin.repositories import stats
@@ -17,11 +15,5 @@ router = APIRouter(
 
 
 @router.get("/overview", response_model=DashboardOverview, summary="大盘核心指标")
-def overview(
-    db: AdminDb,
-    date_from: date | None = Query(None, description="北京时间自然日起始日 YYYY-MM-DD"),
-    date_to: date | None = Query(None, description="北京时间自然日结束日 YYYY-MM-DD"),
-) -> DashboardOverview:
-    return DashboardOverview.model_validate(
-        stats.dashboard_overview(db, date_from=date_from, date_to=date_to)
-    )
+def overview(db: AdminDb) -> DashboardOverview:
+    return DashboardOverview.model_validate(stats.dashboard_overview(db))

app/admin/routers/device_liveness.py

@@ -1,63 +0,0 @@
-"""admin 设备存活监控(只读):列设备心跳/在线掉线 + 顶部统计卡片。
-
-数据源 device_liveness 表(心跳 last_heartbeat_at + liveness_state + kill_alert_pending,
-见 app/models/device.py)。在线/掉线、掉线时长由 repo 按 HEARTBEAT_TIMEOUT_MINUTES 阈值派生。
-纯读:无写、无审计。任意登录管理员可看(同大盘/设备管理,无角色门)。
-"""
-from __future__ import annotations
-
-from typing import Annotated
-
-from fastapi import APIRouter, Depends, Query
-
-from app.admin.deps import AdminDb, get_current_admin
-from app.admin.repositories import queries
-from app.admin.schemas.common import CursorPage
-from app.admin.schemas.device import DeviceLivenessItem, DeviceLivenessStats
-
-router = APIRouter(
-    prefix="/admin/api/device-liveness",
-    tags=["admin-device-liveness"],
-    dependencies=[Depends(get_current_admin)],
-)
-
-
-@router.get("/stats", response_model=DeviceLivenessStats, summary="设备存活统计(顶部卡片)")
-def device_stats(db: AdminDb) -> DeviceLivenessStats:
-    return DeviceLivenessStats(**queries.device_liveness_stats(db))
-
-
-@router.get(
-    "",
-    response_model=CursorPage[DeviceLivenessItem],
-    summary="设备存活列表(在线情况/设备id/归属用户 筛选 + 排序 + 分页,默认掉线置顶)",
-)
-def list_devices(
-    db: AdminDb,
-    status: Annotated[str | None, Query(pattern="^(online|offline|never)$")] = None,
-    device_id: Annotated[str | None, Query(max_length=128)] = None,
-    phone: Annotated[str | None, Query(max_length=20)] = None,
-    user_id: Annotated[int | None, Query()] = None,
-    sort_by: Annotated[
-        str, Query(pattern="^(status|last_heartbeat_at|created_at)$")
-    ] = "status",
-    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[DeviceLivenessItem]:
-    items, next_cursor, total = queries.list_device_liveness(
-        db,
-        status=status,
-        device_id=device_id,
-        phone=phone,
-        user_id=user_id,
-        sort_by=sort_by,
-        sort_order=sort_order,
-        limit=limit,
-        cursor=cursor,
-    )
-    return CursorPage(
-        items=[DeviceLivenessItem.model_validate(d) for d in items],
-        next_cursor=next_cursor,
-        total=total,
-    )

app/admin/schemas/ad_revenue.py

@@ -40,38 +40,15 @@ class AdRevenueRecord(BaseModel):
 
 
 class AdRevenueDaily(BaseModel):
-    """按日期汇总的一天(供前端按天趋势图;全量,不受分页影响)。"""
+    """按日期汇总的一天(供前端按天趋势图;全量,不受 limit 影响)。"""
 
     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="当天实发金币合计")
 
 
-class AdRevenueHourly(BaseModel):
-    """按北京小时(0–23)汇总的一小时(供前端按小时趋势图;全量,不受分页影响,单日 granularity=hour 时非空)。"""
-
-    hour: int = Field(..., description="北京时间小时 0–23")
-    impressions: int = Field(..., description="该小时展示条数合计")
-    revenue_yuan: float = Field(..., description="该小时预估收益合计(元)")
-    expected_coin: int = Field(..., description="该小时应发金币合计")
-    actual_coin: int = Field(..., description="该小时实发金币合计")
-
-
-class AdRevenueTypeStat(BaseModel):
-    """按广告类型(ad_type)的小计:展示条数 + 预估收益(eCPM 由前端用 收益÷展示×1000 算)。"""
-
-    impressions: int = Field(..., description="该类型展示条数合计")
-    revenue_yuan: float = Field(..., description="该类型预估收益合计(元)")
-
-
 class AdRevenueRow(BaseModel):
     """一次广告事件(逐条一行):激励视频展示与发奖按 ad_session_id 合并;信息流展示 / 发奖各自成行。"""
 
@@ -114,36 +91,10 @@ class AdRevenueReportOut(BaseModel):
     date_from: str = Field(..., description="报表起始日期(北京时间 YYYY-MM-DD)")
     date_to: str = Field(..., description="报表结束日期(北京时间 YYYY-MM-DD,闭区间;单日时与 date_from 相同)")
     daily: list[AdRevenueDaily] = Field(..., description="按日期汇总序列(全量,供按天趋势图)")
-    hourly: list[AdRevenueHourly] = Field(
-        default_factory=list,
-        description="按小时汇总序列(全量,供按小时趋势图;按天查询时为空)",
-    )
-    type_stats: dict[str, AdRevenueTypeStat] = Field(
-        default_factory=dict,
-        description="按广告类型(ad_type)小计 {ad_type: {impressions, revenue_yuan}};前端取 draw / reward_video 做分类大盘",
-    )
-    dau: int | None = Field(
-        None,
-        description="今日活跃用户数(复用大盘口径,last_login_at);**仅查询=今日单天时有值**,历史/多天为 null",
-    )
-    total: int = Field(..., description="广告事件总数(全量,不受分页影响;= 当前筛选下的分页总条数)")
-    truncated: bool = Field(..., description="当前页之后是否还有更多事件(len(events) > offset + limit)")
+    total: int = Field(..., description="广告事件总数(全量,不受 limit 影响)")
+    truncated: bool = Field(..., description="明细是否被 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 说明全部按公式发放)")

app/admin/schemas/dashboard.py

@@ -1,8 +1,6 @@
 """admin 大盘 schemas(对应 stats.dashboard_overview 的嵌套结构)。"""
 from __future__ import annotations
 
-from datetime import date
-
 from pydantic import BaseModel
 
 
@@ -40,56 +38,6 @@ class DashboardComparison(BaseModel):
     success_rate: float
 
 
-class DashboardPeriodUsers(BaseModel):
-    new: int
-    active: int
-    retained_new_users: int
-    retention_rate: float | None = None
-    retention_note: str
-
-
-class DashboardPeriodComparison(BaseModel):
-    total: int
-    success: int
-    success_rate: float
-    ordered: int
-    average_duration_ms: int | None = None
-    average_saved_cents: int | None = None
-
-
-class DashboardPeriodCoins(BaseModel):
-    granted_total: int
-    reward_video_coin_total: int = 0
-    feed_ad_coin_total: int = 0
-    signin_coin_total: int = 0
-    signin_boost_coin_total: int = 0
-    task_coin_total: int = 0
-    coupon_reward_coin_total: int = 0
-    comparison_reward_coin_total: int = 0
-    regular_task_coin_total: int = 0
-
-
-class DashboardPeriodCash(BaseModel):
-    withdraw_success_cents: int
-
-
-class DashboardTrendPoint(BaseModel):
-    date: date
-    active_users: int
-    new_users: int
-    comparisons: int
-
-
-class DashboardPeriod(BaseModel):
-    date_from: date
-    date_to: date
-    users: DashboardPeriodUsers
-    comparison: DashboardPeriodComparison
-    coins: DashboardPeriodCoins
-    cash: DashboardPeriodCash
-    trend: list[DashboardTrendPoint] = []
-
-
 class DashboardFeedback(BaseModel):
     new: int
 
@@ -97,12 +45,6 @@ class DashboardFeedback(BaseModel):
 class DashboardCps(BaseModel):
     available: bool
     note: str
-    meituan_order_count: int = 0
-    meituan_commission_cents: int = 0
-    meituan_hit_count: int = 0
-    meituan_miss_count: int = 0
-    meituan_unknown_rate_count: int = 0
-    meituan_hit_rate: float | None = None
 
 
 class DashboardOverview(BaseModel):
@@ -110,6 +52,5 @@ class DashboardOverview(BaseModel):
     coins: DashboardCoins
     cash: DashboardCash
     comparison: DashboardComparison
-    period: DashboardPeriod
     feedback: DashboardFeedback
     cps: DashboardCps

app/admin/schemas/device.py

@@ -1,54 +0,0 @@
-"""admin 设备存活监控 schemas(只读)。
-
-数据源 device_liveness 表(见 app/models/device.py)。online / display_state /
-offline_seconds 为后端按 HEARTBEAT_TIMEOUT_MINUTES 阈值派生的瞬态字段(非 DB 列),
-在 repo 里算好挂到行上,供 from_attributes 读出。
-"""
-from __future__ import annotations
-
-from datetime import datetime
-
-from pydantic import BaseModel, ConfigDict
-
-
-class DeviceLivenessItem(BaseModel):
-    model_config = ConfigDict(from_attributes=True)
-
-    id: int
-    user_id: int
-    # join user 取(瞬态;理论上 user 恒存在,留空仅防脏数据)
-    phone: str | None = None
-    nickname: str | None = None
-
-    device_id: str
-    device_model: str | None = None      # 由 device_id 解析(device_<机型>_<hash>);非 DB 列
-    platform: str
-    app_version: str | None = None
-    registration_id: str | None = None  # 非空 = 拿到极光 token、可推送
-
-    ever_protected: bool                 # 是否开过无障碍(=该设备对功能有意义)
-    first_protected_at: datetime | None = None   # 首次开无障碍时刻(老设备为 null)
-    last_heartbeat_at: datetime | None = None
-    last_report_protection_on: bool      # 心跳里上报的无障碍开关(恒 true,仅观测)
-    liveness_state: str                  # unknown / alive / silent(当前未用) / notified
-    notified_at: datetime | None = None
-    kill_alert_pending: bool             # 掉线召回待客户端 ack(与 state 解耦)
-    created_at: datetime
-    updated_at: datetime
-
-    # ===== 后端派生(非 DB 列)=====
-    online: bool = False                 # ever_protected 且距上次心跳 ≤ 阈值
-    # 显示态:online=在线 / offline=已掉线 / never=从未启用(没开过无障碍)
-    display_state: str = "never"
-    # 掉线时长(秒):仅 offline 时有值;在线 / 从未启用为 None
-    offline_seconds: int | None = None
-
-
-class DeviceLivenessStats(BaseModel):
-    """顶部卡片:总设备数 + 在线 / 已掉线 / 未启用(按心跳阈值派生的 operator 口径,
-    不暴露内部状态机 unknown/alive/silent/notified)。"""
-
-    total: int
-    online: int
-    offline: int
-    never: int

app/api/internal/launch_confirm.py

@@ -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]

app/api/v1/ad.py

@@ -411,7 +411,6 @@ def feed_reward(payload: FeedRewardIn, user: CurrentUser, db: DbSession) -> Feed
         app_env=payload.app_env,
         our_code_id=payload.our_code_id,
         aborted=payload.aborted,
-        display_coin=payload.display_coin,
     )
     logger.info(
         "feed ad reward user_id=%d event=%s status=%s units=%d coin=%d",

app/api/v1/compare.py

@@ -26,7 +26,6 @@ import httpx
 from fastapi import APIRouter, HTTPException, Request, status
 
 from app.core.config import settings
-from app.core.pricebot_client import get_pricebot_client
 from app.core.pricebot_router import pick_pricebot
 
 logger = logging.getLogger("shagua.compare")
@@ -66,10 +65,10 @@ async def _passthrough(request: Request, upstream_path: str) -> dict[str, Any]:
     )
 
     try:
-        client = get_pricebot_client()
-        resp = await client.post(
-            url, content=raw, headers={"Content-Type": "application/json"}, timeout=timeout
-        )
+        async with httpx.AsyncClient(timeout=timeout) as client:
+            resp = await client.post(
+                url, content=raw, headers={"Content-Type": "application/json"}
+            )
     except httpx.RequestError as e:
         logger.error("[pricebot] request failed: %s", e)
         raise HTTPException(

app/api/v1/compare_record.py

@@ -21,7 +21,6 @@ from app.api.deps import CurrentUser, DbSession
 from app.db.session import SessionLocal
 from app.models.comparison import ComparisonRecord
 from app.repositories import comparison as crud_compare
-from app.repositories import invite as crud_invite
 from app.services.pricebot_llm_calls import fetch_llm_calls
 from app.schemas.compare_record import (
     CompareStatsOut,
@@ -53,18 +52,6 @@ def report_record(
     # 任务做,不阻塞上报响应(顺带给 pricebot 落盘留足余量)。upsert 已 commit,后台用
     # 独立 session 按 record id 回填 llm_calls + 派生 llm_call_count/retry_count。
     background_tasks.add_task(_backfill_llm_calls, rec.id, rec.trace_id)
-    # 邀请 v2 发奖:被邀请人完成一次【成功】比价 → 给邀请人发邀请奖励金(幂等,只发一次)。
-    # best-effort:发奖异常不影响比价上报本身(rec 已 commit),只 log;邀请人补偿靠后续对账。
-    if rec.status == "success":
-        try:
-            reward = crud_invite.try_reward_on_compare(db, user.id)
-            if reward.status == "granted":
-                logger.info(
-                    "invite compare reward granted inviter=%s invitee=%s cents=%s",
-                    reward.inviter_user_id, user.id, reward.reward_cents,
-                )
-        except Exception as e:  # noqa: BLE001 best-effort,发奖失败不阻塞上报
-            logger.warning("invite compare reward failed invitee=%s: %s", user.id, e)
     logger.info(
         "compare record user=%s trace=%s biz=%s status=%s saved=%s (llm_calls backfill queued)",
         user.id,

app/api/v1/coupon.py

@@ -20,7 +20,6 @@ from fastapi.concurrency import run_in_threadpool
 
 from app.api.deps import CurrentUser, DbSession
 from app.core.config import settings
-from app.core.pricebot_client import get_pricebot_client
 from app.core.pricebot_router import pick_pricebot
 from app.db.session import SessionLocal
 from app.repositories import coupon_state as coupon_repo
@@ -142,10 +141,10 @@ async def coupon_step(
     )
 
     try:
-        client = get_pricebot_client()
-        resp = await client.post(
-            url, content=raw, headers={"Content-Type": "application/json"}, timeout=timeout
-        )
+        async with httpx.AsyncClient(timeout=timeout) as client:
+            resp = await client.post(
+                url, content=raw, headers={"Content-Type": "application/json"}
+            )
     except httpx.RequestError as e:
         logger.error("[pricebot] request failed: %s", e)
         raise HTTPException(

app/api/v1/invite.py

@@ -38,7 +38,7 @@ logger = logging.getLogger("shagua.invite")
 router = APIRouter(prefix="/api/v1/invite", tags=["invite"])
 
 _BIND_MESSAGES = {
-    "success": "邀请绑定成功",
+    "success": "邀请绑定成功,金币已到账",
     "already_bound": "你已绑定过邀请人",
     "invalid_code": "邀请码无效",
     "self_invite": "不能填写自己的邀请码",
@@ -84,8 +84,6 @@ def _parse_device_model(ua: str) -> str:
 def my_invite(user: CurrentUser, db: DbSession) -> InviteInfoOut:
     code = invite_repo.ensure_code(db, user)
     invited, coins = invite_repo.get_stats(db, user.id)
-    reward_balance, reward_withdrawn = invite_repo.get_reward_stats(db, user.id)
-    days_left, is_fresh_round, countdown_text = invite_repo.compute_invite_countdown(user.created_at)
     sep = "&" if "?" in settings.INVITE_LANDING_URL else "?"
     share_url = f"{settings.INVITE_LANDING_URL}{sep}ref={code}"
     return InviteInfoOut(
@@ -93,11 +91,6 @@ def my_invite(user: CurrentUser, db: DbSession) -> InviteInfoOut:
         share_url=share_url,
         invited_count=invited,
         coins_earned=coins,
-        reward_balance_cents=reward_balance,
-        reward_withdrawn_cents=reward_withdrawn,
-        countdown_days_left=days_left,
-        countdown_is_fresh_round=is_fresh_round,
-        countdown_text=countdown_text,
     )
 
 
@@ -161,7 +154,7 @@ def landing_track(
     return LandingTrackOut(status="ok")
 
 
-@router.post("/bind", response_model=BindInviteOut, summary="绑定邀请人(注册即生效,绑定不发奖)")
+@router.post("/bind", response_model=BindInviteOut, summary="绑定邀请人(注册即生效,双方发金币)")
 def bind_invite(
     req: BindInviteIn, user: CurrentUser, db: DbSession, request: Request
 ) -> BindInviteOut:

app/api/v1/wallet.py

@@ -200,8 +200,7 @@ def withdraw(req: WithdrawRequest, user: CurrentUser, db: DbSession) -> Withdraw
         raise HTTPException(status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail="wechat pay not configured")
     try:
         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,
+            db, user.id, req.amount_cents, user_name=req.user_name, out_bill_no=req.out_bill_no
         )
     except crud_wallet.InvalidWithdrawAmountError as e:
         raise HTTPException(
@@ -275,11 +274,10 @@ def withdraw_status(
 def withdraw_orders(
     user: CurrentUser,
     db: DbSession,
-    source: str | None = Query(None, description="按账户来源过滤:coin_cash / invite_cash;不传=全部"),
     limit: int = Query(20, ge=1, le=100),
     cursor: int | None = Query(None, description="上一页末条 id"),
 ) -> WithdrawOrderPage:
-    items, next_cursor = crud_wallet.list_withdraw_orders(db, user.id, source=source, limit=limit, cursor=cursor)
+    items, next_cursor = crud_wallet.list_withdraw_orders(db, user.id, limit=limit, cursor=cursor)
     return WithdrawOrderPage(
         items=[WithdrawOrderOut.model_validate(it) for it in items],
         next_cursor=next_cursor,

app/core/config.py

@@ -211,41 +211,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"

app/core/pricebot_client.py

@@ -1,35 +0,0 @@
-"""透传到 pricebot 的共享 httpx.AsyncClient 单例。
-
-为什么不能每请求新建(coupon.py / compare.py 老写法 async with httpx.AsyncClient(...)):
-  ① 每次构造都重建一套 SSL 上下文(httpx.create_ssl_context 加载 certifi CA),实测
-     ~1s+/次;而 pricebot 是纯 http 透传,根本用不到 TLS → 纯浪费,且每帧重交一次。
-  ② trust_env 默认 True 会读进程 HTTP_PROXY,把 http://localhost:8000 这条本地透传整个
-     塞进本机代理(如 Clash 7897),恒定再多几秒。
-单例:启动只建一次(SSL/连接池一次性),keep-alive 复用 TCP,每帧降到个位数 ms。
-trust_env=False:对齐 integrations/meituan.py 的既有约定,不被进程代理误导,直连 pricebot。
-"""
-from __future__ import annotations
-
-import httpx
-
-_client: httpx.AsyncClient | None = None
-
-
-def get_pricebot_client() -> httpx.AsyncClient:
-    """取透传单例。lifespan 启动会预热;未预热(如测试态)懒建兜底。
-
-    超时不在此固化(coupon 30s / compare 60s 不同),由调用点 client.post(timeout=...) 传。
-    懒建无 await,asyncio 单线程下不会有并发竞态。
-    """
-    global _client
-    if _client is None:
-        _client = httpx.AsyncClient(trust_env=False)
-    return _client
-
-
-async def aclose_pricebot_client() -> None:
-    """lifespan 关停时调,优雅关连接池。"""
-    global _client
-    if _client is not None:
-        await _client.aclose()
-        _client = None

app/core/rewards.py

@@ -113,9 +113,10 @@ PRICE_REPORT_REWARD_COINS: int = 1000
 FEEDBACK_REWARD_MAX_COINS: int = 10000
 
 
-# ===== 邀请好友(绑定即生效,绑定只建归因关系、双方都不发钱)=====
-# v3(冰 2026-06-26):废除 v1 的"绑定双方各发金币"——被邀请人无奖励、邀请人改比价后发现金
-# (见下方 INVITE_COMPARE_REWARD_CENTS)。原 INVITE_INVITER_COINS / INVITE_INVITEE_COINS 已删。
+# ===== 邀请好友(注册即生效,邀请人 + 被邀请人各发金币)=====
+# 10000 金币 = 1 元,双方各得 1 元。MVP 先用固定常量(不走 app_config)。
+INVITE_INVITER_COINS: int = 10000
+INVITE_INVITEE_COINS: int = 10000
 # "新用户闸":被邀请人必须在注册后此窗口内绑定才发奖(挡存量老用户互相填码薅羊毛)。
 # 自动绑(剪贴板)在首次注册登录后几秒内发生;留 72h 给手动填码兜底。
 INVITE_NEW_USER_WINDOW_HOURS: int = 72
@@ -126,13 +127,6 @@ INVITE_NEW_USER_WINDOW_HOURS: int = 72
 INVITE_FP_WINDOW_DAYS: int = 7
 
 
-# ===== 邀请好友 v2(好友"下载+登录+比价一次"→ 给邀请人发邀请奖励金·现金)=====
-# v2 新规则:不再注册即发金币,改"好友完成首次成功比价"才给【邀请人】发奖,发的是【现金·分】
-# 进独立的邀请奖励金账户(coin_account.invite_cash_balance_cents),与金币体系物理隔离。
-# 200 分 = 2 元。⚠️ 金额待产品定准:邀请主页=2元 / 福利入口=3.5元 不一致,定后改此处。
-INVITE_COMPARE_REWARD_CENTS: int = 200
-
-
 # ===== 看激励视频 / 信息流广告发金币 =====
 # eCPM 取自穿山甲 SDK getShowEcpm().getEcpm(),官方口径单位是【分/千次展示】(不是元!
 # csjplatform 文档原文"通过 getEcpm 获取的单位是分")。计算时先 ÷100 转成元;

app/integrations/pangle_report.py

@@ -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

app/main.py

@@ -49,7 +49,6 @@ from app.core.daily_exchange_worker import (
     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 (
     start_withdraw_reconcile_worker,
     stop_withdraw_reconcile_worker,
@@ -69,7 +68,6 @@ async def lifespan(_: FastAPI) -> AsyncIterator[None]:
         settings.APP_DEBUG,
         settings.DATABASE_URL.split("://", 1)[0],
     )
-    get_pricebot_client()  # 预热透传 client:把建 SSL 上下文的一次性成本付在启动,首个领券请求即热
     reconcile_task = start_withdraw_reconcile_worker()
     heartbeat_task = start_heartbeat_monitor()
     daily_exchange_task = start_daily_exchange_worker()
@@ -79,7 +77,6 @@ async def lifespan(_: FastAPI) -> AsyncIterator[None]:
         await stop_heartbeat_monitor(heartbeat_task)
         await stop_withdraw_reconcile_worker(reconcile_task)
         await stop_daily_exchange_worker(daily_exchange_task)
-        await aclose_pricebot_client()
         logger.info("shutting down")
 
 
@@ -142,22 +139,3 @@ app.mount(
     StaticFiles(directory=str(_media_root)),
     name="media",
 )
-
-# 业务 H5 同源托管(/h5)。与 /api/v1 同 host → H5 用相对路径调后端,免 CORS。
-# .html 加 no-cache:后端改完用户重开页即拉新(远程热更核心);js/图片走默认缓存。
-class _NoCacheHTMLStaticFiles(StaticFiles):
-    async def get_response(self, path: str, scope):
-        resp = await super().get_response(path, scope)
-        # 按响应 content-type 判定,而非请求 path:html=True 时目录式 URL(/h5/x/)
-        # 经 Starlette 内部回落到 index.html,此刻 path 仍是 "x/"(不带 .html)。
-        if resp.headers.get("content-type", "").startswith("text/html"):
-            resp.headers["Cache-Control"] = "no-cache"
-        return resp
-
-
-_h5_root = Path(__file__).resolve().parent.parent / "h5"
-app.mount(
-    "/h5",
-    _NoCacheHTMLStaticFiles(directory=str(_h5_root), html=True),
-    name="h5",
-)

app/models/__init__.py

@@ -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
@@ -39,6 +38,5 @@ from app.models.wallet import (  # noqa: F401
     CashTransaction,
     CoinAccount,
     CoinTransaction,
-    InviteCashTransaction,
     WithdrawOrder,
 )

app/models/ad_pangle_revenue.py

@@ -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}>"
-        )

app/models/device.py

@@ -51,11 +51,6 @@ class DeviceLiveness(Base):
     ever_protected: Mapped[bool] = mapped_column(
         Boolean, nullable=False, default=False
     )
-    # 首次开无障碍(首次收到 accessibility_enabled 心跳)的时刻;ever_protected 第一次翻 true 时记一次,
-    # 后续心跳不覆盖。老设备(迁移前已 protected)无此值 → NULL。
-    first_protected_at: Mapped[datetime | None] = mapped_column(
-        DateTime(timezone=True), nullable=True
-    )
     # 最近一次 service 心跳时间(存活证明);超时即视为保护掉线
     last_heartbeat_at: Mapped[datetime | None] = mapped_column(
         DateTime(timezone=True), index=True, nullable=True

app/models/invite.py

@@ -10,7 +10,7 @@ from __future__ import annotations
 
 from datetime import datetime
 
-from sqlalchemy import Boolean, DateTime, ForeignKey, Integer, String, false, func
+from sqlalchemy import DateTime, ForeignKey, Integer, String, func
 from sqlalchemy.orm import Mapped, mapped_column
 
 from app.db.base import Base
@@ -35,20 +35,6 @@ class InviteRelation(Base):
     inviter_coin: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
     invitee_coin: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
 
-    # ===== v2 比价发奖追踪(好友"下载+登录+比价一次"→ 给邀请人发邀请奖励金)=====
-    # 是否已因"好友完成比价"发过奖:好友比价多次只发一次(防重复发,与 invitee 唯一约束双保险)
-    compare_reward_granted: Mapped[bool] = mapped_column(
-        Boolean, nullable=False, default=False, server_default=false()
-    )
-    # 实发给邀请人的邀请奖励金(分);未发为 0
-    compare_reward_cents: Mapped[int] = mapped_column(
-        Integer, nullable=False, default=0, server_default="0"
-    )
-    # 发奖时间(未发为 None)
-    compare_rewarded_at: Mapped[datetime | None] = mapped_column(
-        DateTime(timezone=True), nullable=True
-    )
-
     created_at: Mapped[datetime] = mapped_column(
         DateTime(timezone=True), server_default=func.now(), index=True, nullable=False
     )

app/models/wallet.py

@@ -25,11 +25,6 @@ class CoinAccount(Base):
     )
     coin_balance: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
     cash_balance_cents: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
-    # 邀请奖励金余额(分)——与金币兑换来的 cash_balance_cents **物理隔离**(产品红线:
-    # 邀请奖励金 ≠ 看广告/金币现金,两本账不可累加)。好友比价发奖入账、提现出账走它。
-    invite_cash_balance_cents: Mapped[int] = mapped_column(
-        Integer, nullable=False, default=0, server_default="0"
-    )
     # 累计赚取的金币(只增不减),用于"历史总收益"类展示
     total_coin_earned: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
 
@@ -113,11 +108,6 @@ class WithdrawOrder(Base):
     # 商户单号(我们生成,微信查单的 out_bill_no),唯一
     out_bill_no: Mapped[str] = mapped_column(String(64), unique=True, index=True, nullable=False)
     amount_cents: Mapped[int] = mapped_column(Integer, nullable=False)
-    # 这笔提现扣的是哪个账户:coin_cash(金币兑换的现金) / invite_cash(邀请奖励金)。
-    # 退款时据此退回**对应**账户,两本账不串。旧单默认 coin_cash。
-    source: Mapped[str] = mapped_column(
-        String(16), nullable=False, default="coin_cash", server_default="coin_cash"
-    )
     # 提现实名(微信达额转账要求):审核后异步打款时要用,发起提现时存下,可空
     user_name: Mapped[str | None] = mapped_column(String(64), nullable=True)
     # 归一化状态:reviewing(待审核) / pending(打款在途) / success / failed(打款失败已退) / rejected(审核拒绝已退)
@@ -210,41 +200,3 @@ class CashTransaction(Base):
 
     def __repr__(self) -> str:  # pragma: no cover
         return f"<CashTransaction id={self.id} user_id={self.user_id} cents={self.amount_cents}>"
-
-
-class InviteCashTransaction(Base):
-    """邀请奖励金流水(单位:分)。与 cash_transaction(金币兑换现金)**物理隔离**——
-    产品红线:邀请奖励金 ≠ 看广告/金币现金,两本账不可累加、各自提现。
-    入账=好友比价发奖(invite_reward),出账=提现(invite_withdraw)/退款(invite_withdraw_refund)。
-    结构与 cash_transaction 同构,balance_after_cents 记的是 coin_account.invite_cash_balance_cents。"""
-
-    __tablename__ = "invite_cash_transaction"
-    __table_args__ = (
-        # 提现退款幂等:一个提现单只退一次(同 cash_transaction 的 withdraw_refund 去重)
-        Index(
-            "ux_invite_cash_txn_refund_ref",
-            "ref_id",
-            unique=True,
-            sqlite_where=text("biz_type = 'invite_withdraw_refund' AND ref_id IS NOT NULL"),
-            postgresql_where=text("biz_type = 'invite_withdraw_refund' AND ref_id IS NOT NULL"),
-        ),
-    )
-
-    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
-    user_id: Mapped[int] = mapped_column(
-        Integer, ForeignKey("user.id"), index=True, nullable=False
-    )
-    # 正数=入账(发奖),负数=出账(提现)
-    amount_cents: Mapped[int] = mapped_column(Integer, nullable=False)
-    balance_after_cents: Mapped[int] = mapped_column(Integer, nullable=False)
-    # 业务类型:invite_reward / invite_withdraw / invite_withdraw_refund
-    biz_type: Mapped[str] = mapped_column(String(32), nullable=False)
-    ref_id: Mapped[str | None] = mapped_column(String(64), nullable=True)
-    remark: Mapped[str | None] = mapped_column(String(128), nullable=True)
-
-    created_at: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), server_default=func.now(), index=True, nullable=False
-    )
-
-    def __repr__(self) -> str:  # pragma: no cover
-        return f"<InviteCashTransaction id={self.id} user_id={self.user_id} cents={self.amount_cents}>"

app/repositories/ad_ecpm.py

@@ -53,16 +53,11 @@ def create_ecpm_record(
         db.commit()
     except IntegrityError:
         db.rollback()
-        # 撞唯一约束 uq_ad_ecpm_record_session(全局按 ad_session_id、不含 user_id):并发同会话重复上报,
-        # 或同一 ad_session_id 已被先到的上报占用。本接口 fire-and-forget、best-effort —— 丢一条不影响业务
-        # (穿山甲后台才是结算权威),绝不向客户端抛 500。兜底查找须与唯一约束**同口径**(只按 ad_session_id、
-        # 不带 user_id):否则不同 user 上报了同一 ad_session_id 时,带 user_id 的查找会漏掉那条别人的记录 →
-        # 旧逻辑在此 raise 成 500(本应静默吞掉)。
-        existing = _find_by_session_global(db, ad_session_id)
-        if existing is not None:
-            return existing
-        # 极少:rollback 后既存记录又查不到(并发删除 / 竞态)。吞掉、返回未入库的内存对象(调用方不读返回值)。
-        return rec
+        if ad_session_id:
+            existing = find_by_session(db, user_id=user_id, ad_session_id=ad_session_id)
+            if existing is not None:
+                return existing
+        raise
     db.refresh(rec)
     return rec
 
@@ -81,20 +76,6 @@ def find_by_session(
     ).scalar_one_or_none()
 
 
-def _find_by_session_global(db: Session, ad_session_id: str | None) -> AdEcpmRecord | None:
-    """按 ad_session_id **全局**查找(与唯一约束 uq_ad_ecpm_record_session 同口径,不含 user_id)。
-
-    仅 create_ecpm_record 撞约束后兜底用:此时撞的是全局会话约束,既存记录可能属于**另一个 user**,
-    带 user_id 的 find_by_session 会漏掉它、导致误判「查无 → raise 500」。其它业务查「某 user 的某次
-    展示 eCPM」仍用 find_by_session(带 user_id,语义更准),不走这里。
-    """
-    if not ad_session_id:
-        return None
-    return db.execute(
-        select(AdEcpmRecord).where(AdEcpmRecord.ad_session_id == ad_session_id)
-    ).scalar_one_or_none()
-
-
 def count_today(db: Session, user_id: int) -> int:
     """该用户今日(北京时间)上报的 eCPM 条数,排查/对账辅助用。"""
     return db.execute(

app/repositories/ad_feed_reward.py

@@ -73,19 +73,16 @@ def grant_feed_reward(
     app_env: str | None = None,
     our_code_id: str | None = None,
     aborted: bool = False,
-    display_coin: int = 0,
 ) -> AdFeedRewardRecord:
     """**每条**信息流广告(客户端每条各上报一次)结算奖励。client_event_id 幂等,同号重试不重复发。
 
-    发奖规则(所见即所得, 2026-06-27 用户拍板「显示多少给多少」):优先**直接发客户端小球显示的金币
-    display_coin**;防刷钳到本条「1 份满额」(eCPM 已钳 AD_ECPM_MAX_FEN, 因子2 按账号累计已发条数取档),
-    合法显示(实际因子2 × 进度 p ≤ 1 份)不被砍, 只挡伪造天价值。旧客户端不传 display_coin 时退回
-    「看满 10 秒发整份」(兼容不断币)。因子2(LT)由**客户端**按 granted 行 COUNT(拉自 /feed-reward/units)
-    算进 display_coin, 后端只记 granted 行让该计数自增, 不再服务端重算份值。
+    发奖规则:**一条广告 = 一个单次公式值**(rewards.calculate_ad_reward_coin),因子2(LT)按账号累计
+    **条**数递进;看满一份时长(unit_count>=1, 即 ≥10 秒)才发,**不逐份累加**。
     - aborted=True(用户中途 ✕ 关闭这条):本条不发,记 status='closed_early'。
-    - display_coin 为 0 且时长不足一份:记 status='too_short' 不发(不计 LT / 当日上限)。
+    - 时长不足 10 秒(unit_count==0):记 status='too_short' 不发。
     - 命中当日条数上限:记 status='capped' 不发。
-    duration_seconds 落库留痕(unit_count 字段), 旧端兼容路径据它判是否满 1 份。
+    duration_seconds 是**这一条**的观看秒数。服务端两道硬闸防刷:时长钳到 FEED_MAX_DURATION_SECONDS、
+    eCPM 在 calculate_ad_reward_coin 内钳到 AD_ECPM_MAX_FEN;叠加每日 get_ad_daily_limit 条数上限。
     feed_scene:点位场景(comparison/coupon/welfare),仅归类落库,不参与计算。
     ad_type:广告形态(feed 信息流 / draw Draw 信息流),仅归类落库;**每日上限与因子2(LT)仍按本表
     全表 unit 累计(feed+draw 共享同一发奖池/上限),不按 ad_type 拆分**。
@@ -142,26 +139,14 @@ def grant_feed_reward(
         )
         return _commit_record(db, rec, client_event_id)
 
-    # 所见即所得(用户 2026-06-27「显示多少给多少」): 优先发**客户端小球显示**的金币 display_coin,
-    # 钳到本条「1 份满额」防刷(eCPM 已钳 AD_ECPM_MAX_FEN; 合法显示=因子2×p≤1份, 不会被砍)。
-    # 因子2(LT)按账号累计已发条数(granted 行 COUNT), 第 existing_ads+1 条。
-    existing_ads = granted_unit_total(db, user_id)
-    unit_cap = rewards.calculate_ad_reward_coin(ecpm, existing_ads + 1)
-    if display_coin > 0:
-        coin = min(display_coin, unit_cap)              # 新端: 所见即所得(直接发小球显示金币)
-    elif unit_count >= 1:
-        coin = unit_cap                                 # 旧端没传 display_coin: 退回「看满 1 份发整份」(兼容)
-    else:
-        coin = 0
-
-    # 显示金币为 0 且没满一份 → 不发, 记 too_short 留痕(不写 granted 行 → 不计 LT / 当日上限)。
-    if coin <= 0:
+    # 整场总时长不足 10 秒,凑不满一份 → 不发,记 too_short 留痕。
+    if unit_count == 0:
         rec = AdFeedRewardRecord(
             client_event_id=client_event_id,
             user_id=user_id,
             reward_date=today,
             duration_seconds=safe_duration,
-            unit_count=unit_count,
+            unit_count=0,
             ad_session_id=ad_session_id,
             ecpm_raw=ecpm,
             adn=adn,
@@ -176,11 +161,15 @@ def grant_feed_reward(
         )
         return _commit_record(db, rec, client_event_id)
 
-    crud_wallet.grant_coins(
-        db, user_id, coin,
-        biz_type="feed_ad_reward", ref_id=client_event_id,
-        remark="信息流广告奖励",
-    )
+    # 一条广告 = 一个「单次公式值」(因子2 按账号累计**条**数, 即第 existing_ads+1 条);看满一份(unit_count>=1)即发,不逐份累加。
+    existing_ads = granted_unit_total(db, user_id)
+    coin = rewards.calculate_ad_reward_coin(ecpm, existing_ads + 1)
+    if coin > 0:
+        crud_wallet.grant_coins(
+            db, user_id, coin,
+            biz_type="feed_ad_reward", ref_id=client_event_id,
+            remark="信息流广告奖励",
+        )
     rec = AdFeedRewardRecord(
         client_event_id=client_event_id,
         user_id=user_id,

app/repositories/ad_pangle_revenue.py

@@ -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

app/repositories/device.py

@@ -72,8 +72,6 @@ def touch_heartbeat(
     device.last_report_protection_on = accessibility_enabled
 
     if accessibility_enabled:
-        if not device.ever_protected:
-            device.first_protected_at = now  # 首次开无障碍记一次,后续心跳不覆盖
         device.last_heartbeat_at = now
         device.ever_protected = True
         device.liveness_state = "alive"

app/repositories/invite.py

@@ -1,14 +1,13 @@
-"""好友邀请 CRUD(注册即生效,绑定只建归因关系、双方都不发钱)。
-
-发奖规则(v3,冰 2026-06-26 拍板):
-  - 绑定时双方都不发钱(被邀请人无奖励、邀请人不发金币)。
-  - 邀请人的钱由 try_reward_on_compare 在好友"成功比价一次"后发 2 元邀请奖励金(防刷)。
-  - v1 的"绑定双方各发金币"已废;invite_relation 的 inviter_coin/invitee_coin 列保留恒 0(待清)。
+"""好友邀请 CRUD(注册即生效,邀请人 + 被邀请人各发金币)。
 
 防重复发奖三道(仿 ad_reward / 提现的资金安全思路):
   1. invitee_user_id 唯一 → 一个被邀请人只能被绑定一次(幂等键)。
   2. 自邀屏蔽 → inviter == invitee 直接拒。
   3. 现成的手机号唯一(每个被邀请人 = 一个真实手机号账号)= 天然限制刷量规模。
+
+发金币复用 wallet.grant_coins(grant 只 flush 不 commit),与建关系记录在**同一事务**
+commit,保证"建关系 + 双方加金币"原子。奖励额 = rewards.INVITE_INVITER_COINS /
+INVITE_INVITEE_COINS。
 """
 from __future__ import annotations
 
@@ -35,30 +34,6 @@ def _gen_code() -> str:
     return "".join(secrets.choice(_CODE_ALPHABET) for _ in range(_CODE_LEN))
 
 
-# ===== v2 邀请倒计时(7 天 1 轮,锚点=注册日,自然日差,东八区)=====
-# 中国不用夏令时,固定 +8 偏移即可(不依赖 tzdata,Windows 本地联调也稳)。
-_CST = timezone(timedelta(hours=8))
-
-
-def compute_invite_countdown(register_at: datetime) -> tuple[int, bool, str]:
-    """按 7 天 1 轮算邀请页倒计时。
-
-    锚点 = 用户注册日(user.created_at),按东八区自然日差算
-    (跨自然日才减、同日多次登录不减,天然满足)。返回:
-      (本轮剩余天数 1..7, 是否刚进入新一轮[非首轮第1天], 展示文案)。
-    """
-    reg = register_at if register_at.tzinfo else register_at.replace(tzinfo=timezone.utc)
-    days_since = max(0, (datetime.now(_CST).date() - reg.astimezone(_CST).date()).days)
-    day_in_cycle = days_since % 7                            # 0..6(本轮第几天,0-based)
-    days_left = 7 - day_in_cycle                             # 7..1(第1天=7、第7天=1)
-    is_fresh_round = days_since >= 7 and day_in_cycle == 0   # 非首轮的第1天
-    if is_fresh_round:
-        text = "恭喜您进入新一轮邀请！\n距离本轮结束还有7天"
-    else:
-        text = f"距本轮结束还有{days_left}天"
-    return days_left, is_fresh_round, text
-
-
 def ensure_code(db: Session, user: User) -> str:
     """保证 user 有邀请码(懒生成),返回它。唯一约束碰撞则换码重试。
 
@@ -115,17 +90,15 @@ def _is_new_user(user: User) -> bool:
 class BindResult:
     status: str                          # success / already_bound / invalid_code / self_invite / not_eligible
     relation: InviteRelation | None = None
-    invitee_coin: int = 0                # v3 起恒 0(绑定不再发金币);保留字段兼容响应
+    invitee_coin: int = 0                # 本次给被邀请人发的金币(success 时 >0)
 
 
 def bind(
     db: Session, *, invitee: User, invite_code: str, channel: str = "clipboard"
 ) -> BindResult:
-    """把 invitee 绑定到 invite_code 对应的邀请人,注册即生效。
+    """把 invitee 绑定到 invite_code 对应的邀请人,注册即生效 + 双方发金币。
 
-    v3 发奖(冰 2026-06-26 拍板):绑定双方都不发钱——被邀请人无奖励,邀请人改"好友成功比价一次
-    才发 2 元邀请奖励金"(见 try_reward_on_compare,防刷)。绑定只建归因关系 + 跑防刷闸。
-    幂等:已绑过 → already_bound。
+    幂等:invitee 已被绑过 → already_bound(不重复发奖)。
     """
     # 幂等:已绑过直接返回(不重复发奖)
     existing = _relation_of_invitee(db, invitee.id)
@@ -141,18 +114,27 @@ def bind(
     if not _is_new_user(invitee):
         return BindResult("not_eligible")
 
-    # v3(冰 2026-06-26 拍板):绑定双方都不发钱。被邀请人不再发新人金币(去掉拉新即时激励);
-    # 邀请人的钱由 try_reward_on_compare 在好友成功比价后发 2 元邀请奖励金(防刷)。
+    inviter_coin = rewards.INVITE_INVITER_COINS
+    invitee_coin = rewards.INVITE_INVITEE_COINS
+
     rel = InviteRelation(
         inviter_user_id=inviter.id,
         invitee_user_id=invitee.id,
         channel=(channel or "clipboard")[:16],
         status="effective",
-        inviter_coin=0,                 # v1 金币线已停用,列保留恒 0(待清)
-        invitee_coin=0,                 # v3:被邀请人绑定不再发金币
+        inviter_coin=inviter_coin,
+        invitee_coin=invitee_coin,
     )
     db.add(rel)
-    # 绑定不发任何金币(邀请人改比价发现金、被邀请人无奖励),仅建归因关系。
+    # 双方发金币(同事务,与建关系一起 commit)。ref_id 互指对方便于对账。
+    crud_wallet.grant_coins(
+        db, inviter.id, inviter_coin,
+        biz_type="invite_inviter", ref_id=str(invitee.id), remark="邀请好友奖励",
+    )
+    crud_wallet.grant_coins(
+        db, invitee.id, invitee_coin,
+        biz_type="invite_invitee", ref_id=str(inviter.id), remark="新人受邀奖励",
+    )
     try:
         db.commit()
     except IntegrityError:
@@ -163,62 +145,16 @@ def bind(
             return BindResult("already_bound", existing)
         raise
     except Exception:
-        # 其它 commit 失败(DB 故障 / PG 序列化冲突等):显式回滚,保证建关系原子,
-        # 不依赖 get_db 关闭时的隐式回滚,语义更硬。
+        # 其它 commit 失败(DB 故障 / PG 序列化冲突等):显式回滚,保证"建关系 + 双方发币"
+        # 原子(要么全成要么全无),不依赖 get_db 关闭时的隐式回滚,语义更硬。
         db.rollback()
         raise
     db.refresh(rel)
-    return BindResult("success", rel)
-
-
-@dataclass
-class CompareRewardResult:
-    status: str                    # granted / no_relation / already_granted / inviter_inactive
-    inviter_user_id: int | None = None
-    reward_cents: int = 0
-
-
-def try_reward_on_compare(db: Session, invitee_user_id: int) -> CompareRewardResult:
-    """被邀请人完成一次成功比价时调用:若其有邀请关系且尚未发过比价奖,给【邀请人】发邀请奖励金。
-
-    v2 发奖规则核心(替代 v1 的"注册即发金币"):好友"下载+登录+比价一次"→ 邀请人得 2 元现金。
-    幂等:compare_reward_granted 标记保证好友比价多次只发一次。无邀请关系 / 已发过 / 邀请人失效
-    → 空操作。发奖(grant_invite_cash 入账独立账户)+ 置标记同事务 commit,保证原子。
-    """
-    rel = _relation_of_invitee(db, invitee_user_id)
-    if rel is None:
-        return CompareRewardResult("no_relation")
-    if rel.compare_reward_granted:
-        return CompareRewardResult("already_granted", rel.inviter_user_id)
-
-    inviter = db.get(User, rel.inviter_user_id)
-    if inviter is None or inviter.status != "active":
-        # 邀请人注销 / 封禁:本次不发、不置标记,待其恢复后下次比价再试(保守,不吞奖励)
-        return CompareRewardResult("inviter_inactive", rel.inviter_user_id)
-
-    reward = rewards.INVITE_COMPARE_REWARD_CENTS
-    rel.compare_reward_granted = True
-    rel.compare_reward_cents = reward
-    rel.compare_rewarded_at = datetime.now(timezone.utc)
-    # 发邀请奖励金到邀请人的独立账户(与金币隔离),ref_id 指向被邀请人便于对账
-    crud_wallet.grant_invite_cash(
-        db, inviter.id, reward,
-        biz_type="invite_reward", ref_id=str(invitee_user_id), remark="好友比价奖励",
-    )
-    try:
-        db.commit()
-    except Exception:
-        db.rollback()
-        raise
-    return CompareRewardResult("granted", inviter.id, reward)
+    return BindResult("success", rel, invitee_coin)
 
 
 def get_stats(db: Session, inviter_id: int) -> tuple[int, int]:
-    """返回 (已成功邀请人数, 累计从邀请获得的金币)。
-
-    金币口径(inviter_coin 之和)自 v3 起恒 0(邀请人收益改走邀请奖励金,见 get_reward_stats /
-    try_reward_on_compare);保留返回位兼容旧响应字段 coins_earned。
-    """
+    """返回 (已成功邀请人数, 累计从邀请获得的金币)。"""
     count = db.execute(
         select(func.count())
         .select_from(InviteRelation)
@@ -231,26 +167,6 @@ def get_stats(db: Session, inviter_id: int) -> tuple[int, int]:
     return int(count), int(coins)
 
 
-def get_reward_stats(db: Session, inviter_id: int) -> tuple[int, int]:
-    """v2 邀请奖励金战绩:(可提现余额/分, 累计提现成功/分)。
-
-    余额 = coin_account.invite_cash_balance_cents;累计提现 = 该用户 source=invite_cash 且
-    status=success 的提现单金额之和(成功打款才算)。供 /invite/me 提现板块展示。
-    """
-    from app.models.wallet import CoinAccount, WithdrawOrder
-    balance = db.execute(
-        select(CoinAccount.invite_cash_balance_cents).where(CoinAccount.user_id == inviter_id)
-    ).scalar_one_or_none()
-    withdrawn = db.execute(
-        select(func.coalesce(func.sum(WithdrawOrder.amount_cents), 0)).where(
-            WithdrawOrder.user_id == inviter_id,
-            WithdrawOrder.source == "invite_cash",
-            WithdrawOrder.status == "success",
-        )
-    ).scalar_one()
-    return int(balance or 0), int(withdrawn)
-
-
 def _mask_phone(phone: str) -> str:
     """手机号脱敏:138****8888。前端拿不到完整号,展示被邀请人时在此兜底名字。
 
@@ -294,7 +210,7 @@ def get_invitees(
         items.append({
             "display_name": u.nickname or u.wechat_nickname or _mask_phone(u.phone),
             "avatar_url": u.avatar_url or u.wechat_avatar_url or None,
-            "coins": rel.inviter_coin,      # v3 起恒 0(邀请人收益改走邀请奖励金)
+            "coins": rel.inviter_coin,
             "invited_at": rel.created_at,
         })
     has_more = offset + len(rows) < int(total)

app/repositories/launch_confirm_sample.py

@@ -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())

app/repositories/wallet.py

@@ -24,7 +24,6 @@ from app.models.wallet import (
     CashTransaction,
     CoinAccount,
     CoinTransaction,
-    InviteCashTransaction,
     WechatTransferAuthorization,
     WithdrawOrder,
 )
@@ -167,36 +166,6 @@ def grant_cash(
     return acc, txn
 
 
-def grant_invite_cash(
-    db: Session,
-    user_id: int,
-    amount_cents: int,
-    *,
-    biz_type: str,
-    ref_id: str | None = None,
-    remark: str | None = None,
-) -> tuple[CoinAccount, InviteCashTransaction]:
-    """邀请奖励金变动入口(正数入账 / 负数出账)。更新 invite_cash_balance_cents + 写
-    invite_cash_transaction,不 commit。与金币兑换的 cash_balance_cents **物理隔离**
-    (产品红线:邀请奖励金 ≠ 金币现金,两本账不可累加)。返回 (account, transaction),
-    调用方负责 commit。不在此校验扣成负——由调用方按业务保护。"""
-    acc = get_or_create_account(db, user_id, commit=False)
-    acc.invite_cash_balance_cents += amount_cents
-
-    txn = InviteCashTransaction(
-        user_id=user_id,
-        amount_cents=amount_cents,
-        balance_after_cents=acc.invite_cash_balance_cents,
-        biz_type=biz_type,
-        ref_id=ref_id,
-        remark=remark,
-        created_at=datetime.now(rewards.CN_TZ).replace(tzinfo=None),
-    )
-    db.add(txn)
-    db.flush()
-    return acc, txn
-
-
 def list_coin_transactions(
     db: Session,
     user_id: int,
@@ -442,43 +411,33 @@ def refund_reviewing_withdraws_on_unbind(db: Session, user_id: int) -> int:
 _OUT_BILL_NO_RE = re.compile(r"^[0-9A-Za-z_-]{8,32}$")
 
 
-def _balance_col(source: str):
-    """提现账户来源 → CoinAccount 余额列。invite_cash=邀请奖励金;否则金币兑换的现金。
-    两账户物理隔离,提现扣款/退款都按 source 走对应列,互不串。"""
-    return (
-        CoinAccount.invite_cash_balance_cents
-        if source == "invite_cash"
-        else CoinAccount.cash_balance_cents
-    )
+def _try_deduct_cash(db: Session, user_id: int, amount_cents: int) -> bool:
+    """原子扣减现金:仅当余额足够时扣,返回是否成功。
 
-
-def _try_deduct_cash(db: Session, user_id: int, amount_cents: int, source: str = "coin_cash") -> bool:
-    """原子扣减指定账户余额:仅当余额足够时扣,返回是否成功。
-
-    用带条件的 UPDATE(`WHERE <col> >= amount`)避免"读-判断-写"竞态——并发/重试时不会两次
-    都通过余额检查导致超额扣款(SQLite 串行写、Postgres 行级,均安全)。source 决定扣
-    cash_balance_cents(coin_cash) 还是 invite_cash_balance_cents(invite_cash)。
+    用带条件的 UPDATE(`WHERE cash_balance_cents >= amount`)避免"读-判断-写"竞态——
+    并发/重试时不会两次都通过余额检查导致超额扣款(SQLite 串行写、Postgres 行级,均安全)。
     """
-    col = _balance_col(source)
     res = db.execute(
         update(CoinAccount)
-        .where(CoinAccount.user_id == user_id, col >= amount_cents)
-        .values({col: col - amount_cents})
+        .where(
+            CoinAccount.user_id == user_id,
+            CoinAccount.cash_balance_cents >= amount_cents,
+        )
+        .values(cash_balance_cents=CoinAccount.cash_balance_cents - amount_cents)
     )
     return res.rowcount == 1
 
 
-def _add_cash(db: Session, user_id: int, amount_cents: int, source: str = "coin_cash") -> int:
-    """原子增加指定账户余额(退款用),返回加后余额。source 决定退回哪个账户(两账户隔离)。"""
-    col = _balance_col(source)
+def _add_cash(db: Session, user_id: int, amount_cents: int) -> int:
+    """原子增加现金(退款用),返回加后余额。"""
     db.execute(
         update(CoinAccount)
         .where(CoinAccount.user_id == user_id)
-        .values({col: col + amount_cents})
+        .values(cash_balance_cents=CoinAccount.cash_balance_cents + amount_cents)
     )
     db.flush()
     bal = db.execute(
-        select(col).where(CoinAccount.user_id == user_id)
+        select(CoinAccount.cash_balance_cents).where(CoinAccount.user_id == user_id)
     ).scalar_one()
     return bal
 
@@ -497,15 +456,11 @@ def _refund_withdraw(
     """
     if order.status in ("failed", "rejected"):
         return  # 防重复退款(并发/对账与查单/重复拒绝同时触发)
-    # 账户隔离:按 order.source 退回对应账户 + 写对应退款流水表
-    is_invite = order.source == "invite_cash"
-    txn_model = InviteCashTransaction if is_invite else CashTransaction
-    refund_biz = "invite_withdraw_refund" if is_invite else "withdraw_refund"
     refunded_txn_id = db.execute(
-        select(txn_model.id).where(
-            txn_model.user_id == order.user_id,
-            txn_model.biz_type == refund_biz,
-            txn_model.ref_id == order.out_bill_no,
+        select(CashTransaction.id).where(
+            CashTransaction.user_id == order.user_id,
+            CashTransaction.biz_type == "withdraw_refund",
+            CashTransaction.ref_id == order.out_bill_no,
         ).limit(1)
     ).scalar_one_or_none()
     if refunded_txn_id is not None:
@@ -513,13 +468,13 @@ def _refund_withdraw(
         order.fail_reason = reason[:256]
         db.commit()
         return
-    bal = _add_cash(db, order.user_id, order.amount_cents, order.source)
+    bal = _add_cash(db, order.user_id, order.amount_cents)
     db.add(
-        txn_model(
+        CashTransaction(
             user_id=order.user_id,
             amount_cents=order.amount_cents,
             balance_after_cents=bal,
-            biz_type=refund_biz,
+            biz_type="withdraw_refund",
             ref_id=order.out_bill_no,
             # 用户可见文案区分"未成功(自动退)"vs"审核未通过";技术原因记在 order.fail_reason
             remark=(
@@ -537,13 +492,13 @@ def _refund_withdraw(
         db.commit()
     except IntegrityError:
         # 并发退款兜底:唯一退款流水已被另一事务写入时,回滚本事务的加钱和流水,
-        # 再把订单状态补到终态。这样无论拒绝/查单/对账怎么并发,金额最多退一次。
+        # 再把订单状态补到终态。这样无论拒绝/查单/对账怎么并发,现金最多退一次。
         db.rollback()
         refunded_txn_id = db.execute(
-            select(txn_model.id).where(
-                txn_model.user_id == user_id,
-                txn_model.biz_type == refund_biz,
-                txn_model.ref_id == out_bill_no,
+            select(CashTransaction.id).where(
+                CashTransaction.user_id == user_id,
+                CashTransaction.biz_type == "withdraw_refund",
+                CashTransaction.ref_id == out_bill_no,
             ).limit(1)
         ).scalar_one_or_none()
         if refunded_txn_id is None:
@@ -607,7 +562,6 @@ def create_withdraw(
     user_id: int,
     amount_cents: int,
     *,
-    source: str = "coin_cash",
     user_name: str | None = None,
     out_bill_no: str | None = None,
 ) -> WithdrawOrder:
@@ -654,23 +608,20 @@ def create_withdraw(
     # 账户须存在(原子扣款的 UPDATE 不会建账户)
     get_or_create_account(db, user_id, commit=True)
 
-    # #1 原子扣款:余额不足时影响行数为 0(按 source 扣对应账户)
-    if not _try_deduct_cash(db, user_id, amount_cents, source):
+    # #1 原子扣款:余额不足时影响行数为 0
+    if not _try_deduct_cash(db, user_id, amount_cents):
         db.rollback()
         raise InsufficientCashError
 
-    is_invite = source == "invite_cash"
-    txn_model = InviteCashTransaction if is_invite else CashTransaction
-    withdraw_biz = "invite_withdraw" if is_invite else "withdraw"
     bal = db.execute(
-        select(_balance_col(source)).where(CoinAccount.user_id == user_id)
+        select(CoinAccount.cash_balance_cents).where(CoinAccount.user_id == user_id)
     ).scalar_one()
     db.add(
-        txn_model(
+        CashTransaction(
             user_id=user_id,
             amount_cents=-amount_cents,
             balance_after_cents=bal,
-            biz_type=withdraw_biz,
+            biz_type="withdraw",
             ref_id=out_bill_no,
             remark="提现到微信零钱(待审核)",
             created_at=datetime.now(rewards.CN_TZ).replace(tzinfo=None),
@@ -680,7 +631,6 @@ def create_withdraw(
         user_id=user_id,
         out_bill_no=out_bill_no,
         amount_cents=amount_cents,
-        source=source,
         user_name=user_name,
         status="reviewing",
     )
@@ -1057,12 +1007,10 @@ def reconcile_pending_withdraws(db: Session, *, older_than_minutes: int = 15) ->
 
 
 def list_withdraw_orders(
-    db: Session, user_id: int, *, source: str | None = None, limit: int = 20, cursor: int | None = None
+    db: Session, user_id: int, *, limit: int = 20, cursor: int | None = None
 ) -> tuple[list[WithdrawOrder], int | None]:
-    """提现单分页(按 id 倒序,游标式)。source 非空时只返回该账户来源的单(coin_cash / invite_cash)。"""
+    """提现单分页(按 id 倒序,游标式)。"""
     stmt = select(WithdrawOrder).where(WithdrawOrder.user_id == user_id)
-    if source is not None:
-        stmt = stmt.where(WithdrawOrder.source == source)
     if cursor is not None:
         stmt = stmt.where(WithdrawOrder.id < cursor)
     stmt = stmt.order_by(WithdrawOrder.id.desc()).limit(limit)

app/schemas/ad.py

@@ -167,11 +167,6 @@ class FeedRewardIn(BaseModel):
     aborted: bool = Field(
         False, description="用户中途 ✕ 关闭广告(未走完比价):整场不发,记 closed_early"
     )
-    display_coin: int = Field(
-        0, ge=0,
-        description="客户端金币小球**本条显示**的金币(所见即所得):后端直接发这个数,钳到本条最大 1 份"
-        "满额防刷。缺省 0 = 旧客户端不传,退回服务端「看满 10 秒发整份」",
-    )
 
 
 class FeedRewardOut(BaseModel):

app/schemas/compare_record.py

@@ -11,7 +11,7 @@ from __future__ import annotations
 
 from datetime import datetime
 
-from pydantic import BaseModel, ConfigDict, Field, field_validator
+from pydantic import BaseModel, ConfigDict, Field
 
 
 # ===== 上报请求 =====
@@ -21,36 +21,8 @@ class ComparisonItemIn(BaseModel):
 
     name: str
     qty: int = 1
-    # specs 仅供比价记录展示(admin-web 详情 / app 记录页都按字符串数组渲染并 join)。
-    # pricebot(2026-06-27 嵌套规格统一)起 calibration 的 specs 可能是规格对象
-    # [{name, qty, sub_specs}] 而非字符串 → 下面的 before-validator 统一拍平成可读字符串,
-    # 兼容新旧两种输入、保持 list[str] 契约不变(下游零改动)。
-    # ⚠️ 两个坑都踩过, 必须"拍平"而非别的: ① 直接声明 list[str] 不拍平 → 对象 specs 整条
-    # 422 被拒、不入库(同下方 platform_results list→dict 同类事故); ② 仅放宽成裸 list 又会让
-    # 下游 join 出 "[object Object]"/对象 toString 的乱码。
     specs: list[str] | None = None
 
-    @field_validator("specs", mode="before")
-    @classmethod
-    def _flatten_specs(cls, v: object) -> object:
-        """pricebot 规格对象 [{name, qty, sub_specs}] → 可读字符串数组; 字符串元素原样保留;
-        非 list 原样交还(让 pydantic 照常报类型错)。嵌套规格拼成 '主项(子1,子2)'。"""
-        if not isinstance(v, list):
-            return v
-        out: list[str] = []
-        for it in v:
-            if isinstance(it, str):
-                s = it
-            elif isinstance(it, dict):
-                name = str(it.get("name") or "").strip()
-                subs = [str(x).strip() for x in (it.get("sub_specs") or []) if str(x).strip()]
-                s = f"{name}({','.join(subs)})" if name and subs else (name or ",".join(subs))
-            else:
-                continue
-            if s:
-                out.append(s)
-        return out
-
 
 class AppliedCouponIn(BaseModel):
     """单笔已用优惠(来自 comparison_results[].applied_coupons)。amount 单位:元、正数。"""
@@ -123,7 +95,6 @@ class ComparisonRecordIn(BaseModel):
     # pricebot done.params.trace_url 原样上报,落库供记录页「复制调试链接」(dir 名含落盘
     # 时分秒前端拼不出,必须由后端透传)。
     trace_url: str | None = Field(None, description="本次比价公网调试链接")
-    total_ms: int | None = Field(None, description="整场比价墙钟耗时(ms)")
 
     # ===== debug 维度(客户端采集上报;旧客户端不带 → None。仅 admin 比价记录页用)=====
     # 必须显式声明,否则 model_dump() 落 raw_payload 时被 pydantic 静默丢弃(同上面 coupon_saved 的坑)。
@@ -173,7 +144,6 @@ class ComparisonRecordOut(BaseModel):
     items: list = []
     comparison_results: list = []
     skipped_dish_names: list = []
-    total_ms: int | None = None
     # 「已下单」(店级):该店名在该用户真实下单(source='compare')里出现过即 True。
     # 由 list_records 动态算出挂在 ORM 实例上(非 DB 列),from_attributes 读出;缺省 False。
     ordered: bool = False

app/schemas/invite.py

@@ -10,12 +10,7 @@ class InviteInfoOut(BaseModel):
     invite_code: str                # 我的邀请码
     share_url: str                  # 落地页链接(含 ?ref=),前端据此生成二维码 + 复制分享
     invited_count: int              # 已成功邀请人数
-    coins_earned: int               # 累计从邀请获得的金币(v1 口径;v2 邀请人改发奖励金)
-    reward_balance_cents: int = 0   # v2 可提现邀请奖励金(分)
-    reward_withdrawn_cents: int = 0 # v2 累计提现成功的邀请奖励金(分)
-    countdown_days_left: int = 7            # v2 本轮剩余天数(7 天 1 轮)
-    countdown_is_fresh_round: bool = False  # 是否刚进入新一轮(非首轮第1天)
-    countdown_text: str = ""                # 倒计时展示文案(前端直接显示,新轮含换行)
+    coins_earned: int               # 累计从邀请获得的金币
 
 
 class LandingTrackIn(BaseModel):

app/schemas/launch_confirm_sample.py

@@ -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

app/schemas/welfare.py

@@ -16,7 +16,6 @@ class CoinAccountOut(BaseModel):
 
     coin_balance: int = Field(..., description="当前金币余额")
     cash_balance_cents: int = Field(..., description="当前现金余额(分)")
-    invite_cash_balance_cents: int = Field(0, description="邀请奖励金余额(分,与现金隔离)")
     total_coin_earned: int = Field(..., description="累计赚取金币")
 
 
@@ -124,7 +123,6 @@ class UnbindWechatResultOut(BaseModel):
 
 class WithdrawRequest(BaseModel):
     amount_cents: int = Field(..., gt=0, description="提现金额(分)")
-    source: str = Field("coin_cash", description="提现账户:coin_cash(金币现金) / invite_cash(邀请奖励金)")
     user_name: str | None = Field(None, description="实名(达额时微信要求,可空)")
     out_bill_no: str | None = Field(
         None, description="客户端幂等键(商户单号):同号重试不重复转账。不传则服务端生成"
@@ -168,7 +166,6 @@ class WithdrawOrderOut(BaseModel):
     id: int
     out_bill_no: str
     amount_cents: int
-    source: str = Field("coin_cash", description="提现账户:coin_cash / invite_cash")
     status: str = Field(..., description="reviewing(待审核) / pending / success / failed / rejected")
     wechat_state: str | None = None
     fail_reason: str | None = None

data/media/dl.html

@@ -8,231 +8,122 @@
 <style>
   * { margin:0; padding:0; box-sizing:border-box; -webkit-tap-highlight-color:transparent; }
   html,body { height:100%; }
-  button { border:0; background:none; color:inherit; font:inherit; cursor:pointer; }
   body {
-    min-height:100vh;
-    display:flex; align-items:center; justify-content:center;
-    background:#000;
-    font-family:-apple-system,BlinkMacSystemFont,"PingFang SC","Helvetica Neue",sans-serif;
+    font-family:-apple-system,BlinkMacSystemFont,"PingFang SC","Microsoft YaHei",sans-serif;
+    background:linear-gradient(165deg,#FF7A3D 0%,#FF3B30 52%,#E0245E 100%);
+    color:#fff; min-height:100%; display:flex; flex-direction:column;
+    align-items:center; justify-content:center; padding:40px 26px; text-align:center;
+    overflow-x:hidden;
   }
-  /* 设备框：桌面预览成 375×667 卡片；真机（≤430）铺满全屏 */
-  .device {
-    position:relative; flex:0 0 auto;
-    width:375px; height:667px;
-    overflow:hidden; border-radius:32px;
-    background:#FFF4CD;
-    box-shadow:0 20px 60px rgba(0,0,0,.5);
-    color:#fff;
+  .logo {
+    width:104px; height:104px; border-radius:26px; background:#fff;
+    display:flex; align-items:center; justify-content:center; font-size:52px;
+    box-shadow:0 14px 34px rgba(0,0,0,.22); margin-bottom:24px;
   }
-  .download-landing {
-    position:absolute; inset:0; z-index:0; overflow:hidden;
-    background:
-      url('coupon-page-bg.png') center center / cover no-repeat,
-      #FFF4CD;
-    color:#1A1A1A; text-align:center;
-  }
-  .download-content {
-    position:relative; z-index:1; height:100%;
-    padding:82px 20px 0;
-    display:flex; flex-direction:column; align-items:center; overflow:hidden;
-  }
-  .brand-lockup {
-    display:flex; align-items:center; justify-content:center; gap:16px;
-  }
-  .ad-logo {
-    width:53px; height:53px; border-radius:13px; display:block;
-    box-shadow:0 10px 24px rgba(255,179,0,.24);
-  }
-  .ad-title {
-    color:#1A1A1A; font-size:32px; font-weight:800; line-height:1.15;
-    letter-spacing:0; white-space:nowrap;
-  }
-  .ad-subtitle {
-    margin-top:22px; max-width:100%;
-    color:#000; font-size:18px; font-weight:400; line-height:1.25;
-    display:flex; align-items:center; justify-content:center; gap:10px; white-space:nowrap;
-  }
-  .ad-subtitle::before, .ad-subtitle::after {
-    content:""; width:5px; height:5px; border-radius:50%; background:#000; flex:0 0 auto;
-  }
-  .bottom-area {
-    position:relative; z-index:2; width:100%; max-width:266px;
-    margin-top:11px;
-    display:grid; grid-template-columns:1fr; justify-items:stretch; align-content:center; gap:10px;
-  }
-  .download-btn {
-    width:100%; height:39px; border-radius:22px; color:#1A1A1A;
-    font-family:inherit; font-size:14px; line-height:1; font-weight:700; letter-spacing:0;
-    display:flex; align-items:center; justify-content:center;
-  }
-  .download-btn.primary {
-    background:linear-gradient(180deg,#FFE066 0%,#FFC400 100%);
-    box-shadow:inset 0 1px 0 rgba(255,255,255,.82), 0 7px 18px rgba(255,179,0,.24);
-  }
-  .download-btn.secondary {
-    background:#fff; border:1px solid #DDD; color:#1A1A1A; font-size:13px;
-    box-shadow:0 2px 8px rgba(122,79,0,.08);
-  }
-  .download-btn:active { transform:translateY(1px); }
-  /* 底部两条卖点文案，压在背景插画两张卡片下方 */
-  /* 卖点卡：CSS 实体卡片（白底+图标），不再靠底图死框，字自适应（对齐 WeChat.html PR siyi 改版）*/
-  .download-feature-card {
-    position:absolute; z-index:2; pointer-events:none;
-    height:62px; padding:0 10px; border-radius:22px;
-    background:#FFFAEE;
-    box-shadow:inset 0 1px 0 rgba(255,255,255,.86), 0 6px 14px rgba(122,79,0,.08);
-    display:flex; align-items:center; gap:8px; color:#1A1A1A;
-  }
-  .download-feature-card.left  { left:24px;  top:576px; width:146px; }
-  .download-feature-card.right { left:199px; top:576px; width:156px; }
-  .download-feature-icon {
-    width:27px; height:27px; flex:0 0 auto; display:block; color:#FFAE00;
-  }
-  .download-feature-icon svg {
-    display:block; width:100%; height:100%; filter:drop-shadow(0 1px 0 rgba(255,255,255,.7));
-  }
-  .download-feature-copy {
-    min-width:0; flex:1 1 auto; text-align:left; white-space:nowrap; letter-spacing:0;
-  }
-  .download-feature-title {
-    display:block; font-size:13px; font-weight:800; line-height:1.12; letter-spacing:0;
-  }
-  .download-feature-desc {
-    display:block; margin-top:5px; color:#5A3A00; font-size:10px; font-weight:400; line-height:1.1;
+  h1 { font-size:30px; font-weight:800; letter-spacing:1px; }
+  .slogan { margin-top:12px; font-size:16px; line-height:1.7; opacity:.95; max-width:300px; }
+  .feats { margin-top:26px; display:flex; flex-direction:column; gap:12px; width:100%; max-width:320px; }
+  .feat { background:rgba(255,255,255,.16); border-radius:14px; padding:13px 16px; font-size:15px; display:flex; align-items:center; gap:10px; }
+  .feat b { font-weight:700; }
+  .btn {
+    margin-top:34px; width:100%; max-width:320px; border:none; cursor:pointer;
+    background:#fff; color:#FF3B30; font-size:19px; font-weight:800;
+    padding:17px 0; border-radius:999px; box-shadow:0 10px 26px rgba(0,0,0,.22);
+    display:flex; align-items:center; justify-content:center; gap:9px;
   }
+  .btn:active { transform:translateY(1px); opacity:.92; }
+  .hint { margin-top:16px; font-size:13px; opacity:.85; }
+  .foot { margin-top:30px; font-size:12px; opacity:.6; line-height:1.6; max-width:320px; }
+
   /* 微信内"去浏览器打开"引导蒙层 */
-  .download-guide-layer {
-    position:absolute; inset:0; z-index:30; display:none;
-    background:rgba(0,0,0,.85); color:#fff;   /* 半透明黑：透出底层（新版）下载页，隐约可见 */
-  }
-  .download-guide-layer.show { display:block; }
-  .download-guide-arrow {
-    position:absolute; top:17px; right:9px; width:80px; height:60px;
-  }
-  .download-guide-arrow-svg {
-    display:block; width:100%; height:100%; overflow:hidden; shape-rendering:geometricPrecision;
-  }
-  .download-guide-title {
-    position:absolute; top:129px; right:16px; width:218px; margin:0;
-    color:#fff; font-size:17px; font-weight:800; line-height:1.32; letter-spacing:0;
-    text-align:right; text-shadow:0 2px 8px rgba(0,0,0,.36);
-  }
-  .download-guide-title .guide-dots { color:#FFD95A; letter-spacing:4px; }
-  .download-guide-title .guide-highlight { color:#FFD95A; white-space:nowrap; }
-  .download-guide-title .guide-final {
-    display:block; margin-top:10px; color:rgba(255,255,255,.94);
-    font-size:13px; font-weight:700; line-height:1.38;
-  }
-  .download-guide-title .guide-target { color:#FFD95A; white-space:nowrap; }
-  .guide-dismiss {
-    position:absolute; bottom:30px; left:0; right:0; text-align:center;
-    font-size:14px; color:#fff; opacity:.75;
-  }
-  .toast {
-    position:absolute; left:50%; bottom:118px; z-index:20;
-    transform:translateX(-50%) translateY(12px);
-    padding:9px 14px; border-radius:12px; background:rgba(0,0,0,.78);
-    color:#fff; font-size:14px; opacity:0; pointer-events:none;
-    transition:opacity .2s ease, transform .2s ease;
-  }
-  .toast.show { opacity:1; transform:translateX(-50%) translateY(0); }
-  @media (max-width:430px) {
-    /* 真机:宽满屏、高按 375:667 锁比例(不拉伸变形),顶对齐、底部留白用底色填。
-       这样底图(含价格卡)与卖点卡片同处 667 坐标基准,卡片用回 top:576,不再相互错位/遮挡。 */
-    body { align-items:flex-start; background:#FFF4CD; }
-    .device { width:100vw; height:calc(100vw * 667 / 375); border-radius:0; box-shadow:none; }
+  #wxmask {
+    display:none; position:fixed; inset:0; z-index:9999;
+    background:rgba(0,0,0,.86); padding:18px;
   }
+  #wxmask.show { display:block; }
+  .arrow { position:absolute; top:8px; right:14px; width:120px; }
+  .wxtip { position:absolute; top:150px; right:18px; left:18px; text-align:right; }
+  .wxtip .big { font-size:21px; font-weight:800; line-height:1.5; }
+  .wxtip .big em { color:#FFD24D; font-style:normal; }
+  .wxtip .sub { margin-top:14px; font-size:15px; line-height:1.8; opacity:.9; }
+  .wxsteps { margin-top:26px; text-align:left; background:rgba(255,255,255,.1); border-radius:14px; padding:18px 18px; font-size:15px; line-height:2; }
+  .wxsteps .n { display:inline-block; width:22px; height:22px; line-height:22px; text-align:center; border-radius:50%; background:#FFD24D; color:#333; font-weight:800; font-size:13px; margin-right:8px; }
+  .closebar { position:absolute; bottom:30px; left:0; right:0; text-align:center; font-size:14px; opacity:.7; }
 </style>
 </head>
 <body>
-<main class="device" aria-label="傻瓜比价下载页">
-  <section class="download-landing" aria-label="傻瓜比价下载页">
-    <div class="download-content">
-      <div class="brand-lockup">
-        <img class="ad-logo" src="sb-brand.png" alt="傻瓜比价">
-        <h1 class="ad-title">傻瓜比价</h1>
-      </div>
-      <p class="ad-subtitle">跨平台比价，用傻瓜</p>
-      <div class="bottom-area" aria-label="下载入口">
-        <button class="download-btn primary"  id="dlbtn"  type="button">应用商店下载</button>
-        <button class="download-btn secondary" id="dlbtn2" type="button">官网下载</button>
-      </div>
-    </div>
-    <div class="download-feature-card left" aria-label="优惠券轻松领，羊毛全都不错过">
-      <span class="download-feature-icon" aria-hidden="true">
-        <svg viewBox="0 0 40 32" focusable="false">
-          <path d="M5 5h30a3 3 0 0 1 3 3v5.2a4.8 4.8 0 0 0 0 9.6V24a3 3 0 0 1-3 3H5a3 3 0 0 1-3-3v-1.2a4.8 4.8 0 0 0 0-9.6V8a3 3 0 0 1 3-3Z" fill="currentColor"/>
-          <path d="M20 10v12" fill="none" stroke="#FFF7CF" stroke-width="3" stroke-linecap="round"/>
-        </svg>
-      </span>
-      <span class="download-feature-copy">
-        <span class="download-feature-title">优惠券轻松领</span>
-        <span class="download-feature-desc">羊毛全都不错过</span>
-      </span>
-    </div>
-    <div class="download-feature-card right" aria-label="一键全网找底价，再也不用费力切屏">
-      <span class="download-feature-icon" aria-hidden="true">
-        <svg viewBox="0 0 40 32" focusable="false">
-          <rect x="5" y="16" width="8" height="11" rx="2" fill="currentColor"/>
-          <rect x="16" y="9" width="8" height="18" rx="2" fill="currentColor"/>
-          <rect x="27" y="3" width="8" height="24" rx="2" fill="currentColor"/>
-        </svg>
-      </span>
-      <span class="download-feature-copy">
-        <span class="download-feature-title">一键全网找底价</span>
-        <span class="download-feature-desc">再也不用费力切屏</span>
-      </span>
-    </div>
-  </section>
+  <div class="logo">🛒</div>
+  <h1>傻瓜比价</h1>
+  <div class="slogan">买什么都先比一比<br>自动帮你找全网最低价</div>
 
-  <!-- 微信内引导：跳出微信去浏览器 -->
-  <div class="download-guide-layer" id="wxGuide" role="dialog" aria-modal="true" aria-labelledby="wxGuideTitle">
-    <div class="download-guide-arrow" aria-hidden="true">
-      <svg class="download-guide-arrow-svg" viewBox="0 0 80 60" focusable="false">
-        <path d="M0 60 C16 32 39 15 66 15" fill="none" stroke="#FFD95A" stroke-width="5.5" stroke-linecap="round"/>
-        <path d="M59 5 L77 14 L63 31" fill="none" stroke="#FFD95A" stroke-width="7" stroke-linecap="round" stroke-linejoin="round"/>
-      </svg>
-    </div>
-    <h2 class="download-guide-title" id="wxGuideTitle">
-      点击右上角 <span class="guide-dots">···</span><br>
-      选择「<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="feats">
+    <div class="feat">🍔 <span>点外卖前一键比价,<b>美团/京东/淘宝</b>到手价一目了然</span></div>
+    <div class="feat">🎟️ <span>自动领遍各平台<b>红包券</b>,能省的一分不漏</span></div>
+    <div class="feat">💰 <span>省下的钱看得见,还能<b>赚金币提现</b></span></div>
   </div>
 
-  <div class="toast" id="toast" role="status" aria-live="polite"></div>
-</main>
+  <button class="btn" id="dlbtn">🏪 打开应用商店下载</button>
+  <div class="hint" id="hint">Android 安卓版 · 应用商店安全下载</div>
+
+  <div class="foot">
+    将前往应用商店下载,安全放心。<br>
+    本页为内部测试页。
+  </div>
+
+  <!-- 微信内引导:跳出微信去浏览器 -->
+  <div id="wxmask">
+    <svg class="arrow" viewBox="0 0 120 130" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path d="M30 120 C 30 70, 55 40, 95 28" stroke="#FFD24D" stroke-width="6" stroke-linecap="round" fill="none" stroke-dasharray="2 13"/>
+      <path d="M95 28 L 78 30 M95 28 L 92 46" stroke="#FFD24D" stroke-width="6" stroke-linecap="round"/>
+    </svg>
+    <div class="wxtip">
+      <div class="big">点击右上角 <em>···</em><br>选择「<em>在浏览器打开</em>」</div>
+      <div class="sub">微信里无法直接下载安装包<br>需在系统浏览器中完成下载</div>
+      <div class="wxsteps">
+        <div><span class="n">1</span>点右上角的 ··· 菜单</div>
+        <div><span class="n">2</span>选择「在浏览器打开」</div>
+        <div><span class="n">3</span>在浏览器里按提示去应用商店下载</div>
+      </div>
+    </div>
+    <div class="closebar" id="wxclose">我知道了 ✕</div>
+  </div>
 
 <script>
-  // ===== 应用商店跳转：用包名（App 唯一标识）定位到傻瓜比价的商店下载页 =====
-  // 主：market:// 唤起手机自带应用市场（华为/小米/OV）；兜底：应用宝网页（任何浏览器都能开）。
+  // 应用商店跳转:用包名(App 唯一标识 = 身份证号)定位到傻瓜比价的商店下载页。
+  // 主:market:// 唤起手机自带应用市场(华为/小米/OV);兜底:应用宝网页(任何浏览器都能开)。
   var PKG = "com.jishisongfu.shaguabijia";
   var MARKET_URL = "market://details?id=" + PKG;
   var YYB_URL = "https://a.app.qq.com/o/simple.jsp?pkgname=" + PKG;
   var ua = navigator.userAgent || "";
   var isWeChat = /MicroMessenger/i.test(ua);
   var isIOS = /iPhone|iPad|iPod/i.test(ua);
-  var ref = new URLSearchParams(location.search).get("ref");  // 邀请码（来自二维码 URL ?ref=）
+  var isAndroid = /Android/i.test(ua);
+  var ref = new URLSearchParams(location.search).get("ref");  // 邀请码(来自二维码 URL ?ref=)
 
-  // ===== 指纹归因兜底：页面加载即上报访问者指纹，后端存 invite_fingerprint 表 =====
-  // 当 APK 首启读剪贴板失败（被覆盖）时，客户端用 (IP+屏幕+UA 机型) 反查 7 天内最近一条 → 撞出原邀请人。
-  // 任何失败都 silent，不影响下载主流程。
+  // 【任务 3】指纹归因兜底:页面加载即上报访问者指纹,后端存 invite_fingerprint 表。
+  // 当 APK 首启读剪贴板失败(被覆盖)时,客户端会用 (IP+屏幕+UA 解析的手机型号) 反查
+  // 本表 7 天内最近一条匹配 → 撞库出原邀请人 → 走原 bind 流程。
+  // 任何失败都 silent(不影响下载主流程);后端 invalid_code/no_ip 也只返 200。
   if (ref) {
-    // screen 报【物理像素】= CSS 像素 × devicePixelRatio，跟 Android dm.widthPixels 对齐，否则撞不上库。
+    // screen 报【物理像素】= CSS 像素 × devicePixelRatio,跟 Android dm.widthPixels(物理像素)对齐。
+    // 不同设备 DPR 不同(常见 2/2.5/3/3.5),CSS 像素直接报会跟客户端不对齐 → 撞不上库。
     var _dpr = window.devicePixelRatio || 1;
     var _sw = Math.round(screen.width * _dpr);
     var _sh = Math.round(screen.height * _dpr);
     fetch("/api/v1/invite/landing-track", {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ ref: ref, screen: _sw + "x" + _sh }),
-    }).catch(function () {});  // silent，绝不阻断下载
+      body: JSON.stringify({
+        ref: ref,
+        screen: _sw + "x" + _sh,
+        // IP / UA 服务端从 HTTP 头自动拿,无需 JS 上报
+      }),
+    }).catch(function () {});  // silent,绝不阻断下载
   }
 
-  // ===== 把邀请码写进剪贴板，APK 首启读出完成归因（deferred deeplink）=====
-  // 浏览器要求：必须在用户点击手势里调用 + HTTPS 下才允许写。
-  function legacyCopy(payload) {                 // 老 webview / 无 clipboard API 兜底
+  // 把邀请码写进剪贴板,APK 首启时读出来完成归因(deferred deeplink 的关键一步)。
+  // 浏览器要求:必须在用户点击手势里调用 + HTTPS 下才允许写。
+  function legacyCopy(payload) {                // 老 webview / 无 clipboard API 兜底
     try {
       var ta = document.createElement("textarea");
       ta.value = payload; ta.style.position = "fixed"; ta.style.top = "-1000px"; ta.style.opacity = "0";
@@ -240,48 +131,50 @@
       document.execCommand("copy"); document.body.removeChild(ta);
     } catch (e) {}
   }
-  function copyInviteCode() {                    // 返回 Promise，完成后才下载，避免异步写入被打断
+  function copyInviteCode() {                   // 返回 Promise(完成后才下载,避免异步写入被打断)
     if (!ref) return Promise.resolve();
     var payload = "SGBJ_INVITE:" + ref;
-    legacyCopy(payload);                          // 同步兜底：在用户手势内立刻 execCommand 写一次（最可靠）
+    legacyCopy(payload);                         // 同步兜底:在用户手势内立刻 execCommand 写一次(最可靠)
     if (navigator.clipboard && navigator.clipboard.writeText) {
-      return navigator.clipboard.writeText(payload).catch(function () {});
+      return navigator.clipboard.writeText(payload).catch(function () {});  // 现代 API 锦上添花,失败无妨
     }
     return Promise.resolve();
   }
-  // 跳应用商店：先 market:// 唤起自带商店；2.5s 内页面没切后台 → 兜底跳应用宝网页，不让用户卡死。
+  // 跳应用商店:先尝试 market:// 唤起手机自带商店;若 2.5s 内页面没切到后台
+  //(= 没有商店接管 market://),兜底跳应用宝网页下载页,不让用户卡死。
   function openStore() {
     var jumped = false;
-    document.addEventListener("visibilitychange", function () { if (document.hidden) jumped = true; });
-    window.addEventListener("pagehide", function () { jumped = true; });
-    window.addEventListener("blur", function () { jumped = true; });
-    window.location.href = MARKET_URL;
-    setTimeout(function () { if (!jumped) window.location.href = YYB_URL; }, 2500);
+    function markJumped() { jumped = true; }           // 页面切到后台 = 商店已唤起
+    document.addEventListener("visibilitychange", function () {
+      if (document.hidden) jumped = true;
+    });
+    window.addEventListener("pagehide", markJumped);
+    window.addEventListener("blur", markJumped);
+    window.location.href = MARKET_URL;                 // 唤起自带应用市场
+    setTimeout(function () {
+      if (!jumped) window.location.href = YYB_URL;     // 没唤起 → 应用宝网页兜底
+    }, 2500);
   }
 
-  // ===== 微信内引导蒙层 =====
-  var wxGuide = document.getElementById("wxGuide");
-  function showWxGuide() { wxGuide.classList.add("show"); }
-  function hideWxGuide() { wxGuide.classList.remove("show"); }
-  document.getElementById("wxGuideDismiss").addEventListener("click", hideWxGuide);
-  if (isWeChat) showWxGuide();   // 微信里一进页面就提示去浏览器（微信内下载必被拦）
+  var hint = document.getElementById("hint");
+  if (isIOS) hint.textContent = "检测到 iPhone · iOS 版请前往 App Store";
 
-  function showToast(text) {
-    var toast = document.getElementById("toast");
-    toast.textContent = text; toast.classList.add("show");
-    clearTimeout(showToast.timer);
-    showToast.timer = setTimeout(function () { toast.classList.remove("show"); }, 1400);
-  }
+  var mask = document.getElementById("wxmask");
+  function showMask(){ mask.classList.add("show"); }
+  function hideMask(){ mask.classList.remove("show"); }
+  document.getElementById("wxclose").addEventListener("click", hideMask);
 
-  // ===== 下载按钮：微信内引导去浏览器；iOS 提示；安卓写邀请码 + 跳应用商店 =====
-  function handleDownload() {
-    if (isWeChat) { showWxGuide(); return; }
-    if (isIOS)    { alert("iOS 版即将上线，请前往 App Store 搜索「傻瓜比价」"); return; }
-    copyInviteCode();   // 先把邀请码写进剪贴板（供 App 首启归因），链路丢了还有 landing-track 指纹兜底
+  // 微信里一进页面就提示去浏览器打开(下载在微信内必被拦)
+  if (isWeChat) showMask();
+
+  document.getElementById("dlbtn").addEventListener("click", function(){
+    if (isWeChat) { showMask(); return; }           // 微信内:引导去浏览器
+    if (isIOS)    { alert("iOS 版即将上线,请前往 App Store 搜索「傻瓜比价」"); return; }
+    // 安卓浏览器:先把邀请码写进剪贴板(legacyCopy 同步写、最可靠),再跳应用商店。
+    // 剪贴板供 App 首启归因;链路长易丢时由指纹兜底(已上报 landing-track)接住。
+    copyInviteCode();
     openStore();
-  }
-  document.getElementById("dlbtn").addEventListener("click", handleDownload);
-  document.getElementById("dlbtn2").addEventListener("click", handleDownload);
+  });
 </script>
 </body>
 </html>

docs/H5-WebView改造方案.md

@@ -1,154 +0,0 @@
-# H5 / WebView 改造方案(app-server 端)
-
-> 仓库:`shaguabijia-app-server`　分支:`feat/h5-sgbridge`　日期:2026-06-29
-> 配套文档:`shaguabijia-app-android` 仓库 `docs/H5-WebView改造方案.md`(原生壳 + SGBridge.kt)
-> 本方案 = **方案1:以本仓已有 `SGBridge` 为统一基准**,安卓退役其 `NativeBridge`。
-
----
-
-## 1. 背景与现状
-
-项目里同时存在**两套互不兼容**的 H5 方案,尚未收敛:
-
-| | 本仓那套(已在 `main`,PR #89) | 安卓那套(`feat/records-h5`,未进 main) |
-|---|---|---|
-| 桥 | `SGBridge`(JS)↔ `SGBridgeNative`(原生),协议丰富 + 事件总线 | `NativeBridge`,仅 4 法 |
-| 托管 | **设计为**后端同源托管(相对 `/api/v1`、免 CORS) | 本地 assets `file://`(跨域 + 放行 CORS) |
-| 页面 | `h5/mine/index.html`(7771)+ `h5/shared/bridge.js`+`api.js` | `records`(1778)、`reports`(603) |
-| 落地 | **半成品**:安卓从无 `SGBridge.kt`;且 `h5/` 实际没挂(StaticFiles 只挂了 `data/media` 头像上传) | 已接进安卓导航但只在分支上 |
-
-**结论(已对齐):** 目标是「远程后端托管 + 四 tab 全 H5」,该方向天然契合本仓 SGBridge(同源相对路径、`mine` 已成型、`shared/` 已就绪)。故统一到 SGBridge,把安卓的 records/reports 页**迁入本仓** `h5/`。
-
----
-
-## 2. 目标与范围
-
-**目标:** 由 app-server 同源托管全部业务 H5,配齐 `shared/` 桥与接口封装,支持安卓「原生壳 + 远程 H5」一套桥贯通,可不发版热更。
-
-**本仓(app-server)范围:**
-- H5 托管:新增 **FastAPI StaticFiles 挂载 `/h5`** → 指向仓库 `h5/` 目录(同源、免 CORS)
-- 迁入 records / reports 两页(从安卓 `feat/records-h5` 移植),改用 `SGBridge` / `SGApi`
-- `shared/bridge.js` 补 **`closePage`(返回)**;`shared/api.js` 已同源就绪(必要时补 multipart 说明)
-- 远程开关配置接口(返回 per-page `native`/`h5` 标志)
-- 缓存 / 热更策略(cache-control + 版本)
-
-**不在本仓(见 android 文档):** `SGBridge.kt`、WebView 宿主、原生/H5 切换接线。
-
-**后端业务接口:零改动** —— H5 复用现有 `/api/v1/...`(`/compare/records`、`/report`、`/wallet/account`、`/coupon/stats` 等),只是请求方从 Kotlin 改成网页 fetch。
-
----
-
-## 3. 关键决策(已锁定)
-
-| # | 决策 | 选定 | 理由 |
-|---|---|---|---|
-| D1 | 桥基准 | **SGBridge**(安卓退役 NativeBridge) | 协议齐、mine 成型、三端对齐 |
-| D2 | 托管 | **FastAPI StaticFiles 挂 `/h5`** | 同源免 CORS、复用现有 `/media` 方式、nginx 已反代 `/`→uvicorn,dev+prod 都能跑 |
-| D3 | 离线兜底 | 纯远程 + 安卓侧重试页 | YAGNI;后端不需为离线做特殊处理 |
-| D4 | 地址 | 安卓用 `BackendUrl.current` 推导 H5 地址(同源) | H5 与 `/api/v1` 同 host,自动跟随环境 |
-| D5 | 迁移顺序 | records → reports → 首页/福利;mine 最后校准 | 用小页验证桥,风险分散 |
-
----
-
-## 4. H5 托管(D2)
-
-`app/main.py` 现有挂载(仅头像):
-
-```python
-app.mount(settings.MEDIA_URL_PREFIX, StaticFiles(directory=str(_media_root)), name="media")
-```
-
-**新增** H5 静态挂载(指向仓库根 `h5/`,`html=True` 让目录路径回落到 `index.html`):
-
-```python
-_h5_root = Path(__file__).resolve().parent.parent / "h5"   # 仓库根 h5/
-app.mount("/h5", StaticFiles(directory=str(_h5_root), html=True), name="h5")
-```
-
-- 访问:`https://app-api.shaguabijia.com/h5/records/index.html`(prod)/ `http://<dev-host>:8770/h5/...`(debug)。
-- 与 `/api/v1` **同 host → 同源**:H5 内 `SGApi` 用相对 `/api/v1`,免 CORS、免 `getApiBase`。
-- prod 可选改由 nginx 直发 `h5/`(绕过 uvicorn)以提性能——本期先用 StaticFiles,nginx 优化留后。
-
----
-
-## 5. H5 工程结构
-
-```
-h5/
-├── shared/
-│   ├── bridge.js   # SGBridge:H5↔原生桥(本期补 closePage)
-│   └── api.js      # SGApi:同源相对 /api/v1 封装(已就绪)
-├── mine/index.html      # 我的页(已成型,M4 按真实 SGBridge.kt 校准)
-├── records/index.html   # ← 从安卓迁入(M1)
-└── reports/index.html   # ← 从安卓迁入(M2)
-```
-
-各页头部引入:`<script src="../shared/bridge.js"></script>` + `<script src="../shared/api.js"></script>`。
-
----
-
-## 6. records / reports 页迁入(从安卓移植)
-
-**搬运 + 改桥(迁移、非重写,UI/CSS/逻辑占绝大部分原样保留):**
-
-| 安卓原写法(NativeBridge) | 迁入后(SGBridge / SGApi) |
-|---|---|
-| `NativeBridge.getApiBase()` 拼绝对 URL(8 处) | **删除**,改相对 `/api/v1/...`(同源) |
-| `NativeBridge.getToken()`(7 处) | `SGBridge.getToken()`(同名) |
-| `NativeBridge.onUnauthorized()`(6 处) | 走 `SGApi` 内置 401 → `SGBridge.requestLogin()` |
-| `NativeBridge.closePage()`(5 处) | `SGBridge.closePage()`(**bridge.js 本期新增**) |
-| 普通 GET/POST | 改用 `SGApi.get/post('/...')`(自动带 token、处理 401) |
-
-**上报传图(records)特别说明:** 走 `<input type="file">` + 客户端压缩 + **`FormData` multipart** POST `/api/v1/report`。`SGApi` 只发 JSON,**不覆盖 multipart**,故这段**保留自定义 `fetch`**:URL 改相对 `/api/v1/report`、`Authorization` 头取 `SGBridge.getToken()`。文件选择依赖**安卓宿主 `onShowFileChooser`**(见 android 文档),后端无需改动。
-
----
-
-## 7. `shared/bridge.js` 改动
-
-- **新增 `closePage()`**:`SGBridge.closePage()` → 调 `SGBridgeNative.closePage()`(无桥时 mock `console.log`)。records/reports 顶栏返回箭头、`?from=profile` 返回都用它。
-- 其余方法(`getToken`/`requestLogin`/`navigate`/`getAuthState`/事件总线…)已就绪,保持签名,供 mine 及后续 tab 使用。
-- 浏览器无 `SGBridgeNative` 时走 MOCK,便于本地 `python -m http.server` 或 StaticFiles 直接调样式。
-
----
-
-## 8. SGBridge 接口契约(三端共享)
-
-> 与 android 文档同表;`shared/bridge.js` 为权威。新增方法三端同步。
-
-**查询类(同步返回 String):** `getAuthState` / `getToken` ✓ / `getDeviceId` / `getAppVersion` / `getInstalledApps` / `getCouponClaimedToday`
-**动作类(无返回):** `navigate` / `requestLogin` ✓ / `toast` / `openMeituan` / `startCompare` / `startCouponClaim` / `launchApp` / **`closePage`【新增】✓**
-**事件类(原生→H5,`_emit`):** `onAuthChange` / `onBalanceChange` / `onSigninChange` / `onResume`
-(✓ = records 阶段 M1 最小子集)
-
----
-
-## 9. 远程开关配置接口
-
-- 提供一个轻量配置:返回各页渲染方式 `{ records: "h5"|"native", reports: ..., home: ..., welfare: ..., mine: ... }`。
-- 安卓 `AppNavHost` 据此决定加载 H5 还是原生页,**不发版即可灰度 / 一键回退**。
-- 复用现有远程配置/开关基建(参考安卓 `ad-config-remote-delivery`、`comparing-ad-remote-flag` 的下发方式),无则新增一个 `GET /api/v1/app/ui-flags` 之类端点。
-
----
-
-## 10. 缓存与热更
-
-- H5 是后端托管 → **改完即生效**(用户重开页即拉新),这是远程方案的核心收益。
-- `index.html` 用 `Cache-Control: no-cache`(或短 TTL)保证及时性;`shared/*.js`、图片等带版本/指纹便于长缓存。StaticFiles 可配响应头或交 nginx 处理。
-
----
-
-## 11. 迁移顺序与风险
-
-| 里程碑 | server 侧动作 |
-|---|---|
-| **M1 records** | 挂 `/h5`;`bridge.js` 加 `closePage`;records 迁入 + 改桥;配 `index.html` no-cache |
-| **M2 reports** | reports 迁入 + 改桥 |
-| **M3 首页/福利** | 首页/福利页 H5 化(需 SGBridge P2+ 协议,配合安卓) |
-| **M4 mine + 收尾** | mine 按真实 SGBridge.kt 校准;远程开关接口上线 |
-
-| 风险 | 缓解 |
-|---|---|
-| SGBridge 原生侧未验证 | M1 用 records 小页验证(详见 android 文档) |
-| multipart 上传被误套进 SGApi | 文档明确:上报保留自定义 multipart fetch,不走 SGApi |
-| 同源被破坏(H5 与 API 不同 host) | 坚持 StaticFiles 同源托管;若改独立前端域名,需回评 SGApi 相对路径策略 |
-| 缓存导致改了不生效 | `index.html` no-cache + 资源指纹 |

docs/api/admin-ad-revenue-report.md

@@ -27,11 +27,8 @@
   | `date_to` | string | =`date_from` | 结束日 北京时间 `YYYY-MM-DD`,**闭区间**;单日时与 `date_from` 相同 |
   | `user_id` | int | 全部 | 只看某用户;不传=所有用户 |
   | `ad_type` | string | 全部 | `reward_video` / `feed` / `draw`;不传=全部类型 |
-  | `feed_scene` | string | 全部 | `comparison`(比价)/ `coupon`(领券)/ `welfare`(福利);**全局筛选**,同时作用于明细 / 合计 / `daily`·`hourly` 趋势;不传=全部场景 |
   | `granularity` | string | `day` | `day`=按天 / `hour`=按小时(聚合键再加北京时间小时 0–23);**区间>1 天建议用 day** |
-  | `limit` | int(1~1000) | 500 | **每页条数**(分页大小);`total`/`total_*`/`daily`/`hourly` 按全量统计不受分页影响 |
-  | `offset` | int(≥0) | 0 | 分页偏移(已跳过条数)=(页码−1)×`limit` |
-  | `sort` | string | `time` | 明细排序:`time`=按时间倒序(新→旧) / `ecpm`=按 eCPM 数值倒序 |
+  | `limit` | int(1~1000) | 500 | **展示**明细组数(截断;`total`/`total_*`/`daily` 按全量统计不受影响) |
 
   约束:`date_to` 不早于 `date_from`、区间最长 **92 天**、日期须 `YYYY-MM-DD`,否则 `422`。
 
@@ -39,48 +36,25 @@
   | 字段 | 类型 | 说明 |
   |---|---|---|
   | `date_from` / `date_to` | string | 报表起止日期(闭区间) |
-  | `daily` | `AdRevenueDaily[]` | 按日期汇总序列(全量,供按天趋势图;不受分页影响) |
-  | `hourly` | `AdRevenueHourly[]` | 按小时汇总序列(全量,供按小时趋势图;**仅 `granularity=hour` 时非空**;不受分页影响) |
-  | `type_stats` | `{[ad_type]: AdRevenueTypeStat}` | 按广告类型(`ad_type`)小计(全量);前端取 `draw` / `reward_video` 做分类大盘 |
-  | `dau` | int \| null | 今日活跃用户数(复用大盘口径 `last_login_at`,今日登录过);**仅查询=今日单天时有值**,历史/多天为 `null` |
-  | `total` | int | 当前筛选下的**分页总条数**(全量,不受分页影响;= 前端分页器 total) |
-  | `truncated` | bool | 当前页之后是否还有更多事件(`len(events) > offset + limit`) |
+  | `daily` | `AdRevenueDaily[]` | 按日期汇总序列(全量,供按天趋势图;不受 `limit` 影响) |
+  | `total` | int | 聚合组**总数**(全量,不受 `limit` 影响) |
+  | `truncated` | bool | 明细是否被 `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 说明全部按公式发放) |
-  | `items` | `AdRevenueRow[]` | 逐条广告事件(**按时间倒序:新→旧**);`limit`/`offset` 对全量做分页切片,返回当前页 |
+  | `items` | `AdRevenueRow[]` | 聚合明细(按 日期→用户→类型→代码位 排序) |
 
 ### AdRevenueDaily(`daily[]` — 按天趋势)
 | 字段 | 类型 | 说明 |
 |---|---|---|
 | `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 | 当天实发金币合计 |
 
-### AdRevenueHourly(`hourly[]` — 按小时趋势,仅 `granularity=hour` 时非空)
-| 字段 | 类型 | 说明 |
-|---|---|---|
-| `hour` | int | 北京时间小时 0–23 |
-| `impressions` | int | 该小时展示条数合计 |
-| `revenue_yuan` | float | 该小时预估收益合计(元) |
-| `expected_coin` | int | 该小时应发金币合计 |
-| `actual_coin` | int | 该小时实发金币合计 |
-
-### AdRevenueTypeStat(`type_stats[ad_type]` — 分广告类型小计,供大盘第二行)
-| 字段 | 类型 | 说明 |
-|---|---|---|
-| `impressions` | int | 该类型展示条数合计 |
-| `revenue_yuan` | float | 该类型预估收益合计(元);eCPM 由前端用 收益÷展示×1000 算 |
-
 ### AdRevenueRow(`items[]`)
 | 字段 | 类型 | 说明 |
 |---|---|---|
@@ -130,6 +104,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) 仍保留(同一复算口径,可全局按场景/只看不符筛选)。

docs/database/ad_pangle_daily_revenue.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 结算单 / 穿山甲后台为准。

docs/guides/邀请功能-实现原理与本地测试.md

@@ -37,7 +37,7 @@ B 安装并首启 App
         └─ POST /api/v1/invite/bind { invite_code, channel="clipboard" }
         ↓
 后端 repositories/invite.py bind()
-  └─ 过四道防线 → 建 invite_relation(邀请金币已下线,不写金币流水)
+  └─ 过四道防线 → 建 invite_relation + 给 A、B 各发金币(同事务原子提交)
 ```
 
 手动填码这条:B 在邀请页输码 → `InviteRepository.bindManual()` → `POST /bind { channel="manual" }` → 同一个 `bind()`。
@@ -52,20 +52,20 @@ B 安装并首启 App
 |---|---|
 | 端点 | `app/api/v1/invite.py`:`GET /api/v1/invite/me`(返回 `invite_code` + `share_url` + 战绩)、`POST /api/v1/invite/bind`(绑定,`channel` = `clipboard` / `manual`)。**均需 Bearer 鉴权**。 |
 | share_url 构造 | `invite.py` 的 `my_invite`:`settings.INVITE_LANDING_URL + "?ref=" + code`。`INVITE_LANDING_URL` 在 `app/core/config.py`(默认 `https://app-api.shaguabijia.com/media/dl.html`)。 |
-| 业务逻辑 | `app/repositories/invite.py`:`ensure_code`(懒生成 6 位邀请码,去混淆字符集,唯一约束碰撞则换码)/ `resolve_inviter`(邀请码→邀请人,大小写不敏感)/ `bind`(下面详述)/ `get_stats`(已邀人数 + 兼容累计金币字段,当前恒为 0)。 |
+| 业务逻辑 | `app/repositories/invite.py`:`ensure_code`(懒生成 6 位邀请码,去混淆字符集,唯一约束碰撞则换码)/ `resolve_inviter`(邀请码→邀请人,大小写不敏感)/ `bind`(下面详述)/ `get_stats`(已邀人数 + 累计金币)。 |
 | 数据模型 | `app/models/invite.py` 的 `InviteRelation`(`inviter_user_id` / `invitee_user_id` / `channel` / `status` / `inviter_coin` / `invitee_coin` / `created_at`)+ `app/models/user.py` 的 `User.invite_code` 列。 |
 | 迁移 | `alembic/versions/invite_code_and_relation.py`:给 `user` 加 `invite_code`(唯一索引)+ 建 `invite_relation` 表。`down_revision = 11a1d08c6f55`。 |
 | 收发模型 | `app/schemas/invite.py`:`InviteInfoOut` / `BindInviteIn` / `BindInviteOut`。 |
-| 新人窗口 | `app/core/rewards.py`:`INVITE_NEW_USER_WINDOW_HOURS`(72)。邀请金币已下线,不再配置邀请金币常量。 |
+| 奖励常量 | `app/core/rewards.py`:`INVITE_INVITER_COINS` / `INVITE_INVITEE_COINS`(各 10000 = 1 元)、`INVITE_NEW_USER_WINDOW_HOURS`(72)。 |
 
 **`bind()` 的四道防线(防重复 / 防刷,看 `repositories/invite.py`):**
 
-1. **被邀请人唯一**:`invitee_user_id` 唯一约束 → 一个 B 只能被绑一次(幂等键,重复返回 `already_bound`,不重复绑定)。
+1. **被邀请人唯一**:`invitee_user_id` 唯一约束 → 一个 B 只能被绑一次(幂等键,重复返回 `already_bound`,不重复发奖)。
 2. **自邀屏蔽**:`inviter == invitee` → `self_invite`。
-3. **新人闸**:`_is_new_user`(B 的 `created_at` 在 `INVITE_NEW_USER_WINDOW_HOURS` = 72h 内)才生效,挡存量老用户互相填码刷关系 → 否则 `not_eligible`。
+3. **新人闸**:`_is_new_user`(B 的 `created_at` 在 `INVITE_NEW_USER_WINDOW_HOURS` = 72h 内)才发奖,挡存量老用户互相填码薅羊毛 → 否则 `not_eligible`。
 4. **手机号唯一**(天然限量):每个 B = 一个真实手机号账号。
 
-邀请金币已下线:`bind()` 只记录绑定关系,不再写 `coin_transaction`;响应里的金币字段保留兼容旧客户端,当前恒为 0。
+发金币复用 `repositories/wallet.py` 的 `grant_coins`,与建关系记录在**同一事务**提交,保证"建关系 + 双方加金币"原子。
 
 ### 3.2 前端(shaguabijia-app-android)
 
@@ -120,7 +120,7 @@ B 安装并首启 App
 ### 4.4 测试硬约束 / 坑(都是机制,不是 bug)
 
 - **B 必须用新手机号**:`invitee_user_id` 唯一,一个 B 只能绑一次;反复测要换号(或手删 `invite_relation` 那行 + 回滚金币)。
-- **72h 新人闸**:B 注册后 72 小时内绑定才生效(刚注册肯定满足)。
+- **72h 新人闸**:B 注册后 72 小时内绑才发奖(刚注册肯定满足)。
 - **A ≠ B**:自邀被屏蔽。
 - **B 从点下载到首启 App 之间别复制别的东西**:剪贴板会被覆盖 → 归因丢(剪贴板 deferred deeplink 的固有脆弱性)。
 - **笔记本 IP 别变**:debug 包把 `BASE_URL` 的 IP 烧死在编译期,DHCP 一换就连不上 → 给笔记本固定个 LAN IP。

h5/home/assets/home/index/home-tri-arrow-button.svg

@@ -1,34 +0,0 @@
-<svg width="172" height="148" viewBox="0 0 172 148" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <defs>
-    <filter id="buttonShadow" x="0" y="0" width="172" height="148" color-interpolation-filters="sRGB">
-      <feDropShadow dx="0" dy="10" stdDeviation="7" flood-color="#D79A1E" flood-opacity=".22"/>
-      <feDropShadow dx="0" dy="2" stdDeviation="2" flood-color="#FFFFFF" flood-opacity=".88"/>
-    </filter>
-    <linearGradient id="buttonFill" x1="43" y1="16" x2="126" y2="135" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#FFFCE3"/>
-      <stop offset=".38" stop-color="#FFF2A8"/>
-      <stop offset=".72" stop-color="#FFE27A"/>
-      <stop offset="1" stop-color="#FFD15A"/>
-    </linearGradient>
-    <linearGradient id="buttonStroke" x1="35" y1="11" x2="136" y2="139" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#FFF7C2"/>
-      <stop offset=".48" stop-color="#FFE484"/>
-      <stop offset="1" stop-color="#EAB237"/>
-    </linearGradient>
-    <radialGradient id="buttonGlow" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(70 44) rotate(62) scale(86 66)">
-      <stop stop-color="#FFFFFF" stop-opacity=".86"/>
-      <stop offset=".58" stop-color="#FFFFFF" stop-opacity=".24"/>
-      <stop offset="1" stop-color="#FFFFFF" stop-opacity="0"/>
-    </radialGradient>
-    <linearGradient id="arrowStroke" x1="50" y1="49" x2="125" y2="98" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#FFAE16"/>
-      <stop offset="1" stop-color="#F08300"/>
-    </linearGradient>
-  </defs>
-  <g filter="url(#buttonShadow)">
-    <path d="M45 13H127C151.8 13 166 35.8 166 62V86C166 112.2 151.8 135 127 135H45C20.2 135 6 112.2 6 86V62C6 35.8 20.2 13 45 13Z" fill="url(#buttonFill)" stroke="url(#buttonStroke)" stroke-width="3"/>
-    <path d="M48 19H124C146.1 19 159 38.7 159 63V84C159 108.3 146.1 128 124 128H48C25.9 128 13 108.3 13 84V63C13 38.7 25.9 19 48 19Z" fill="url(#buttonGlow)"/>
-    <path d="M58 51L81 74L58 97" stroke="url(#arrowStroke)" stroke-width="15" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M93 51L116 74L93 97" stroke="url(#arrowStroke)" stroke-width="15" stroke-linecap="round" stroke-linejoin="round"/>
-  </g>
-</svg>

h5/home/assets/shared/icons/README.md

@@ -1,43 +0,0 @@
-# Shared Icons
-
-通用图标的单一事实源（canonical source）。每个图标都是独立 SVG 文件，但**实际页面里必须内联 SVG markup**（不用 `<img src>` 或 `<svg src>` 引用），符合 prototypes 仓库"每个 HTML 自包含"原则。
-
-## 工作流
-
-1. 改图标 → 改这里的 SVG 文件
-2. 在所有用到的 HTML 里同步替换内联 SVG markup
-3. DESIGN.md 引用本目录路径作为基准
-
-## 现有图标
-
-| 文件 | 用途 | 推荐内联尺寸 |
-|---|---|---|
-| `back-chevron.svg` | 顶部导航返回按钮 | 24×24 |
-| `tab-home-outline.svg` | 底 tab "首页" 未选中态 | 24×24 |
-| `tab-home-filled.svg` | 底 tab "首页" 选中态（黄填充）| 24×24 |
-| `tab-welfare-outline.svg` | 底 tab "福利" 未选中态 | 24×24 |
-| `tab-welfare-filled.svg` | 底 tab "福利" 选中态（黄填充）| 24×24 |
-| `tab-profile-outline.svg` | 底 tab "我的" 未选中态 | 24×24 |
-| `tab-profile-filled.svg` | 底 tab "我的" 选中态（黄填充）| 24×24 |
-
-## 标准 button 包装
-
-```html
-<button class="btn-back" onclick="goBack()" aria-label="返回">
-  <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M15 6L9 12L15 18" stroke="#1A1A1A" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"/>
-  </svg>
-</button>
-```
-
-```css
-.btn-back {
-  width: 44px; height: 44px;
-  display: flex; align-items: center; justify-content: center;
-  background: transparent; border: none; padding: 0;
-  cursor: pointer; -webkit-tap-highlight-color: transparent;
-  flex-shrink: 0;
-}
-.btn-back:active { opacity: 0.5; }
-.btn-back svg { width: 24px; height: 24px; display: block; }
-```

h5/home/assets/shared/icons/back-chevron.svg

@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path d="M15 6L9 12L15 18" stroke="#1A1A1A" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

h5/home/assets/shared/icons/tab-home-filled.svg

@@ -1,4 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path d="M3 12l9-8 9 8" stroke="#1A1A1A" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M5 10v9a1 1 0 001 1h3v-5h6v5h3a1 1 0 001-1v-9" fill="#FFD600" stroke="#1A1A1A" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

h5/home/assets/shared/icons/tab-home-outline.svg

@@ -1,4 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#1A1A1A" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" xmlns="http://www.w3.org/2000/svg">
-  <path d="M3 12l9-8 9 8"/>
-  <path d="M5 10v9a1 1 0 001 1h3v-5h6v5h3a1 1 0 001-1v-9"/>
-</svg>

h5/home/assets/shared/icons/tab-profile-filled.svg

@@ -1,4 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="12" cy="8" r="4" fill="#FFD600" stroke="#1A1A1A" stroke-width="2"/>
-  <path d="M4 20c0-4 4-6 8-6s8 2 8 6" fill="#FFD600" stroke="#1A1A1A" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

h5/home/assets/shared/icons/tab-profile-outline.svg

@@ -1,4 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#1A1A1A" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="12" cy="8" r="4"/>
-  <path d="M4 20c0-4 4-6 8-6s8 2 8 6"/>
-</svg>

h5/home/assets/shared/icons/tab-welfare-filled.svg

@@ -1,6 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <rect x="3" y="8" width="18" height="4" rx="1" fill="#FFD600" stroke="#1A1A1A" stroke-width="2"/>
-  <path d="M5 12v7a1 1 0 001 1h12a1 1 0 001-1v-7" fill="#FFD600" stroke="#1A1A1A" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M12 8v12" stroke="#1A1A1A" stroke-width="2"/>
-  <path d="M7.5 8C6 8 5 6.5 6 5.5S9 4 9.5 5.5c.4 1.2 2.5 2.5 2.5 2.5s2.1-1.3 2.5-2.5C15 4 17 4.5 18 5.5s-1 2.5-2.5 2.5" stroke="#1A1A1A" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

h5/home/assets/shared/icons/tab-welfare-outline.svg

@@ -1,6 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#1A1A1A" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" xmlns="http://www.w3.org/2000/svg">
-  <rect x="3" y="8" width="18" height="4" rx="1"/>
-  <path d="M12 8v12"/>
-  <path d="M5 12v7a1 1 0 001 1h12a1 1 0 001-1v-7"/>
-  <path d="M7.5 8C6 8 5 6.5 6 5.5S9 4 9.5 5.5c.4 1.2 2.5 2.5 2.5 2.5s2.1-1.3 2.5-2.5C15 4 17 4.5 18 5.5s-1 2.5-2.5 2.5"/>
-</svg>

h5/home/assets/shared/logos/sb-brand-vector.svg

@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="512" height="512">
-  <defs>
-    <clipPath id="appIconClip">
-      <rect x="0" y="0" width="512" height="512" rx="105" ry="105"/>
-    </clipPath>
-  </defs>
-  <rect x="0" y="0" width="512" height="512" rx="105" ry="105" fill="rgb(255, 217, 61)"/>
-  <image href="sb-brand.png" x="0" y="0" width="512" height="512" preserveAspectRatio="none" clip-path="url(#appIconClip)"/>
-</svg>