Merge remote-tracking branch 'origin/main' into feat/ops-config-ad-flags-reconcile

alembic/versions/b3f1a2c4d5e6_user_username_and_default_nickname.py

@@ -0,0 +1,79 @@
+"""user.username(对外展示账号 ID)+ 默认昵称,并回填存量用户
+
+Revision ID: b3f1a2c4d5e6
+Revises: 45047b5a884c
+Create Date: 2026-06-16 12:00:00.000000
+
+加 user.username(11 位纯数字、首位非 1 与手机号天然区分、全局唯一)。存量用户:
+生成唯一 username,昵称为空的补 9 位字母数字随机昵称。
+迁移自包含(不 import app 业务代码,逻辑冻结为当时快照)。
+"""
+import secrets
+import string
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'b3f1a2c4d5e6'
+down_revision: Union[str, Sequence[str], None] = '45047b5a884c'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+_USERNAME_FIRST = "23456789"      # 首位避前导 0、避 1(手机号都以 1 开头)
+_USERNAME_DIGITS = "0123456789"
+_NICKNAME_ALPHABET = string.ascii_letters + string.digits
+
+
+def _gen_username() -> str:
+    return secrets.choice(_USERNAME_FIRST) + "".join(
+        secrets.choice(_USERNAME_DIGITS) for _ in range(10)
+    )
+
+
+def _gen_nickname() -> str:
+    return "".join(secrets.choice(_NICKNAME_ALPHABET) for _ in range(9))
+
+
+def upgrade() -> None:
+    # 1. 先加可空列(存量行此刻还没值)
+    with op.batch_alter_table('user', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('username', sa.String(length=11), nullable=True))
+
+    # 2. 回填存量:每人一个唯一 username;昵称为空的补随机昵称。
+    #    表里 username 原本全空,本批用 used 防互撞即可(无既有非空值需规避)。
+    #    "user" 是 PostgreSQL 保留字,必须加双引号(SQLite 也接受双引号标识符)。
+    bind = op.get_bind()
+    rows = bind.execute(sa.text('SELECT id, nickname FROM "user"')).fetchall()
+    used = set()
+    for row in rows:
+        uid, nick = row[0], row[1]
+        while True:
+            uname = _gen_username()
+            if uname not in used:
+                used.add(uname)
+                break
+        if nick is None or not str(nick).strip():
+            bind.execute(
+                sa.text('UPDATE "user" SET username = :u, nickname = :n WHERE id = :i'),
+                {"u": uname, "n": _gen_nickname(), "i": uid},
+            )
+        else:
+            bind.execute(
+                sa.text('UPDATE "user" SET username = :u WHERE id = :i'),
+                {"u": uname, "i": uid},
+            )
+
+    # 3. 收紧:NOT NULL + 唯一索引(对齐模型 unique=True, index=True)
+    with op.batch_alter_table('user', schema=None) as batch_op:
+        batch_op.alter_column('username', existing_type=sa.String(length=11), nullable=False)
+        batch_op.create_index('ix_user_username', ['username'], unique=True)
+
+
+def downgrade() -> None:
+    with op.batch_alter_table('user', schema=None) as batch_op:
+        batch_op.drop_index('ix_user_username')
+        batch_op.drop_column('username')

alembic/versions/cps_link_tables.py

@@ -0,0 +1,61 @@
+"""cps_link / cps_click tables (群发短链 + 点击统计)
+
+Revision ID: cps_link_tables
+Revises: cps_tables
+Create Date: 2026-06-16 13:20:00.000000
+
+群发券链接套一层 /c/{code} 做点击统计:cps_link(短码→美团目标) + cps_click(点击事件)。
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+revision: str = "cps_link_tables"
+down_revision: Union[str, Sequence[str], None] = "cps_tables"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+_NOW = sa.text("CURRENT_TIMESTAMP")
+
+
+def upgrade() -> None:
+    op.create_table(
+        "cps_link",
+        sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
+        sa.Column("code", sa.String(length=16), nullable=False),
+        sa.Column("group_id", sa.Integer(), nullable=False),
+        sa.Column("activity_id", sa.Integer(), nullable=False),
+        sa.Column("sid", sa.String(length=64), nullable=False),
+        sa.Column("platform", sa.String(length=20), nullable=False, server_default="meituan"),
+        sa.Column("target_url", sa.String(length=1024), nullable=False),
+        sa.Column("created_at", sa.DateTime(timezone=True), server_default=_NOW, nullable=False),
+        sa.PrimaryKeyConstraint("id"),
+        sa.UniqueConstraint("code", name="uq_cps_link_code"),
+    )
+    op.create_index("ix_cps_link_code", "cps_link", ["code"])
+    op.create_index("ix_cps_link_group_id", "cps_link", ["group_id"])
+    op.create_index("ix_cps_link_activity_id", "cps_link", ["activity_id"])
+    op.create_index("ix_cps_link_sid", "cps_link", ["sid"])
+
+    op.create_table(
+        "cps_click",
+        sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
+        sa.Column("link_id", sa.Integer(), nullable=False),
+        sa.Column("group_id", sa.Integer(), nullable=False),
+        sa.Column("sid", sa.String(length=64), nullable=False),
+        sa.Column("ip", sa.String(length=64), nullable=True),
+        sa.Column("ua", sa.String(length=512), nullable=True),
+        sa.Column("clicked_at", sa.DateTime(timezone=True), server_default=_NOW, nullable=False),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    op.create_index("ix_cps_click_link_id", "cps_click", ["link_id"])
+    op.create_index("ix_cps_click_group_id", "cps_click", ["group_id"])
+    op.create_index("ix_cps_click_sid", "cps_click", ["sid"])
+    op.create_index("ix_cps_click_clicked_at", "cps_click", ["clicked_at"])
+
+
+def downgrade() -> None:
+    op.drop_table("cps_click")
+    op.drop_table("cps_link")

alembic/versions/cps_tables.py

@@ -0,0 +1,92 @@
+"""cps_group / cps_activity / cps_order tables (CPS 分发与对账)
+
+Revision ID: cps_tables
+Revises: b3f1a2c4d5e6
+Create Date: 2026-06-16 12:40:00.000000
+
+群发 CPS 优惠券的分发与对账:cps_group(群=sid) + cps_activity(可推广活动池) +
+cps_order(美团 query_order 按 sid 拉回的订单明细)。金额统一存「分」。
+order_id 全局唯一(reconcile 按它 upsert,订单状态会变则更新)。
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+
+revision: str = "cps_tables"
+down_revision: Union[str, Sequence[str], None] = "b3f1a2c4d5e6"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+_NOW = sa.text("CURRENT_TIMESTAMP")
+
+
+def upgrade() -> None:
+    op.create_table(
+        "cps_group",
+        sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
+        sa.Column("sid", sa.String(length=64), nullable=False),
+        sa.Column("name", sa.String(length=128), nullable=False),
+        sa.Column("member_count", sa.Integer(), nullable=True),
+        sa.Column("status", sa.String(length=20), nullable=False, server_default="active"),
+        sa.Column("remark", sa.String(length=256), nullable=True),
+        sa.Column("created_at", sa.DateTime(timezone=True), server_default=_NOW, nullable=False),
+        sa.PrimaryKeyConstraint("id"),
+        sa.UniqueConstraint("sid", name="uq_cps_group_sid"),
+    )
+    op.create_index("ix_cps_group_sid", "cps_group", ["sid"])
+
+    op.create_table(
+        "cps_activity",
+        sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
+        sa.Column("platform", sa.String(length=20), nullable=False, server_default="meituan"),
+        sa.Column("name", sa.String(length=128), nullable=False),
+        sa.Column("act_id", sa.String(length=64), nullable=True),
+        sa.Column("product_view_sign", sa.String(length=128), nullable=True),
+        sa.Column("status", sa.String(length=20), nullable=False, server_default="active"),
+        sa.Column("remark", sa.String(length=256), nullable=True),
+        sa.Column("created_at", sa.DateTime(timezone=True), server_default=_NOW, nullable=False),
+        sa.PrimaryKeyConstraint("id"),
+    )
+
+    op.create_table(
+        "cps_order",
+        sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
+        sa.Column("order_id", sa.String(length=64), nullable=False),
+        sa.Column("sid", sa.String(length=64), nullable=True),
+        sa.Column("act_id", sa.String(length=64), nullable=True),
+        sa.Column("biz_line", sa.Integer(), nullable=True),
+        sa.Column("trade_type", sa.Integer(), nullable=True),
+        sa.Column("pay_price_cents", sa.Integer(), nullable=True),
+        sa.Column("commission_cents", sa.Integer(), nullable=True),
+        sa.Column("commission_rate", sa.String(length=16), nullable=True),
+        sa.Column("refund_price_cents", sa.Integer(), nullable=True),
+        sa.Column("refund_profit_cents", sa.Integer(), nullable=True),
+        sa.Column("mt_status", sa.String(length=8), nullable=True),
+        sa.Column("invalid_reason", sa.String(length=128), nullable=True),
+        sa.Column("product_name", sa.String(length=512), nullable=True),
+        sa.Column("pay_time", sa.DateTime(timezone=True), nullable=True),
+        sa.Column("mt_update_time", sa.DateTime(timezone=True), nullable=True),
+        sa.Column(
+            "raw",
+            sa.JSON().with_variant(postgresql.JSONB(), "postgresql"),
+            nullable=False,
+        ),
+        sa.Column("first_seen", sa.DateTime(timezone=True), server_default=_NOW, nullable=False),
+        sa.Column("updated_at", sa.DateTime(timezone=True), server_default=_NOW, nullable=False),
+        sa.PrimaryKeyConstraint("id"),
+        sa.UniqueConstraint("order_id", name="uq_cps_order_order_id"),
+    )
+    op.create_index("ix_cps_order_order_id", "cps_order", ["order_id"])
+    op.create_index("ix_cps_order_sid", "cps_order", ["sid"])
+    op.create_index("ix_cps_order_act_id", "cps_order", ["act_id"])
+    op.create_index("ix_cps_order_mt_status", "cps_order", ["mt_status"])
+    op.create_index("ix_cps_order_pay_time", "cps_order", ["pay_time"])
+
+
+def downgrade() -> None:
+    op.drop_table("cps_order")
+    op.drop_table("cps_activity")
+    op.drop_table("cps_group")

alembic/versions/cps_v2_platforms.py

@@ -0,0 +1,61 @@
+"""cps v2: 活动 payload(淘口令/京东链接) + 群多平台/sid 可空 + 点击 event_type
+
+Revision ID: cps_v2_platforms
+Revises: cps_link_tables
+Create Date: 2026-06-17 11:00:00.000000
+
+接入淘宝/京东:
+- cps_activity.payload   淘宝整段淘口令文本 / 京东推广链接(美团仍用 act_id)
+- cps_group.platforms    该群发哪些平台(多选);sid 改可空(纯淘宝/京东无 sid)
+- cps_link.sid 可空 + target_url 加长(淘口令较长)
+- cps_click.event_type   visit / copy(淘宝落地页"复制口令")
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+
+revision: str = "cps_v2_platforms"
+down_revision: Union[str, Sequence[str], None] = "cps_link_tables"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # 活动:淘宝淘口令 / 京东链接
+    op.add_column("cps_activity", sa.Column("payload", sa.Text(), nullable=True))
+
+    # 群:多平台(现有群都是美团,server_default 回填)+ sid 可空
+    op.add_column(
+        "cps_group",
+        sa.Column(
+            "platforms",
+            sa.JSON().with_variant(postgresql.JSONB(), "postgresql"),
+            nullable=False,
+            server_default=sa.text("'[\"meituan\"]'::jsonb"),
+        ),
+    )
+    op.alter_column("cps_group", "sid", existing_type=sa.String(64), nullable=True)
+
+    # link:sid 可空 + target 加长
+    op.alter_column("cps_link", "sid", existing_type=sa.String(64), nullable=True)
+    op.alter_column("cps_link", "target_url", existing_type=sa.String(1024), type_=sa.String(2048))
+
+    # click:sid 可空 + 事件类型
+    op.alter_column("cps_click", "sid", existing_type=sa.String(64), nullable=True)
+    op.add_column(
+        "cps_click",
+        sa.Column("event_type", sa.String(16), nullable=False, server_default="visit"),
+    )
+
+
+def downgrade() -> None:
+    op.drop_column("cps_click", "event_type")
+    op.alter_column("cps_click", "sid", existing_type=sa.String(64), nullable=False)
+    op.alter_column("cps_link", "target_url", existing_type=sa.String(2048), type_=sa.String(1024))
+    op.alter_column("cps_link", "sid", existing_type=sa.String(64), nullable=False)
+    op.drop_column("cps_group", "platforms")
+    op.alter_column("cps_group", "sid", existing_type=sa.String(64), nullable=False)
+    op.drop_column("cps_activity", "payload")

app/admin/main.py

@@ -19,6 +19,7 @@ from app.admin.routers.admins import router as admins_router
 from app.admin.routers.audit import router as audit_router
 from app.admin.routers.auth import router as auth_router
 from app.admin.routers.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.ops_stat_config import router as ops_stat_config_router
 from app.admin.routers.feedback import router as feedback_router
@@ -90,5 +91,6 @@ admin_app.include_router(feedback_router)
 admin_app.include_router(admins_router)
 admin_app.include_router(audit_router)
 admin_app.include_router(config_router)
+admin_app.include_router(cps_router)
 admin_app.include_router(ad_audit_router)
 admin_app.include_router(ad_revenue_router)

app/admin/repositories/cps.py

@@ -0,0 +1,308 @@
+"""admin CPS 数据访问:群/活动 CRUD + 美团订单拉单入库(对账) + 按群统计聚合。
+
+美团 query_order 返回的金额是「元」字符串、时间是秒级时间戳,这里统一转「分」+ tz-aware。
+统计在 Python 侧聚合(订单量级小、admin 低频),逻辑清晰、跨 PG/SQLite 无 SQL 方言坑。
+"""
+from __future__ import annotations
+
+from datetime import datetime, timezone
+from decimal import Decimal, InvalidOperation
+from uuid import uuid4
+
+from sqlalchemy import desc, select
+from sqlalchemy.orm import Session
+
+from app.admin.repositories.queries import _as_utc, offset_paginate
+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_order import CpsOrder
+
+# 美团订单状态:取消(4)/风控(5)不计佣金;结算(6)为佣金真正到账
+_INVALID_STATUS = {"4", "5"}
+_SETTLED_STATUS = "6"
+
+
+# ───────────── 单位换算 ─────────────
+def _yuan_to_cents(v: object) -> int | None:
+    """「元」字符串/数 → 分。None / 空 / 字面 "null" → None。"""
+    if v is None:
+        return None
+    s = str(v).strip()
+    if not s or s.lower() == "null":
+        return None
+    try:
+        return int((Decimal(s) * 100).to_integral_value())
+    except (InvalidOperation, ValueError):
+        return None
+
+
+def _ts_to_dt(ts: object) -> datetime | None:
+    """秒级时间戳 → tz-aware UTC datetime(绝对时刻,前端按北京展示)。"""
+    if not ts:
+        return None
+    try:
+        return datetime.fromtimestamp(int(ts), tz=timezone.utc)
+    except (ValueError, OSError, TypeError):
+        return None
+
+
+# ───────────── 群 ─────────────
+def get_group(db: Session, group_id: int) -> CpsGroup | None:
+    return db.get(CpsGroup, group_id)
+
+
+def get_group_by_sid(db: Session, sid: str) -> CpsGroup | None:
+    return db.execute(select(CpsGroup).where(CpsGroup.sid == sid)).scalar_one_or_none()
+
+
+def list_groups(
+    db: Session, *, keyword: str | None = None, status: str | None = None,
+    limit: int = 20, cursor: int | None = None,
+) -> tuple[list[CpsGroup], int | None, int]:
+    stmt = select(CpsGroup)
+    if keyword and keyword.strip():
+        kw = f"%{keyword.strip()}%"
+        stmt = stmt.where(CpsGroup.name.ilike(kw) | CpsGroup.sid.ilike(kw))
+    if status:
+        stmt = stmt.where(CpsGroup.status == status)
+    return offset_paginate(db, stmt, (desc(CpsGroup.id),), limit=limit, cursor=cursor)
+
+
+def create_group(
+    db: Session, *, name: str, platforms: list[str], sid: str | None = None,
+    member_count: int | None = None, remark: str | None = None, commit: bool = True,
+) -> CpsGroup:
+    """建群。含 meituan 才有 sid(留空自动 g<id>);纯淘宝/京东 sid=None(那俩不支持 sid)。"""
+    has_meituan = "meituan" in (platforms or [])
+    # 含美团:用填的 sid,或临时占位待回填 g<id>;不含美团:sid 恒 None
+    seed_sid = (sid or f"tmp{uuid4().hex[:20]}") if has_meituan else None
+    group = CpsGroup(
+        name=name,
+        platforms=list(platforms or []),
+        sid=seed_sid,
+        member_count=member_count,
+        remark=remark,
+    )
+    db.add(group)
+    db.flush()
+    if has_meituan and not sid:
+        group.sid = f"g{group.id}"
+        db.flush()
+    if commit:
+        db.commit()
+        db.refresh(group)
+    return group
+
+
+def update_group(
+    db: Session, group: CpsGroup, *, name: str | None = None,
+    platforms: list[str] | None = None,
+    member_count: int | None = None, status: str | None = None,
+    remark: str | None = None, commit: bool = True,
+) -> CpsGroup:
+    if name is not None:
+        group.name = name
+    if platforms is not None:
+        group.platforms = list(platforms)
+    if member_count is not None:
+        group.member_count = member_count
+    if status is not None:
+        group.status = status
+    if remark is not None:
+        group.remark = remark
+    if commit:
+        db.commit()
+        db.refresh(group)
+    else:
+        db.flush()
+    return group
+
+
+# ───────────── 活动 ─────────────
+def get_activity(db: Session, activity_id: int) -> CpsActivity | None:
+    return db.get(CpsActivity, activity_id)
+
+
+def list_activities(
+    db: Session, *, platform: str | None = None, status: str | None = None,
+    limit: int = 20, cursor: int | None = None,
+) -> tuple[list[CpsActivity], int | None, int]:
+    stmt = select(CpsActivity)
+    if platform:
+        stmt = stmt.where(CpsActivity.platform == platform)
+    if status:
+        stmt = stmt.where(CpsActivity.status == status)
+    return offset_paginate(db, stmt, (desc(CpsActivity.id),), limit=limit, cursor=cursor)
+
+
+def create_activity(
+    db: Session, *, name: str, platform: str = "meituan", act_id: str | None = None,
+    product_view_sign: str | None = None, payload: str | None = None,
+    remark: str | None = None, commit: bool = True,
+) -> CpsActivity:
+    activity = CpsActivity(
+        name=name, platform=platform, act_id=act_id,
+        product_view_sign=product_view_sign, payload=payload, remark=remark,
+    )
+    db.add(activity)
+    if commit:
+        db.commit()
+        db.refresh(activity)
+    else:
+        db.flush()
+    return activity
+
+
+# ───────────── 订单(对账) ─────────────
+def _map_order_fields(r: dict) -> dict:
+    """美团 query_order 单条 dataList → CpsOrder 字段(金额转分、时间转 datetime)。"""
+    pn = r.get("productName")
+    if pn and len(pn) > 500:
+        pn = pn[:500]
+    return {
+        "sid": (r.get("sid") or None),
+        "act_id": str(r["actId"]) if r.get("actId") is not None else None,
+        "biz_line": r.get("businessLine"),
+        "trade_type": r.get("tradeType"),
+        "pay_price_cents": _yuan_to_cents(r.get("payPrice")),
+        "commission_cents": _yuan_to_cents(r.get("profit")),
+        "commission_rate": str(r["commissionRate"]) if r.get("commissionRate") is not None else None,
+        "refund_price_cents": _yuan_to_cents(r.get("refundPrice")),
+        "refund_profit_cents": _yuan_to_cents(r.get("refundProfit")),
+        "mt_status": str(r["status"]) if r.get("status") is not None else None,
+        "invalid_reason": (r.get("invalidReason") or None),
+        "product_name": pn or None,
+        "pay_time": _ts_to_dt(r.get("payTime")),
+        "mt_update_time": _ts_to_dt(r.get("updateTime")),
+        "raw": r,
+    }
+
+
+def reconcile_orders(
+    db: Session, *, start_time: int, end_time: int,
+    query_time_type: int = 1, sid: str | None = None, max_pages: int = 200,
+) -> dict:
+    """调美团 query_order 分页拉单 → 按 order_id upsert。返回 {fetched, inserted, updated, pages}。
+
+    订单状态会随时间变(付款→完成→结算/退款),重复拉同一单则更新。max_pages 防异常死循环。
+    """
+    fetched = inserted = updated = pages = 0
+    page = 1
+    while page <= max_pages:
+        resp = meituan.query_order(
+            sid=sid, start_time=start_time, end_time=end_time,
+            query_time_type=query_time_type, page=page, limit=100,
+        )
+        rows = ((resp.get("data") or {}).get("dataList")) or []
+        if not rows:
+            break
+        pages += 1
+        for r in rows:
+            order_id = str(r.get("orderId") or "").strip()
+            if not order_id:
+                continue
+            fetched += 1
+            fields = _map_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 len(rows) < 100:
+            break
+        page += 1
+    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,
+) -> tuple[list[CpsOrder], int | None, int]:
+    stmt = select(CpsOrder)
+    if sid:
+        stmt = stmt.where(CpsOrder.sid == sid)
+    if mt_status:
+        stmt = stmt.where(CpsOrder.mt_status == mt_status)
+    return offset_paginate(db, stmt, (desc(CpsOrder.id),), limit=limit, cursor=cursor)
+
+
+# ───────────── 统计(按群聚合) ─────────────
+def group_stats(
+    db: Session, *, date_from: datetime | None = None, date_to: datetime | None = None,
+) -> list[dict]:
+    """按 sid 聚合订单 + join 群信息。已建但本期无单的活跃群也列出(全 0)。
+    未归群的 sid(历史/其它来源)单独成行 group_id=None。按预估佣金降序。
+    """
+    ostmt = select(CpsOrder)
+    if date_from is not None:
+        ostmt = ostmt.where(CpsOrder.pay_time >= _as_utc(date_from))
+    if date_to is not None:
+        ostmt = ostmt.where(CpsOrder.pay_time <= _as_utc(date_to))
+    orders_by_sid: dict[str | None, list[CpsOrder]] = {}
+    for o in db.execute(ostmt).scalars().all():
+        orders_by_sid.setdefault(o.sid, []).append(o)
+
+    clicks = cps_link_repo.click_stats_by_group(db, date_from=date_from, date_to=date_to)
+    groups = list(db.execute(select(CpsGroup)).scalars().all())
+
+    def _order_agg(items: list[CpsOrder]) -> dict:
+        valid = [o for o in items if o.mt_status not in _INVALID_STATUS]
+        settled = [o for o in items if o.mt_status == _SETTLED_STATUS]
+        canceled = [o for o in items if o.mt_status in _INVALID_STATUS]
+        return {
+            "order_count": len(valid),
+            "settled_count": len(settled),
+            "canceled_count": len(canceled),
+            "gmv_cents": sum(o.pay_price_cents or 0 for o in valid),
+            "est_commission_cents": sum(o.commission_cents or 0 for o in valid),
+            "settled_commission_cents": sum(o.commission_cents or 0 for o in settled),
+        }
+
+    # 淘宝/京东无法对账 → 对账字段全 None(前端显示 "-")
+    _no_recon = {
+        "order_count": None, "settled_count": None, "canceled_count": None,
+        "gmv_cents": None, "est_commission_cents": None, "settled_commission_cents": None,
+    }
+
+    rows: list[dict] = []
+    seen_sids: set[str] = set()
+    for g in groups:
+        if g.status != "active":
+            continue
+        c = clicks.get(g.id) or {}
+        row = {
+            "group_id": g.id, "sid": g.sid, "name": g.name,
+            "platforms": list(g.platforms or []), "member_count": g.member_count,
+            "click_pv": c.get("pv", 0), "click_uv": c.get("uv", 0),
+            "copy_pv": c.get("copy_pv", 0), "copy_uv": c.get("copy_uv", 0),
+        }
+        # 对账只对美团群(有 sid);淘宝/京东 → None
+        if "meituan" in (g.platforms or []) and g.sid:
+            row.update(_order_agg(orders_by_sid.get(g.sid, [])))
+            seen_sids.add(g.sid)
+        else:
+            row.update(_no_recon)
+        rows.append(row)
+
+    # 未归群的历史美团 sid(如 wonderableai):单列,有对账无点击
+    for sid, items in orders_by_sid.items():
+        if sid is None or sid in seen_sids:
+            continue
+        row = {
+            "group_id": None, "sid": sid, "name": sid, "platforms": ["meituan"],
+            "member_count": None, "click_pv": 0, "click_uv": 0, "copy_pv": 0, "copy_uv": 0,
+        }
+        row.update(_order_agg(items))
+        rows.append(row)
+
+    # 佣金降序(None 当 0),次按点击
+    rows.sort(key=lambda x: ((x["est_commission_cents"] or 0), x["click_pv"]), reverse=True)
+    return rows

app/admin/routers/cps.py

@@ -0,0 +1,295 @@
+"""admin CPS 分发与对账:群/活动管理 + 生成落地页短链 + 美团订单对账 + 统计。
+
+平台:meituan(actId+sid 转链 + query_order 对账) / taobao(整段淘口令) / jd(链接)。
+淘宝/京东无 API → 只统计点击(咱落地页 PV/UV + 淘宝复制),对账字段显示 "-"。
+群/活动管理 = operator;订单对账(涉佣金) = finance;只读列表/统计 = 登录即可。
+"""
+from __future__ import annotations
+
+import time
+from datetime import datetime, timedelta, timezone
+from typing import Annotated
+
+from fastapi import APIRouter, Depends, HTTPException, Query, Request
+
+from app.admin.audit import write_audit
+from app.admin.deps import AdminDb, get_client_ip, get_current_admin, require_role
+from app.admin.repositories import cps as cps_repo
+from app.admin.schemas.common import CursorPage
+from app.admin.schemas.cps import (
+    CpsActivityCreate,
+    CpsActivityOut,
+    CpsGroupCreate,
+    CpsGroupOut,
+    CpsGroupStat,
+    CpsGroupUpdate,
+    CpsOrderOut,
+    CpsReconcileResult,
+    CpsReferralLinkItem,
+    CpsReferralLinksOut,
+    CpsReferralLinksRequest,
+    CpsStatsOut,
+)
+from app.core.config import settings
+from app.integrations import meituan
+from app.integrations.meituan import MeituanCpsError
+from app.models.admin import AdminUser
+from app.models.cps_activity import CpsActivity
+from app.models.cps_group import CpsGroup
+from app.repositories import cps_link as cps_link_repo
+
+router = APIRouter(
+    prefix="/admin/api/cps",
+    tags=["admin-cps"],
+    dependencies=[Depends(get_current_admin)],
+)
+
+_VALID_PLATFORMS = {"meituan", "taobao", "jd"}
+
+
+# ───────────── 群 ─────────────
+@router.get("/groups", response_model=CursorPage[CpsGroupOut], summary="群列表")
+def list_groups(
+    db: AdminDb,
+    keyword: Annotated[str | None, Query(max_length=100)] = None,
+    status: Annotated[str | None, Query(pattern="^(active|archived)$")] = None,
+    limit: Annotated[int, Query(ge=1, le=100)] = 20,
+    cursor: Annotated[int | None, Query()] = None,
+) -> CursorPage[CpsGroupOut]:
+    items, next_cursor, total = cps_repo.list_groups(
+        db, keyword=keyword, status=status, limit=limit, cursor=cursor
+    )
+    return CursorPage(
+        items=[CpsGroupOut.model_validate(g) for g in items],
+        next_cursor=next_cursor,
+        total=total,
+    )
+
+
+@router.post("/groups", response_model=CpsGroupOut, summary="新建群")
+def create_group(
+    body: CpsGroupCreate,
+    request: Request,
+    admin: Annotated[AdminUser, Depends(require_role("operator"))],
+    db: AdminDb,
+) -> CpsGroupOut:
+    bad = [p for p in body.platforms if p not in _VALID_PLATFORMS]
+    if bad:
+        raise HTTPException(status_code=400, detail=f"非法平台: {bad}")
+    has_meituan = "meituan" in body.platforms
+    if has_meituan and body.sid and cps_repo.get_group_by_sid(db, body.sid) is not None:
+        raise HTTPException(status_code=409, detail="sid 已存在")
+    group = cps_repo.create_group(
+        db, name=body.name, platforms=body.platforms, sid=body.sid,
+        member_count=body.member_count, remark=body.remark, commit=False,
+    )
+    write_audit(
+        db, admin, action="cps.group.create", target_type="cps_group", target_id=group.id,
+        detail={"name": group.name, "platforms": group.platforms, "sid": group.sid},
+        ip=get_client_ip(request), commit=False,
+    )
+    db.commit()
+    db.refresh(group)
+    return CpsGroupOut.model_validate(group)
+
+
+@router.patch("/groups/{group_id}", response_model=CpsGroupOut, summary="编辑群")
+def update_group(
+    group_id: int,
+    body: CpsGroupUpdate,
+    request: Request,
+    admin: Annotated[AdminUser, Depends(require_role("operator"))],
+    db: AdminDb,
+) -> CpsGroupOut:
+    group = cps_repo.get_group(db, group_id)
+    if group is None:
+        raise HTTPException(status_code=404, detail="群不存在")
+    if body.platforms is not None:
+        bad = [p for p in body.platforms if p not in _VALID_PLATFORMS]
+        if bad:
+            raise HTTPException(status_code=400, detail=f"非法平台: {bad}")
+    cps_repo.update_group(
+        db, group, name=body.name, platforms=body.platforms,
+        member_count=body.member_count, status=body.status, remark=body.remark, commit=False,
+    )
+    write_audit(
+        db, admin, action="cps.group.update", target_type="cps_group", target_id=group_id,
+        detail=body.model_dump(exclude_none=True), ip=get_client_ip(request), commit=False,
+    )
+    db.commit()
+    db.refresh(group)
+    return CpsGroupOut.model_validate(group)
+
+
+# ───────────── 活动 ─────────────
+@router.get("/activities", response_model=CursorPage[CpsActivityOut], summary="活动列表")
+def list_activities(
+    db: AdminDb,
+    platform: Annotated[str | None, Query(max_length=20)] = None,
+    status: Annotated[str | None, Query(pattern="^(active|archived)$")] = None,
+    limit: Annotated[int, Query(ge=1, le=100)] = 20,
+    cursor: Annotated[int | None, Query()] = None,
+) -> CursorPage[CpsActivityOut]:
+    items, next_cursor, total = cps_repo.list_activities(
+        db, platform=platform, status=status, limit=limit, cursor=cursor
+    )
+    return CursorPage(
+        items=[CpsActivityOut.model_validate(a) for a in items],
+        next_cursor=next_cursor,
+        total=total,
+    )
+
+
+@router.post("/activities", response_model=CpsActivityOut, summary="新建活动")
+def create_activity(
+    body: CpsActivityCreate,
+    request: Request,
+    admin: Annotated[AdminUser, Depends(require_role("operator"))],
+    db: AdminDb,
+) -> CpsActivityOut:
+    if body.platform == "meituan":
+        if not body.act_id and not body.product_view_sign:
+            raise HTTPException(status_code=400, detail="美团活动需填 actId 或 productViewSign")
+    else:  # taobao / jd
+        if not body.payload:
+            label = "淘口令" if body.platform == "taobao" else "推广链接"
+            raise HTTPException(status_code=400, detail=f"{body.platform} 活动需填{label}")
+    activity = cps_repo.create_activity(
+        db, name=body.name, platform=body.platform, act_id=body.act_id,
+        product_view_sign=body.product_view_sign, payload=body.payload,
+        remark=body.remark, commit=False,
+    )
+    write_audit(
+        db, admin, action="cps.activity.create", target_type="cps_activity", target_id=activity.id,
+        detail={"name": activity.name, "platform": activity.platform},
+        ip=get_client_ip(request), commit=False,
+    )
+    db.commit()
+    db.refresh(activity)
+    return CpsActivityOut.model_validate(activity)
+
+
+# ───────────── 生成链接(批量,按平台分支) ─────────────
+def _gen_one_link(db, group: CpsGroup, activity: CpsActivity):
+    """给一个活动生成一条落地页 link。美团:转链拿短链(需群 sid);淘宝/京东:用 payload。"""
+    if activity.platform == "meituan":
+        if not group.sid:
+            raise HTTPException(status_code=400, detail=f"群「{group.name}」无 sid,无法生成美团链接")
+        try:
+            resp = meituan.get_referral_link(
+                act_id=activity.act_id, product_view_sign=activity.product_view_sign,
+                sid=group.sid, link_type_list=[1, 2, 3],
+            )
+        except MeituanCpsError as e:
+            raise HTTPException(status_code=502, detail=f"美团转链失败: {e}") from e
+        link_map = {str(k): v for k, v in (resp.get("referralLinkMap") or {}).items()}
+        if not link_map and resp.get("data"):
+            link_map = {"1": resp["data"]}
+        target = link_map.get("2") or link_map.get("1") or link_map.get("3")
+        if not target:
+            raise HTTPException(status_code=502, detail=f"美团未返回有效链接(活动「{activity.name}」)")
+    else:  # taobao(淘口令) / jd(链接)
+        if not activity.payload:
+            raise HTTPException(status_code=400, detail=f"活动「{activity.name}」缺少内容")
+        target = activity.payload
+    return cps_link_repo.create_link(
+        db, group_id=group.id, activity_id=activity.id, sid=group.sid,
+        target_url=target, platform=activity.platform, commit=False,
+    )
+
+
+@router.post("/referral-links", response_model=CpsReferralLinksOut, summary="批量生成落地页短链")
+def generate_referral_links(
+    body: CpsReferralLinksRequest,
+    request: Request,
+    admin: Annotated[AdminUser, Depends(require_role("operator"))],
+    db: AdminDb,
+) -> CpsReferralLinksOut:
+    group = cps_repo.get_group(db, body.group_id)
+    if group is None:
+        raise HTTPException(status_code=404, detail="群不存在")
+    group_platforms = set(group.platforms or [])
+    base = settings.CPS_REDIRECT_BASE.rstrip("/")
+
+    items: list[CpsReferralLinkItem] = []
+    for aid in body.activity_ids:
+        activity = cps_repo.get_activity(db, aid)
+        if activity is None:
+            raise HTTPException(status_code=404, detail=f"活动 {aid} 不存在")
+        if activity.platform not in group_platforms:
+            raise HTTPException(
+                status_code=400,
+                detail=f"活动「{activity.name}」平台({activity.platform})不在群「{group.name}」范围内",
+            )
+        link = _gen_one_link(db, group, activity)
+        items.append(CpsReferralLinkItem(
+            activity_id=activity.id, activity_name=activity.name, platform=activity.platform,
+            redirect_url=f"{base}/c/{link.code}" if base else f"/c/{link.code}", code=link.code,
+        ))
+
+    write_audit(
+        db, admin, action="cps.referral_link.generate", target_type="cps_group", target_id=group.id,
+        detail={"group": group.name, "activity_ids": body.activity_ids, "count": len(items)},
+        ip=get_client_ip(request), commit=False,
+    )
+    db.commit()
+    return CpsReferralLinksOut(group_name=group.name, results=items)
+
+
+# ───────────── 订单对账 ─────────────
+@router.post("/orders/reconcile", response_model=CpsReconcileResult, summary="拉取美团订单对账")
+def reconcile_orders(
+    request: Request,
+    admin: Annotated[AdminUser, Depends(require_role("finance"))],
+    db: AdminDb,
+    days: Annotated[int, Query(ge=1, le=90)] = 7,
+    sid: Annotated[str | None, Query(max_length=64)] = None,
+) -> CpsReconcileResult:
+    now = int(time.time())
+    try:
+        result = cps_repo.reconcile_orders(
+            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={"days": days, "sid": sid, **result}, ip=get_client_ip(request), commit=True,
+    )
+    return CpsReconcileResult(**result)
+
+
+@router.get("/orders", response_model=CursorPage[CpsOrderOut], summary="订单明细")
+def list_orders(
+    db: AdminDb,
+    sid: Annotated[str | None, Query(max_length=64)] = None,
+    mt_status: Annotated[str | None, Query(max_length=8)] = None,
+    limit: Annotated[int, Query(ge=1, le=100)] = 20,
+    cursor: Annotated[int | None, Query()] = None,
+) -> CursorPage[CpsOrderOut]:
+    items, next_cursor, total = cps_repo.list_orders(
+        db, sid=sid, mt_status=mt_status, limit=limit, cursor=cursor
+    )
+    return CursorPage(
+        items=[CpsOrderOut.model_validate(o) for o in items],
+        next_cursor=next_cursor,
+        total=total,
+    )
+
+
+# ───────────── 统计 ─────────────
+@router.get("/stats", response_model=CpsStatsOut, summary="按群对账统计")
+def get_stats(
+    db: AdminDb,
+    days: Annotated[int, Query(ge=1, le=90)] = 30,
+) -> CpsStatsOut:
+    date_to = datetime.now(timezone.utc)
+    date_from = date_to - timedelta(days=days)
+    rows = cps_repo.group_stats(db, date_from=date_from, date_to=date_to)
+    stats = [CpsGroupStat(**r) for r in rows]
+    return CpsStatsOut(
+        groups=stats,
+        total_order_count=sum(s.order_count or 0 for s in stats),
+        total_est_commission_cents=sum(s.est_commission_cents or 0 for s in stats),
+        total_settled_commission_cents=sum(s.settled_commission_cents or 0 for s in stats),
+    )

app/admin/schemas/cps.py

@@ -0,0 +1,139 @@
+"""admin CPS 分发与对账 schemas。金额统一「分」(cents),前端 yuan() 展示。
+
+平台:meituan(actId+sid 转链对账) / taobao(淘口令,只统计点击) / jd(链接,只统计点击)。
+对账类字段对淘宝/京东为 None → 前端显示 "-"(无法对账)。
+"""
+from __future__ import annotations
+
+from datetime import datetime
+
+from pydantic import BaseModel, ConfigDict, Field
+
+
+# ───────────── 群 ─────────────
+class CpsGroupOut(BaseModel):
+    model_config = ConfigDict(from_attributes=True)
+
+    id: int
+    sid: str | None = None  # 仅美团群有
+    name: str
+    platforms: list[str] = Field(default_factory=list)
+    member_count: int | None = None
+    status: str
+    remark: str | None = None
+    created_at: datetime
+
+
+class CpsGroupCreate(BaseModel):
+    name: str = Field(min_length=1, max_length=128)
+    # 该群发哪些平台,至少选一个
+    platforms: list[str] = Field(min_length=1)
+    # 仅当含 meituan 时需要(留空自动生成);纯淘宝/京东不填,后端置 None。
+    sid: str | None = Field(default=None, max_length=64, pattern=r"^[A-Za-z0-9]+$")
+    member_count: int | None = Field(default=None, ge=0)
+    remark: str | None = Field(default=None, max_length=256)
+
+
+class CpsGroupUpdate(BaseModel):
+    name: str | None = Field(default=None, min_length=1, max_length=128)
+    platforms: list[str] | None = None
+    member_count: int | None = Field(default=None, ge=0)
+    status: str | None = Field(default=None, pattern=r"^(active|archived)$")
+    remark: str | None = Field(default=None, max_length=256)
+
+
+# ───────────── 活动 ─────────────
+class CpsActivityOut(BaseModel):
+    model_config = ConfigDict(from_attributes=True)
+
+    id: int
+    platform: str
+    name: str
+    act_id: str | None = None
+    product_view_sign: str | None = None
+    payload: str | None = None  # 淘宝淘口令 / 京东链接
+    status: str
+    remark: str | None = None
+    created_at: datetime
+
+
+class CpsActivityCreate(BaseModel):
+    name: str = Field(min_length=1, max_length=128)
+    platform: str = Field(pattern=r"^(meituan|taobao|jd)$")
+    # 美团:act_id 或 product_view_sign 二选一
+    act_id: str | None = Field(default=None, max_length=64)
+    product_view_sign: str | None = Field(default=None, max_length=128)
+    # 淘宝:整段淘口令文本 / 京东:推广链接
+    payload: str | None = Field(default=None, max_length=4096)
+    remark: str | None = Field(default=None, max_length=256)
+
+
+# ───────────── 生成链接(批量) ─────────────
+class CpsReferralLinksRequest(BaseModel):
+    group_id: int
+    activity_ids: list[int] = Field(min_length=1)
+
+
+class CpsReferralLinkItem(BaseModel):
+    activity_id: int
+    activity_name: str
+    platform: str
+    redirect_url: str  # 我们的落地页 /c/{code}(发群用)
+    code: str
+
+
+class CpsReferralLinksOut(BaseModel):
+    group_name: str
+    results: list[CpsReferralLinkItem]
+
+
+# ───────────── 对账拉单 ─────────────
+class CpsReconcileResult(BaseModel):
+    fetched: int
+    inserted: int
+    updated: int
+    pages: int
+
+
+# ───────────── 订单明细 ─────────────
+class CpsOrderOut(BaseModel):
+    model_config = ConfigDict(from_attributes=True)
+
+    id: int
+    order_id: str
+    sid: str | None = None
+    act_id: str | None = None
+    pay_price_cents: int | None = None
+    commission_cents: int | None = None
+    commission_rate: str | None = None
+    mt_status: str | None = None
+    invalid_reason: str | None = None
+    product_name: str | None = None
+    pay_time: datetime | None = None
+
+
+# ───────────── 统计 ─────────────
+class CpsGroupStat(BaseModel):
+    group_id: int | None = None
+    sid: str | None = None
+    name: str
+    platforms: list[str] = Field(default_factory=list)
+    member_count: int | None = None
+    click_pv: int = 0
+    click_uv: int = 0
+    copy_pv: int = 0   # 淘宝"复制口令"次数
+    copy_uv: int = 0
+    # 对账类:淘宝/京东无法对账 → None(前端显示 "-");美团群为数值
+    order_count: int | None = None
+    settled_count: int | None = None
+    canceled_count: int | None = None
+    gmv_cents: int | None = None
+    est_commission_cents: int | None = None
+    settled_commission_cents: int | None = None
+
+
+class CpsStatsOut(BaseModel):
+    groups: list[CpsGroupStat]
+    total_order_count: int
+    total_est_commission_cents: int
+    total_settled_commission_cents: int

app/api/v1/compare.py

@@ -116,3 +116,11 @@ async def intent_precoupon_step(request: Request) -> dict[str, Any]:
 @router.post("/price/step", summary="外卖比价 Phase 2 步进 (透传到 pricebot)")
 async def price_step(request: Request) -> dict[str, Any]:
     return await _passthrough(request, "/api/price/step")
+
+
+@router.post("/trace/finalize", summary="比价 trace 收尾上云 (透传到 pricebot, 终止/未识别拿 trace_url)")
+async def trace_finalize(request: Request) -> dict[str, Any]:
+    # 用户终止 / Phase1 未识别没走到 done 帧, pricebot 没上云也没回传 trace_url。客户端收尾时
+    # 打这个, _passthrough 按 trace_id 一致性 hash 落到处理这条 trace 的同一 pricebot 进程
+    # (dir_cache 在那, 才能算对 trace 目录), 由后者打包上云返回 {trace_url}。
+    return await _passthrough(request, "/api/trace/finalize")

app/api/v1/compare_record.py

@@ -73,13 +73,20 @@ def list_records(
     db: DbSession,
     limit: int = Query(20, ge=1, le=100),
     cursor: int | None = Query(None, description="上一页末条 id"),
+    include_trace: bool = Query(
+        False,
+        description="客户端开了本机 agent 调试模式时带 true,放行本人记录的 trace_url",
+    ),
 ) -> ComparisonRecordPage:
     items, next_cursor = crud_compare.list_records(
         db, user.id, limit=limit, cursor=cursor
     )
     outs = [ComparisonRecordOut.model_validate(it) for it in items]
-    # 权限闸:未开 debug_trace_enabled 的用户不下发 trace_url(列表页「复制调试链接」靠它)
-    if not user.debug_trace_enabled:
+    # 权限闸:未开 debug_trace_enabled 的用户不下发 trace_url(列表页「复制调试链接」靠它)。
+    # include_trace=true 例外:客户端开了本机 agent 调试模式时带上,放行**本人记录**的 trace_url
+    # ——list_records 只查 user.id 自己的记录,给本人看自己的调试链接无越权,与实时结果页
+    # CompResultScreen「debug 权限 OR 本机 agent 调试」同口径(领导 2026-06-12 拍板)。
+    if not (user.debug_trace_enabled or include_trace):
         for o in outs:
             o.trace_url = None
     return ComparisonRecordPage(items=outs, next_cursor=next_cursor)

app/api/v1/cps_redirect.py

@@ -0,0 +1,138 @@
+"""CPS 群发短链落地:用户点 /c/{code} → 记点击 → 按平台 302 跳 或 返回淘宝落地页。
+
+公网无鉴权(群里任何人点都要能跳/能领)。记点击失败绝不影响用户。
+- 美团/京东:记 visit + 302 跳 target(美团短链 / 京东链接)
+- 淘宝:记 visit + 返回 H5 落地页(整段淘口令复制按钮);点"复制口令"→ POST /c/{code}/copy 记 copy
+"""
+from __future__ import annotations
+
+import json
+
+from fastapi import APIRouter, Depends, Request
+from fastapi.responses import HTMLResponse, RedirectResponse
+from sqlalchemy.orm import Session
+
+from app.db.session import get_db
+from app.models.cps_link import CpsLink
+from app.repositories import cps_link as cps_link_repo
+
+router = APIRouter(tags=["cps-redirect"])
+
+# code 不存在/失效时的兜底落地
+_FALLBACK_URL = "https://www.meituan.com/"
+
+
+def _client_ip(request: Request) -> str | None:
+    xff = request.headers.get("x-forwarded-for")
+    if xff:
+        return xff.split(",")[0].strip()
+    return request.client.host if request.client else None
+
+
+def _record(db: Session, link: CpsLink, request: Request, event_type: str) -> None:
+    try:
+        cps_link_repo.record_click(
+            db, link=link, ip=_client_ip(request),
+            ua=request.headers.get("user-agent"), event_type=event_type,
+        )
+    except Exception:
+        pass  # 记点击失败不阻断
+
+
+@router.get("/c/{code}", summary="群发短链落地(记点击 + 跳转/淘宝落地页)")
+def cps_landing(code: str, request: Request, db: Session = Depends(get_db)):
+    link = cps_link_repo.get_by_code(db, code)
+    if link is None:
+        return RedirectResponse(_FALLBACK_URL, status_code=302)
+    _record(db, link, request, "visit")
+    if link.platform == "taobao":
+        return HTMLResponse(_taobao_landing_html(link.target_url))
+    # 美团短链 / 京东链接:直接 302 跳
+    return RedirectResponse(link.target_url, status_code=302)
+
+
+@router.post("/c/{code}/copy", summary="淘宝落地页点了「复制口令」(记 copy 事件)")
+def cps_copy(code: str, request: Request, db: Session = Depends(get_db)) -> dict:
+    link = cps_link_repo.get_by_code(db, code)
+    if link is not None:
+        _record(db, link, request, "copy")
+    return {"ok": True}
+
+
+def _taobao_landing_html(token: str) -> str:
+    """淘宝落地页 H5(红色喜庆,两步引导,底部复制淘口令按钮)。token 安全嵌入 JS。"""
+    return _TAOBAO_HTML.replace("__TOKEN_JS__", json.dumps(token))
+
+
+_TAOBAO_HTML = """<!DOCTYPE html>
+<html lang="zh">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no">
+<title>淘宝闪购 · 天天领红包</title>
+<style>
+*{margin:0;padding:0;box-sizing:border-box;-webkit-tap-highlight-color:transparent}
+body{font-family:-apple-system,"PingFang SC",sans-serif;background:#fff0ef;color:#333;padding-bottom:120px}
+.banner{background:linear-gradient(180deg,#ff4d4f,#ff7a45);color:#fff;padding:26px 20px 62px;text-align:center;border-radius:0 0 26px 26px}
+.tag{display:inline-block;background:#fff;color:#ff4d4f;font-weight:700;font-size:15px;padding:4px 16px;border-radius:14px;margin-bottom:14px}
+.banner h1{font-size:30px;font-weight:800;line-height:1.25;letter-spacing:1px}
+.banner .pill{display:inline-block;margin-top:14px;background:#ffd54a;color:#a52800;font-weight:700;font-size:14px;padding:6px 18px;border-radius:16px}
+.card{background:#fff;margin:-42px 16px 0;border-radius:18px;padding:22px 18px;box-shadow:0 8px 24px rgba(255,77,79,.12)}
+.card .title{text-align:center;color:#ff4d4f;font-weight:800;font-size:18px;background:linear-gradient(90deg,#fff,#ffe1e1,#fff);padding:9px;border-radius:18px;margin-bottom:16px}
+.step{display:flex;align-items:center;margin:14px 4px;font-size:15px}
+.step .num{flex:none;width:22px;height:22px;border-radius:50%;background:#222;color:#fff;font-size:13px;font-weight:700;display:flex;align-items:center;justify-content:center;margin-right:10px}
+.step b{color:#ff4d4f}
+.redbao{background:linear-gradient(135deg,#ff5b5b,#ff3b3b);border-radius:14px;margin-top:16px;padding:16px}
+.redbao .rb-head{text-align:center;color:#fff;font-size:18px;font-weight:800;margin-bottom:2px}
+.redbao .rb-sub{text-align:center;color:#fff;font-size:12px;opacity:.85;margin-bottom:10px}
+.coupon{background:#fff;color:#ff3b3b;border-radius:10px;padding:11px 14px;display:flex;align-items:center;margin-top:10px}
+.coupon .amt{font-size:24px;font-weight:800;flex:none;width:92px}
+.coupon .amt small{font-size:11px;display:block;color:#999;font-weight:400}
+.coupon .desc{flex:1}
+.coupon .desc .c-t{font-weight:700;font-size:15px;color:#333}
+.coupon .desc .c-s{font-size:11px;color:#999}
+.coupon .go{flex:none;background:#ff3b3b;color:#fff;font-size:13px;padding:6px 14px;border-radius:14px}
+.btn-wrap{position:fixed;left:0;right:0;bottom:0;padding:16px;background:linear-gradient(180deg,rgba(255,240,239,0),#fff0ef 45%)}
+.btn{display:block;width:100%;background:linear-gradient(90deg,#ff5b5b,#ff3b3b);color:#fff;font-size:19px;font-weight:800;text-align:center;padding:16px;border:none;border-radius:30px;box-shadow:0 6px 16px rgba(255,59,59,.4)}
+.btn:active{transform:scale(.98)}
+.toast{position:fixed;left:50%;top:42%;transform:translate(-50%,-50%);background:rgba(0,0,0,.82);color:#fff;padding:12px 22px;border-radius:10px;font-size:15px;opacity:0;transition:opacity .25s;pointer-events:none;z-index:99;white-space:nowrap}
+.toast.show{opacity:1}
+</style>
+</head>
+<body>
+<div class="banner">
+  <div class="tag">淘宝闪购</div>
+  <h1>天天来闪购<br>下单抽免单</h1>
+  <div class="pill">最高 15-15 红包 · 天天可领</div>
+</div>
+<div class="card">
+  <div class="title">最高 15-15 红包  天天可领!</div>
+  <div class="step"><span class="num">1</span><div>第一步:点击下方按钮 <b>复制淘口令</b></div></div>
+  <div class="step"><span class="num">2</span><div>第二步:打开 <b>淘宝 App</b>,自动弹出领取红包</div></div>
+  <div class="redbao">
+    <div class="rb-head">外卖红包 · 今日已到账</div>
+    <div class="rb-sub">明天继续来领哦</div>
+    <div class="coupon"><div class="amt">¥15<small>满15可用</small></div><div class="desc"><div class="c-t">外卖红包</div><div class="c-s">仅限于美食外卖</div></div><div class="go">去使用</div></div>
+    <div class="coupon"><div class="amt">¥7<small>满9可用</small></div><div class="desc"><div class="c-t">外卖红包</div><div class="c-s">仅限于美食外卖</div></div><div class="go">去使用</div></div>
+  </div>
+</div>
+<div class="btn-wrap"><button class="btn" onclick="copyToken()">复制口令去淘宝领红包</button></div>
+<div class="toast" id="toast"></div>
+<script>
+var TOKEN = __TOKEN_JS__;
+function showToast(m){var t=document.getElementById('toast');t.textContent=m;t.classList.add('show');setTimeout(function(){t.classList.remove('show')},2200)}
+function reportCopy(){try{fetch(location.pathname+'/copy',{method:'POST',keepalive:true})}catch(e){}}
+function done(){showToast('复制成功!打开淘宝即可领取');reportCopy()}
+function fallback(){
+  var ta=document.createElement('textarea');ta.value=TOKEN;ta.style.position='fixed';ta.style.opacity='0';
+  document.body.appendChild(ta);ta.focus();ta.select();
+  try{document.execCommand('copy');done()}catch(e){showToast('复制失败,请长按手动复制')}
+  document.body.removeChild(ta);
+}
+function copyToken(){
+  if(navigator.clipboard&&window.isSecureContext){navigator.clipboard.writeText(TOKEN).then(done).catch(fallback)}
+  else{fallback()}
+}
+</script>
+</body>
+</html>"""

app/core/config.py

@@ -210,6 +210,13 @@ class Settings(BaseSettings):
     # MVP 落地页就放 app-server 的 /media 静态目录下(dl.html)。
     INVITE_LANDING_URL: str = "https://app-api.shaguabijia.com/media/dl.html"
 
+    # ===== CPS 群发短链跳转 =====
+    # 群发券链接套一层我们的短链 /c/{code} 做点击统计后 302 跳美团。这里是写进 admin
+    # 生成链接里的对外跳转域名前缀。本地填 http://localhost:8770;生产**强烈建议用独立
+    # 域名**(大量群发会被微信封,别用主 API 域名连累整个 App)。留空 → 跳转端点用请求
+    # 的 Host 兜底拼绝对地址。
+    CPS_REDIRECT_BASE: str = ""
+
     # ===== CORS =====
     CORS_ALLOW_ORIGINS: str = ""
 

app/integrations/meituan.py

@@ -126,13 +126,23 @@ def query_coupon(
 
 def get_referral_link(
     *,
-    product_view_sign: str,
+    product_view_sign: str | None = None,
+    act_id: str | None = None,
     platform: int = 1,
     biz_line: int | None = None,
     sid: str | None = None,
     link_type_list: list[int] | None = None,
 ) -> dict[str, Any]:
-    body: dict[str, Any] = {"productViewSign": product_view_sign}
+    """换推广链接。actId(活动物料)与 productViewSign(商品券)二选一。
+    用 actId 入参时,出参 data 为 null,链接全在 referralLinkMap(实测)。
+    """
+    if not act_id and not product_view_sign:
+        raise MeituanCpsError("act_id 或 product_view_sign 必填其一")
+    body: dict[str, Any] = {}
+    if act_id:
+        body["actId"] = act_id
+    else:
+        body["productViewSign"] = product_view_sign
     if platform == 2:
         body["platform"] = 2
         if biz_line is not None:
@@ -142,3 +152,30 @@ def get_referral_link(
     body["linkTypeList"] = link_type_list or [1, 3]
 
     return _call("/cps_open/common/api/v1/get_referral_link", body)
+
+
+def query_order(
+    *,
+    sid: str | None = None,
+    start_time: int,
+    end_time: int,
+    query_time_type: int = 1,
+    page: int = 1,
+    limit: int = 100,
+) -> dict[str, Any]:
+    """按时间窗(+可选 sid)拉 CPS 订单做对账。实测要点:
+    - 分页是 page / limit(不是 pageNo/pageSize);startTime/endTime 是 10 位秒级时间戳
+    - query_time_type: 1 按支付时间 2 按更新时间
+    - 响应 data.dataList[],每条含 orderId / sid / payPrice(元) / profit(元) /
+      commissionRate / status(2付款 3完成 4取消 5风控 6结算) / payTime(秒) / actId 等
+    """
+    body: dict[str, Any] = {
+        "queryTimeType": query_time_type,
+        "startTime": start_time,
+        "endTime": end_time,
+        "page": page,
+        "limit": limit,
+    }
+    if sid:
+        body["sid"] = sid
+    return _call("/cps_open/common/api/v1/query_order", body)

app/main.py

@@ -20,6 +20,7 @@ from app.api.v1.compare import router as compare_router
 from app.api.v1.compare_milestone import router as compare_milestone_router
 from app.api.v1.compare_record import router as compare_record_router
 from app.api.v1.coupon import router as coupon_router
+from app.api.v1.cps_redirect import router as cps_redirect_router
 from app.api.internal.price import router as internal_price_router
 from app.api.internal.store import router as internal_store_router
 from app.api.v1.feedback import router as feedback_router
@@ -107,6 +108,8 @@ app.include_router(report_router)
 app.include_router(internal_price_router)
 app.include_router(internal_store_router)
 app.include_router(platform_router)
+# CPS 群发短链跳转 /c/{code}(公网无鉴权:记点击 → 302 跳美团)
+app.include_router(cps_redirect_router)
 
 # 用户上传文件(头像)静态服务。生产可改由 nginx 直接 serve MEDIA_ROOT。
 _media_root = Path(settings.MEDIA_ROOT)

app/models/__init__.py

@@ -6,6 +6,10 @@ from app.models.ad_watch_log import AdWatchLog  # noqa: F401
 from app.models.admin import AdminAuditLog, AdminUser  # noqa: F401
 from app.models.app_config import AppConfig  # noqa: F401
 from app.models.comparison import ComparisonRecord  # noqa: F401
+from app.models.cps_activity import CpsActivity  # noqa: F401
+from app.models.cps_group import CpsGroup  # noqa: F401
+from app.models.cps_link import CpsClick, CpsLink  # noqa: F401
+from app.models.cps_order import CpsOrder  # noqa: F401
 from app.models.comparison_milestone import ComparisonMilestoneClaim  # noqa: F401
 from app.models.coupon_state import (  # noqa: F401
     CouponClaimRecord,

app/models/cps_activity.py

@@ -0,0 +1,36 @@
+"""CPS 可推广活动池(cps_activity)。
+
+运营预存常推的活动(券),生成链接时选它,省得每次记 actId。当前只接美团:
+`act_id` = 美团联盟「我要推广-活动推广」第一列的物料 ID。`platform` 预留,接
+淘宝/京东时复用本表(各自的活动标识)。
+"""
+from __future__ import annotations
+
+from datetime import datetime
+
+from sqlalchemy import DateTime, Integer, String, Text, func
+from sqlalchemy.orm import Mapped, mapped_column
+
+from app.db.base import Base
+
+
+class CpsActivity(Base):
+    __tablename__ = "cps_activity"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
+    platform: Mapped[str] = mapped_column(String(20), nullable=False, default="meituan")  # meituan|taobao|jd
+    name: Mapped[str] = mapped_column(String(128), nullable=False)
+    # 美团活动物料 ID(actId);淘宝/京东接入后存各自活动标识。
+    act_id: Mapped[str | None] = mapped_column(String(64), nullable=True)
+    # 美团商品券 productViewSign(与 act_id 二选一转链;多数活动用 act_id)。
+    product_view_sign: Mapped[str | None] = mapped_column(String(128), nullable=True)
+    # 淘宝:整段淘口令文本(落地页原样复制);京东:推广链接(落地页 302 跳)。美团不用这个(用 act_id)。
+    payload: Mapped[str | None] = mapped_column(Text, nullable=True)
+    status: Mapped[str] = mapped_column(String(20), nullable=False, default="active")  # active | archived
+    remark: Mapped[str | None] = mapped_column(String(256), nullable=True)
+    created_at: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True), server_default=func.now(), nullable=False
+    )
+
+    def __repr__(self) -> str:  # pragma: no cover
+        return f"<CpsActivity id={self.id} platform={self.platform} name={self.name!r}>"

app/models/cps_group.py

@@ -0,0 +1,37 @@
+"""CPS 推广群(cps_group)。
+
+每个微信群一条记录,`sid` 是美团联盟二级渠道追踪位(get_referral_link / query_order
+共用):发券时塞进推广链接,订单回来按 sid 归群对账。美团限制 sid 仅字母+数字 ≤64。
+"""
+from __future__ import annotations
+
+from datetime import datetime
+
+from sqlalchemy import JSON, DateTime, Integer, String, func
+from sqlalchemy.dialects.postgresql import JSONB
+from sqlalchemy.orm import Mapped, mapped_column
+
+from app.db.base import Base
+
+
+class CpsGroup(Base):
+    __tablename__ = "cps_group"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
+    # 渠道标识。仅美团需要(sid 追踪);纯淘宝/京东群无 sid(那俩不支持)。含美团时建群分配。
+    sid: Mapped[str | None] = mapped_column(String(64), unique=True, index=True, nullable=True)
+    name: Mapped[str] = mapped_column(String(128), nullable=False)
+    # 该群发哪些平台的券(多选): ["meituan","taobao","jd"]。含 meituan 才需要 sid。
+    platforms: Mapped[list] = mapped_column(
+        JSON().with_variant(JSONB(), "postgresql"), nullable=False, default=list
+    )
+    # 群人数,运营填,作转化率分母(可空)。
+    member_count: Mapped[int | None] = mapped_column(Integer, nullable=True)
+    status: Mapped[str] = mapped_column(String(20), nullable=False, default="active")  # active | archived
+    remark: Mapped[str | None] = mapped_column(String(256), nullable=True)
+    created_at: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True), server_default=func.now(), nullable=False
+    )
+
+    def __repr__(self) -> str:  # pragma: no cover
+        return f"<CpsGroup id={self.id} sid={self.sid!r} name={self.name!r}>"

app/models/cps_link.py

@@ -0,0 +1,57 @@
+"""CPS 群发短链(cps_link)+ 点击事件(cps_click)。
+
+群发券链接套一层我们自己的短链 `/c/{code}`:用户点 → 记一条 cps_click → 302 跳
+target_url(美团短链,微信可打开)。据此统计点击 PV/UV(按群/活动/时段),配合 cps_order
+的下单/佣金做"点击→下单→佣金"漏斗。group_id/sid 在 cps_click 里冗余一份,统计直接按
+群聚合点击、不必 join cps_link。
+"""
+from __future__ import annotations
+
+from datetime import datetime
+
+from sqlalchemy import DateTime, Integer, String, func
+from sqlalchemy.orm import Mapped, mapped_column
+
+from app.db.base import Base
+
+
+class CpsLink(Base):
+    __tablename__ = "cps_link"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
+    # 短码:发群链接 /c/{code} 的 code,全局唯一。
+    code: Mapped[str] = mapped_column(String(16), unique=True, index=True, nullable=False)
+    group_id: Mapped[int] = mapped_column(Integer, index=True, nullable=False)
+    activity_id: Mapped[int] = mapped_column(Integer, index=True, nullable=False)
+    # 仅美团 link 有 sid(渠道追踪);淘宝/京东无 sid。
+    sid: Mapped[str | None] = mapped_column(String(64), index=True, nullable=True)
+    platform: Mapped[str] = mapped_column(String(20), nullable=False, default="meituan")
+    # 跳转/落地目标: 美团短链 / 京东链接(302 跳) / 淘宝整段淘口令文本(H5 落地页复制)。
+    target_url: Mapped[str] = mapped_column(String(2048), nullable=False)
+    created_at: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True), server_default=func.now(), nullable=False
+    )
+
+    def __repr__(self) -> str:  # pragma: no cover
+        return f"<CpsLink id={self.id} code={self.code!r} sid={self.sid!r}>"
+
+
+class CpsClick(Base):
+    __tablename__ = "cps_click"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
+    link_id: Mapped[int] = mapped_column(Integer, index=True, nullable=False)
+    group_id: Mapped[int] = mapped_column(Integer, index=True, nullable=False)  # 冗余,按群聚合快
+    sid: Mapped[str | None] = mapped_column(String(64), index=True, nullable=True)  # 冗余(淘宝/京东无)
+    # 事件类型: visit(进落地页/被跳转) | copy(淘宝落地页点了"复制口令")
+    event_type: Mapped[str] = mapped_column(
+        String(16), nullable=False, default="visit", server_default="visit"
+    )
+    ip: Mapped[str | None] = mapped_column(String(64), nullable=True)
+    ua: Mapped[str | None] = mapped_column(String(512), nullable=True)
+    clicked_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"<CpsClick id={self.id} link_id={self.link_id} group_id={self.group_id}>"

app/models/cps_order.py

@@ -0,0 +1,63 @@
+"""CPS 对账订单(cps_order)。
+
+从美团联盟 query_order 按时间窗拉回、按 sid 归群的订单明细。字段对齐 query_order
+实测返回:
+  - payPrice / profit 是「元」字符串 → 入库统一转「分」(与全站口径一致)
+  - payTime / updateTime 是秒级时间戳 → 入库转 tz-aware datetime
+  - status: 2付款 3完成 4取消 5风控 6结算(取消/风控不计佣金)
+order_id 全局唯一,reconcile 按它 upsert(订单状态会变,重复拉则更新)。
+"""
+from __future__ import annotations
+
+from datetime import datetime
+
+from sqlalchemy import JSON, DateTime, Integer, String, func
+from sqlalchemy.dialects.postgresql import JSONB
+from sqlalchemy.orm import Mapped, mapped_column
+
+from app.db.base import Base
+
+
+class CpsOrder(Base):
+    __tablename__ = "cps_order"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
+    # 美团订单号(加密串),全局唯一,upsert 幂等键。
+    order_id: Mapped[str] = mapped_column(String(64), unique=True, index=True, nullable=False)
+    # 渠道追踪位 = 群 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)
+    biz_line: Mapped[int | None] = mapped_column(Integer, nullable=True)  # 1=外卖
+    trade_type: Mapped[int | None] = mapped_column(Integer, nullable=True)  # 1=cps 2=cpa
+
+    pay_price_cents: Mapped[int | None] = mapped_column(Integer, nullable=True)
+    commission_cents: Mapped[int | None] = mapped_column(Integer, nullable=True)  # 预估佣金(profit)
+    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)
+
+    # 美团订单状态: 2付款 3完成 4取消 5风控 6结算
+    mt_status: Mapped[str | None] = mapped_column(String(8), 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)
+
+    pay_time: Mapped[datetime | None] = mapped_column(
+        DateTime(timezone=True), index=True, nullable=True
+    )
+    mt_update_time: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
+
+    raw: Mapped[dict] = mapped_column(
+        JSON().with_variant(JSONB(), "postgresql"), nullable=False, default=dict
+    )
+    first_seen: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True), server_default=func.now(), nullable=False
+    )
+    updated_at: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True), server_default=func.now(), onupdate=func.now(), nullable=False
+    )
+
+    def __repr__(self) -> str:  # pragma: no cover
+        return (
+            f"<CpsOrder id={self.id} order_id={self.order_id!r} "
+            f"sid={self.sid!r} status={self.mt_status} profit_cents={self.commission_cents}>"
+        )

app/models/user.py

@@ -27,6 +27,10 @@ class User(Base):
     id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
     phone: Mapped[str] = mapped_column(String(20), unique=True, index=True, nullable=False)
 
+    # 对外展示的账号 ID:11 位纯数字、首位非 1(与手机号天然区分——手机号都以 1 开头)、全局唯一、
+    # 创建时随机生成、不可变、不参与登录(登录仍走 phone)。生成见 repositories/user._gen_username。
+    username: Mapped[str] = mapped_column(String(11), unique=True, index=True, nullable=False)
+
     # 注册渠道:jverify / sms。后续加 wechat / apple 时扩
     register_channel: Mapped[str] = mapped_column(String(20), nullable=False, default="jverify")
 

app/repositories/cps_link.py

@@ -0,0 +1,95 @@
+"""CPS 群发短链 + 点击 数据访问(用户侧跳转端点 + admin 生成/统计 共用)。
+
+短码生成去掉易混字符;点击按 (ip, ua) 近似去重 UV。点击量级小、admin 低频,统计在
+Python 侧聚合,跨 PG/SQLite 无方言坑(与 admin cps repo 同风格)。
+"""
+from __future__ import annotations
+
+import secrets
+from datetime import datetime
+
+from sqlalchemy import select
+from sqlalchemy.orm import Session
+
+from app.models.cps_link import CpsClick, CpsLink
+
+# 去掉易混字符 0/O/1/l/I,运营/用户肉眼复制不易错
+_CODE_ALPHABET = "abcdefghijkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789"
+
+
+def _gen_code(n: int = 8) -> str:
+    return "".join(secrets.choice(_CODE_ALPHABET) for _ in range(n))
+
+
+def get_by_code(db: Session, code: str) -> CpsLink | None:
+    return db.execute(select(CpsLink).where(CpsLink.code == code)).scalar_one_or_none()
+
+
+def create_link(
+    db: Session, *, group_id: int, activity_id: int, sid: str | None, target_url: str,
+    platform: str = "meituan", commit: bool = True,
+) -> CpsLink:
+    """生成唯一短码并存库。冲突重试 5 次,仍冲突用 12 位兜底(概率近 0)。"""
+    code = _gen_code()
+    for _ in range(5):
+        if get_by_code(db, code) is None:
+            break
+        code = _gen_code()
+    else:
+        code = _gen_code(12)
+    link = CpsLink(
+        code=code, group_id=group_id, activity_id=activity_id, sid=sid,
+        target_url=target_url, platform=platform,
+    )
+    db.add(link)
+    if commit:
+        db.commit()
+        db.refresh(link)
+    else:
+        db.flush()
+    return link
+
+
+def record_click(
+    db: Session, *, link: CpsLink, ip: str | None = None, ua: str | None = None,
+    event_type: str = "visit",
+) -> None:
+    """记一条点击。event_type: visit(进落地页/被跳转) | copy(淘宝点了"复制口令")。"""
+    db.add(CpsClick(
+        link_id=link.id, group_id=link.group_id, sid=link.sid, event_type=event_type,
+        ip=ip, ua=(ua[:500] if ua else None),
+    ))
+    db.commit()
+
+
+def click_stats_by_group(
+    db: Session, *, date_from: datetime | None = None, date_to: datetime | None = None,
+) -> dict[int, dict]:
+    """按 group_id 聚合点击 → {group_id: {pv, uv, copy_pv, copy_uv}}。
+    visit 计入 pv/uv,copy(淘宝复制口令) 计入 copy_pv/copy_uv;uv 按 (ip, ua) 近似去重。"""
+    stmt = select(CpsClick)
+    if date_from is not None:
+        stmt = stmt.where(CpsClick.clicked_at >= date_from)
+    if date_to is not None:
+        stmt = stmt.where(CpsClick.clicked_at <= date_to)
+    clicks = list(db.execute(stmt).scalars().all())
+
+    agg: dict[int, dict] = {}
+    seen_visit: dict[int, set] = {}
+    seen_copy: dict[int, set] = {}
+    for c in clicks:
+        a = agg.setdefault(c.group_id, {"pv": 0, "uv": 0, "copy_pv": 0, "copy_uv": 0})
+        key = (c.ip, c.ua)
+        if c.event_type == "copy":
+            a["copy_pv"] += 1
+            s = seen_copy.setdefault(c.group_id, set())
+            if key not in s:
+                s.add(key)
+                a["copy_uv"] += 1
+        else:
+            a["pv"] += 1
+            s = seen_visit.setdefault(c.group_id, set())
+            if key not in s:
+                s.add(key)
+                a["uv"] += 1
+    return agg

app/repositories/user.py

@@ -4,6 +4,8 @@
 """
 from __future__ import annotations
 
+import secrets
+import string
 from datetime import datetime, timezone
 
 from sqlalchemy import select
@@ -12,6 +14,50 @@ from sqlalchemy.orm import Session
 from app.models.user import User
 
 
+# ===== 创建时分配的标识:用户名(对外展示账号 ID)+ 默认昵称 =====
+
+# 用户名 = 11 位纯数字,首位 2-9(避前导 0、避 1 与手机号区分),后 10 位 0-9。
+# 空间 8×10^10,创建时随机生成 + 查重去重,全局唯一、不可变、不参与登录。
+_USERNAME_FIRST = "23456789"
+_USERNAME_DIGITS = "0123456789"
+_USERNAME_LEN = 11
+
+# 默认昵称 = 9 位大小写字母 + 数字随机串(创建时给,用户可后续改;不要求唯一)。
+_NICKNAME_ALPHABET = string.ascii_letters + string.digits
+_NICKNAME_LEN = 9
+
+
+def _gen_username() -> str:
+    """随机一个 11 位纯数字、首位非 0/1 的用户名(不保证唯一,唯一性由 _gen_unique_username 兜)。"""
+    return secrets.choice(_USERNAME_FIRST) + "".join(
+        secrets.choice(_USERNAME_DIGITS) for _ in range(_USERNAME_LEN - 1)
+    )
+
+
+def _gen_nickname() -> str:
+    """随机一个 9 位字母+数字的默认昵称。"""
+    return "".join(secrets.choice(_NICKNAME_ALPHABET) for _ in range(_NICKNAME_LEN))
+
+
+def get_user_by_username(db: Session, username: str) -> User | None:
+    return db.execute(
+        select(User).where(User.username == username)
+    ).scalar_one_or_none()
+
+
+def _gen_unique_username(db: Session) -> str:
+    """生成一个库里尚不存在的用户名(仿 invite.ensure_code 的碰撞重试)。
+
+    8×10^10 空间下碰撞极罕见,查重 + 重试足够;并发下的残留碰撞由 username 唯一约束
+    兜底(commit 抛 IntegrityError,与现有 phone 并发同号同级别,概率 ~ 用户数/8e10)。
+    """
+    for _ in range(8):
+        uname = _gen_username()
+        if get_user_by_username(db, uname) is None:
+            return uname
+    raise RuntimeError("生成用户名连续碰撞,请重试")
+
+
 def get_user_by_id(db: Session, user_id: int) -> User | None:
     return db.get(User, user_id)
 
@@ -36,6 +82,8 @@ def upsert_user_for_login(
     if user is None:
         user = User(
             phone=phone,
+            username=_gen_unique_username(db),
+            nickname=_gen_nickname(),
             register_channel=register_channel,
             last_login_at=now,
         )

app/schemas/auth.py

@@ -18,6 +18,8 @@ class UserOut(BaseModel):
     model_config = ConfigDict(from_attributes=True)  # 允许直接 UserOut.model_validate(orm_user)
 
     id: int
+    # 对外展示的账号 ID:11 位纯数字、首位非 1、全局唯一、创建时分配、不可变。区别于登录用的 phone。
+    username: str
     phone: str
     nickname: str | None = None
     avatar_url: str | None = None

scripts/pull_meituan_coupons.py

@@ -202,6 +202,18 @@ def _to_cents(yuan) -> int | None:
         return None
 
 
+def _strip_nul(v):
+    """递归去掉字符串里的 NUL(0x00):PostgreSQL 的 text / jsonb 字段都不接受该字节,
+    美团偶有脏数据(某券文本含 NUL)会让整批 upsert 抛 DataError。入库前统一清洗。"""
+    if isinstance(v, str):
+        return v.replace(chr(0), "")
+    if isinstance(v, dict):
+        return {k: _strip_nul(x) for k, x in v.items()}
+    if isinstance(v, list):
+        return [_strip_nul(x) for x in v]
+    return v
+
+
 def _parse_item(item: dict, source: dict, city_id: str) -> dict | None:
     cpd = item.get("couponPackDetail") or {}
     br = item.get("brandInfo") or {}
@@ -231,7 +243,8 @@ def _parse_item(item: dict, source: dict, city_id: str) -> dict | None:
         dist = None
 
     dedup_raw = f"{brand}|{name}|{price_cents}"
-    return {
+    # 入库前递归清洗 NUL(美团脏数据偶含 0x00,PostgreSQL text/jsonb 拒绝整批 → DataError)
+    return _strip_nul({
         "source": source["code"],
         "platform": source["platform"],
         "biz_line": item.get("bizLine") or cpd.get("bizLine"),
@@ -252,7 +265,7 @@ def _parse_item(item: dict, source: dict, city_id: str) -> dict | None:
         "delivery_distance_m": dist,
         "dedup_key": hashlib.md5(dedup_raw.encode("utf-8")).hexdigest(),
         "raw": item,
-    }
+    })
 
 
 def _pull_one_city(city: dict, index: int, concurrency: int, stagger: float) -> list[dict]:
@@ -372,7 +385,13 @@ def run_once(
                     fails.append(city["name"])
                     print(f"  [fail] {city['name']}: {type(e).__name__}: {str(e)[:60]}")
                     continue
-                up, _dup = _upsert(db, parsed, now)
+                try:
+                    up, _dup = _upsert(db, parsed, now)
+                except Exception as e:  # noqa: BLE001
+                    db.rollback()  # 事务已 abort,必须 rollback 才能继续给下一城复用 Session
+                    fails.append(city["name"])
+                    print(f"  [入库失败] {city['name']}: {type(e).__name__}: {str(e)[:80]}")
+                    continue
                 total_up += up
                 done += 1
                 if done % 20 == 0 or done == n_city:

tests/test_auth.py

@@ -206,3 +206,40 @@ def test_sms_gc_purges_stale_only(monkeypatch) -> None:
     assert "stale" not in sms._codes and "fresh" in sms._codes
     assert "old" not in sms._last_sent and "recent" in sms._last_sent
     assert "yesterday" not in sms._daily_count and "today" in sms._daily_count
+
+
+# ============================ 用户名 / 默认昵称 ============================
+
+def test_login_assigns_username_and_nickname(client) -> None:
+    """新用户创建即分配:11 位纯数字 username(首位非 0/1,与手机号天然区分)+ 9 位字母数字默认昵称。"""
+    phone = "13600136000"
+    client.post("/api/v1/auth/sms/send", json={"phone": phone})
+    r = client.post("/api/v1/auth/sms/login", json={"phone": phone, "code": "123456"})
+    assert r.status_code == 200, r.text
+    user = r.json()["user"]
+
+    uname = user["username"]
+    assert uname.isdigit() and len(uname) == 11          # 11 位纯数字
+    assert uname[0] not in ("0", "1")                     # 无前导 0、与手机号(均以 1 开头)区分
+
+    nick = user["nickname"]
+    assert nick and len(nick) == 9 and nick.isalnum()     # 9 位字母+数字
+
+
+def test_username_stable_and_unique_on_relogin() -> None:
+    """同号重登 username 不变(不可变标识);不同号 username 不同(唯一)。
+    直连 repository 绕开 HTTP 短信冷却。"""
+    from app.db.session import SessionLocal
+    from app.repositories import user as user_repo
+
+    db = SessionLocal()
+    try:
+        a1 = user_repo.upsert_user_for_login(db, phone="13522220001", register_channel="sms")
+        uname_a, id_a = a1.username, a1.id
+        a2 = user_repo.upsert_user_for_login(db, phone="13522220001", register_channel="sms")
+        assert a2.id == id_a and a2.username == uname_a    # 重登:同一行、username 稳定不变
+
+        b = user_repo.upsert_user_for_login(db, phone="13522220002", register_channel="sms")
+        assert b.username != uname_a                        # 不同用户、username 唯一
+    finally:
+        db.close()

tests/test_invite.py

@@ -300,7 +300,7 @@ def test_bind_no_code_no_fingerprint(client) -> None:
 # =====================================================================
 
 def test_invitees_basic(client) -> None:
-    """A 邀 B、C → 列表返 2 条、total=2、没设资料的名字=脱敏手机号、头像 null、金币对。"""
+    """A 邀 B、C → 列表返 2 条、total=2、名字=被邀请人默认昵称(创建即有)、头像 null、金币对。"""
     a = _login(client, "13800002050")
     a_code = _my_code(client, a)
     for phone in ("13800002051", "13800002052"):
@@ -313,9 +313,14 @@ def test_invitees_basic(client) -> None:
     assert body["total"] == 2
     assert body["has_more"] is False
     assert len(body["items"]) == 2
-    # 没设昵称头像 → 名字脱敏手机号、头像 null(不依赖顺序用 set)
+    # 创建即分配默认昵称 → 名字=被邀请人昵称(取实际值对比)、头像 null(不依赖顺序用 set)
+    with SessionLocal() as db:
+        expected_names = {
+            get_user_by_phone(db, "13800002051").nickname,
+            get_user_by_phone(db, "13800002052").nickname,
+        }
     names = {it["display_name"] for it in body["items"]}
-    assert names == {"138****2051", "138****2052"}
+    assert names == expected_names
     assert all(it["avatar_url"] is None for it in body["items"])
     assert all(it["coins"] == INVITE_INVITER_COINS for it in body["items"])
 
@@ -336,9 +341,12 @@ def test_invitees_order_desc(client) -> None:
         ).scalar_one()
         rel_b.created_at = datetime.now(timezone.utc) - timedelta(hours=2)
         db.commit()
+        nick_b = ub.nickname
+        nick_c = get_user_by_phone(db, "13800002062").nickname
     items = client.get("/api/v1/invite/invitees", headers=_auth(a)).json()["items"]
-    assert items[0]["display_name"] == "138****2062"  # C 刚邀,在前
-    assert items[1]["display_name"] == "138****2061"  # B 2 小时前,在后
+    # 创建即有默认昵称 → display_name=被邀请人昵称;本用例核心验证倒序(C 刚邀在前、B 2h 前在后)
+    assert items[0]["display_name"] == nick_c
+    assert items[1]["display_name"] == nick_b
 
 
 def test_invitees_nickname_priority(client) -> None: