chore(deploy): 穿山甲收益拉取 systemd 定时器(每天10:30)+ 运维手册

为 #92 的 scripts/sync_pangle_revenue.py 补 systemd 部署单元,让穿山甲 GroMore T+1 后台收益每天自动拉取入库,免人工敲命令。纯部署/文档文件,不改运行时代码。

- service:oneshot,跑 `--days 3` 回补近 3 天(幂等 upsert,扛偶发漏跑与穿山甲历史订正);10min 硬超时;加固块对齐主服务。
- timer:每天 10:30 触发(穿山甲约 10:00 出数留余量),Persistent 宕机后补跑。
- md:运维手册——上线前置(.env 填 PANGLE_REPORT_* 凭证、子账号需授权否则接口 118)、部署/健康检查/参数/注意事项(join key 用 ad_unit_id 非 code_id 等)。
- 风格对齐现有 deploy/daily-exchange.* 与 deploy/meituan-etl.*。

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

.env.example

@@ -58,6 +58,13 @@ MT_CPS_DEFAULT_SID=sgbjia
 # 线上国内服务器留空(=直连)。留空且本机直连失败时 /feed、/coupons、/top-sales 会返回空。
 MT_CPS_PROXY=
 
+# ===== 京东联盟 CPS =====
+# 京东联盟/京东宙斯开放平台创建应用后填写。AUTH_KEY 是工具商授权 key,自有应用可留空。
+JD_UNION_APP_KEY=
+JD_UNION_APP_SECRET=
+JD_UNION_SITE_ID=
+JD_UNION_AUTH_KEY=
+
 # ===== Pricebot 上游 (领券/比价业务透传目标) =====
 # 客户端调本服务的 /api/v1/coupon/step 等,我们透传到 pricebot-backend。
 # 本地开发用 localhost:8000。生产部署改成内网地址(如 http://pricebot.internal:8000)。

.gitignore

@@ -23,14 +23,17 @@ dist/
 *.db-journal
 *.db-shm
 *.db-wal
-# data/ 整体不入库(运行时数据/上传文件/大二进制)。例外:邀请落地页 dl.html——
-# 它既是生产落地页又是本地测试资产,纳入 git 便于同事一致测试
+# data/ 整体不入库(运行时数据/上传文件/大二进制)。例外:邀请落地页 dl.html 及其
+# 引用的静态插画(coupon-page-bg.png 底图 + sb-brand.png logo)——既是生产落地页资产
+# 又是本地测试资产,纳入 git 便于同事一致测试、且随部署进生产 /media(否则线上 404→落地页毛坯)。
 # (见 docs/邀请功能-实现原理与本地测试.md)。其余(avatars/ / *.apk / app.db 等)仍忽略。
 data/*
 !data/media/
 data/media/*
 !data/media/dl.html
 !data/media/taobao_landing.jpg
+!data/media/coupon-page-bg.png
+!data/media/sb-brand.png
 
 secrets/*
 !secrets/.gitkeep

alembic/versions/feedback_submit_env.py

@@ -0,0 +1,34 @@
+"""feedback 加提交端环境快照(app_version / device_model / rom_name / android_version)
+
+Revision ID: feedback_submit_env
+Revises: ad_pangle_daily_revenue
+Create Date: 2026-06-29 00:00:00.000000
+
+admin 用户反馈页要展示「提交版本号」「机型OS版本」,需在提交时落库端环境。仅新增可空列,
+SQLite 原生支持 add_column、不用 batch;downgrade 的 drop_column 在 SQLite 走 batch 兜底。
+历史反馈无此快照 → 留 NULL(无法回填);客户端改版带上后的新反馈才有值。
+"""
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+
+revision: str = "feedback_submit_env"
+down_revision: Union[str, Sequence[str], None] = "ad_pangle_daily_revenue"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.add_column("feedback", sa.Column("app_version", sa.String(length=32), nullable=True))
+    op.add_column("feedback", sa.Column("device_model", sa.String(length=64), nullable=True))
+    op.add_column("feedback", sa.Column("rom_name", sa.String(length=32), nullable=True))
+    op.add_column("feedback", sa.Column("android_version", sa.String(length=16), nullable=True))
+
+
+def downgrade() -> None:
+    with op.batch_alter_table("feedback") as batch_op:
+        batch_op.drop_column("android_version")
+        batch_op.drop_column("rom_name")
+        batch_op.drop_column("device_model")
+        batch_op.drop_column("app_version")

alembic/versions/jd_cps_order_fields.py

@@ -0,0 +1,56 @@
+"""add jd cps order fields
+
+Revision ID: jd_cps_order_fields
+Revises: 7db22acee504
+Create Date: 2026-06-28 20:30:00.000000
+"""
+from __future__ import annotations
+
+from alembic import op
+import sqlalchemy as sa
+
+
+revision = "jd_cps_order_fields"
+down_revision = "7db22acee504"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    with op.batch_alter_table("cps_order") as batch_op:
+        batch_op.add_column(
+            sa.Column("platform", sa.String(length=20), nullable=False, server_default="meituan")
+        )
+        batch_op.add_column(sa.Column("external_order_id", sa.String(length=128), nullable=True))
+        batch_op.add_column(sa.Column("external_row_id", sa.String(length=128), nullable=True))
+        batch_op.add_column(sa.Column("estimated_commission_cents", sa.Integer(), nullable=True))
+        batch_op.add_column(sa.Column("actual_commission_cents", sa.Integer(), nullable=True))
+        batch_op.add_column(sa.Column("jd_valid_code", sa.String(length=16), nullable=True))
+        batch_op.add_column(sa.Column("settle_month", sa.String(length=16), nullable=True))
+        batch_op.add_column(sa.Column("site_id", sa.String(length=128), nullable=True))
+        batch_op.add_column(sa.Column("position_id", sa.String(length=128), nullable=True))
+        batch_op.add_column(sa.Column("pid", sa.String(length=128), nullable=True))
+        batch_op.add_column(sa.Column("sub_union_id", sa.String(length=128), nullable=True))
+        batch_op.create_index("ix_cps_order_platform", ["platform"])
+        batch_op.create_index("ix_cps_order_external_order_id", ["external_order_id"])
+        batch_op.create_index("ix_cps_order_external_row_id", ["external_row_id"])
+        batch_op.create_index("ix_cps_order_jd_valid_code", ["jd_valid_code"])
+
+
+def downgrade() -> None:
+    with op.batch_alter_table("cps_order") as batch_op:
+        batch_op.drop_index("ix_cps_order_jd_valid_code")
+        batch_op.drop_index("ix_cps_order_external_row_id")
+        batch_op.drop_index("ix_cps_order_external_order_id")
+        batch_op.drop_index("ix_cps_order_platform")
+        batch_op.drop_column("sub_union_id")
+        batch_op.drop_column("pid")
+        batch_op.drop_column("position_id")
+        batch_op.drop_column("site_id")
+        batch_op.drop_column("settle_month")
+        batch_op.drop_column("jd_valid_code")
+        batch_op.drop_column("actual_commission_cents")
+        batch_op.drop_column("estimated_commission_cents")
+        batch_op.drop_column("external_row_id")
+        batch_op.drop_column("external_order_id")
+        batch_op.drop_column("platform")

app/admin/repositories/ad_revenue.py

@@ -87,6 +87,7 @@ def ad_revenue_report(
     user_id: int | None = None,
     ad_type: str | None = None,
     feed_scene: str | None = None,
+    app_env: str | None = None,
     granularity: str = "day",
     limit: int = 500,
     offset: int = 0,
@@ -156,8 +157,12 @@ def ad_revenue_report(
             "has_impression": True,
             "impressions": 1,
             "ecpm": rec.ecpm_raw,
-            # 单次展示收益(元)= eCPM元 ÷ 1000(每千次→单次);与发奖同源解析,口径一致。
-            "revenue_yuan": round(rewards.parse_ecpm_yuan(rec.ecpm_raw) / 1000.0, 6),
+            # 单次展示收益(元)= eCPM元 ÷ 1000(每千次→单次)。eCPM 先钳到 AD_ECPM_MAX_FEN(¥500 CPM)
+            # 再折收益,与发奖口径 [rewards.calculate_ad_reward_coin] 一致(2026-06-29 修:原裸 parse_ecpm_yuan
+            # 不钳,伪造/异常天价 eCPM 会把报表预估收益冲到任意大;金币侧已钳、收益侧漏钳)。
+            "revenue_yuan": round(
+                min(rewards.parse_ecpm_yuan(rec.ecpm_raw), rewards.AD_ECPM_MAX_FEN / 100.0) / 1000.0, 6,
+            ),
             "adn": rec.adn,
             "slot_id": rec.slot_id,
         }
@@ -213,6 +218,14 @@ def ad_revenue_report(
     if feed_scene is not None:
         events = [e for e in events if e.get("feed_scene") == feed_scene]
 
+    # app_env 过滤(2026-06-29 新增能力,修隐患:测试应用上报的假 eCPM 如 ¥678 CPM 会污染正式收益合计/平均):
+    # 显式传 "prod"/"test" 只看该环境;不传=全部(维持现状)。**不擅自把默认改成排除 test**——本地 dev 库多为
+    # test 数据、默认排除会使本地报表空,且「正式报表是否含 test」属产品口径。建议前端报表页加 app_env 筛选器
+    # (默认选 prod),或产品确认后再把默认改成排除 test。注:穿山甲后台收益列(total_pangle_*)暂未联动此过滤
+    # (它是独立对照列,且 pangle 的 test 是真实小额、非客户端那种假值)。
+    if app_env is not None:
+        events = [e for e in events if e.get("app_env") == app_env]
+
     # 排序:time=按时间倒序(新→旧);ecpm=按 eCPM 数值倒序(eCPM 原值是字符串「分」,转数值排;
     # 纯发奖行用其发奖采用的 eCPM,缺失/非法计 0 排末尾)。
     if sort == "ecpm":

app/admin/repositories/cps.py

@@ -7,13 +7,14 @@ from __future__ import annotations
 
 from datetime import datetime, timedelta, timezone
 from decimal import Decimal, InvalidOperation
+from typing import Any
 from uuid import uuid4
 
 from sqlalchemy import desc, func, select
 from sqlalchemy.orm import Session
 
 from app.admin.repositories.queries import _as_utc, offset_paginate
-from app.integrations import meituan
+from app.integrations import jd_union, 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
@@ -24,6 +25,11 @@ from app.models.cps_wx_user import CpsWxUser
 # 美团订单状态:取消(4)/风控(5)不计佣金;结算(6)为佣金真正到账
 _INVALID_STATUS = {"4", "5"}
 _SETTLED_STATUS = "6"
+_JD_INVALID_CODES = {
+    "2", "3", "4", "5", "6", "7", "8", "9", "11", "13", "14", "19", "20", "21",
+    "22", "23", "25", "26", "27", "28", "29", "30", "31", "34", "35", "36",
+}
+_JD_UNPAID_CODES = {"15"}
 
 # CPS 点击时序按北京时区分桶(运营看的是北京时间)
 _BJ_TZ = timezone(timedelta(hours=8))
@@ -47,6 +53,36 @@ def _ts_to_dt(ts: object) -> datetime | None:
     """秒级时间戳 → tz-aware UTC datetime(绝对时刻,前端按北京展示)。"""
     if not ts:
         return None
+
+
+def _jd_dt_to_utc(value: object) -> datetime | None:
+    """京东时间字符串(北京时间) → UTC aware datetime。"""
+    if value is None:
+        return None
+    s = str(value).strip()
+    if not s:
+        return None
+    for fmt in ("%Y-%m-%d %H:%M:%S", "%Y-%m-%d"):
+        try:
+            dt = datetime.strptime(s, fmt)
+            return dt.replace(tzinfo=_BJ_TZ).astimezone(timezone.utc)
+        except ValueError:
+            continue
+    return None
+
+
+def _text(value: object) -> str | None:
+    if value is None:
+        return None
+    s = str(value).strip()
+    return s or None
+
+
+def _pick(row: dict[str, Any], *keys: str) -> Any:
+    for key in keys:
+        if key in row and row[key] is not None:
+            return row[key]
+    return None
     try:
         return datetime.fromtimestamp(int(ts), tz=timezone.utc)
     except (ValueError, OSError, TypeError):
@@ -249,6 +285,80 @@ def _map_order_fields(r: dict) -> dict:
     }
 
 
+def _jd_order_key(r: dict[str, Any]) -> str | None:
+    row_id = _text(_pick(r, "id", "rowId", "orderRowId"))
+    if row_id:
+        return f"jd:{row_id}"
+    order_id = _text(_pick(r, "orderId", "parentOrderId"))
+    sku_id = _text(_pick(r, "skuId"))
+    if order_id and sku_id:
+        return f"jd:{order_id}:{sku_id}"
+    if order_id:
+        return f"jd:{order_id}"
+    return None
+
+
+def _map_jd_order_fields(r: dict[str, Any]) -> dict:
+    """京东 order.row.query 单条订单行 → CpsOrder 字段。"""
+    sku_name = _text(_pick(r, "skuName", "goodsName", "productName"))
+    if sku_name and len(sku_name) > 500:
+        sku_name = sku_name[:500]
+    valid_code = _text(_pick(r, "validCode", "valid_code"))
+    actual_fee = _yuan_to_cents(_pick(r, "actualFee", "actual_fee"))
+    estimate_fee = _yuan_to_cents(_pick(r, "estimateFee", "estimate_fee"))
+    commission = actual_fee if actual_fee not in (None, 0) else estimate_fee
+    order_time = _jd_dt_to_utc(_pick(r, "orderTime", "order_time"))
+    return {
+        "platform": "jd",
+        "external_order_id": _text(_pick(r, "orderId", "parentOrderId")),
+        "external_row_id": _text(_pick(r, "id", "rowId", "orderRowId")),
+        "sid": _text(_pick(r, "subUnionId", "sub_union_id")),
+        "act_id": None,
+        "biz_line": None,
+        "trade_type": None,
+        "pay_price_cents": _yuan_to_cents(
+            _pick(r, "actualCosPrice", "estimateCosPrice", "price")
+        ),
+        "commission_cents": commission,
+        "commission_rate": _text(_pick(r, "commissionRate", "commission_rate")),
+        "refund_price_cents": None,
+        "refund_profit_cents": None,
+        "estimated_commission_cents": estimate_fee,
+        "actual_commission_cents": actual_fee,
+        "mt_status": None,
+        "jd_valid_code": valid_code,
+        "invalid_reason": None if _is_jd_valid_code(valid_code) else f"validCode={valid_code}",
+        "product_name": sku_name,
+        "settle_month": _text(_pick(r, "payMonth", "settleMonth", "pay_month")),
+        "site_id": _text(_pick(r, "siteId", "site_id")),
+        "position_id": _text(_pick(r, "positionId", "position_id")),
+        "pid": _text(_pick(r, "pid")),
+        "sub_union_id": _text(_pick(r, "subUnionId", "sub_union_id")),
+        "pay_time": order_time,
+        "mt_update_time": _jd_dt_to_utc(_pick(r, "modifyTime", "updateTime", "modify_time"))
+        or order_time,
+        "raw": r,
+    }
+
+
+def _is_jd_valid_code(valid_code: str | None) -> bool:
+    code = str(valid_code).strip() if valid_code is not None else ""
+    return bool(code and code not in _JD_INVALID_CODES and code not in _JD_UNPAID_CODES)
+
+
+def is_jd_order_valid(order: CpsOrder) -> bool:
+    return _is_jd_valid_code(order.jd_valid_code)
+
+
+def effective_commission_cents(order: CpsOrder) -> int:
+    if order.platform == "jd":
+        if order.actual_commission_cents not in (None, 0):
+            return order.actual_commission_cents or 0
+        if order.estimated_commission_cents is not None:
+            return order.estimated_commission_cents or 0
+    return order.commission_cents or 0
+
+
 def reconcile_orders(
     db: Session, *, start_time: int, end_time: int,
     query_time_type: int = 1, sid: str | None = None, max_pages: int = 200,
@@ -274,6 +384,11 @@ def reconcile_orders(
                 continue
             fetched += 1
             fields = _map_order_fields(r)
+            fields.setdefault("platform", "meituan")
+            fields.setdefault("external_order_id", order_id)
+            fields.setdefault("external_row_id", None)
+            fields.setdefault("estimated_commission_cents", fields.get("commission_cents"))
+            fields.setdefault("actual_commission_cents", None)
             existing = db.execute(
                 select(CpsOrder).where(CpsOrder.order_id == order_id)
             ).scalar_one_or_none()
@@ -291,6 +406,56 @@ def reconcile_orders(
     return {"fetched": fetched, "inserted": inserted, "updated": updated, "pages": pages}
 
 
+def reconcile_jd_orders(
+    db: Session, *, start_time: datetime, end_time: datetime,
+    query_time_type: int = 3, max_pages: int = 100,
+) -> dict:
+    """调京东 order.row.query 拉单 → 按订单行 upsert。
+
+    京东单次查询窗口最多 1 小时,这里按北京自然时间切窗并逐页拉取。
+    """
+    fetched = inserted = updated = pages = 0
+    cur = start_time
+    while cur < end_time:
+        win_end = min(cur + timedelta(hours=1), end_time)
+        page = 1
+        while page <= max_pages:
+            resp = jd_union.query_order_rows(
+                start_time=cur,
+                end_time=win_end,
+                query_time_type=query_time_type,
+                page_index=page,
+                page_size=200,
+            )
+            rows = resp.get("rows") or []
+            has_more = bool(resp.get("has_more"))
+            if not rows:
+                break
+            pages += 1
+            for r in rows:
+                order_id = _jd_order_key(r)
+                if not order_id:
+                    continue
+                fetched += 1
+                fields = _map_jd_order_fields(r)
+                existing = db.execute(
+                    select(CpsOrder).where(CpsOrder.order_id == order_id)
+                ).scalar_one_or_none()
+                if existing is None:
+                    db.add(CpsOrder(order_id=order_id, **fields))
+                    inserted += 1
+                else:
+                    for k, v in fields.items():
+                        setattr(existing, k, v)
+                    updated += 1
+            if not has_more or len(rows) < 200:
+                break
+            page += 1
+        cur = win_end
+    db.commit()
+    return {"fetched": fetched, "inserted": inserted, "updated": updated, "pages": pages}
+
+
 def list_orders(
     db: Session, *, sid: str | None = None, mt_status: str | None = None,
     limit: int = 20, cursor: int | None = None,

app/admin/repositories/queries.py

@@ -125,8 +125,9 @@ def list_users(
     return offset_paginate(db, stmt, (order_fn(sort_col), id_order), limit=limit, cursor=cursor)
 
 
-def _attach_user_info(db: Session, records: list[ComparisonRecord]) -> None:
-    """给每条比价记录瞬态挂 phone/nickname(非 DB 列,供 admin schema from_attributes 读)。"""
+def _attach_user_info(db: Session, records: list[ComparisonRecord | Feedback | PriceReport]) -> None:
+    """给每条记录瞬态挂 phone/nickname(非 DB 列,供 admin schema from_attributes 读)。
+    按 user_id 鸭子类型,比价记录/反馈/上报通用。"""
     uids = {r.user_id for r in records}
     if not uids:
         return
@@ -562,7 +563,25 @@ def list_feedbacks(
     sort_col = sort_cols.get(sort_by, Feedback.id)
     order_fn = asc if sort_order == "asc" else desc
     id_order = asc(Feedback.id) if sort_order == "asc" else desc(Feedback.id)
-    return offset_paginate(db, stmt, (order_fn(sort_col), id_order), limit=limit, cursor=cursor)
+    items, next_cursor, total = offset_paginate(
+        db, stmt, (order_fn(sort_col), id_order), limit=limit, cursor=cursor
+    )
+    _attach_user_info(db, items)  # 列表展示完整手机号(点手机号查该用户全部反馈)
+    return items, next_cursor, total
+
+
+def feedback_summary(db: Session) -> dict:
+    """反馈审核台各状态计数(待审核/已采纳/未采纳/合计)。待审核含历史 new 态(与前端 isPending 一致)。"""
+    rows = db.execute(
+        select(Feedback.status, func.count(Feedback.id)).group_by(Feedback.status)
+    ).all()
+    by_status = {status: int(count) for status, count in rows}
+    return {
+        "pending": by_status.get("pending", 0) + by_status.get("new", 0),
+        "adopted": by_status.get("adopted", 0),
+        "rejected": by_status.get("rejected", 0),
+        "total": sum(by_status.values()),
+    }
 
 
 def list_analytics_events(
@@ -769,6 +788,7 @@ def get_user_overview(db: Session, user_id: int) -> dict | None:
         "user": user,
         "coin_balance": acc.coin_balance if acc else 0,
         "cash_balance_cents": acc.cash_balance_cents if acc else 0,
+        "invite_cash_balance_cents": acc.invite_cash_balance_cents if acc else 0,
         "total_coin_earned": acc.total_coin_earned if acc else 0,
         "comparison_total": _count(ComparisonRecord, ComparisonRecord.user_id == user_id),
         "comparison_success": _count(
@@ -978,21 +998,66 @@ def user_coin_records(
     return rows[offset:offset + limit], (offset + limit if has_more else None), total
 
 
+def _attach_price_report_comparison(db: Session, records: list[PriceReport]) -> None:
+    """给每条上报瞬态挂关联比价记录的 trace + 设备/版本快照:
+    trace_id/trace_url(点 Trace 看完整比价过程)、device_model/rom_name/android_version(机型OS版本列)、
+    app_version(提交版本号列,= 提交时我们 app 的 versionName)。
+    comparison_record_id 为空 / 关联记录查不到 → 全 None。"""
+    cids = {r.comparison_record_id for r in records if r.comparison_record_id is not None}
+    rows = (
+        db.execute(
+            select(
+                ComparisonRecord.id,
+                ComparisonRecord.trace_id,
+                ComparisonRecord.trace_url,
+                ComparisonRecord.device_model,
+                ComparisonRecord.rom_name,
+                ComparisonRecord.android_version,
+                ComparisonRecord.app_version,
+            ).where(ComparisonRecord.id.in_(cids))
+        ).all()
+        if cids
+        else []
+    )
+    cmap = {row.id: row for row in rows}
+    for r in records:
+        row = cmap.get(r.comparison_record_id)
+        r.trace_id = row.trace_id if row else None
+        r.trace_url = row.trace_url if row else None
+        r.device_model = row.device_model if row else None
+        r.rom_name = row.rom_name if row else None
+        r.android_version = row.android_version if row else None
+        r.app_version = row.app_version if row else None
+
+
 def list_price_reports(
     db: Session,
     *,
     status: str | None = None,
     user_id: int | None = None,
+    sort_by: str = "id",
+    sort_order: str = "desc",
     limit: int = 20,
     cursor: int | None = None,
 ) -> tuple[list[PriceReport], int | None, int]:
-    """上报更低价列表(admin 全量,可按状态/用户筛)。offset 分页 + total,id 倒序。"""
+    """上报更低价列表(admin 全量,可按状态/用户筛)。offset 分页 + total,按 id·提交时间排序。
+    join User 取 phone 瞬态挂(列表展示完整手机号);按 comparison_record_id 挂 trace_id/trace_url。"""
     stmt = select(PriceReport)
     if status:
         stmt = stmt.where(PriceReport.status == status)
     if user_id is not None:
         stmt = stmt.where(PriceReport.user_id == user_id)
-    return offset_paginate(db, stmt, (PriceReport.id.desc(),), limit=limit, cursor=cursor)
+
+    sort_cols = {"id": PriceReport.id, "created_at": PriceReport.created_at}
+    sort_col = sort_cols.get(sort_by, PriceReport.id)
+    order_fn = asc if sort_order == "asc" else desc
+    id_order = asc(PriceReport.id) if sort_order == "asc" else desc(PriceReport.id)
+    items, next_cursor, total = offset_paginate(
+        db, stmt, (order_fn(sort_col), id_order), limit=limit, cursor=cursor
+    )
+    _attach_user_info(db, items)
+    _attach_price_report_comparison(db, items)
+    return items, next_cursor, total
 
 
 def price_report_summary(db: Session) -> dict:

app/admin/repositories/stats.py

@@ -13,6 +13,7 @@ from sqlalchemy.orm import Session
 
 from app.models.ad_feed_reward import AdFeedRewardRecord
 from app.models.ad_reward import AdRewardRecord
+from app.models.analytics_event import AnalyticsEvent
 from app.models.comparison import ComparisonRecord
 from app.models.coupon_state import CouponPromptEngagement
 from app.models.cps_order import CpsOrder
@@ -35,6 +36,13 @@ REGULAR_TASK_EXCLUDED_BIZ_TYPES = (
 )
 MEITUAN_CPS_INVALID_STATUSES = ("4", "5")
 MEITUAN_CPS_SETTLED_STATUS = "6"
+COMPARE_START_EVENT = "real_compare_start"
+COUPON_START_EVENT = "real_coupon_start"
+JD_CPS_INVALID_CODES = {
+    "2", "3", "4", "5", "6", "7", "8", "9", "11", "13", "14", "19", "20", "21",
+    "22", "23", "25", "26", "27", "28", "29", "30", "31", "34", "35", "36",
+}
+JD_CPS_UNPAID_CODES = {"15"}
 
 
 def _beijing_today_start_utc() -> datetime:
@@ -45,14 +53,31 @@ def _beijing_today_start_utc() -> datetime:
 
 
 def today_dau(db: Session) -> int:
-    """今日活跃用户数(DAU):北京时区今天 0 点后登录过(last_login_at)。
+    """今日活跃用户数(DAU):登录 + 开始比价 + 开始领券,按用户去重。
 
     广告收益报表复用这个函数;历史窗口 DAU 由 dashboard_overview 的 period 口径另算。
     """
+    today_bj = datetime.now(_BEIJING).date()
     today_start = _beijing_today_start_utc()
-    return int(
-        db.execute(select(func.count(User.id)).where(User.last_login_at >= today_start)).scalar_one()
+    tomorrow_start = today_start + timedelta(days=1)
+    login_user_ids = _id_set(
+        db,
+        select(User.id).where(User.last_login_at >= today_start, User.last_login_at < tomorrow_start),
     )
+    compare_start_user_ids = _event_user_ids(
+        db, (COMPARE_START_EVENT,), today_start, tomorrow_start
+    )
+    coupon_event_user_ids = _event_user_ids(
+        db, (COUPON_START_EVENT,), today_start, tomorrow_start
+    )
+    coupon_claim_user_ids = _id_set(
+        db,
+        select(CouponPromptEngagement.user_id).where(
+            CouponPromptEngagement.engage_date == today_bj,
+            CouponPromptEngagement.engage_type == "claim_started",
+        ),
+    )
+    return len(login_user_ids | compare_start_user_ids | coupon_event_user_ids | coupon_claim_user_ids)
 
 
 def _default_period_end() -> date:
@@ -91,6 +116,24 @@ def _date_range(date_from: date, date_to: date) -> list[date]:
     return [date_from + timedelta(days=i) for i in range(days + 1)]
 
 
+def _id_set(db: Session, stmt) -> set[int]:
+    return {int(v) for v in db.execute(stmt).scalars().all() if v is not None}
+
+
+def _event_user_ids(
+    db: Session, event_names: tuple[str, ...], start_utc: datetime, end_utc: datetime
+) -> set[int]:
+    return _id_set(
+        db,
+        select(AnalyticsEvent.user_id).where(
+            AnalyticsEvent.user_id.is_not(None),
+            AnalyticsEvent.event.in_(event_names),
+            AnalyticsEvent.created_at >= start_utc,
+            AnalyticsEvent.created_at < end_utc,
+        ),
+    )
+
+
 def _commission_rate_percent(raw: str | None) -> Decimal | None:
     """美团 commissionRate 原值: "300"=3%, "10"=0.1%;也兼容 "3%"。"""
     if raw is None:
@@ -107,6 +150,11 @@ def _commission_rate_percent(raw: str | None) -> Decimal | None:
     return val / Decimal("100")
 
 
+def _jd_valid_order(order: CpsOrder) -> bool:
+    code = str(order.jd_valid_code).strip() if order.jd_valid_code is not None else ""
+    return bool(code and code not in JD_CPS_INVALID_CODES and code not in JD_CPS_UNPAID_CODES)
+
+
 def dashboard_overview(
     db: Session, *, date_from: date | None = None, date_to: date | None = None
 ) -> dict:
@@ -216,17 +264,22 @@ def dashboard_overview(
     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)
+    compare_start_user_ids = _event_user_ids(
+        db, (COMPARE_START_EVENT,), start_utc, end_utc
     )
-    coupon_user_ids = _user_id_set(
+    coupon_event_user_ids = _event_user_ids(
+        db, (COUPON_START_EVENT,), start_utc, end_utc
+    )
+    coupon_claim_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_active_user_ids = (
+        login_user_ids | compare_start_user_ids | coupon_event_user_ids | coupon_claim_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)
@@ -248,10 +301,13 @@ def dashboard_overview(
                 User.last_login_at < day_end_utc,
             )
         )
-        daily_compare_user_ids = _user_id_set(
-            select(ComparisonRecord.user_id).where(*daily_comparison_conds)
+        daily_compare_start_user_ids = _event_user_ids(
+            db, (COMPARE_START_EVENT,), day_start_utc, day_end_utc
         )
-        daily_coupon_user_ids = _user_id_set(
+        daily_coupon_event_user_ids = _event_user_ids(
+            db, (COUPON_START_EVENT,), day_start_utc, day_end_utc
+        )
+        daily_coupon_claim_user_ids = _user_id_set(
             select(CouponPromptEngagement.user_id).where(
                 CouponPromptEngagement.engage_date == cur_date,
                 CouponPromptEngagement.engage_type == "claim_started",
@@ -261,7 +317,10 @@ def dashboard_overview(
             {
                 "date": cur_date,
                 "active_users": len(
-                    daily_login_user_ids | daily_compare_user_ids | daily_coupon_user_ids
+                    daily_login_user_ids
+                    | daily_compare_start_user_ids
+                    | daily_coupon_event_user_ids
+                    | daily_coupon_claim_user_ids
                 ),
                 "new_users": _count(
                     User,
@@ -317,7 +376,7 @@ def dashboard_overview(
         *period_coin_conds,
         CoinTransaction.biz_type.notin_(REGULAR_TASK_EXCLUDED_BIZ_TYPES),
     )
-    period_meituan_orders = list(
+    period_cps_orders = list(
         db.execute(
             select(CpsOrder).where(
                 CpsOrder.pay_time >= start_utc,
@@ -325,9 +384,17 @@ def dashboard_overview(
             )
         ).scalars()
     )
+    period_meituan_orders = [
+        o for o in period_cps_orders if (o.platform or "meituan") == "meituan"
+    ]
     period_meituan_valid_orders = [
         o for o in period_meituan_orders if o.mt_status not in MEITUAN_CPS_INVALID_STATUSES
     ]
+    period_jd_orders = [o for o in period_cps_orders if o.platform == "jd"]
+    period_jd_valid_orders = [o for o in period_jd_orders if _jd_valid_order(o)]
+    period_jd_invalid_orders = [
+        o for o in period_jd_orders if o.jd_valid_code and not _jd_valid_order(o)
+    ]
     period_meituan_hit_count = 0
     period_meituan_miss_count = 0
     period_meituan_unknown_rate_count = 0
@@ -412,8 +479,8 @@ def dashboard_overview(
                 "retained_new_users": len(period_retained_new_user_ids),
                 "retention_rate": period_retention_rate,
                 "retention_note": (
-                    "近似口径:登录(last_login_at)+已上报比价记录+领券claim_started;"
-                    "尚不包含未完成上报的比价开始事件"
+                    "口径:登录(last_login_at)+开始比价(real_compare_start)+"
+                    "开始领券(real_coupon_start/claim_started),按用户去重"
                 ),
             },
             "comparison": {
@@ -450,7 +517,7 @@ def dashboard_overview(
         },
         "cps": {
             "available": True,
-            "note": "美团 CPS 读 cps_order 对账订单;淘宝/京东佣金暂空",
+            "note": "美团/JD 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
@@ -459,5 +526,17 @@ def dashboard_overview(
             "meituan_miss_count": period_meituan_miss_count,
             "meituan_unknown_rate_count": period_meituan_unknown_rate_count,
             "meituan_hit_rate": period_meituan_hit_rate,
+            "jd_order_count": len(period_jd_valid_orders),
+            # 数据大盘京东 CPS 只看实际佣金,不再用预估佣金兜底。
+            "jd_commission_cents": sum(
+                o.actual_commission_cents or 0 for o in period_jd_valid_orders
+            ),
+            "jd_actual_commission_cents": sum(
+                o.actual_commission_cents or 0 for o in period_jd_valid_orders
+            ),
+            "jd_estimated_commission_cents": sum(
+                o.estimated_commission_cents or 0 for o in period_jd_valid_orders
+            ),
+            "jd_invalid_count": len(period_jd_invalid_orders),
         },
     }

app/admin/routers/ad_revenue.py

@@ -56,6 +56,13 @@ def get_ad_revenue_report(
             "全局筛选,同时影响明细 / 合计 / 趋势"
         ),
     ] = None,
+    app_env: Annotated[
+        str | None,
+        Query(
+            description="prod(正式应用) / test(测试应用);不传=全部。"
+            "建议正式收益报表选 prod,避免测试应用的假 eCPM 污染收益合计/平均"
+        ),
+    ] = None,
     granularity: Annotated[
         str, Query(description="day=按天 / hour=按小时(北京时间);区间>1 天建议用 day")
     ] = "day",
@@ -75,7 +82,7 @@ def get_ad_revenue_report(
 
     result = ad_revenue.ad_revenue_report(
         db, date_from=d_from.isoformat(), date_to=d_to.isoformat(),
-        user_id=user_id, ad_type=ad_type, feed_scene=feed_scene,
+        user_id=user_id, ad_type=ad_type, feed_scene=feed_scene, app_env=app_env,
         granularity=granularity, limit=limit, offset=offset, sort=sort,
     )
     return AdRevenueReportOut(

app/admin/routers/cps.py

@@ -1,7 +1,7 @@
-"""admin CPS 分发与对账:群/活动管理 + 生成落地页短链 + 美团订单对账 + 统计。
+"""admin CPS 分发与对账:群/活动管理 + 生成落地页短链 + 联盟订单对账 + 统计。
 
 平台:meituan(actId+sid 转链 + query_order 对账) / taobao(整段淘口令) / jd(链接)。
-淘宝/京东无 API → 只统计点击(咱落地页 PV/UV + 淘宝复制),对账字段显示 "-"。
+淘宝暂未接 API → 只统计点击(咱落地页 PV/UV + 淘宝复制),对账字段显示 "-"。
 群/活动管理 = operator;订单对账(涉佣金) = finance;只读列表/统计 = 登录即可。
 """
 from __future__ import annotations
@@ -34,6 +34,7 @@ from app.admin.schemas.cps import (
 from app.core import media
 from app.core.config import settings
 from app.integrations import meituan
+from app.integrations.jd_union import JdUnionError
 from app.integrations.meituan import MeituanCpsError
 from app.models.admin import AdminUser
 from app.models.cps_activity import CpsActivity
@@ -373,7 +374,22 @@ def _reconcile_range_to_ts(
     return int(start_dt.timestamp()), int(end_dt.timestamp())
 
 
-@router.post("/orders/reconcile", response_model=CpsReconcileResult, summary="拉取美团订单对账")
+def _reconcile_range_to_bj_dt(
+    date_from: _date | None, date_to: _date | None, days: int
+) -> tuple[datetime, datetime]:
+    start_ts, end_ts = _reconcile_range_to_ts(date_from, date_to, days)
+    return (
+        datetime.fromtimestamp(start_ts, tz=_BEIJING),
+        datetime.fromtimestamp(end_ts, tz=_BEIJING),
+    )
+
+
+def _merge_reconcile_result(total: dict, current: dict) -> None:
+    for key in ("fetched", "inserted", "updated", "pages"):
+        total[key] = int(total.get(key, 0)) + int(current.get(key, 0))
+
+
+@router.post("/orders/reconcile", response_model=CpsReconcileResult, summary="拉取联盟订单对账")
 def reconcile_orders(
     request: Request,
     admin: Annotated[AdminUser, Depends(require_role("finance"))],
@@ -382,26 +398,42 @@ def reconcile_orders(
     date_to: Annotated[str | None, Query(description="结束日 YYYY-MM-DD")] = None,
     days: Annotated[int, Query(ge=1, le=90, description="未传日期时默认拉近 N 天")] = 7,
     sid: Annotated[str | None, Query(max_length=64)] = None,
-    query_time_type: Annotated[int, Query(ge=1, le=2)] = 1,
+    query_time_type: Annotated[int, Query(ge=1, le=3)] = 1,
+    platform: Annotated[str, Query(pattern="^(all|meituan|jd)$")] = "all",
 ) -> CpsReconcileResult:
-    start_ts, end_ts = _reconcile_range_to_ts(
-        _parse_day(date_from, field="date_from"),
-        _parse_day(date_to, field="date_to"),
-        days,
-    )
+    parsed_from = _parse_day(date_from, field="date_from")
+    parsed_to = _parse_day(date_to, field="date_to")
+    result = {"fetched": 0, "inserted": 0, "updated": 0, "pages": 0}
     try:
-        result = cps_repo.reconcile_orders(
-            db,
-            start_time=start_ts,
-            end_time=end_ts,
-            query_time_type=query_time_type,
-            sid=sid,
-        )
+        if platform in {"all", "meituan"}:
+            start_ts, end_ts = _reconcile_range_to_ts(parsed_from, parsed_to, days)
+            mt_result = cps_repo.reconcile_orders(
+                db,
+                start_time=start_ts,
+                end_time=end_ts,
+                query_time_type=query_time_type if query_time_type in (1, 2) else 2,
+                sid=sid,
+            )
+            _merge_reconcile_result(result, mt_result)
+        if platform in {"all", "jd"}:
+            if sid:
+                raise HTTPException(status_code=422, detail="京东订单刷新不支持 sid 筛选")
+            start_dt, end_dt = _reconcile_range_to_bj_dt(parsed_from, parsed_to, days)
+            jd_result = cps_repo.reconcile_jd_orders(
+                db,
+                start_time=start_dt,
+                end_time=end_dt,
+                query_time_type=query_time_type,
+            )
+            _merge_reconcile_result(result, jd_result)
     except MeituanCpsError as e:
         raise HTTPException(status_code=502, detail=f"美团拉单失败: {e}") from e
+    except JdUnionError 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={
+            "platform": platform,
             "date_from": date_from,
             "date_to": date_to,
             "days": days,

app/admin/routers/feedback.py

@@ -10,7 +10,12 @@ from app.admin.audit import write_audit
 from app.admin.deps import AdminDb, get_client_ip, get_current_admin, require_role
 from app.admin.repositories import mutations, queries
 from app.admin.schemas.common import CursorPage, OkResponse
-from app.admin.schemas.feedback import FeedbackApproveRequest, FeedbackOut, FeedbackRejectRequest
+from app.admin.schemas.feedback import (
+    FeedbackApproveRequest,
+    FeedbackOut,
+    FeedbackRejectRequest,
+    FeedbackSummary,
+)
 from app.models.admin import AdminUser
 from app.models.feedback import Feedback
 from app.repositories import wallet as wallet_repo
@@ -59,6 +64,11 @@ def list_feedbacks(
     )
 
 
+@router.get("/summary", response_model=FeedbackSummary, summary="反馈审核统计(各状态计数)")
+def feedback_summary(db: AdminDb) -> FeedbackSummary:
+    return FeedbackSummary.model_validate(queries.feedback_summary(db))
+
+
 @router.post("/{feedback_id}/handle", response_model=OkResponse, summary="标记反馈已处理")
 def handle_feedback(
     feedback_id: int,

app/admin/routers/price_report.py

@@ -37,11 +37,14 @@ def list_price_reports(
     db: AdminDb,
     status: Annotated[str | None, Query()] = None,
     user_id: Annotated[int | None, Query()] = None,
+    sort_by: Annotated[str, Query(pattern="^(id|created_at)$")] = "id",
+    sort_order: Annotated[str, Query(pattern="^(asc|desc)$")] = "desc",
     limit: Annotated[int, Query(ge=1, le=100)] = 20,
     cursor: Annotated[int | None, Query()] = None,
 ) -> CursorPage[PriceReportOut]:
     items, next_cursor, total = queries.list_price_reports(
-        db, status=status, user_id=user_id, limit=limit, cursor=cursor,
+        db, status=status, user_id=user_id,
+        sort_by=sort_by, sort_order=sort_order, limit=limit, cursor=cursor,
     )
     return CursorPage(
         items=[PriceReportOut.model_validate(r) for r in items],

app/admin/routers/users.py

@@ -210,22 +210,28 @@ def grant_user_cash(
     db: AdminDb,
 ) -> OkResponse:
     """给指定用户增/减或设值现金(分)。delta:正=发放、负=扣减;set:直接设为目标值。
+    account=coin_cash(金币兑现金)/ invite_cash(邀请奖励金):两本账物理隔离、各调各的。
     主要用于让无现金用户直接测试提现。"""
     user = user_repo.get_user_by_id(db, user_id)
     if user is None:
         raise HTTPException(status_code=404, detail="用户不存在")
-    # set=设为目标值:读当前余额算差值,仍复用 grant_cash 写一笔流水(沿用原子/审计/扣负保护)
+    # 按目标账户选「余额字段 + 变动入口」(grant_invite_cash 与 grant_cash 同构)
+    is_invite = body.account == "invite_cash"
+    balance_attr = "invite_cash_balance_cents" if is_invite else "cash_balance_cents"
+    grant_fn = wallet_repo.grant_invite_cash if is_invite else wallet_repo.grant_cash
+    acct_label = "邀请奖励金" if is_invite else "现金"
+    before: int | None = None
+    # set=设为目标值:读当前余额算差值,仍复用 grant 写一笔流水(沿用原子/审计/扣负保护)
     if body.mode == "set":
         if body.amount_cents < 0:
-            raise HTTPException(status_code=400, detail="目标现金值不能为负")
+            raise HTTPException(status_code=400, detail=f"目标{acct_label}值不能为负")
         # lock=True:锁账户行,防连点/并发各读同一 before 算同一 delta 双写,余额错位
-        before = wallet_repo.get_or_create_account(
-            db, user_id, commit=False, lock=True
-        ).cash_balance_cents
+        acc_locked = wallet_repo.get_or_create_account(db, user_id, commit=False, lock=True)
+        before = getattr(acc_locked, balance_attr)
         delta = body.amount_cents - before
         if delta == 0:
             raise HTTPException(
-                status_code=400, detail=f"当前现金已为 {body.amount_cents} 分,无需调整"
+                status_code=400, detail=f"当前{acct_label}已为 {body.amount_cents} 分,无需调整"
             )
     else:
         if body.amount_cents == 0:
@@ -234,18 +240,20 @@ def grant_user_cash(
         # 负数扣减时不允许扣成负余额(运营误操作保护);lock=True 防并发扣穿
         if delta < 0:
             acc_now = wallet_repo.get_or_create_account(db, user_id, commit=False, lock=True)
-            if acc_now.cash_balance_cents + delta < 0:
+            if getattr(acc_now, balance_attr) + delta < 0:
                 raise HTTPException(
-                    status_code=400, detail=f"扣减后现金为负(当前余额 {acc_now.cash_balance_cents} 分)"
+                    status_code=400,
+                    detail=f"扣减后{acct_label}为负(当前余额 {getattr(acc_now, balance_attr)} 分)",
                 )
     biz_type = "admin_grant" if delta > 0 else "admin_deduct"
-    # grant_cash 只 flush 不 commit;审计同 commit=False;最后一起 commit → 原子(改钱+留痕)
-    acc, _ = wallet_repo.grant_cash(
+    # grant 只 flush 不 commit;审计同 commit=False;最后一起 commit → 原子(改钱+留痕)
+    acc, _ = grant_fn(
         db, user_id, delta, biz_type=biz_type, remark=f"admin:{body.reason}"[:128],
     )
     detail = {
+        "account": body.account,
         "amount_cents": delta,
-        "balance_after_cents": acc.cash_balance_cents,
+        "balance_after_cents": getattr(acc, balance_attr),
         "reason": body.reason,
     }
     if body.mode == "set":

app/admin/schemas/cps.py

@@ -1,7 +1,7 @@
 """admin CPS 分发与对账 schemas。金额统一「分」(cents),前端 yuan() 展示。
 
-平台:meituan(actId+sid 转链对账) / taobao(淘口令,只统计点击) / jd(链接,只统计点击)。
-对账类字段对淘宝/京东为 None → 前端显示 "-"(无法对账)。
+平台:meituan(actId+sid 转链对账) / taobao(淘口令,只统计点击) / jd(链接 + 订单 API 对账)。
+对账类字段对淘宝为 None → 前端显示 "-"(暂未对账)。
 """
 from __future__ import annotations
 
@@ -116,15 +116,22 @@ class CpsOrderOut(BaseModel):
     model_config = ConfigDict(from_attributes=True)
 
     id: int
+    platform: str = "meituan"
     order_id: str
+    external_order_id: str | None = None
+    external_row_id: str | None = None
     sid: str | None = None
     act_id: str | None = None
     pay_price_cents: int | None = None
     commission_cents: int | None = None
+    estimated_commission_cents: int | None = None
+    actual_commission_cents: int | None = None
     commission_rate: str | None = None
     mt_status: str | None = None
+    jd_valid_code: str | None = None
     invalid_reason: str | None = None
     product_name: str | None = None
+    settle_month: str | None = None
     pay_time: datetime | None = None
 
 

app/admin/schemas/dashboard.py

@@ -103,6 +103,11 @@ class DashboardCps(BaseModel):
     meituan_miss_count: int = 0
     meituan_unknown_rate_count: int = 0
     meituan_hit_rate: float | None = None
+    jd_order_count: int = 0
+    jd_commission_cents: int = 0
+    jd_actual_commission_cents: int = 0
+    jd_estimated_commission_cents: int = 0
+    jd_invalid_count: int = 0
 
 
 class DashboardOverview(BaseModel):

app/admin/schemas/feedback.py

@@ -23,6 +23,14 @@ class FeedbackOut(BaseModel):
     reviewed_by_admin_id: int | None = None
     reviewed_at: datetime | None = None
     created_at: datetime
+    # 提交端环境快照(feedback 表列):提交版本号 / 机型OS版本;改版前的历史反馈为 None
+    app_version: str | None = None
+    device_model: str | None = None
+    rom_name: str | None = None
+    android_version: str | None = None
+    # 联表瞬态字段(queries._attach_user_info 挂):列表展示完整手机号,点手机号查该用户全部反馈
+    phone: str | None = None
+    nickname: str | None = None
 
 
 class FeedbackApproveRequest(BaseModel):
@@ -37,3 +45,12 @@ class FeedbackApproveRequest(BaseModel):
 class FeedbackRejectRequest(BaseModel):
     reason: str = Field(min_length=1, max_length=256, description="未采纳原因,用户端可见")
     note: str | None = Field(default=None, max_length=256, description="运营内部审核备注")
+
+
+class FeedbackSummary(BaseModel):
+    """审核台顶部各状态计数(pending 含历史 new 态)。"""
+
+    pending: int
+    adopted: int
+    rejected: int
+    total: int

app/admin/schemas/price_report.py

@@ -31,6 +31,17 @@ class PriceReportOut(BaseModel):
     reward_coins: int | None = None
     reviewed_at: datetime | None = None
     created_at: datetime
+    # 联表瞬态字段:phone/nickname 由 _attach_user_info 挂(展示完整手机号、点击查该用户全部上报);
+    # 其余由 _attach_price_report_comparison 从关联比价记录挂:trace_*(Trace 列点跳调试链接)、
+    # device_model/rom_name/android_version(机型OS版本列)、app_version(提交版本号列)
+    phone: str | None = None
+    nickname: str | None = None
+    trace_id: str | None = None
+    trace_url: str | None = None
+    device_model: str | None = None
+    rom_name: str | None = None
+    android_version: str | None = None
+    app_version: str | None = None
 
 
 class PriceReportRejectRequest(BaseModel):

app/admin/schemas/user.py

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

app/api/v1/feedback.py

@@ -61,6 +61,11 @@ async def submit_feedback(
     content: str = Form(...),
     # 原型改版后客户端不再采集联系方式;保留字段以兼容旧端 + 后续可能复用,默认空串。
     contact: str = Form(default=""),
+    # 提交端环境快照(admin 反馈页展示「提交版本号」「机型OS版本」);旧端不带 → 空串 → 存 NULL。
+    app_version: str = Form(default=""),
+    device_model: str = Form(default=""),
+    rom_name: str = Form(default=""),
+    android_version: str = Form(default=""),
     images: list[UploadFile] = File(default=[]),
 ) -> FeedbackOut:
     content = content.strip()
@@ -86,6 +91,8 @@ async def submit_feedback(
 
     fb = feedback_repo.create_feedback(
         db, user_id=user.id, content=content, contact=contact, images=urls,
+        app_version=app_version.strip(), device_model=device_model.strip(),
+        rom_name=rom_name.strip(), android_version=android_version.strip(),
     )
     logger.info("feedback id=%d user_id=%d images=%d", fb.id, user.id, len(urls))
     return FeedbackOut.model_validate(fb)

app/api/v1/wallet.py

@@ -202,6 +202,9 @@ def withdraw(req: WithdrawRequest, user: CurrentUser, db: DbSession) -> Withdraw
         order = crud_wallet.create_withdraw(
             db, user.id, req.amount_cents, source=req.source,
             user_name=req.user_name, out_bill_no=req.out_bill_no,
+            # 0.01 元调试提现:放行低于最低额的小额。双闸——客户端仅 debug 包在「0.01 元提现」开关开时
+            # 连同 skip_review 一起下发;服务端仅非 prod 才认。生产恒 False,最低额校验照常。
+            allow_sub_min=(req.skip_review and not settings.is_prod),
         )
     except crud_wallet.InvalidWithdrawAmountError as e:
         raise HTTPException(

app/core/config.py

@@ -113,6 +113,21 @@ class Settings(BaseSettings):
         """美团 CPS 凭证齐全(缺则接口返空,而非 502)。"""
         return bool(self.MT_CPS_APP_KEY and self.MT_CPS_APP_SECRET)
 
+    # ===== 京东联盟 CPS =====
+    # app_key/app_secret 来自京东联盟应用;site_id 是推广管理里的 APP/网站 ID;
+    # auth_key 是工具商授权 key,自有应用查询可留空。
+    JD_UNION_APP_KEY: str = ""
+    JD_UNION_APP_SECRET: str = ""
+    JD_UNION_SITE_ID: str = ""
+    JD_UNION_AUTH_KEY: str = ""
+    JD_UNION_GATEWAY: str = "https://api.jd.com/routerjson"
+    JD_UNION_TIMEOUT_SEC: int = 15
+
+    @property
+    def jd_union_configured(self) -> bool:
+        """京东联盟订单查询凭证齐全。"""
+        return bool(self.JD_UNION_APP_KEY and self.JD_UNION_APP_SECRET)
+
     # ===== 微信服务号(网页授权) =====
     # CPS 落地页在微信内拿用户 openid(base 静默)/昵称头像(userinfo),做用户级群统计。
     # ⚠️ 区别于 WECHAT_APP_ID(那是 App 移动应用,用于微信支付);这是【已认证服务号】。

app/integrations/jd_union.py

@@ -0,0 +1,163 @@
+"""京东联盟 OpenAPI 客户端。
+
+当前只接数据大盘需要的订单明细接口:
+`jd.union.open.order.row.query`。京东要求订单查询时间窗最长 1 小时,
+调用方负责切窗分页。
+"""
+from __future__ import annotations
+
+import hashlib
+import json
+import logging
+from datetime import datetime, timedelta, timezone
+from typing import Any
+
+import httpx
+
+from app.core.config import settings
+
+logger = logging.getLogger(__name__)
+
+_BEIJING = timezone(timedelta(hours=8))
+
+
+class JdUnionError(RuntimeError):
+    """京东联盟 API 调用失败。"""
+
+
+def _parse_json_maybe(value: Any) -> Any:
+    if not isinstance(value, str):
+        return value
+    text = value.strip()
+    if not text:
+        return value
+    try:
+        return json.loads(text)
+    except json.JSONDecodeError:
+        return value
+
+
+def _sign(params: dict[str, Any], secret: str) -> str:
+    pieces = [secret]
+    for key in sorted(k for k in params if k != "sign"):
+        value = params[key]
+        if value is None:
+            continue
+        pieces.append(f"{key}{value}")
+    pieces.append(secret)
+    raw = "".join(pieces)
+    return hashlib.md5(raw.encode("utf-8")).hexdigest().upper()
+
+
+def _unwrap_response(data: dict[str, Any]) -> dict[str, Any]:
+    if "error_response" in data:
+        err = data["error_response"] or {}
+        msg = err.get("zh_desc") or err.get("en_desc") or err.get("msg") or err
+        raise JdUnionError(f"京东 API 错误: {msg}")
+
+    body: Any = data
+    for key, value in data.items():
+        if key.endswith("_responce") or key.endswith("_response"):
+            body = value
+            break
+
+    body = _parse_json_maybe(body)
+    if not isinstance(body, dict):
+        raise JdUnionError("京东 API 返回格式异常")
+
+    result = body.get("queryResult", body.get("result", body))
+    result = _parse_json_maybe(result)
+    if not isinstance(result, dict):
+        raise JdUnionError("京东 API 业务结果格式异常")
+
+    code = str(result.get("code", result.get("resultCode", "200")))
+    if code not in {"0", "200"}:
+        msg = result.get("message") or result.get("msg") or result.get("resultMsg") or result
+        raise JdUnionError(f"京东 API 业务错误: {msg}")
+    return result
+
+
+def call(method: str, payload: dict[str, Any], *, version: str = "1.0") -> dict[str, Any]:
+    if not settings.jd_union_configured:
+        raise JdUnionError("京东联盟凭证未配置")
+
+    biz_json = json.dumps(payload, ensure_ascii=False, separators=(",", ":"))
+    params: dict[str, Any] = {
+        "method": method,
+        "app_key": settings.JD_UNION_APP_KEY,
+        "timestamp": datetime.now(_BEIJING).strftime("%Y-%m-%d %H:%M:%S"),
+        "format": "json",
+        "v": version,
+        "sign_method": "md5",
+        "360buy_param_json": biz_json,
+    }
+    params["sign"] = _sign(params, settings.JD_UNION_APP_SECRET)
+
+    try:
+        with httpx.Client(timeout=settings.JD_UNION_TIMEOUT_SEC, trust_env=False) as client:
+            resp = client.post(settings.JD_UNION_GATEWAY, data=params)
+            resp.raise_for_status()
+            data = resp.json()
+    except httpx.HTTPError as e:
+        raise JdUnionError(f"京东 API 网络错误: {e}") from e
+    except json.JSONDecodeError as e:
+        raise JdUnionError("京东 API 返回非 JSON") from e
+
+    return _unwrap_response(data)
+
+
+def _extract_rows(result: dict[str, Any]) -> tuple[list[dict[str, Any]], bool]:
+    payload = _parse_json_maybe(result.get("data", result.get("result", result)))
+    has_more = bool(result.get("hasMore") or result.get("has_more"))
+
+    if isinstance(payload, dict):
+        for key in ("orderRowResp", "orderRows", "orderList", "orders", "list", "rows"):
+            rows = _parse_json_maybe(payload.get(key))
+            if isinstance(rows, list):
+                return [r for r in rows if isinstance(r, dict)], bool(
+                    payload.get("hasMore") or payload.get("has_more") or has_more
+                )
+        return [], bool(payload.get("hasMore") or payload.get("has_more") or has_more)
+    if isinstance(payload, list):
+        return [r for r in payload if isinstance(r, dict)], has_more
+    return [], has_more
+
+
+def query_order_rows(
+    *,
+    start_time: datetime,
+    end_time: datetime,
+    query_time_type: int = 3,
+    page_index: int = 1,
+    page_size: int = 200,
+) -> dict[str, Any]:
+    """查询京东 CPS 订单行。
+
+    query_time_type: 1 下单时间, 2 完成时间, 3 更新时间。
+    start_time/end_time 用北京时间展示给京东;调用方需保证窗口不超过 1 小时。
+    """
+    start_bj = start_time.astimezone(_BEIJING)
+    end_bj = end_time.astimezone(_BEIJING)
+    if end_bj <= start_bj:
+        return {"rows": [], "has_more": False}
+    if end_bj - start_bj > timedelta(hours=1):
+        raise JdUnionError("京东订单查询单次时间窗不能超过 1 小时")
+
+    order_req: dict[str, Any] = {
+        "pageIndex": page_index,
+        "pageSize": min(max(page_size, 1), 200),
+        "type": query_time_type,
+        "startTime": start_bj.strftime("%Y-%m-%d %H:%M:%S"),
+        "endTime": end_bj.strftime("%Y-%m-%d %H:%M:%S"),
+    }
+    if settings.JD_UNION_AUTH_KEY:
+        order_req["key"] = settings.JD_UNION_AUTH_KEY
+    result = call("jd.union.open.order.row.query", {"orderReq": order_req})
+    rows, has_more = _extract_rows(result)
+    logger.info(
+        "jd.union.open.order.row.query fetched rows=%s page=%s has_more=%s",
+        len(rows),
+        page_index,
+        has_more,
+    )
+    return {"rows": rows, "has_more": has_more, "raw": result}

app/main.py

@@ -2,18 +2,23 @@
 
 通过 `uvicorn app.main:app --reload` 启动。
 """
+
 from __future__ import annotations
 
 import logging
 from collections.abc import AsyncIterator
 from contextlib import asynccontextmanager
-
 from pathlib import Path
 
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
+from fastapi.responses import FileResponse
 from fastapi.staticfiles import StaticFiles
 
+from app.api.internal.app_version import router as internal_app_version_router
+from app.api.internal.launch_confirm import router as internal_launch_confirm_router
+from app.api.internal.price import router as internal_price_router
+from app.api.internal.store import router as internal_store_router
 from app.api.v1.ad import router as ad_router
 from app.api.v1.analytics import router as analytics_router
 from app.api.v1.auth import router as auth_router
@@ -21,12 +26,8 @@ from app.api.v1.compare import router as compare_router
 from app.api.v1.compare_milestone import router as compare_milestone_router
 from app.api.v1.compare_record import router as compare_record_router
 from app.api.v1.coupon import router as coupon_router
-from app.api.v1.device import router as device_router
 from app.api.v1.cps_redirect import router as cps_redirect_router
-from app.api.internal.app_version import router as internal_app_version_router
-from app.api.internal.launch_confirm import router as internal_launch_confirm_router
-from app.api.internal.price import router as internal_price_router
-from app.api.internal.store import router as internal_store_router
+from app.api.v1.device import router as device_router
 from app.api.v1.feedback import router as feedback_router
 from app.api.v1.invite import router as invite_router
 from app.api.v1.meituan import router as meituan_router
@@ -40,14 +41,14 @@ from app.api.v1.user import router as user_router
 from app.api.v1.wallet import router as wallet_router
 from app.api.v1.wxpay import router as wxpay_router
 from app.core.config import settings
-from app.core.heartbeat_monitor_worker import (
-    start_heartbeat_monitor,
-    stop_heartbeat_monitor,
-)
 from app.core.daily_exchange_worker import (
     start_daily_exchange_worker,
     stop_daily_exchange_worker,
 )
+from app.core.heartbeat_monitor_worker import (
+    start_heartbeat_monitor,
+    stop_heartbeat_monitor,
+)
 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 (
@@ -137,6 +138,30 @@ app.include_router(cps_redirect_router)
 # 用户上传文件(头像)静态服务。生产可改由 nginx 直接 serve MEDIA_ROOT。
 _media_root = Path(settings.MEDIA_ROOT)
 _media_root.mkdir(parents=True, exist_ok=True)
+
+
+# 官网下载的 APK 直链(落地页 dl.html「官网下载」按钮指向 /media/shaguabijia.apk)。
+# 必须在 StaticFiles 挂载【之前】注册,否则被静态挂载吃掉。
+# StaticFiles 给 .apk 的 Content-Type 不对、且无 attachment 头 → 部分国产浏览器不触发下载、转甩应用市场;
+# 这里显式回 application/vnd.android.package-archive + Content-Disposition:attachment 强制浏览器下载。
+# 文件由 scripts/publish_apk.sh 编 release 包后放到 data/media/shaguabijia.apk(*.apk 不入 git,需部署时放)。
+_APK_PATH = _media_root / "shaguabijia.apk"
+
+
+@app.get(f"{settings.MEDIA_URL_PREFIX}/shaguabijia.apk", tags=["meta"], include_in_schema=False)
+def download_apk() -> FileResponse:
+    if not _APK_PATH.is_file():
+        from fastapi import HTTPException
+
+        raise HTTPException(status_code=404, detail="安装包未就绪")
+    return FileResponse(
+        _APK_PATH,
+        media_type="application/vnd.android.package-archive",
+        filename="shaguabijia.apk",
+        headers={"Content-Disposition": 'attachment; filename="shaguabijia.apk"'},
+    )
+
+
 app.mount(
     settings.MEDIA_URL_PREFIX,
     StaticFiles(directory=str(_media_root)),

app/models/cps_order.py

@@ -1,11 +1,13 @@
 """CPS 对账订单(cps_order)。
 
-从美团联盟 query_order 按时间窗拉回、按 sid 归群的订单明细。字段对齐 query_order
+从联盟 API 按时间窗拉回、按平台落库的 CPS 订单明细。字段最初对齐美团 query_order,
+后续兼容京东订单报表:
 实测返回:
   - payPrice / profit 是「元」字符串 → 入库统一转「分」(与全站口径一致)
   - payTime / updateTime 是秒级时间戳 → 入库转 tz-aware datetime
   - status: 2付款 3完成 4取消 5风控 6结算(取消/风控不计佣金)
-order_id 全局唯一,reconcile 按它 upsert(订单状态会变,重复拉则更新)。
+order_id 全局唯一,reconcile 按它 upsert(订单状态会变,重复拉则更新)。京东订单用
+`jd:<row_id>` 前缀避免与美团订单号碰撞。
 """
 from __future__ import annotations
 
@@ -22,8 +24,13 @@ class CpsOrder(Base):
     __tablename__ = "cps_order"
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
-    # 美团订单号(加密串),全局唯一,upsert 幂等键。
+    # 平台:meituan / jd。历史数据迁移默认 meituan。
+    platform: Mapped[str] = mapped_column(String(20), default="meituan", index=True, nullable=False)
+    # 平台订单号/行号包装后的全局唯一键,upsert 幂等。
     order_id: Mapped[str] = mapped_column(String(64), unique=True, index=True, nullable=False)
+    # 平台原始订单号/行号。京东一笔订单多 SKU 时可按行号区分。
+    external_order_id: Mapped[str | None] = mapped_column(String(128), index=True, nullable=True)
+    external_row_id: Mapped[str | None] = mapped_column(String(128), index=True, nullable=True)
     # 渠道追踪位 = 群 sid(历史无 sid 订单为空)。按它归群聚合。
     sid: Mapped[str | None] = mapped_column(String(64), index=True, nullable=True)
     act_id: Mapped[str | None] = mapped_column(String(64), index=True, nullable=True)
@@ -35,11 +42,21 @@ class CpsOrder(Base):
     commission_rate: Mapped[str | None] = mapped_column(String(16), nullable=True)  # "300"=3% "10"=0.1%
     refund_price_cents: Mapped[int | None] = mapped_column(Integer, nullable=True)
     refund_profit_cents: Mapped[int | None] = mapped_column(Integer, nullable=True)
+    # 通用佣金拆分。美团只有预估 profit;京东有预估/实际佣金。
+    estimated_commission_cents: Mapped[int | None] = mapped_column(Integer, nullable=True)
+    actual_commission_cents: Mapped[int | None] = mapped_column(Integer, nullable=True)
 
     # 美团订单状态: 2付款 3完成 4取消 5风控 6结算
     mt_status: Mapped[str | None] = mapped_column(String(8), index=True, nullable=True)
+    # 京东订单有效码(validCode),用于判断是否有效/已完成。
+    jd_valid_code: Mapped[str | None] = mapped_column(String(16), index=True, nullable=True)
     invalid_reason: Mapped[str | None] = mapped_column(String(128), nullable=True)
     product_name: Mapped[str | None] = mapped_column(String(512), nullable=True)
+    settle_month: Mapped[str | None] = mapped_column(String(16), nullable=True)
+    site_id: Mapped[str | None] = mapped_column(String(128), nullable=True)
+    position_id: Mapped[str | None] = mapped_column(String(128), nullable=True)
+    pid: Mapped[str | None] = mapped_column(String(128), nullable=True)
+    sub_union_id: Mapped[str | None] = mapped_column(String(128), nullable=True)
 
     pay_time: Mapped[datetime | None] = mapped_column(
         DateTime(timezone=True), index=True, nullable=True
@@ -59,5 +76,6 @@ class CpsOrder(Base):
     def __repr__(self) -> str:  # pragma: no cover
         return (
             f"<CpsOrder id={self.id} order_id={self.order_id!r} "
-            f"sid={self.sid!r} status={self.mt_status} profit_cents={self.commission_cents}>"
+            f"platform={self.platform!r} sid={self.sid!r} "
+            f"status={self.mt_status or self.jd_valid_code} profit_cents={self.commission_cents}>"
         )

app/models/feedback.py

@@ -25,6 +25,11 @@ class Feedback(Base):
     contact: Mapped[str] = mapped_column(String(128), nullable=False)
     # 截图 URL 列表(相对路径,如 ["/media/feedback/u1_ab12.jpg"]);无图为 None
     images: Mapped[list[str] | None] = mapped_column(JSON, nullable=True)
+    # 提交时的端环境快照(admin 排查用;客户端改版带上后的新反馈才有,历史数据为 NULL)
+    app_version: Mapped[str | None] = mapped_column(String(32), nullable=True)  # 我们 app versionName
+    device_model: Mapped[str | None] = mapped_column(String(64), nullable=True)  # Build.MODEL
+    rom_name: Mapped[str | None] = mapped_column(String(32), nullable=True)  # OemDetector os:ColorOS/MIUI/...
+    android_version: Mapped[str | None] = mapped_column(String(16), nullable=True)  # Build.VERSION.RELEASE
     # pending(审核中) / adopted(已采纳) / rejected(未采纳)
     status: Mapped[str] = mapped_column(String(16), nullable=False, default="pending", index=True)
     reject_reason: Mapped[str | None] = mapped_column(String(256), nullable=True)

app/repositories/feedback.py

@@ -17,12 +17,20 @@ def create_feedback(
     content: str,
     contact: str,
     images: list[str] | None,
+    app_version: str | None = None,
+    device_model: str | None = None,
+    rom_name: str | None = None,
+    android_version: str | None = None,
 ) -> Feedback:
     fb = Feedback(
         user_id=user_id,
         content=content,
         contact=contact,
         images=images or None,
+        app_version=app_version or None,
+        device_model=device_model or None,
+        rom_name=rom_name or None,
+        android_version=android_version or None,
         status="pending",
         created_at=datetime.now(CN_TZ).replace(tzinfo=None),
     )

app/repositories/invite.py

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

app/repositories/wallet.py

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

data/media/dl.html

@@ -198,7 +198,7 @@
       选择「<span class="guide-highlight">在浏览器打开</span>」
       <span class="guide-final">在浏览器里按提示<span class="guide-target">去应用商店下载</span></span>
     </h2>
-    <div class="guide-dismiss" id="wxGuideDismiss">我知道了 ✕</div>
+    <!-- <div class="guide-dismiss" id="wxGuideDismiss">我知道了 ✕</div> -->
   </div>
 
   <div class="toast" id="toast" role="status" aria-live="polite"></div>
@@ -263,7 +263,7 @@
   var wxGuide = document.getElementById("wxGuide");
   function showWxGuide() { wxGuide.classList.add("show"); }
   function hideWxGuide() { wxGuide.classList.remove("show"); }
-  document.getElementById("wxGuideDismiss").addEventListener("click", hideWxGuide);
+  // document.getElementById("wxGuideDismiss").addEventListener("click", hideWxGuide);  // 「我知道了 ✕」已注释隐藏
   if (isWeChat) showWxGuide();   // 微信里一进页面就提示去浏览器（微信内下载必被拦）
 
   function showToast(text) {
@@ -273,15 +273,24 @@
     showToast.timer = setTimeout(function () { toast.classList.remove("show"); }, 1400);
   }
 
-  // ===== 下载按钮：微信内引导去浏览器；iOS 提示；安卓写邀请码 + 跳应用商店 =====
+  // ===== 应用商店下载：微信内引导去浏览器；iOS 提示；安卓写邀请码 + 跳应用商店 =====
   function handleDownload() {
     if (isWeChat) { showWxGuide(); return; }
     if (isIOS)    { alert("iOS 版即将上线，请前往 App Store 搜索「傻瓜比价」"); return; }
     copyInviteCode();   // 先把邀请码写进剪贴板（供 App 首启归因），链路丢了还有 landing-track 指纹兜底
     openStore();
   }
+  // ===== 官网下载：微信/iOS 同上引导；安卓直接跳 APK 直链 → 弹系统下载弹窗 =====
+  // APK_URL 跟随页面 host：本地走 LAN、生产走 app-api.shaguabijia.com（见邀请功能文档约定）。
+  var APK_URL = location.origin + "/media/shaguabijia.apk";
+  function handleWebsiteDownload() {
+    if (isWeChat) { showWxGuide(); return; }
+    if (isIOS)    { alert("iOS 版即将上线，请前往 App Store 搜索「傻瓜比价」"); return; }
+    copyInviteCode();   // 同样先写邀请码进剪贴板（供 App 首启归因）
+    window.location.href = APK_URL;
+  }
   document.getElementById("dlbtn").addEventListener("click", handleDownload);
-  document.getElementById("dlbtn2").addEventListener("click", handleDownload);
+  document.getElementById("dlbtn2").addEventListener("click", handleWebsiteDownload);
 </script>
 </body>
 </html>

deploy/pangle-revenue.md

@@ -0,0 +1,67 @@
+# 穿山甲 GroMore 收益拉取 定时任务 — 运维手册
+
+> 对象:维护「每天拉穿山甲后台收益入库」这套定时任务的同事。
+> 🔒 服务器登录信息见**私密交接清单**,不入库。
+
+## 它是什么
+admin「广告收益报表」里的「穿山甲后台收益(T+1)」读的是**本地表 `ad_pangle_daily_revenue` 的快照,不是实时查穿山甲**。穿山甲只通过 GroMore 数据 API 给数、且 **T+1**(次日约 10:00 出昨天的数),所以每天得拉一次入库,报表才会往前走。
+
+- 每天 10:30 跑一轮 `scripts/sync_pangle_revenue.py`,默认 `--days 3` 回补近 3 天。
+- 维度 = 日期 × 应用(site_id)× 广告位(ad_unit_id);指标 = `revenue`(预估)+ `api_revenue`(结算口径)。
+- **幂等 upsert**:同一(日期×应用×代码位)重跑只覆盖、不重复,故回补 / 重跑 / catch-up 都安全。
+- 穿山甲无用户/设备维度 → 只能落「汇总/趋势级」,报表带 user_id 过滤时这块收益置空(显示「-」)。
+
+## 文件
+| 项 | 路径 |
+|---|---|
+| 脚本入口 | `scripts/sync_pangle_revenue.py` |
+| 拉取 / 签名 | `app/integrations/pangle_report.py`(签名=参数字典序拼接+secure_key 后 MD5) |
+| 入库表 | `ad_pangle_daily_revenue`(读写在 `app/repositories/ad_pangle_revenue.py`) |
+| 凭证 | `.env` 的 `PANGLE_REPORT_USER_ID` / `PANGLE_REPORT_ROLE_ID` / `PANGLE_REPORT_SECURITY_KEY` |
+| 应用映射 | `.env` 的 `PANGLE_REPORT_SITE_ID_PROD`(5830519)/ `PANGLE_REPORT_SITE_ID_TEST`(5832303) |
+| systemd 单元 | `deploy/pangle-revenue.{service,timer}` |
+
+## 上线前置(只做一次)
+1. **填凭证**:后台「接入中心 → GroMore-API」领 user_id / role_id / Security Key(`secure_key`,**≠ 发奖 m-key**),填进线上 `.env` 的 `PANGLE_REPORT_*`。三项填齐脚本才工作,缺任一 → no-op 退出。
+2. **子账号要授权**:线上若用子账号(role_id ≠ user_id),需主账号给它授「查看全部数据」,否则接口报 **118**(无权限)。本人自查自己(user_id=role_id)无此问题。
+3. 凭证泄露:后台「重置 key 值」即可,改完同步线上 `.env` 重跑。
+
+## 部署(Linux 服务器,需 root)
+```bash
+sudo cp deploy/pangle-revenue.{service,timer} /etc/systemd/system/
+sudo systemctl daemon-reload && sudo systemctl enable --now pangle-revenue.timer
+systemctl list-timers pangle-revenue.timer   # 确认下次触发时间(应是次日 10:30)
+```
+
+## 怎么看健康 / 手动跑一次
+```bash
+sudo systemctl start pangle-revenue.service     # 立即手动跑一轮(不等 10:30)
+journalctl -u pangle-revenue -n 30 --no-pager   # 看日志:拉取区间 / 入库行数 / 新增更新 / 预估收益合计
+```
+成功日志形如:`✅ 完成:接口 N 行 → 入库 M 行(跳过 x),新增 a / 更新 b;预估收益合计 ¥19.42`。
+> 看不到收益、提示 `PANGLE_REPORT_* 未配置`→ 回「上线前置」补 `.env`;报 118 → 子账号没授「查看全部数据」。
+
+## 本机 Windows 开发(无 systemd)
+直接手动跑:
+```
+.venv\Scripts\python -m scripts.sync_pangle_revenue            # 拉昨天
+.venv\Scripts\python -m scripts.sync_pangle_revenue --days 3   # 回补近 3 天
+.venv\Scripts\python -m scripts.sync_pangle_revenue --date 2026-06-27          # 指定单天
+.venv\Scripts\python -m scripts.sync_pangle_revenue --start 2026-06-01 --end 2026-06-27   # 区间回补
+```
+
+## 脚本参数
+- 无参:拉**昨天**(北京时间)。timer 用的是 `--days 3`。
+- `--days N`:从昨天起往前回补 N 天(含昨天)。
+- `--date YYYY-MM-DD`:指定单天。
+- `--start / --end`:指定闭区间(跨度 ≤ 31 天,接口上限 1 个月,超了报 114)。
+
+## 注意事项
+- **触发时间**:`OnCalendar=*-*-* 10:30:00`。穿山甲 ~10:00 出数,故别早于 10:00 跑(会拉到空/不全)。
+- **catch-up**:`Persistent=true` 补跑错过的那一轮;叠加 `--days 3`,漏一两天重新触发即自愈。
+- **今天 / 今天以前要分开查**:脚本默认只拉昨天及更早,不混查今天(接口约束),无需关心。
+- **join key 是 `ad_unit_id`(我们配的 104xxx)不是 `code_id`**:`code_id` 是底层各 ADN 代码位,对不上口径;`ad_unit_id='-1'` 是未归因桶。改维度时务必注意(详见脚本头注释)。
+- **`api_revenue` 很稀疏**:测试应用 ADN 没配 Reporting → 全 0,仅 prod 个别位有;`revenue`(预估)才是稳的主力。
+- **DB 无关**:sqlite / postgres 均可(upsert 逐行 select-then-write,不像美团 ETL 需要 PG)。
+- **别和别的触发方式双跑**:本 systemd timer 与「手动 cron / 进程内任务」二选一,虽幂等不会重复入库,纯属多余。
+- **改脚本 / 改部署**:走 git + PR,由有 root 的人部署。

deploy/pangle-revenue.service

@@ -0,0 +1,38 @@
+# 每天拉穿山甲 GroMore T+1 天级收益入库 —— 单轮跑,由 pangle-revenue.timer 每天 10:30 触发。
+# 落 ad_pangle_daily_revenue 表,供 admin 广告收益报表的「穿山甲后台收益(T+1)」区块。
+#
+# 仅用于 Linux 服务器;本机 Windows 开发无 systemd,直接手动跑脚本即可:
+#   .venv\Scripts\python -m scripts.sync_pangle_revenue            # 拉昨天(北京时间)
+#   .venv\Scripts\python -m scripts.sync_pangle_revenue --days 3   # 回补近 3 天
+#
+# 部署(服务器):
+#   sudo cp deploy/pangle-revenue.{service,timer} /etc/systemd/system/
+#   sudo systemctl daemon-reload && sudo systemctl enable --now pangle-revenue.timer
+#   # 手动跑一次验证: sudo systemctl start pangle-revenue.service && journalctl -u pangle-revenue -n 30
+#
+# 前置:.env 配好 PANGLE_REPORT_USER_ID / PANGLE_REPORT_ROLE_ID / PANGLE_REPORT_SECURITY_KEY
+#       (后台「接入中心 → GroMore-API」领;子账号需主账号授「查看全部数据」否则接口 118)。
+#       未配齐这三项 → 脚本自动 no-op 退出,免动 timer。
+[Unit]
+Description=Sync Pangle GroMore daily revenue (T+1, one-shot, driven by timer)
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=oneshot
+User=root
+WorkingDirectory=/opt/shaguabijia-app-server
+Environment="PATH=/opt/shaguabijia-app-server/.venv/bin:/usr/bin:/bin"
+EnvironmentFile=/opt/shaguabijia-app-server/.env
+# 默认拉昨天;--days 3 回补近 3 天(幂等 upsert,应对偶发漏跑 + 穿山甲对历史数据订正,重跑无害)。
+ExecStart=/opt/shaguabijia-app-server/.venv/bin/python -m scripts.sync_pangle_revenue --days 3
+SyslogIdentifier=pangle-revenue
+# 仅几个 HTTP 请求 + 小批量入库,通常数秒;给 10min 硬超时防穿山甲接口卡死。
+TimeoutStartSec=600
+
+# 与主服务 shaguabijia-app-server.service 同款加固。
+NoNewPrivileges=true
+PrivateTmp=true
+ProtectSystem=strict
+ReadWritePaths=/opt/shaguabijia-app-server
+ProtectHome=true

deploy/pangle-revenue.timer

@@ -0,0 +1,14 @@
+# 每天 10:30 触发一次穿山甲 GroMore T+1 收益拉取入库(Linux 服务器用)。
+# 见 pangle-revenue.service 顶部注释的部署步骤。
+[Unit]
+Description=Run Pangle GroMore daily revenue sync at 10:30
+
+[Timer]
+# 穿山甲 T+1、次日约 10:00 出数;10:30 触发留 30min 余量。要错开整点扎堆可微调到 10:35。
+OnCalendar=*-*-* 10:30:00
+# 服务器宕机/重启后,补跑错过的那一轮(而不是干等次日);叠加 --days 3 回补,漏一两天能自愈。
+Persistent=true
+AccuracySec=1min
+
+[Install]
+WantedBy=timers.target

scripts/publish_apk.sh

@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+# 编 release 正式包并发布到官网下载位 data/media/shaguabijia.apk。
+#
+# 背景:落地页 dl.html「官网下载」按钮指向 /media/shaguabijia.apk(见 app/main.py download_apk 路由)。
+# 该 apk 不入 git(.gitignore 忽略 *.apk),也没有 CI 自动放 —— 以前全靠手动 cp,常忘/放成 debug 包。
+# 本脚本把"编 release + 放到位"固化成一条命令。发版时跑一次即可。
+#
+# 用法:  bash scripts/publish_apk.sh
+# 产物:  <app-server>/data/media/shaguabijia.apk(release 签名、指向生产后端的正式包)
+#
+# 注意:① 需要 app/jishisongfu-release.jks 存在(release 签名,仅 CTO 持有);缺失会编译失败。
+#       ② 服务器部署不在本脚本职责内 —— 它只把 apk 放到本仓 data/media/;上线由部署流程把
+#          data/media/ 同步到生产(或 nginx serve 同目录)。
+set -euo pipefail
+
+# 路径全部相对脚本位置算,跟 CWD 无关。
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SERVER_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
+ANDROID_DIR="$(cd "$SERVER_DIR/../shaguabijia-app-android" && pwd)"
+DEST="$SERVER_DIR/data/media/shaguabijia.apk"
+APK_OUT="$ANDROID_DIR/app/build/outputs/apk/release/app-release.apk"
+
+# Android Studio 自带 JBR(本机构建环境约定)。已设 JAVA_HOME 则尊重现有值。
+export JAVA_HOME="${JAVA_HOME:-D:/android-studio/jbr}"
+
+echo "[publish_apk] Android 工程: $ANDROID_DIR"
+if [ ! -f "$ANDROID_DIR/app/jishisongfu-release.jks" ]; then
+  echo "[publish_apk] ✗ 缺 app/jishisongfu-release.jks(release 签名),无法出正式包。" >&2
+  exit 1
+fi
+
+echo "[publish_apk] 编 release 包(assembleRelease,R8+release 签名,BASE_URL=生产)…"
+( cd "$ANDROID_DIR" && ./gradlew :app:assembleRelease )
+
+if [ ! -f "$APK_OUT" ]; then
+  echo "[publish_apk] ✗ 没找到产物 $APK_OUT" >&2
+  exit 1
+fi
+
+mkdir -p "$(dirname "$DEST")"
+cp "$APK_OUT" "$DEST"
+SIZE_MB=$(( $(wc -c < "$DEST") / 1024 / 1024 ))
+echo "[publish_apk] ✓ 已发布 → $DEST (${SIZE_MB}MB)"
+echo "[publish_apk]   官网下载链接(生产):https://app-api.shaguabijia.com/media/shaguabijia.apk"
+echo "[publish_apk]   部署:把 data/media/ 同步到生产服务器(本脚本不负责上线)。"

tests/test_admin_read.py

@@ -66,6 +66,7 @@ def test_dashboard_overview(admin_client: TestClient, admin_token: str) -> None:
     assert "success_rate" in data["comparison"]
     assert data["cps"]["available"] is True
     assert "meituan_order_count" in data["cps"]
+    assert "jd_order_count" in data["cps"]
 
 
 def test_user_list_and_detail(admin_client: TestClient, admin_token: str) -> None:

tests/test_cps_admin.py

@@ -11,6 +11,7 @@ from app.admin.repositories import admin_user as admin_repo
 from app.admin.repositories import cps as cps_repo
 from app.db.session import SessionLocal
 from app.models.cps_link import CpsClick
+from app.models.cps_order import CpsOrder
 from app.models.cps_wx_user import CpsWxUser
 from app.repositories import cps_link as cps_link_repo
 
@@ -180,3 +181,73 @@ def test_day_users_cross_year(admin_client: TestClient, admin_token: str) -> Non
     assert len(users) == 1
     assert users[0]["openid"] == openid
     assert users[0]["visit_count"] == 5  # 次年 01-01 那条被时间窗排除
+
+
+def test_jd_reconcile_updates_dashboard(
+    admin_client: TestClient, admin_token: str, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    """京东拉单:按订单行入库;大盘只统计有效 validCode 的佣金。"""
+
+    def fake_query_order_rows(**kwargs):
+        start = kwargs["start_time"].astimezone(_BJ)
+        if start.hour != 10 or kwargs["page_index"] != 1:
+            return {"rows": [], "has_more": False}
+        return {
+            "rows": [
+                {
+                    "id": "pytest-jd-row-valid",
+                    "orderId": "pytest-jd-order-1",
+                    "skuId": "sku-1",
+                    "skuName": "京东测试商品",
+                    "orderTime": "2026-06-25 10:10:00",
+                    "modifyTime": "2026-06-25 10:20:00",
+                    "validCode": "16",
+                    "estimateCosPrice": "19.90",
+                    "estimateFee": "1.23",
+                    "actualFee": "2.34",
+                    "commissionRate": "10.00",
+                },
+                {
+                    "id": "pytest-jd-row-invalid",
+                    "orderId": "pytest-jd-order-2",
+                    "skuId": "sku-2",
+                    "skuName": "京东无效订单",
+                    "orderTime": "2026-06-25 10:15:00",
+                    "modifyTime": "2026-06-25 10:25:00",
+                    "validCode": "4",
+                    "estimateCosPrice": "9.90",
+                    "estimateFee": "0.50",
+                    "commissionRate": "5.00",
+                },
+            ],
+            "has_more": False,
+        }
+
+    monkeypatch.setattr("app.integrations.jd_union.query_order_rows", fake_query_order_rows)
+    r = admin_client.post(
+        "/admin/api/cps/orders/reconcile",
+        params={
+            "platform": "jd",
+            "date_from": "2026-06-25",
+            "date_to": "2026-06-25",
+            "query_time_type": 1,
+        },
+        headers=_auth(admin_token),
+    )
+    assert r.status_code == 200, r.text
+    assert r.json()["fetched"] == 2
+
+    with SessionLocal() as db:
+        rows = db.query(CpsOrder).filter(CpsOrder.platform == "jd").all()
+        assert len([o for o in rows if o.order_id.startswith("jd:pytest-jd-row")]) == 2
+
+    overview = admin_client.get(
+        "/admin/api/stats/overview",
+        params={"date_from": "2026-06-25", "date_to": "2026-06-25"},
+        headers=_auth(admin_token),
+    )
+    assert overview.status_code == 200, overview.text
+    cps = overview.json()["cps"]
+    assert cps["jd_order_count"] >= 1
+    assert cps["jd_commission_cents"] >= 234
+    assert cps["jd_invalid_count"] >= 1