feat(compare): 比价记录列表改按创建时间倒序(id 兜底)

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

alembic/versions/8ac524a8ea02_merge_comparison_and_savings_heads.py

@@ -0,0 +1,26 @@
+"""merge comparison and savings heads
+
+Revision ID: 8ac524a8ea02
+Revises: d4e5f6a7b8c9, savings_report_fields
+Create Date: 2026-06-02 09:53:06.924912
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '8ac524a8ea02'
+down_revision: Union[str, Sequence[str], None] = ('d4e5f6a7b8c9', 'savings_report_fields')
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    pass
+
+
+def downgrade() -> None:
+    pass

alembic/versions/9258bddde4ea_新增_price_report_上报更低价表.py

@@ -0,0 +1,65 @@
+"""新增 price_report 上报更低价表
+
+Revision ID: 9258bddde4ea
+Revises: ad60a1b2c3d4
+Create Date: 2026-06-05 10:15:51.508598
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '9258bddde4ea'
+down_revision: Union[str, Sequence[str], None] = 'ad60a1b2c3d4'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('price_report',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('user_id', sa.Integer(), nullable=False),
+    sa.Column('comparison_record_id', sa.Integer(), nullable=True),
+    sa.Column('store_name', sa.String(length=128), nullable=True),
+    sa.Column('dish_summary', sa.String(length=256), nullable=True),
+    sa.Column('original_platform_id', sa.String(length=32), nullable=True),
+    sa.Column('original_platform_name', sa.String(length=32), nullable=True),
+    sa.Column('original_price_cents', sa.Integer(), nullable=True),
+    sa.Column('reported_platform_id', sa.String(length=32), nullable=False),
+    sa.Column('reported_platform_name', sa.String(length=32), nullable=False),
+    sa.Column('reported_price_cents', sa.Integer(), nullable=False),
+    sa.Column('images', sa.JSON(), nullable=False),
+    sa.Column('status', sa.String(length=16), nullable=False),
+    sa.Column('reject_reason', sa.String(length=256), nullable=True),
+    sa.Column('reward_coins', sa.Integer(), nullable=True),
+    sa.Column('reviewed_at', sa.DateTime(timezone=True), nullable=True),
+    sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=False),
+    sa.ForeignKeyConstraint(['comparison_record_id'], ['comparison_record.id'], ),
+    sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    with op.batch_alter_table('price_report', schema=None) as batch_op:
+        batch_op.create_index(batch_op.f('ix_price_report_comparison_record_id'), ['comparison_record_id'], unique=False)
+        batch_op.create_index(batch_op.f('ix_price_report_created_at'), ['created_at'], unique=False)
+        batch_op.create_index(batch_op.f('ix_price_report_status'), ['status'], unique=False)
+        batch_op.create_index(batch_op.f('ix_price_report_user_id'), ['user_id'], unique=False)
+    # 注:autogenerate 另检测到「删除 order_record 表」——那是已降级为审计的历史表
+    #     (model 已移除、库表保留),与本次无关,手动剔除,避免误删他人审计数据。
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    # (对称:upgrade 未删 order_record,downgrade 也不重建它)
+    with op.batch_alter_table('price_report', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_price_report_user_id'))
+        batch_op.drop_index(batch_op.f('ix_price_report_status'))
+        batch_op.drop_index(batch_op.f('ix_price_report_created_at'))
+        batch_op.drop_index(batch_op.f('ix_price_report_comparison_record_id'))
+
+    op.drop_table('price_report')
+    # ### end Alembic commands ###

alembic/versions/ad_ecpm_record.py

@@ -0,0 +1,47 @@
+"""ad_ecpm_record table (广告展示 eCPM 上报记录,内部收益统计/对账)
+
+Revision ID: a1b2c3d4e5f6
+Revises: f01db5d77dac
+Create Date: 2026-05-31 11:30:00.000000
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'a1b2c3d4e5f6'
+down_revision: Union[str, Sequence[str], None] = 'f01db5d77dac'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.create_table(
+        'ad_ecpm_record',
+        sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+        sa.Column('user_id', sa.Integer(), nullable=False),
+        sa.Column('ad_type', sa.String(length=32), nullable=False),
+        sa.Column('adn', sa.String(length=32), nullable=True),
+        sa.Column('slot_id', sa.String(length=64), nullable=True),
+        sa.Column('ecpm_raw', sa.String(length=32), nullable=False),
+        sa.Column('report_date', sa.String(length=10), nullable=False),
+        sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=False),
+        sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
+        sa.PrimaryKeyConstraint('id'),
+    )
+    with op.batch_alter_table('ad_ecpm_record', schema=None) as batch_op:
+        batch_op.create_index(batch_op.f('ix_ad_ecpm_record_user_id'), ['user_id'], unique=False)
+        batch_op.create_index(batch_op.f('ix_ad_ecpm_record_report_date'), ['report_date'], unique=False)
+        batch_op.create_index(batch_op.f('ix_ad_ecpm_record_created_at'), ['created_at'], unique=False)
+
+
+def downgrade() -> None:
+    with op.batch_alter_table('ad_ecpm_record', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_ad_ecpm_record_created_at'))
+        batch_op.drop_index(batch_op.f('ix_ad_ecpm_record_report_date'))
+        batch_op.drop_index(batch_op.f('ix_ad_ecpm_record_user_id'))
+
+    op.drop_table('ad_ecpm_record')

alembic/versions/admin_tables.py

@@ -0,0 +1,65 @@
+"""admin_user + admin_audit_log tables (运营 admin 后台:账号 + 操作审计)
+
+Revision ID: ad60a1b2c3d4
+Revises: 8ac524a8ea02
+Create Date: 2026-06-03 10:00:00.000000
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'ad60a1b2c3d4'
+down_revision: Union[str, Sequence[str], None] = '8ac524a8ea02'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.create_table(
+        'admin_user',
+        sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+        sa.Column('username', sa.String(length=64), nullable=False),
+        sa.Column('password_hash', sa.String(length=255), nullable=False),
+        sa.Column('role', sa.String(length=20), nullable=False, server_default='operator'),
+        sa.Column('status', sa.String(length=20), nullable=False, server_default='active'),
+        sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=False),
+        sa.Column('last_login_at', sa.DateTime(timezone=True), nullable=True),
+        sa.PrimaryKeyConstraint('id'),
+    )
+    with op.batch_alter_table('admin_user', schema=None) as batch_op:
+        batch_op.create_index(batch_op.f('ix_admin_user_username'), ['username'], unique=True)
+
+    op.create_table(
+        'admin_audit_log',
+        sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+        sa.Column('admin_id', sa.Integer(), nullable=False),
+        sa.Column('admin_username', sa.String(length=64), nullable=False),
+        sa.Column('action', sa.String(length=64), nullable=False),
+        sa.Column('target_type', sa.String(length=32), nullable=False),
+        sa.Column('target_id', sa.String(length=64), nullable=True),
+        sa.Column('detail', sa.JSON().with_variant(sa.dialects.postgresql.JSONB(), 'postgresql'), nullable=True),
+        sa.Column('ip', sa.String(length=64), nullable=True),
+        sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=False),
+        sa.ForeignKeyConstraint(['admin_id'], ['admin_user.id'], ),
+        sa.PrimaryKeyConstraint('id'),
+    )
+    with op.batch_alter_table('admin_audit_log', schema=None) as batch_op:
+        batch_op.create_index(batch_op.f('ix_admin_audit_log_admin_id'), ['admin_id'], unique=False)
+        batch_op.create_index(batch_op.f('ix_admin_audit_log_action'), ['action'], unique=False)
+        batch_op.create_index(batch_op.f('ix_admin_audit_log_created_at'), ['created_at'], unique=False)
+
+
+def downgrade() -> None:
+    with op.batch_alter_table('admin_audit_log', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_admin_audit_log_created_at'))
+        batch_op.drop_index(batch_op.f('ix_admin_audit_log_action'))
+        batch_op.drop_index(batch_op.f('ix_admin_audit_log_admin_id'))
+    op.drop_table('admin_audit_log')
+
+    with op.batch_alter_table('admin_user', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_admin_user_username'))
+    op.drop_table('admin_user')

alembic/versions/b7e2c1a9f4d3_comparison_record_best_deeplink.py

@@ -0,0 +1,32 @@
+"""comparison_record 加 best_deeplink(再次比价直达商家深链)
+
+Revision ID: b7e2c1a9f4d3
+Revises: 9258bddde4ea
+Create Date: 2026-06-05
+
+「再次比价」要直达上次最低价平台的商家/商品页。深链(link)在比价时客户端已从剪贴板采到
+(collectedLinks[best_index]),本列把它落库;再次比价时写剪贴板 + launch 该平台 App 直达。
+旧记录无此列值(None) → 前端降级为打开对应 App 首页。
+
+手写迁移(只加一列):autogenerate 会误报"删 order_record"(降级为审计的历史表,model 已移除、
+库表保留),手写规避该噪音。
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+revision: str = "b7e2c1a9f4d3"
+down_revision: Union[str, Sequence[str], None] = "9258bddde4ea"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    with op.batch_alter_table("comparison_record", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("best_deeplink", sa.String(length=1024), nullable=True))
+
+
+def downgrade() -> None:
+    with op.batch_alter_table("comparison_record", schema=None) as batch_op:
+        batch_op.drop_column("best_deeplink")

alembic/versions/comparison_milestone_claim_table.py

@@ -0,0 +1,41 @@
+"""comparison_milestone_claim table (比价战绩里程碑领取记录)
+
+Revision ID: d4e5f6a7b8c9
+Revises: c3d4e5f6a7b8
+Create Date: 2026-05-31 18:00:00.000000
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'd4e5f6a7b8c9'
+down_revision: Union[str, Sequence[str], None] = 'c3d4e5f6a7b8'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.create_table(
+        'comparison_milestone_claim',
+        sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+        sa.Column('user_id', sa.Integer(), nullable=False),
+        sa.Column('milestone', sa.Integer(), nullable=False),
+        sa.Column('coin_awarded', sa.Integer(), nullable=False),
+        sa.Column('claimed_at', sa.DateTime(timezone=True), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=False),
+        sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
+        sa.PrimaryKeyConstraint('id'),
+        sa.UniqueConstraint('user_id', 'milestone', name='uq_compare_milestone_user'),
+    )
+    with op.batch_alter_table('comparison_milestone_claim', schema=None) as batch_op:
+        batch_op.create_index(batch_op.f('ix_comparison_milestone_claim_user_id'), ['user_id'], unique=False)
+
+
+def downgrade() -> None:
+    with op.batch_alter_table('comparison_milestone_claim', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_comparison_milestone_claim_user_id'))
+
+    op.drop_table('comparison_milestone_claim')

alembic/versions/comparison_record_information.py

@@ -0,0 +1,28 @@
+"""comparison_record.information (done 帧文案/失败原因)
+
+Revision ID: c3d4e5f6a7b8
+Revises: b2c3d4e5f6a7
+Create Date: 2026-05-31 18:00:00.000000
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'c3d4e5f6a7b8'
+down_revision: Union[str, Sequence[str], None] = 'b2c3d4e5f6a7'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    with op.batch_alter_table('comparison_record', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('information', sa.String(length=256), nullable=True))
+
+
+def downgrade() -> None:
+    with op.batch_alter_table('comparison_record', schema=None) as batch_op:
+        batch_op.drop_column('information')

alembic/versions/comparison_record_table.py

@@ -0,0 +1,64 @@
+"""comparison_record table (比价记录:每次比价完整明细,「我的比价记录」数据源)
+
+Revision ID: b2c3d4e5f6a7
+Revises: a1b2c3d4e5f6
+Create Date: 2026-05-31 15:00:00.000000
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'b2c3d4e5f6a7'
+down_revision: Union[str, Sequence[str], None] = 'a1b2c3d4e5f6'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.create_table(
+        'comparison_record',
+        sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+        sa.Column('user_id', sa.Integer(), nullable=False),
+        sa.Column('device_id', sa.String(length=64), nullable=True),
+        sa.Column('business_type', sa.String(length=16), nullable=False),
+        sa.Column('trace_id', sa.String(length=64), nullable=False),
+        sa.Column('source_platform_id', sa.String(length=32), nullable=True),
+        sa.Column('source_platform_name', sa.String(length=32), nullable=True),
+        sa.Column('source_package', sa.String(length=128), nullable=True),
+        sa.Column('source_price_cents', sa.Integer(), nullable=True),
+        sa.Column('best_platform_id', sa.String(length=32), nullable=True),
+        sa.Column('best_platform_name', sa.String(length=32), nullable=True),
+        sa.Column('best_price_cents', sa.Integer(), nullable=True),
+        sa.Column('saved_amount_cents', sa.Integer(), nullable=True),
+        sa.Column('is_source_best', sa.Boolean(), nullable=True),
+        sa.Column('store_name', sa.String(length=128), nullable=True),
+        sa.Column('total_dish_count', sa.Integer(), nullable=True),
+        sa.Column('skipped_dish_count', sa.Integer(), nullable=True),
+        sa.Column('status', sa.String(length=16), nullable=False),
+        # PG 上为 JSONB,其它(SQLite)为 JSON——与模型层 with_variant 对齐
+        sa.Column('items', sa.JSON().with_variant(sa.dialects.postgresql.JSONB(), 'postgresql'), nullable=False),
+        sa.Column('comparison_results', sa.JSON().with_variant(sa.dialects.postgresql.JSONB(), 'postgresql'), nullable=False),
+        sa.Column('skipped_dish_names', sa.JSON().with_variant(sa.dialects.postgresql.JSONB(), 'postgresql'), nullable=False),
+        sa.Column('raw_payload', sa.JSON().with_variant(sa.dialects.postgresql.JSONB(), 'postgresql'), nullable=True),
+        sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=False),
+        sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
+        sa.PrimaryKeyConstraint('id'),
+        sa.UniqueConstraint('user_id', 'trace_id', name='uq_comparison_user_trace'),
+    )
+    with op.batch_alter_table('comparison_record', schema=None) as batch_op:
+        batch_op.create_index(batch_op.f('ix_comparison_record_user_id'), ['user_id'], unique=False)
+        batch_op.create_index(batch_op.f('ix_comparison_record_business_type'), ['business_type'], unique=False)
+        batch_op.create_index(batch_op.f('ix_comparison_record_created_at'), ['created_at'], unique=False)
+
+
+def downgrade() -> None:
+    with op.batch_alter_table('comparison_record', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_comparison_record_created_at'))
+        batch_op.drop_index(batch_op.f('ix_comparison_record_business_type'))
+        batch_op.drop_index(batch_op.f('ix_comparison_record_user_id'))
+
+    op.drop_table('comparison_record')

app/admin/__init__.py

@@ -0,0 +1,6 @@
+"""运营 Admin 后台子应用。
+
+独立 FastAPI app(app.admin.main:admin_app),独立进程/端口运行,复用 App 的
+models/repositories/integrations + 同一个 DB,但鉴权完全隔离(独立 JWT secret)。
+现有 app.main:app 不 import 本包,admin 崩溃不影响 App 主进程。
+"""

app/admin/audit.py

@@ -0,0 +1,38 @@
+"""审计写入门面。
+
+每个 admin 写操作调一次 write_audit,把"谁(admin)在哪个 IP 对什么(target)做了什么
+(action)+ 前后值(detail)"落进 admin_audit_log。
+
+⚠️ 涉钱/涉状态的写操作:传 commit=False,和业务写操作放同一事务一起 commit,
+保证"改了就有痕、有痕就改了"原子(见 plan 风险点 1)。轻量操作可 commit=True。
+"""
+from __future__ import annotations
+
+from sqlalchemy.orm import Session
+
+from app.admin.repositories import audit_log as audit_repo
+from app.models.admin import AdminUser
+
+
+def write_audit(
+    db: Session,
+    admin: AdminUser,
+    *,
+    action: str,
+    target_type: str,
+    target_id: str | int | None = None,
+    detail: dict | None = None,
+    ip: str | None = None,
+    commit: bool = True,
+) -> None:
+    audit_repo.add_audit_log(
+        db,
+        admin_id=admin.id,
+        admin_username=admin.username,
+        action=action,
+        target_type=target_type,
+        target_id=str(target_id) if target_id is not None else None,
+        detail=detail,
+        ip=ip,
+        commit=commit,
+    )

app/admin/deps.py

@@ -0,0 +1,84 @@
+"""Admin API 共享依赖:DB session、当前 admin、角色守卫、客户端 IP。
+
+仿 app/api/deps.py 的 get_current_user,但验的是独立的 admin JWT、查的是 admin_user 表。
+"""
+from __future__ import annotations
+
+from typing import Annotated
+
+from fastapi import Depends, HTTPException, Request, status
+from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
+from sqlalchemy.orm import Session
+
+from app.admin.repositories import admin_user as admin_repo
+from app.admin.security import AdminTokenError, decode_admin_token
+from app.db.session import get_db
+from app.models.admin import AdminUser
+
+_bearer = HTTPBearer(auto_error=False, scheme_name="AdminBearer")
+
+
+def get_current_admin(
+    credentials: Annotated[HTTPAuthorizationCredentials | None, Depends(_bearer)],
+    db: Annotated[Session, Depends(get_db)],
+) -> AdminUser:
+    """从 Authorization: Bearer <admin_token> 解出当前管理员。失败统一 401。"""
+    if credentials is None or credentials.scheme.lower() != "bearer":
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail="missing bearer token",
+            headers={"WWW-Authenticate": "Bearer"},
+        )
+    try:
+        payload = decode_admin_token(credentials.credentials)
+    except AdminTokenError as e:
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail=str(e),
+            headers={"WWW-Authenticate": "Bearer"},
+        ) from e
+
+    admin = admin_repo.get_by_id(db, int(payload["sub"]))
+    if admin is None or admin.status != "active":
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail="admin not found or disabled",
+            headers={"WWW-Authenticate": "Bearer"},
+        )
+    return admin
+
+
+CurrentAdmin = Annotated[AdminUser, Depends(get_current_admin)]
+AdminDb = Annotated[Session, Depends(get_db)]
+
+
+def require_role(*roles: str):
+    """角色守卫依赖工厂。super_admin 恒通过(全权)。
+
+    用法:在路由签名加 `_: Annotated[AdminUser, Depends(require_role("finance"))]`,
+    或 `dependencies=[Depends(require_role("finance"))]`(不需要拿 admin 时)。
+    """
+    allowed = set(roles)
+
+    def _checker(admin: CurrentAdmin) -> AdminUser:
+        if admin.role != "super_admin" and admin.role not in allowed:
+            need = sorted(allowed | {"super_admin"})
+            raise HTTPException(
+                status_code=status.HTTP_403_FORBIDDEN,
+                detail=f"role '{admin.role}' not allowed (need one of {need})",
+            )
+        return admin
+
+    return _checker
+
+
+def get_client_ip(request: Request) -> str:
+    """取客户端 IP(审计日志用)。生产经 nginx 反代,优先 X-Forwarded-For 第一段;否则直连 IP。
+
+    ⚠️ XFF 可被客户端伪造。nginx 必须用 `proxy_set_header X-Forwarded-For $remote_addr`
+    覆盖客户端传入值(见 M4 部署),否则审计里的 IP 可被伪造。审计 IP 仅作记录、不参与鉴权。
+    """
+    xff = request.headers.get("x-forwarded-for")
+    if xff:
+        return xff.split(",")[0].strip()
+    return request.client.host if request.client else ""

app/admin/main.py

@@ -0,0 +1,80 @@
+"""Admin 后台 FastAPI app(独立进程)。
+
+启动:uvicorn app.admin.main:admin_app --host 127.0.0.1 --port 8771
+复用 App 的 DB/models/repositories/integrations;鉴权独立(admin JWT,见 app/admin/security.py)。
+现有 app.main:app 不 import 本模块,两进程互不影响。
+"""
+from __future__ import annotations
+
+import logging
+from collections.abc import AsyncIterator
+from contextlib import asynccontextmanager
+
+from fastapi import FastAPI
+from fastapi.middleware.cors import CORSMiddleware
+
+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.dashboard import router as dashboard_router
+from app.admin.routers.feedback import router as feedback_router
+from app.admin.routers.users import router as users_router
+from app.admin.routers.wallet import router as wallet_router
+from app.admin.routers.withdraw import router as withdraw_router
+from app.core.config import settings
+from app.core.logging import setup_logging
+
+setup_logging(debug=settings.APP_DEBUG)
+logger = logging.getLogger("shagua.admin")
+
+
+@asynccontextmanager
+async def lifespan(_: FastAPI) -> AsyncIterator[None]:
+    logger.info(
+        "admin app started env=%s db=%s",
+        settings.APP_ENV,
+        settings.DATABASE_URL.split("://", 1)[0],
+    )
+    yield
+    logger.info("admin app shutting down")
+
+
+admin_app = FastAPI(
+    title=f"{settings.APP_NAME} · Admin",
+    version="0.1.0",
+    docs_url="/admin/docs" if not settings.is_prod else None,
+    redoc_url=None,
+    lifespan=lifespan,
+)
+
+# admin 前端独立部署。生产同域(nginx)无需 CORS;本地 next dev 跨域需放行开发源。
+_dev_origins = [
+    "http://localhost:3001",
+    "http://127.0.0.1:3001",
+    "http://localhost:3000",
+    "http://127.0.0.1:3000",
+]
+_origins = settings.cors_origins_list or ([] if settings.is_prod else _dev_origins)
+if _origins:
+    admin_app.add_middleware(
+        CORSMiddleware,
+        allow_origins=_origins,
+        allow_credentials=True,
+        allow_methods=["*"],
+        allow_headers=["*"],
+    )
+
+
+@admin_app.get("/admin/api/health", tags=["meta"])
+def health() -> dict[str, str]:
+    return {"status": "ok", "service": "admin"}
+
+
+admin_app.include_router(auth_router)
+admin_app.include_router(dashboard_router)
+admin_app.include_router(users_router)
+admin_app.include_router(wallet_router)
+admin_app.include_router(withdraw_router)
+admin_app.include_router(feedback_router)
+admin_app.include_router(admins_router)
+admin_app.include_router(audit_router)

app/admin/repositories/__init__.py

@@ -0,0 +1 @@
+"""admin 专用数据访问层(跨用户查询 + admin 账号 + 审计 + 大盘聚合)。"""

app/admin/repositories/admin_user.py

@@ -0,0 +1,64 @@
+"""admin_user 表 CRUD。"""
+from __future__ import annotations
+
+from datetime import datetime, timezone
+
+from sqlalchemy import select
+from sqlalchemy.orm import Session
+
+from app.core.security import hash_password
+from app.models.admin import AdminUser
+
+
+def get_by_id(db: Session, admin_id: int) -> AdminUser | None:
+    return db.get(AdminUser, admin_id)
+
+
+def get_by_username(db: Session, username: str) -> AdminUser | None:
+    stmt = select(AdminUser).where(AdminUser.username == username)
+    return db.execute(stmt).scalar_one_or_none()
+
+
+def create_admin(
+    db: Session, *, username: str, password: str, role: str = "operator"
+) -> AdminUser:
+    admin = AdminUser(
+        username=username,
+        password_hash=hash_password(password),
+        role=role,
+    )
+    db.add(admin)
+    db.commit()
+    db.refresh(admin)
+    return admin
+
+
+def update_last_login(db: Session, admin: AdminUser) -> None:
+    admin.last_login_at = datetime.now(timezone.utc)
+    db.commit()
+
+
+def list_admins(db: Session) -> list[AdminUser]:
+    stmt = select(AdminUser).order_by(AdminUser.id)
+    return list(db.execute(stmt).scalars().all())
+
+
+def set_role(db: Session, admin: AdminUser, *, role: str) -> AdminUser:
+    admin.role = role
+    db.commit()
+    db.refresh(admin)
+    return admin
+
+
+def set_status(db: Session, admin: AdminUser, *, status: str) -> AdminUser:
+    admin.status = status
+    db.commit()
+    db.refresh(admin)
+    return admin
+
+
+def set_password(db: Session, admin: AdminUser, *, password: str) -> AdminUser:
+    admin.password_hash = hash_password(password)
+    db.commit()
+    db.refresh(admin)
+    return admin

app/admin/repositories/audit_log.py

@@ -0,0 +1,70 @@
+"""admin_audit_log 写入 + 查询。
+
+审计日志只增不改不删——任何写操作经 app.admin.audit.write_audit 落一条。
+"""
+from __future__ import annotations
+
+from sqlalchemy import select
+from sqlalchemy.orm import Session
+
+from app.models.admin import AdminAuditLog
+
+
+def add_audit_log(
+    db: Session,
+    *,
+    admin_id: int,
+    admin_username: str,
+    action: str,
+    target_type: str,
+    target_id: str | None = None,
+    detail: dict | None = None,
+    ip: str | None = None,
+    commit: bool = True,
+) -> AdminAuditLog:
+    """插一条审计。commit=False 时只 flush,让调用方把审计和业务写操作放同一事务。"""
+    log = AdminAuditLog(
+        admin_id=admin_id,
+        admin_username=admin_username,
+        action=action,
+        target_type=target_type,
+        target_id=target_id,
+        detail=detail,
+        ip=ip,
+    )
+    db.add(log)
+    if commit:
+        db.commit()
+        db.refresh(log)
+    else:
+        db.flush()
+    return log
+
+
+def list_audit_logs(
+    db: Session,
+    *,
+    action: str | None = None,
+    target_type: str | None = None,
+    admin_id: int | None = None,
+    limit: int = 50,
+    cursor: int | None = None,
+) -> tuple[list[AdminAuditLog], int | None]:
+    """游标分页(id 倒序),与现有 list_* 约定一致。返回 (rows, next_cursor)。"""
+    stmt = select(AdminAuditLog)
+    if action:
+        stmt = stmt.where(AdminAuditLog.action == action)
+    if target_type:
+        stmt = stmt.where(AdminAuditLog.target_type == target_type)
+    if admin_id is not None:
+        stmt = stmt.where(AdminAuditLog.admin_id == admin_id)
+    if cursor is not None:
+        stmt = stmt.where(AdminAuditLog.id < cursor)
+    stmt = stmt.order_by(AdminAuditLog.id.desc())
+    rows = list(db.execute(stmt.limit(limit + 1)).scalars().all())
+    has_more = len(rows) > limit
+    items = rows[:limit]
+    # next_cursor 必须是"本页返回的最后一条"的 id(下一页查 id < 它),不能用 rows[limit]——
+    # rows[limit] 是探测下一页用的第 limit+1 条,它既不在本页也不在下页 → 每页边界丢一条。
+    next_cursor = items[-1].id if has_more else None
+    return items, next_cursor

app/admin/repositories/mutations.py

@@ -0,0 +1,36 @@
+"""admin 写操作 repo(状态改写)。
+
+涉钱的金币/提现复用 app.repositories.wallet(grant_coins / refresh_withdraw_status /
+reconcile_pending_withdraws),不在这里重写——重写涉钱逻辑就是给自己埋雷。
+
+set_user_status / update_feedback_status 支持 commit=False,让 router 把"业务写 + 审计写"
+放进同一事务一起 commit(原子:改了就有审计、有审计就真改了,见 plan 风险点 1)。
+"""
+from __future__ import annotations
+
+from sqlalchemy.orm import Session
+
+from app.models.feedback import Feedback
+from app.models.user import User
+
+
+def set_user_status(db: Session, user: User, *, status: str, commit: bool = True) -> User:
+    user.status = status
+    if commit:
+        db.commit()
+        db.refresh(user)
+    else:
+        db.flush()
+    return user
+
+
+def update_feedback_status(
+    db: Session, feedback: Feedback, *, status: str, commit: bool = True
+) -> Feedback:
+    feedback.status = status
+    if commit:
+        db.commit()
+        db.refresh(feedback)
+    else:
+        db.flush()
+    return feedback

app/admin/repositories/queries.py

@@ -0,0 +1,153 @@
+"""admin 跨用户查询(去掉现有 repo 的 user_id 强制过滤)+ 通用游标分页 helper + 用户概览。
+
+现有 app/repositories/ 的 list_* 都强绑单个 user_id(C 端只看自己);admin 要看全量、按条件筛,
+所以在这里另起一套。游标约定与现有一致:id 倒序,cursor=上页最后一条 id,返回 (items, next_cursor)。
+"""
+from __future__ import annotations
+
+from sqlalchemy import Select, func, select
+from sqlalchemy.orm import Session
+
+from app.models.comparison import ComparisonRecord
+from app.models.feedback import Feedback
+from app.models.user import User
+from app.models.wallet import CashTransaction, CoinAccount, CoinTransaction, WithdrawOrder
+
+
+def cursor_paginate(
+    db: Session, stmt: Select, id_col, *, limit: int, cursor: int | None
+) -> tuple[list, int | None]:
+    """通用游标分页(id 倒序)。stmt 不要预先带 order_by/limit。
+
+    多取 1 条探测有没有下一页;next_cursor 取本页最后一条的 id(下一页查 id < 它),
+    绝不用第 limit+1 条的 id——那条既不在本页也不在下页,会每页边界丢一条(见 audit_log 同款修复)。
+    """
+    if cursor is not None:
+        stmt = stmt.where(id_col < cursor)
+    stmt = stmt.order_by(id_col.desc()).limit(limit + 1)
+    rows = list(db.execute(stmt).scalars().all())
+    has_more = len(rows) > limit
+    items = rows[:limit]
+    next_cursor = items[-1].id if has_more else None
+    return items, next_cursor
+
+
+def list_users(
+    db: Session,
+    *,
+    phone: str | None = None,
+    register_channel: str | None = None,
+    status: str | None = None,
+    limit: int = 20,
+    cursor: int | None = None,
+) -> tuple[list[User], int | None]:
+    stmt = select(User)
+    if phone:
+        stmt = stmt.where(User.phone.like(f"{phone}%"))  # 前缀匹配
+    if register_channel:
+        stmt = stmt.where(User.register_channel == register_channel)
+    if status:
+        stmt = stmt.where(User.status == status)
+    return cursor_paginate(db, stmt, User.id, limit=limit, cursor=cursor)
+
+
+def list_all_coin_transactions(
+    db: Session,
+    *,
+    user_id: int | None = None,
+    biz_type: str | None = None,
+    limit: int = 20,
+    cursor: int | None = None,
+) -> tuple[list[CoinTransaction], int | None]:
+    stmt = select(CoinTransaction)
+    if user_id is not None:
+        stmt = stmt.where(CoinTransaction.user_id == user_id)
+    if biz_type:
+        stmt = stmt.where(CoinTransaction.biz_type == biz_type)
+    return cursor_paginate(db, stmt, CoinTransaction.id, limit=limit, cursor=cursor)
+
+
+def list_all_cash_transactions(
+    db: Session,
+    *,
+    user_id: int | None = None,
+    biz_type: str | None = None,
+    limit: int = 20,
+    cursor: int | None = None,
+) -> tuple[list[CashTransaction], int | None]:
+    stmt = select(CashTransaction)
+    if user_id is not None:
+        stmt = stmt.where(CashTransaction.user_id == user_id)
+    if biz_type:
+        stmt = stmt.where(CashTransaction.biz_type == biz_type)
+    return cursor_paginate(db, stmt, CashTransaction.id, limit=limit, cursor=cursor)
+
+
+def list_all_withdraw_orders(
+    db: Session,
+    *,
+    user_id: int | None = None,
+    status: str | None = None,
+    limit: int = 20,
+    cursor: int | None = None,
+) -> tuple[list[WithdrawOrder], int | None]:
+    stmt = select(WithdrawOrder)
+    if user_id is not None:
+        stmt = stmt.where(WithdrawOrder.user_id == user_id)
+    if status:
+        stmt = stmt.where(WithdrawOrder.status == status)
+    return cursor_paginate(db, stmt, WithdrawOrder.id, limit=limit, cursor=cursor)
+
+
+def list_feedbacks(
+    db: Session,
+    *,
+    status: str | None = None,
+    user_id: int | None = None,
+    limit: int = 20,
+    cursor: int | None = None,
+) -> tuple[list[Feedback], int | None]:
+    stmt = select(Feedback)
+    if status:
+        stmt = stmt.where(Feedback.status == status)
+    if user_id is not None:
+        stmt = stmt.where(Feedback.user_id == user_id)
+    return cursor_paginate(db, stmt, Feedback.id, limit=limit, cursor=cursor)
+
+
+def get_withdraw_by_out_bill_no(db: Session, out_bill_no: str) -> WithdrawOrder | None:
+    """按商户单号查提现单(admin 重试打款先拿 user_id 用,M3)。"""
+    return db.execute(
+        select(WithdrawOrder).where(WithdrawOrder.out_bill_no == out_bill_no)
+    ).scalar_one_or_none()
+
+
+def get_user_overview(db: Session, user_id: int) -> dict | None:
+    """用户 360 概览:基础资料 + 钱包余额 + 各项 count。历史明细走各自分页接口(带 user_id 过滤)。"""
+    user = db.get(User, user_id)
+    if user is None:
+        return None
+    acc = db.get(CoinAccount, user_id)  # 可能为 None(从未发生过金币动作)
+
+    def _count(model, *conds) -> int:
+        return db.execute(select(func.count(model.id)).where(*conds)).scalar_one()
+
+    return {
+        "user": user,
+        "coin_balance": acc.coin_balance if acc else 0,
+        "cash_balance_cents": acc.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(
+            ComparisonRecord,
+            ComparisonRecord.user_id == user_id,
+            ComparisonRecord.status == "success",
+        ),
+        "withdraw_total": _count(WithdrawOrder, WithdrawOrder.user_id == user_id),
+        "withdraw_success_cents": db.execute(
+            select(func.coalesce(func.sum(WithdrawOrder.amount_cents), 0)).where(
+                WithdrawOrder.user_id == user_id, WithdrawOrder.status == "success"
+            )
+        ).scalar_one(),
+        "feedback_total": _count(Feedback, Feedback.user_id == user_id),
+    }

app/admin/repositories/stats.py

@@ -0,0 +1,91 @@
+"""admin 大盘聚合查询(全局 count/sum/DAU/成功率)。全部只读、不改任何数据。
+
+⚠️ 性能:这些是全表 count/sum,P0 数据量小够用;用户量上来后热点字段(user.created_at /
+user.last_login_at / comparison_record.status / withdraw_order.status)要加索引,或改增量统计表。
+"""
+from __future__ import annotations
+
+from datetime import datetime, timedelta, timezone
+
+from sqlalchemy import func, select
+from sqlalchemy.orm import Session
+
+from app.models.comparison import ComparisonRecord
+from app.models.feedback import Feedback
+from app.models.user import User
+from app.models.wallet import CoinTransaction, WithdrawOrder
+
+_BEIJING = timezone(timedelta(hours=8))
+
+
+def _beijing_today_start_utc() -> datetime:
+    """北京时间今天 0 点对应的 UTC 时刻(DAU / 今日新增按北京时区切天)。"""
+    now_bj = datetime.now(_BEIJING)
+    start_bj = now_bj.replace(hour=0, minute=0, second=0, microsecond=0)
+    return start_bj.astimezone(timezone.utc)
+
+
+def dashboard_overview(db: Session) -> dict:
+    today_start = _beijing_today_start_utc()
+
+    def _count(model, *conds) -> int:
+        stmt = select(func.count(model.id))
+        if conds:
+            stmt = stmt.where(*conds)
+        return db.execute(stmt).scalar_one()
+
+    def _sum(col, *conds) -> int:
+        stmt = select(func.coalesce(func.sum(col), 0))
+        if conds:
+            stmt = stmt.where(*conds)
+        return db.execute(stmt).scalar_one()
+
+    # ===== 用户 =====
+    by_status = dict(
+        db.execute(select(User.status, func.count(User.id)).group_by(User.status)).all()
+    )
+
+    # ===== 提现状态分布 =====
+    wd_by_status = dict(
+        db.execute(
+            select(WithdrawOrder.status, func.count(WithdrawOrder.id)).group_by(
+                WithdrawOrder.status
+            )
+        ).all()
+    )
+
+    # ===== 比价 =====
+    comparison_total = _count(ComparisonRecord)
+    comparison_success = _count(ComparisonRecord, ComparisonRecord.status == "success")
+    success_rate = round(comparison_success / comparison_total, 4) if comparison_total else 0.0
+
+    return {
+        "users": {
+            "total": _count(User),
+            "active": by_status.get("active", 0),
+            "disabled": by_status.get("disabled", 0),
+            "deleted": by_status.get("deleted", 0),
+            "new_today": _count(User, User.created_at >= today_start),
+            "dau": _count(User, User.last_login_at >= today_start),
+        },
+        "coins": {
+            # 累计发放金币(coin_transaction 里所有 amount>0 之和;负数是兑换/扣减不计)
+            "granted_total": _sum(CoinTransaction.amount, CoinTransaction.amount > 0),
+        },
+        "cash": {
+            "withdraw_success_cents": _sum(
+                WithdrawOrder.amount_cents, WithdrawOrder.status == "success"
+            ),
+            "withdraw_pending_count": wd_by_status.get("pending", 0),
+            "withdraw_success_count": wd_by_status.get("success", 0),
+            "withdraw_failed_count": wd_by_status.get("failed", 0),
+        },
+        "comparison": {
+            "total": comparison_total,
+            "success": comparison_success,
+            "success_rate": success_rate,
+        },
+        "feedback": {"new": _count(Feedback, Feedback.status == "new")},
+        # CPS 收入数据源未接(referral-link 只换链接,转化/佣金未回收)→ 前端显示"待接入"。
+        "cps": {"available": False, "note": "CPS 转化数据未接入(P2)"},
+    }

app/admin/routers/__init__.py

@@ -0,0 +1 @@
+"""admin 路由(前缀统一 /admin/api)。"""

app/admin/routers/admins.py

@@ -0,0 +1,69 @@
+"""admin 账号管理(仅 super_admin):列表 / 创建 / 改角色启停重置密码。均写审计。"""
+from __future__ import annotations
+
+from fastapi import APIRouter, Depends, HTTPException, Request
+
+from app.admin.audit import write_audit
+from app.admin.deps import AdminDb, CurrentAdmin, get_client_ip, require_role
+from app.admin.repositories import admin_user as admin_repo
+from app.admin.schemas.admin import AdminCreateRequest, AdminUpdateRequest
+from app.admin.schemas.auth import AdminOut
+from app.core.security import hash_password
+
+router = APIRouter(
+    prefix="/admin/api/admins",
+    tags=["admin-accounts"],
+    dependencies=[Depends(require_role())],  # require_role() 无参 = 仅 super_admin 通过
+)
+
+
+@router.get("", response_model=list[AdminOut], summary="管理员列表")
+def list_admins(db: AdminDb) -> list[AdminOut]:
+    return [AdminOut.model_validate(a) for a in admin_repo.list_admins(db)]
+
+
+@router.post("", response_model=AdminOut, summary="创建管理员")
+def create_admin(
+    body: AdminCreateRequest, request: Request, admin: CurrentAdmin, db: AdminDb
+) -> AdminOut:
+    if admin_repo.get_by_username(db, body.username) is not None:
+        raise HTTPException(status_code=409, detail="用户名已存在")
+    new = admin_repo.create_admin(
+        db, username=body.username, password=body.password, role=body.role
+    )
+    write_audit(
+        db, admin, action="admin.create", target_type="admin", target_id=new.id,
+        detail={"username": new.username, "role": new.role}, ip=get_client_ip(request), commit=True,
+    )
+    return AdminOut.model_validate(new)
+
+
+@router.patch("/{admin_id}", response_model=AdminOut, summary="改角色/启停/重置密码")
+def update_admin(
+    admin_id: int, body: AdminUpdateRequest, request: Request, admin: CurrentAdmin, db: AdminDb
+) -> AdminOut:
+    target = admin_repo.get_by_id(db, admin_id)
+    if target is None:
+        raise HTTPException(status_code=404, detail="管理员不存在")
+    if admin_id == admin.id and body.status == "disabled":
+        raise HTTPException(status_code=400, detail="不能禁用自己")
+
+    changes: dict = {}
+    if body.role is not None:
+        target.role = body.role
+        changes["role"] = body.role
+    if body.status is not None:
+        target.status = body.status
+        changes["status"] = body.status
+    if body.password is not None:
+        target.password_hash = hash_password(body.password)
+        changes["password"] = "reset"
+    if not changes:
+        raise HTTPException(status_code=400, detail="无任何变更字段")
+    db.commit()
+    db.refresh(target)
+    write_audit(
+        db, admin, action="admin.update", target_type="admin", target_id=admin_id,
+        detail=changes, ip=get_client_ip(request), commit=True,
+    )
+    return AdminOut.model_validate(target)

app/admin/routers/audit.py

@@ -0,0 +1,34 @@
+"""admin 操作审计日志查询(所有 admin 可看:谁在何时对什么做了什么)。"""
+from __future__ import annotations
+
+from typing import Annotated
+
+from fastapi import APIRouter, Depends, Query
+
+from app.admin.deps import AdminDb, get_current_admin
+from app.admin.repositories import audit_log as audit_repo
+from app.admin.schemas.admin import AdminAuditLogOut
+from app.admin.schemas.common import CursorPage
+
+router = APIRouter(
+    prefix="/admin/api/audit-logs",
+    tags=["admin-audit"],
+    dependencies=[Depends(get_current_admin)],
+)
+
+
+@router.get("", response_model=CursorPage[AdminAuditLogOut], summary="审计日志(谁改了什么)")
+def list_audit_logs(
+    db: AdminDb,
+    action: Annotated[str | None, Query()] = None,
+    target_type: Annotated[str | None, Query()] = None,
+    admin_id: Annotated[int | None, Query()] = None,
+    limit: Annotated[int, Query(ge=1, le=100)] = 50,
+    cursor: Annotated[int | None, Query()] = None,
+) -> CursorPage[AdminAuditLogOut]:
+    items, next_cursor = audit_repo.list_audit_logs(
+        db, action=action, target_type=target_type, admin_id=admin_id, limit=limit, cursor=cursor,
+    )
+    return CursorPage(
+        items=[AdminAuditLogOut.model_validate(x) for x in items], next_cursor=next_cursor,
+    )

app/admin/routers/auth.py

@@ -0,0 +1,48 @@
+"""Admin 认证:账号密码登录 → admin JWT(独立 secret)。"""
+from __future__ import annotations
+
+import logging
+
+from fastapi import APIRouter, Depends, HTTPException
+
+from app.admin.deps import AdminDb, CurrentAdmin
+from app.admin.repositories import admin_user as admin_repo
+from app.admin.schemas.auth import AdminLoginRequest, AdminLoginResponse, AdminOut
+from app.admin.security import create_admin_token
+from app.core.ratelimit import rate_limit
+from app.core.security import verify_password
+
+logger = logging.getLogger("shagua.admin.auth")
+
+router = APIRouter(prefix="/admin/api/auth", tags=["admin-auth"])
+
+
+@router.post(
+    "/login",
+    response_model=AdminLoginResponse,
+    summary="管理员登录",
+    dependencies=[Depends(rate_limit(10, 60, "admin-login"))],  # 同 IP 每分钟≤10 次,防爆破
+)
+def login(req: AdminLoginRequest, db: AdminDb) -> AdminLoginResponse:
+    admin = admin_repo.get_by_username(db, req.username)
+    # 用户名不存在 / 密码错统一 401 同文案(防账号枚举)。
+    # disabled 账号单独 403"账号已禁用":admin 是内部少数已知账号、无枚举价值,
+    # 明确提示比防枚举更有运维价值(与 App 端 auth.py 对 disabled 用户的 403 一致)。
+    if admin is None or not verify_password(req.password, admin.password_hash):
+        raise HTTPException(status_code=401, detail="用户名或密码错误")
+    if admin.status != "active":
+        raise HTTPException(status_code=403, detail="账号已禁用")
+
+    token, expires_in = create_admin_token(admin_id=admin.id, role=admin.role)
+    admin_repo.update_last_login(db, admin)
+    logger.info("admin login ok id=%d username=%s role=%s", admin.id, admin.username, admin.role)
+    return AdminLoginResponse(
+        access_token=token,
+        expires_in=expires_in,
+        admin=AdminOut.model_validate(admin),
+    )
+
+
+@router.get("/me", response_model=AdminOut, summary="当前管理员")
+def me(admin: CurrentAdmin) -> AdminOut:
+    return AdminOut.model_validate(admin)

app/admin/routers/dashboard.py

@@ -0,0 +1,19 @@
+"""admin 数据大盘(只读聚合)。"""
+from __future__ import annotations
+
+from fastapi import APIRouter, Depends
+
+from app.admin.deps import AdminDb, get_current_admin
+from app.admin.repositories import stats
+from app.admin.schemas.dashboard import DashboardOverview
+
+router = APIRouter(
+    prefix="/admin/api/stats",
+    tags=["admin-stats"],
+    dependencies=[Depends(get_current_admin)],
+)
+
+
+@router.get("/overview", response_model=DashboardOverview, summary="大盘核心指标")
+def overview(db: AdminDb) -> DashboardOverview:
+    return DashboardOverview.model_validate(stats.dashboard_overview(db))

app/admin/routers/feedback.py

@@ -0,0 +1,56 @@
+"""admin 反馈工单:列表(读)+ 标记已处理(写,带审计)。"""
+from __future__ import annotations
+
+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 mutations, queries
+from app.admin.schemas.common import CursorPage, OkResponse
+from app.admin.schemas.feedback import FeedbackOut
+from app.models.admin import AdminUser
+from app.models.feedback import Feedback
+
+router = APIRouter(
+    prefix="/admin/api/feedbacks",
+    tags=["admin-feedback"],
+    dependencies=[Depends(get_current_admin)],
+)
+
+
+@router.get("", response_model=CursorPage[FeedbackOut], summary="反馈工单列表")
+def list_feedbacks(
+    db: AdminDb,
+    status: Annotated[str | None, Query()] = None,
+    user_id: Annotated[int | None, Query()] = None,
+    limit: Annotated[int, Query(ge=1, le=100)] = 20,
+    cursor: Annotated[int | None, Query()] = None,
+) -> CursorPage[FeedbackOut]:
+    items, next_cursor = queries.list_feedbacks(
+        db, status=status, user_id=user_id, limit=limit, cursor=cursor,
+    )
+    return CursorPage(
+        items=[FeedbackOut.model_validate(f) for f in items], next_cursor=next_cursor,
+    )
+
+
+@router.post("/{feedback_id}/handle", response_model=OkResponse, summary="标记反馈已处理")
+def handle_feedback(
+    feedback_id: int,
+    request: Request,
+    admin: Annotated[AdminUser, Depends(require_role("operator"))],
+    db: AdminDb,
+) -> OkResponse:
+    fb = db.get(Feedback, feedback_id)
+    if fb is None:
+        raise HTTPException(status_code=404, detail="反馈不存在")
+    before = fb.status
+    mutations.update_feedback_status(db, fb, status="handled", commit=False)
+    write_audit(
+        db, admin, action="feedback.handle", target_type="feedback", target_id=feedback_id,
+        detail={"before": before, "after": "handled"}, ip=get_client_ip(request), commit=False,
+    )
+    db.commit()
+    return OkResponse()

app/admin/routers/users.py

@@ -0,0 +1,111 @@
+"""admin 用户管理:列表 + 360 详情(读)+ 封禁/解封 + 手动调金币(写,带审计)。"""
+from __future__ import annotations
+
+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 mutations, queries
+from app.admin.schemas.common import CursorPage, OkResponse
+from app.admin.schemas.user import (
+    AdminUserListItem,
+    AdminUserOverview,
+    GrantCoinsRequest,
+    SetUserStatusRequest,
+)
+from app.models.admin import AdminUser
+from app.repositories import user as user_repo
+from app.repositories import wallet as wallet_repo
+
+router = APIRouter(
+    prefix="/admin/api/users",
+    tags=["admin-users"],
+    dependencies=[Depends(get_current_admin)],
+)
+
+
+@router.get("", response_model=CursorPage[AdminUserListItem], summary="用户列表(筛选+分页)")
+def list_users(
+    db: AdminDb,
+    phone: Annotated[str | None, Query()] = None,
+    register_channel: Annotated[str | None, Query()] = None,
+    status: Annotated[str | None, Query()] = None,
+    limit: Annotated[int, Query(ge=1, le=100)] = 20,
+    cursor: Annotated[int | None, Query()] = None,
+) -> CursorPage[AdminUserListItem]:
+    items, next_cursor = queries.list_users(
+        db, phone=phone, register_channel=register_channel, status=status,
+        limit=limit, cursor=cursor,
+    )
+    return CursorPage(
+        items=[AdminUserListItem.model_validate(u) for u in items],
+        next_cursor=next_cursor,
+    )
+
+
+@router.get("/{user_id}", response_model=AdminUserOverview, summary="用户 360 详情")
+def get_user(user_id: int, db: AdminDb) -> AdminUserOverview:
+    overview = queries.get_user_overview(db, user_id)
+    if overview is None:
+        raise HTTPException(status_code=404, detail="用户不存在")
+    return AdminUserOverview.model_validate(overview)
+
+
+@router.post("/{user_id}/status", response_model=OkResponse, summary="封禁/解封用户")
+def set_user_status(
+    user_id: int,
+    body: SetUserStatusRequest,
+    request: Request,
+    admin: Annotated[AdminUser, Depends(require_role("operator"))],
+    db: AdminDb,
+) -> OkResponse:
+    user = user_repo.get_user_by_id(db, user_id)
+    if user is None:
+        raise HTTPException(status_code=404, detail="用户不存在")
+    if user.status == "deleted":
+        raise HTTPException(status_code=400, detail="已注销账号不可改状态")
+    before = user.status
+    # 业务写 + 审计写同一事务(commit=False),最后一起 commit:改了就有痕、有痕就真改了
+    mutations.set_user_status(db, user, status=body.status, commit=False)
+    write_audit(
+        db, admin, action="user.status.set", target_type="user", target_id=user_id,
+        detail={"before": before, "after": body.status}, ip=get_client_ip(request), commit=False,
+    )
+    db.commit()
+    return OkResponse()
+
+
+@router.post("/{user_id}/coins", response_model=OkResponse, summary="手动增减金币(带审计)")
+def grant_user_coins(
+    user_id: int,
+    body: GrantCoinsRequest,
+    request: Request,
+    admin: Annotated[AdminUser, Depends(require_role("finance"))],
+    db: AdminDb,
+) -> OkResponse:
+    if body.amount == 0:
+        raise HTTPException(status_code=400, detail="amount 不能为 0")
+    user = user_repo.get_user_by_id(db, user_id)
+    if user is None:
+        raise HTTPException(status_code=404, detail="用户不存在")
+    # 负数扣减时不允许扣成负余额(运营误操作保护)
+    if body.amount < 0:
+        acc_now = wallet_repo.get_or_create_account(db, user_id, commit=False)
+        if acc_now.coin_balance + body.amount < 0:
+            raise HTTPException(
+                status_code=400, detail=f"扣减后金币为负(当前余额 {acc_now.coin_balance})"
+            )
+    biz_type = "admin_grant" if body.amount > 0 else "admin_deduct"
+    # grant_coins 只 flush 不 commit;审计同 commit=False;最后一起 commit → 原子(改钱+留痕)
+    acc, _ = wallet_repo.grant_coins(
+        db, user_id, body.amount, biz_type=biz_type, remark=f"admin:{body.reason}"[:128],
+    )
+    write_audit(
+        db, admin, action="user.coins.grant", target_type="user", target_id=user_id,
+        detail={"amount": body.amount, "balance_after": acc.coin_balance, "reason": body.reason},
+        ip=get_client_ip(request), commit=False,
+    )
+    db.commit()
+    return OkResponse()

app/admin/routers/wallet.py

@@ -0,0 +1,49 @@
+"""admin 钱包:金币流水 + 现金流水(跨用户,可按 user_id 过滤)。手动调金币见 M3。"""
+from __future__ import annotations
+
+from typing import Annotated
+
+from fastapi import APIRouter, Depends, Query
+
+from app.admin.deps import AdminDb, get_current_admin
+from app.admin.repositories import queries
+from app.admin.schemas.common import CursorPage
+from app.admin.schemas.wallet import CashTxnOut, CoinTxnOut
+
+router = APIRouter(
+    prefix="/admin/api/wallet",
+    tags=["admin-wallet"],
+    dependencies=[Depends(get_current_admin)],
+)
+
+
+@router.get("/coin-transactions", response_model=CursorPage[CoinTxnOut], summary="金币流水")
+def coin_transactions(
+    db: AdminDb,
+    user_id: Annotated[int | None, Query()] = None,
+    biz_type: Annotated[str | None, Query()] = None,
+    limit: Annotated[int, Query(ge=1, le=100)] = 20,
+    cursor: Annotated[int | None, Query()] = None,
+) -> CursorPage[CoinTxnOut]:
+    items, next_cursor = queries.list_all_coin_transactions(
+        db, user_id=user_id, biz_type=biz_type, limit=limit, cursor=cursor,
+    )
+    return CursorPage(
+        items=[CoinTxnOut.model_validate(t) for t in items], next_cursor=next_cursor,
+    )
+
+
+@router.get("/cash-transactions", response_model=CursorPage[CashTxnOut], summary="现金流水")
+def cash_transactions(
+    db: AdminDb,
+    user_id: Annotated[int | None, Query()] = None,
+    biz_type: Annotated[str | None, Query()] = None,
+    limit: Annotated[int, Query(ge=1, le=100)] = 20,
+    cursor: Annotated[int | None, Query()] = None,
+) -> CursorPage[CashTxnOut]:
+    items, next_cursor = queries.list_all_cash_transactions(
+        db, user_id=user_id, biz_type=biz_type, limit=limit, cursor=cursor,
+    )
+    return CursorPage(
+        items=[CashTxnOut.model_validate(t) for t in items], next_cursor=next_cursor,
+    )

app/admin/routers/withdraw.py

@@ -0,0 +1,85 @@
+"""admin 提现:列表(读)+ 单笔重试查单 + 批量对账(写,带审计)。
+
+提现的钱逻辑(查微信/退款/撤单/幂等)全部复用 app.repositories.wallet,admin 只触发 + 记审计。
+这些 wallet 函数内部各自 commit(涉及微信调用),审计在其后单独 commit:操作本身幂等,
+审计记录"谁触发的 + 结果",事务边界比"改金币"宽松是有意的(不能塞进 wallet 的自有事务)。
+"""
+from __future__ import annotations
+
+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 queries
+from app.admin.schemas.common import CursorPage
+from app.admin.schemas.wallet import ReconcileResult, WithdrawOrderOut
+from app.integrations import wxpay
+from app.models.admin import AdminUser
+from app.repositories import wallet as wallet_repo
+
+router = APIRouter(
+    prefix="/admin/api/withdraws",
+    tags=["admin-withdraw"],
+    dependencies=[Depends(get_current_admin)],
+)
+
+
+@router.get("", response_model=CursorPage[WithdrawOrderOut], summary="提现单列表")
+def list_withdraws(
+    db: AdminDb,
+    user_id: Annotated[int | None, Query()] = None,
+    status: Annotated[str | None, Query()] = None,
+    limit: Annotated[int, Query(ge=1, le=100)] = 20,
+    cursor: Annotated[int | None, Query()] = None,
+) -> CursorPage[WithdrawOrderOut]:
+    items, next_cursor = queries.list_all_withdraw_orders(
+        db, user_id=user_id, status=status, limit=limit, cursor=cursor,
+    )
+    return CursorPage(
+        items=[WithdrawOrderOut.model_validate(o) for o in items], next_cursor=next_cursor,
+    )
+
+
+# 注意:/reconcile 必须在 /{out_bill_no}/refresh 之前声明(静态路径优先于路径参数)
+@router.post("/reconcile", response_model=ReconcileResult, summary="批量对账(扫超时 pending 单)")
+def reconcile(
+    request: Request,
+    admin: Annotated[AdminUser, Depends(require_role("finance"))],
+    db: AdminDb,
+    older_than_minutes: Annotated[int, Query(ge=0)] = 15,
+) -> ReconcileResult:
+    try:
+        result = wallet_repo.reconcile_pending_withdraws(db, older_than_minutes=older_than_minutes)
+    except wxpay.WxPayNotConfiguredError as e:
+        raise HTTPException(status_code=503, detail="微信支付未配置") from e
+    write_audit(
+        db, admin, action="withdraw.reconcile", target_type="withdraw", target_id=None,
+        detail=result, ip=get_client_ip(request), commit=True,
+    )
+    return ReconcileResult(**result)
+
+
+@router.post("/{out_bill_no}/refresh", response_model=WithdrawOrderOut, summary="单笔重试查单")
+def refresh_withdraw(
+    out_bill_no: str,
+    request: Request,
+    admin: Annotated[AdminUser, Depends(require_role("finance"))],
+    db: AdminDb,
+) -> WithdrawOrderOut:
+    order = queries.get_withdraw_by_out_bill_no(db, out_bill_no)
+    if order is None:
+        raise HTTPException(status_code=404, detail="提现单不存在")
+    try:
+        refreshed = wallet_repo.refresh_withdraw_status(
+            db, order.user_id, out_bill_no, cancel_if_unconfirmed=True,
+        )
+    except wxpay.WxPayNotConfiguredError as e:
+        raise HTTPException(status_code=503, detail="微信支付未配置") from e
+    write_audit(
+        db, admin, action="withdraw.refresh", target_type="withdraw", target_id=out_bill_no,
+        detail={"status": refreshed.status, "wechat_state": refreshed.wechat_state},
+        ip=get_client_ip(request), commit=True,
+    )
+    return WithdrawOrderOut.model_validate(refreshed)

app/admin/schemas/__init__.py

@@ -0,0 +1 @@
+"""admin 请求/响应 schemas(snake_case,与前端约定一致)。"""

app/admin/schemas/admin.py

@@ -0,0 +1,37 @@
+"""admin 账号管理 + 审计日志 schemas。"""
+from __future__ import annotations
+
+from datetime import datetime
+from typing import Literal
+
+from pydantic import BaseModel, ConfigDict, Field
+
+_Role = Literal["super_admin", "finance", "operator"]
+
+
+class AdminCreateRequest(BaseModel):
+    username: str = Field(..., min_length=3, max_length=64)
+    password: str = Field(..., min_length=8, max_length=72)  # bcrypt ≤72 字节
+    role: _Role = "operator"
+
+
+class AdminUpdateRequest(BaseModel):
+    """改角色 / 启用禁用 / 重置密码,字段都可选(只改传了的)。"""
+
+    role: _Role | None = None
+    status: Literal["active", "disabled"] | None = None
+    password: str | None = Field(None, min_length=8, max_length=72)
+
+
+class AdminAuditLogOut(BaseModel):
+    model_config = ConfigDict(from_attributes=True)
+
+    id: int
+    admin_id: int
+    admin_username: str
+    action: str
+    target_type: str
+    target_id: str | None = None
+    detail: dict | None = None
+    ip: str | None = None
+    created_at: datetime

app/admin/schemas/auth.py

@@ -0,0 +1,29 @@
+"""Admin 认证 schemas。"""
+from __future__ import annotations
+
+from datetime import datetime
+
+from pydantic import BaseModel, ConfigDict, Field
+
+
+class AdminLoginRequest(BaseModel):
+    username: str = Field(..., min_length=1, max_length=64)
+    password: str = Field(..., min_length=1, max_length=128)
+
+
+class AdminOut(BaseModel):
+    model_config = ConfigDict(from_attributes=True)
+
+    id: int
+    username: str
+    role: str
+    status: str
+    created_at: datetime
+    last_login_at: datetime | None = None
+
+
+class AdminLoginResponse(BaseModel):
+    access_token: str
+    token_type: str = "Bearer"
+    expires_in: int = Field(..., description="access_token 剩余秒数(过期重新登录)")
+    admin: AdminOut

app/admin/schemas/common.py

@@ -0,0 +1,19 @@
+"""通用 schema:游标分页响应 + 通用 ok 响应。"""
+from __future__ import annotations
+
+from typing import Generic, TypeVar
+
+from pydantic import BaseModel
+
+T = TypeVar("T")
+
+
+class CursorPage(BaseModel, Generic[T]):
+    """游标分页响应:items + 下一页游标(next_cursor=None 表示末页)。"""
+
+    items: list[T]
+    next_cursor: int | None = None
+
+
+class OkResponse(BaseModel):
+    ok: bool = True

app/admin/schemas/dashboard.py

@@ -0,0 +1,48 @@
+"""admin 大盘 schemas(对应 stats.dashboard_overview 的嵌套结构)。"""
+from __future__ import annotations
+
+from pydantic import BaseModel
+
+
+class DashboardUsers(BaseModel):
+    total: int
+    active: int
+    disabled: int
+    deleted: int
+    new_today: int
+    dau: int
+
+
+class DashboardCoins(BaseModel):
+    granted_total: int
+
+
+class DashboardCash(BaseModel):
+    withdraw_success_cents: int
+    withdraw_pending_count: int
+    withdraw_success_count: int
+    withdraw_failed_count: int
+
+
+class DashboardComparison(BaseModel):
+    total: int
+    success: int
+    success_rate: float
+
+
+class DashboardFeedback(BaseModel):
+    new: int
+
+
+class DashboardCps(BaseModel):
+    available: bool
+    note: str
+
+
+class DashboardOverview(BaseModel):
+    users: DashboardUsers
+    coins: DashboardCoins
+    cash: DashboardCash
+    comparison: DashboardComparison
+    feedback: DashboardFeedback
+    cps: DashboardCps

app/admin/schemas/feedback.py

@@ -0,0 +1,18 @@
+"""admin 反馈工单 schemas。"""
+from __future__ import annotations
+
+from datetime import datetime
+
+from pydantic import BaseModel, ConfigDict
+
+
+class FeedbackOut(BaseModel):
+    model_config = ConfigDict(from_attributes=True)
+
+    id: int
+    user_id: int
+    content: str
+    contact: str
+    images: list[str] | None = None
+    status: str
+    created_at: datetime

app/admin/schemas/user.py

@@ -0,0 +1,47 @@
+"""admin 用户管理 schemas。"""
+from __future__ import annotations
+
+from datetime import datetime
+from typing import Literal
+
+from pydantic import BaseModel, ConfigDict, Field
+
+
+class AdminUserListItem(BaseModel):
+    model_config = ConfigDict(from_attributes=True)
+
+    id: int
+    phone: str
+    nickname: str | None = None
+    register_channel: str
+    status: str
+    wechat_openid: str | None = None
+    created_at: datetime
+    last_login_at: datetime
+
+
+class AdminUserOverview(BaseModel):
+    """用户 360 概览:基础资料 + 钱包余额 + 各项 count(历史明细走各自分页接口)。"""
+
+    model_config = ConfigDict(from_attributes=True)
+
+    user: AdminUserListItem
+    coin_balance: int
+    cash_balance_cents: int
+    total_coin_earned: int
+    comparison_total: int
+    comparison_success: int
+    withdraw_total: int
+    withdraw_success_cents: int
+    feedback_total: int
+
+
+class GrantCoinsRequest(BaseModel):
+    amount: int = Field(..., description="金币变动:正=增加,负=扣减(不可为 0)")
+    reason: str = Field(..., min_length=1, max_length=128, description="操作原因(必填,入审计)")
+
+
+class SetUserStatusRequest(BaseModel):
+    status: Literal["active", "disabled"] = Field(
+        ..., description="active=解封 / disabled=封禁(注销 deleted 不走此接口)"
+    )

app/admin/schemas/wallet.py

@@ -0,0 +1,52 @@
+"""admin 钱包(金币/现金流水 + 提现单)schemas。"""
+from __future__ import annotations
+
+from datetime import datetime
+
+from pydantic import BaseModel, ConfigDict
+
+
+class CoinTxnOut(BaseModel):
+    model_config = ConfigDict(from_attributes=True)
+
+    id: int
+    user_id: int
+    amount: int
+    balance_after: int
+    biz_type: str
+    ref_id: str | None = None
+    remark: str | None = None
+    created_at: datetime
+
+
+class CashTxnOut(BaseModel):
+    model_config = ConfigDict(from_attributes=True)
+
+    id: int
+    user_id: int
+    amount_cents: int
+    balance_after_cents: int
+    biz_type: str
+    ref_id: str | None = None
+    remark: str | None = None
+    created_at: datetime
+
+
+class WithdrawOrderOut(BaseModel):
+    model_config = ConfigDict(from_attributes=True)
+
+    id: int
+    user_id: int
+    out_bill_no: str
+    amount_cents: int
+    status: str
+    wechat_state: str | None = None
+    transfer_bill_no: str | None = None
+    fail_reason: str | None = None
+    created_at: datetime
+    updated_at: datetime
+
+
+class ReconcileResult(BaseModel):
+    checked: int
+    resolved: int

app/admin/security.py

@@ -0,0 +1,55 @@
+"""Admin JWT:与 App 用户 token 完全隔离。
+
+用独立 secret(settings.ADMIN_JWT_SECRET ≠ JWT_SECRET_KEY)+ payload typ="admin",
+双重保证 App 用户的 access_token 无法当 admin token 用(secret 不同直接验签失败)。
+admin 无 refresh:过期(默认 12h)重新登录,简单。
+"""
+from __future__ import annotations
+
+from datetime import datetime, timedelta, timezone
+from typing import Any
+
+import jwt
+
+from app.core.config import settings
+
+_ALGO = "HS256"
+
+
+class AdminTokenError(Exception):
+    """admin token 解析/校验失败,api 层捕获后返回 401。"""
+
+
+def _now() -> datetime:
+    return datetime.now(timezone.utc)
+
+
+def create_admin_token(*, admin_id: int, role: str) -> tuple[str, int]:
+    """签发 admin access token,返回 (token, expires_in_seconds)。"""
+    now = _now()
+    expire = now + timedelta(minutes=settings.ADMIN_JWT_EXPIRE_MINUTES)
+    payload: dict[str, Any] = {
+        "sub": str(admin_id),
+        "role": role,
+        "typ": "admin",
+        "iat": int(now.timestamp()),
+        "exp": int(expire.timestamp()),
+    }
+    token = jwt.encode(payload, settings.ADMIN_JWT_SECRET, algorithm=_ALGO)
+    return token, int((expire - now).total_seconds())
+
+
+def decode_admin_token(token: str) -> dict[str, Any]:
+    """解析校验 admin token。签名错/过期/typ 非 admin → AdminTokenError。"""
+    try:
+        payload = jwt.decode(token, settings.ADMIN_JWT_SECRET, algorithms=[_ALGO])
+    except jwt.ExpiredSignatureError as e:
+        raise AdminTokenError("token expired") from e
+    except jwt.InvalidTokenError as e:
+        raise AdminTokenError(f"invalid token: {e}") from e
+
+    if payload.get("typ") != "admin":
+        raise AdminTokenError("not an admin token")
+    if "sub" not in payload:
+        raise AdminTokenError("token missing sub")
+    return payload

app/api/v1/ad.py

@@ -19,8 +19,15 @@ from app.core import rewards
 from app.core.config import settings
 from app.integrations import pangle
 from app.core.ratelimit import rate_limit
+from app.repositories import ad_ecpm as crud_ecpm
 from app.repositories import ad_reward as crud_ad
-from app.schemas.ad import AdRewardStatusOut, PangleCallbackOut, TestGrantOut
+from app.schemas.ad import (
+    AdRewardStatusOut,
+    EcpmReportIn,
+    EcpmReportOut,
+    PangleCallbackOut,
+    TestGrantOut,
+)
 
 logger = logging.getLogger("shagua.ad")
 
@@ -95,6 +102,30 @@ def reward_status(user: CurrentUser, db: DbSession) -> AdRewardStatusOut:
     )
 
 
+@router.post(
+    "/ecpm-report",
+    response_model=EcpmReportOut,
+    summary="上报本次广告展示的 eCPM(内部收益统计)",
+    dependencies=[Depends(rate_limit(120, 60, "ad-ecpm-report"))],
+)
+def ecpm_report(payload: EcpmReportIn, user: CurrentUser, db: DbSession) -> EcpmReportOut:
+    """客户端在广告展示后(onAdShow 读 getShowEcpm)上报 eCPM,落库做内部收益统计/对账。
+
+    Bearer 鉴权,user_id 取自 JWT(不信 body)。best-effort:落库即 ok,客户端 fire-and-forget,
+    丢一两条不影响业务(穿山甲后台报表是结算权威)。eCPM 与发奖(S2S)是两条独立流,不逐条关联。
+    """
+    crud_ecpm.create_ecpm_record(
+        db, user.id,
+        ad_type=payload.ad_type, ecpm_raw=payload.ecpm,
+        adn=payload.adn, slot_id=payload.slot_id,
+    )
+    logger.info(
+        "ad ecpm report user_id=%d type=%s ecpm=%s adn=%s slot=%s",
+        user.id, payload.ad_type, payload.ecpm, payload.adn, payload.slot_id,
+    )
+    return EcpmReportOut(ok=True)
+
+
 @router.post(
     "/test-grant",
     response_model=TestGrantOut,

app/api/v1/auth.py

@@ -12,9 +12,10 @@ from __future__ import annotations
 
 import logging
 
-from fastapi import APIRouter, HTTPException, status
+from fastapi import APIRouter, Depends, HTTPException, status
 
 from app.api.deps import CurrentUser, DbSession
+from app.core.ratelimit import rate_limit
 from app.core.security import TokenError, decode_token, issue_token_pair
 from app.integrations.jiguang import JiguangError, mask_phone, verify_and_get_phone
 from app.integrations.sms import SmsError, send_code, verify_code
@@ -71,19 +72,29 @@ def jverify_login(req: JverifyLoginRequest, db: DbSession) -> TokenWithUser:
 
 # ===================== 短信登录 =====================
 
-@router.post("/sms/send", response_model=SmsSendResponse, summary="发送短信验证码 (mock)")
+@router.post(
+    "/sms/send",
+    response_model=SmsSendResponse,
+    summary="发送短信验证码",
+    dependencies=[Depends(rate_limit(10, 60, "sms-send"))],  # 同 IP 每分钟≤10 次(防一 IP 刷不同号)
+)
 def sms_send(req: SmsSendRequest) -> SmsSendResponse:
     try:
         cooldown = send_code(req.phone)
     except SmsError as e:
-        raise HTTPException(status_code=429, detail=str(e)) from e
+        raise HTTPException(status_code=e.status_code, detail=str(e)) from e
 
     from app.core.config import settings  # 局部 import 避免循环
 
     return SmsSendResponse(sent=True, mock=settings.SMS_MOCK, cooldown_sec=cooldown)
 
 
-@router.post("/sms/login", response_model=TokenWithUser, summary="手机号+验证码登录")
+@router.post(
+    "/sms/login",
+    response_model=TokenWithUser,
+    summary="手机号+验证码登录",
+    dependencies=[Depends(rate_limit(20, 60, "sms-login"))],  # 防撞库爆破(另有单码失败次数上限)
+)
 def sms_login(req: SmsLoginRequest, db: DbSession) -> TokenWithUser:
     if not verify_code(req.phone, req.code):
         raise HTTPException(status_code=400, detail="invalid sms code")

app/api/v1/compare.py

@@ -83,6 +83,13 @@ async def intent_recognize(request: Request) -> dict[str, Any]:
     return await _passthrough(request, "/api/intent/recognize")
 
 
+@router.post("/intent/step", summary="外卖比价 Phase 1 多帧意图识别 (透传到 pricebot, 仅淘宝源)")
+async def intent_step(request: Request) -> dict[str, Any]:
+    # 多帧版意图识别(展开+滚动采集→提取): 循环调用直到 done(done 帧顶层带
+    # result+calibration)。目前仅淘宝源走这条, 其它源走上面单次 /intent/recognize。
+    return await _passthrough(request, "/api/intent/step")
+
+
 @router.post("/price/step", summary="外卖比价 Phase 2 步进 (透传到 pricebot)")
 async def price_step(request: Request) -> dict[str, Any]:
     return await _passthrough(request, "/api/price/step")

app/api/v1/compare_milestone.py

@@ -0,0 +1,76 @@
+"""比价战绩里程碑 endpoint(福利页「记录比价战绩」)。
+
+路由前缀 `/api/v1/compare`:
+  GET  /milestones                进度与各档领取状态
+  POST /milestones/{milestone}/claim  领取某档奖励
+
+**均需鉴权**。解锁进度 = 该用户 status='success' 的 comparison_record 条数;每档领一次。
+"""
+from __future__ import annotations
+
+import logging
+
+from fastapi import APIRouter, HTTPException, status
+
+from app.api.deps import CurrentUser, DbSession
+from app.repositories import comparison_milestone as crud_milestone
+from app.schemas.compare_record import (
+    MilestoneClaimResultOut,
+    MilestoneStateOut,
+    MilestoneStatusOut,
+)
+
+logger = logging.getLogger("shagua.compare_milestone")
+
+router = APIRouter(prefix="/api/v1/compare", tags=["compare-milestone"])
+
+
+@router.get(
+    "/milestones",
+    response_model=MilestoneStatusOut,
+    summary="比价战绩里程碑进度",
+)
+def get_milestones(user: CurrentUser, db: DbSession) -> MilestoneStatusOut:
+    st = crud_milestone.get_status(db, user.id)
+    return MilestoneStatusOut(
+        success_count=st.success_count,
+        claimable_count=st.claimable_count,
+        milestones=[
+            MilestoneStateOut(milestone=m.milestone, coin=m.coin, state=m.state)
+            for m in st.milestones
+        ],
+    )
+
+
+@router.post(
+    "/milestones/{milestone}/claim",
+    response_model=MilestoneClaimResultOut,
+    summary="领取比价战绩里程碑奖励",
+)
+def claim_milestone(
+    milestone: int, user: CurrentUser, db: DbSession
+) -> MilestoneClaimResultOut:
+    try:
+        coin, balance = crud_milestone.claim(db, user.id, milestone)
+    except crud_milestone.UnknownMilestoneError as e:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND, detail="unknown milestone"
+        ) from e
+    except crud_milestone.MilestoneLockedError as e:
+        raise HTTPException(
+            status_code=status.HTTP_409_CONFLICT, detail="milestone locked"
+        ) from e
+    except crud_milestone.AlreadyClaimedError as e:
+        raise HTTPException(
+            status_code=status.HTTP_409_CONFLICT, detail="milestone already claimed"
+        ) from e
+
+    logger.info(
+        "compare milestone claimed user_id=%d milestone=%d coin=%d",
+        user.id,
+        milestone,
+        coin,
+    )
+    return MilestoneClaimResultOut(
+        milestone=milestone, coin_awarded=coin, coin_balance=balance
+    )

app/api/v1/compare_record.py

@@ -0,0 +1,86 @@
+"""比价记录 endpoint(「我的比价记录」数据源)。
+
+路由前缀 `/api/v1/compare`:
+  POST /record         上报一次比价结果(幂等:同 user+trace_id 覆盖)
+  GET  /records        比价记录列表(游标分页)
+  GET  /records/{id}   单条详情(含 raw_payload 全量)
+
+**均需鉴权**(CurrentUser)——与同文件无关的不鉴权透传 `compare.py` 分开:那个是
+转发壳(MVP 不鉴权),这里是按用户维度落库的业务接口,必须有 user_id。
+
+注:本轮只做 server 端,客户端(android 仓)在 done 帧后调 POST /record 上报的改动
+另起一轮(见 app-server docs/待办与技术债.md P1)。
+"""
+from __future__ import annotations
+
+import logging
+
+from fastapi import APIRouter, HTTPException, Query, status
+
+from app.api.deps import CurrentUser, DbSession
+from app.repositories import comparison as crud_compare
+from app.schemas.compare_record import (
+    ComparisonRecordCreatedOut,
+    ComparisonRecordDetailOut,
+    ComparisonRecordIn,
+    ComparisonRecordPage,
+    ComparisonRecordOut,
+)
+
+logger = logging.getLogger("shagua.compare_record")
+
+router = APIRouter(prefix="/api/v1/compare", tags=["compare-record"])
+
+
+@router.post(
+    "/record",
+    response_model=ComparisonRecordCreatedOut,
+    summary="上报一次比价结果(幂等)",
+)
+def report_record(
+    payload: ComparisonRecordIn, user: CurrentUser, db: DbSession
+) -> ComparisonRecordCreatedOut:
+    rec = crud_compare.upsert_record(db, user_id=user.id, payload=payload)
+    logger.info(
+        "compare record user=%s trace=%s biz=%s status=%s saved=%s",
+        user.id,
+        rec.trace_id,
+        rec.business_type,
+        rec.status,
+        rec.saved_amount_cents,
+    )
+    return ComparisonRecordCreatedOut(id=rec.id)
+
+
+@router.get(
+    "/records",
+    response_model=ComparisonRecordPage,
+    summary="比价记录列表(游标分页)",
+)
+def list_records(
+    user: CurrentUser,
+    db: DbSession,
+    limit: int = Query(20, ge=1, le=100),
+    cursor: int | None = Query(None, description="上一页末条 id"),
+) -> ComparisonRecordPage:
+    items, next_cursor = crud_compare.list_records(
+        db, user.id, limit=limit, cursor=cursor
+    )
+    return ComparisonRecordPage(
+        items=[ComparisonRecordOut.model_validate(it) for it in items],
+        next_cursor=next_cursor,
+    )
+
+
+@router.get(
+    "/records/{record_id}",
+    response_model=ComparisonRecordDetailOut,
+    summary="比价记录详情(含 raw_payload)",
+)
+def get_record(
+    record_id: int, user: CurrentUser, db: DbSession
+) -> ComparisonRecordDetailOut:
+    rec = crud_compare.get_record(db, user.id, record_id)
+    if rec is None:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="record not found")
+    return ComparisonRecordDetailOut.model_validate(rec)

app/api/v1/report.py

@@ -0,0 +1,145 @@
+"""上报更低价 endpoint。
+
+路由前缀 `/api/v1/report`,需 Bearer 鉴权(上报绑登录用户)。
+  POST /         提交上报(multipart:comparison_record_id / reported_platform_id /
+                 reported_price(元) + images 1~4 张)
+  GET  /records  上报记录列表(?status= pending/approved/rejected 可选筛选)
+
+要点:
+- 截图复用 [app.core.media] 落盘到 /media/price_report/。
+- 原最低价由 comparison_record_id 反查比价记录 best_*(不信任客户端传的快照)。
+- 校验(D):上报价必须 < 原最低价,否则 400。
+- 提交一律 status=pending;通过发奖励是人工审核后台动作,不在此。
+"""
+from __future__ import annotations
+
+import logging
+
+from fastapi import APIRouter, File, Form, HTTPException, UploadFile
+
+from app.api.deps import CurrentUser, DbSession
+from app.core import media
+from app.models.comparison import ComparisonRecord
+from app.repositories import report as report_repo
+from app.schemas.report import (
+    ReportRecordCounts,
+    ReportRecordOut,
+    ReportRecordsOut,
+    ReportSubmitOut,
+)
+
+logger = logging.getLogger("shagua.report")
+
+router = APIRouter(prefix="/api/v1/report", tags=["report"])
+
+_MAX_IMAGES = 4
+_VALID_STATUS = ("pending", "approved", "rejected")
+
+# 上报平台(canonical id → 展示名),与原型 fb-platform-chip data-pf 一致
+_PLATFORM_NAMES = {
+    "meituan-waimai": "美团外卖",
+    "jd-waimai": "京东外卖",
+    "taobao-shanguang": "淘宝闪购",
+}
+
+
+def _dish_summary(items: list | None) -> str | None:
+    """把比价记录 items[{name,qty,...}] 拼成菜品摘要文案。"""
+    if not items:
+        return None
+    names = [str(it.get("name", "")).strip() for it in items if isinstance(it, dict)]
+    names = [n for n in names if n]
+    return "、".join(names) if names else None
+
+
+@router.post("", response_model=ReportSubmitOut, summary="提交上报更低价")
+async def submit_report(
+    user: CurrentUser,
+    db: DbSession,
+    comparison_record_id: int = Form(...),
+    reported_platform_id: str = Form(...),
+    reported_price: str = Form(..., description="用户填的更低价(元)"),
+    images: list[UploadFile] = File(default=[]),
+) -> ReportSubmitOut:
+    # 平台
+    reported_platform_id = reported_platform_id.strip()
+    platform_name = _PLATFORM_NAMES.get(reported_platform_id)
+    if platform_name is None:
+        raise HTTPException(status_code=400, detail="不支持的上报平台")
+
+    # 价格(元 → 分)
+    try:
+        price_yuan = float(reported_price)
+    except (TypeError, ValueError):
+        raise HTTPException(status_code=400, detail="价格格式不正确") from None
+    if price_yuan <= 0:
+        raise HTTPException(status_code=400, detail="价格必须大于 0")
+    reported_price_cents = round(price_yuan * 100)
+
+    # 反查比价记录(必须属于本人)→ 取原最低价快照
+    rec = db.get(ComparisonRecord, comparison_record_id)
+    if rec is None or rec.user_id != user.id:
+        raise HTTPException(status_code=404, detail="比价记录不存在")
+    original_price_cents = rec.best_price_cents
+
+    # D:上报价必须低于原最低价
+    if original_price_cents is not None and reported_price_cents >= original_price_cents:
+        raise HTTPException(
+            status_code=400,
+            detail=f"上报价需低于原最低价 ¥{original_price_cents / 100:.2f}",
+        )
+
+    # 截图(至少 1 张,最多 4 张)
+    files = [f for f in (images or []) if f is not None and f.filename]
+    if not files:
+        raise HTTPException(status_code=400, detail="请至少上传一张截图证明")
+    if len(files) > _MAX_IMAGES:
+        raise HTTPException(status_code=400, detail=f"最多上传 {_MAX_IMAGES} 张图片")
+    urls: list[str] = []
+    for f in files:
+        data = await f.read()
+        try:
+            urls.append(media.save_report_image(user.id, data))
+        except media.MediaError as e:
+            raise HTTPException(status_code=400, detail=str(e)) from e
+
+    rep = report_repo.create_report(
+        db,
+        user_id=user.id,
+        comparison_record_id=comparison_record_id,
+        store_name=rec.store_name,
+        dish_summary=_dish_summary(rec.items),
+        original_platform_id=rec.best_platform_id,
+        original_platform_name=rec.best_platform_name,
+        original_price_cents=original_price_cents,
+        reported_platform_id=reported_platform_id,
+        reported_platform_name=platform_name,
+        reported_price_cents=reported_price_cents,
+        images=urls,
+    )
+    logger.info("price_report id=%d user_id=%d images=%d", rep.id, user.id, len(urls))
+    return ReportSubmitOut.model_validate(rep)
+
+
+@router.get("/records", response_model=ReportRecordsOut, summary="上报记录列表")
+def list_report_records(
+    user: CurrentUser,
+    db: DbSession,
+    status: str | None = None,
+) -> ReportRecordsOut:
+    status = (status or "").strip() or None
+    if status and status not in _VALID_STATUS:
+        raise HTTPException(status_code=400, detail="无效的状态筛选")
+    rows = report_repo.list_reports(db, user.id, status)
+    # counts 始终基于全量(不受 status 筛选影响),供前端 chip 计数
+    all_rows = rows if status is None else report_repo.list_reports(db, user.id, None)
+    counts = ReportRecordCounts(
+        all=len(all_rows),
+        pending=sum(1 for r in all_rows if r.status == "pending"),
+        approved=sum(1 for r in all_rows if r.status == "approved"),
+        rejected=sum(1 for r in all_rows if r.status == "rejected"),
+    )
+    return ReportRecordsOut(
+        records=[ReportRecordOut.model_validate(r) for r in rows],
+        counts=counts,
+    )

app/core/ad_cooldown.py

@@ -0,0 +1,54 @@
+"""看激励视频冷却策略 —— 与发奖记录查询解耦的纯计算。
+
+当前策略:**每 N 次一轮,看满一轮后强制冷却若干秒**(N / 秒数 取自 [rewards] 常量)。
+[repositories.ad_reward.today_status] 只负责取数据(今日 granted 的 created_at 列表),
+把"本轮已看几次 + 冷却到几点"的策略判断委托到这里。
+
+⚠️ 这是临时策略,后续要调。换策略(间隔式 / 每日配额式 / 指数退避 …)**只改本文件**,
+repository 不碰——这就是把它独立出来的目的。保持 [compute_cooldown] 签名稳定即可。
+"""
+from __future__ import annotations
+
+from dataclasses import dataclass
+from datetime import datetime, timedelta, timezone
+
+from app.core.rewards import VIDEO_ROUND_COOLDOWN_SECONDS, VIDEO_ROUND_REQUIRED_COUNT
+
+
+@dataclass(frozen=True)
+class CooldownState:
+    """冷却策略的输出。"""
+
+    round_count: int  # 本轮已看次数 0..N-1(展示用)
+    cooldown_until: datetime | None  # 本轮冷却结束时间(UTC);None = 不在冷却
+
+
+def compute_cooldown(
+    granted_times_desc: list[datetime],
+    now: datetime,
+    *,
+    round_size: int = VIDEO_ROUND_REQUIRED_COUNT,
+    cooldown_seconds: int = VIDEO_ROUND_COOLDOWN_SECONDS,
+) -> CooldownState:
+    """按"每 round_size 次一轮、看满一轮后冷却 cooldown_seconds 秒"算本轮进度 + 冷却结束时间。
+
+    :param granted_times_desc: 今日 status=granted 记录的 created_at,**按时间倒序**(最新在前)。
+    :param now: 当前时间(UTC,带 tzinfo),用于判断冷却是否已过。
+    :param round_size / cooldown_seconds: 策略参数,默认取 rewards 常量,可注入便于测试/调参。
+
+    纯函数,不碰 DB。冷却派生算法:把今日 granted 倒序,跳过当前未完成轮的 round_count 条,
+    下一条即"上一轮最后一次"的时间,+ cooldown_seconds 仍 > now 则在冷却中。
+    SQLite 上 created_at 可能是 naive,按 UTC 解读再比较。
+    """
+    used = len(granted_times_desc)
+    round_count = used % round_size
+    cooldown_until: datetime | None = None
+    if used >= round_size:
+        # round_count 必 < round_size <= used,索引合法
+        last_round_end = granted_times_desc[round_count]
+        if last_round_end.tzinfo is None:
+            last_round_end = last_round_end.replace(tzinfo=timezone.utc)
+        cd_end = last_round_end + timedelta(seconds=cooldown_seconds)
+        if cd_end > now:
+            cooldown_until = cd_end
+    return CooldownState(round_count=round_count, cooldown_until=cooldown_until)

app/core/config.py

@@ -40,6 +40,20 @@ class Settings(BaseSettings):
     JWT_ACCESS_TOKEN_EXPIRE_MINUTES: int = 120
     JWT_REFRESH_TOKEN_EXPIRE_DAYS: int = 30
 
+    # ===== Admin 后台 =====
+    # admin 用独立 JWT secret(≠ JWT_SECRET_KEY),App 用户 token 无法越权访问后台。
+    # 生产必须改成高熵随机串(同 JWT_SECRET_KEY 的要求)。
+    ADMIN_JWT_SECRET: str = "change-me-admin"
+    ADMIN_JWT_EXPIRE_MINUTES: int = 720  # admin 登录态 12 小时(无 refresh,过期重登)
+    # 可选 IP 白名单(逗号分隔),为空=应用层不限制(靠 nginx allow/deny 兜底)。
+    ADMIN_IP_ALLOWLIST: str = ""
+
+    @property
+    def admin_ip_allowlist(self) -> list[str]:
+        if not self.ADMIN_IP_ALLOWLIST.strip():
+            return []
+        return [ip.strip() for ip in self.ADMIN_IP_ALLOWLIST.split(",") if ip.strip()]
+
     # ===== 极光 =====
     JG_APP_KEY: str = ""
     JG_MASTER_SECRET: str = ""
@@ -51,6 +65,14 @@ class Settings(BaseSettings):
     SMS_MOCK: bool = True
     SMS_CODE_TTL_SEC: int = 300
     SMS_SEND_INTERVAL_SEC: int = 60
+    # 真实发送走极光短信 REST(自定义验证码模式:本服务生成 code,极光只负责发)。
+    # 复用极光一键登录的 JG_APP_KEY / JG_MASTER_SECRET(同一个极光应用)+ JG_REQUEST_TIMEOUT_SEC。
+    SMS_SEND_ENDPOINT: str = "https://api.sms.jpush.cn/v1/messages"
+    SMS_SIGN_ID: int = 31729       # 极光短信签名 ID(非机密,可被 .env 覆盖)
+    SMS_TEMPLATE_ID: int = 1       # 极光短信模板 ID(变量名 code,有效期 5 分钟)
+    SMS_CODE_LENGTH: int = 6       # 验证码位数(本服务生成;前端 code 字段 4-8 位兼容)
+    SMS_DAILY_LIMIT_PER_PHONE: int = 10   # 单手机号每日发送上限(防刷 + 控费)
+    SMS_MAX_VERIFY_ATTEMPTS: int = 5      # 单个验证码最多校验失败次数,超过即作废(防爆破)
 
     # ===== 美团联盟 CPS =====
     # 未配置时所有 /api/v1/meituan/* 接口 200 返空(优雅降级),不影响登录/领券等其他业务。

app/core/media.py

@@ -62,6 +62,11 @@ def save_feedback_image(user_id: int, data: bytes) -> str:
     return _save_image("feedback", user_id, data)
 
 
+def save_report_image(user_id: int, data: bytes) -> str:
+    """保存上报更低价截图,返回相对 URL(`/media/price_report/<file>`)。"""
+    return _save_image("price_report", user_id, data)
+
+
 def delete_avatar(url: str | None) -> None:
     """删除本服务托管的旧头像文件;外部 URL(如微信头像)或空值不处理。"""
     prefix = f"{settings.MEDIA_URL_PREFIX}/avatars/"

app/core/rewards.py

@@ -53,18 +53,33 @@ WITHDRAW_MAX_CENTS: int = 5_000_000  # 5 万元
 TASK_ENABLE_NOTIFICATION = "enable_notification"
 
 # task_key -> 奖励金币
+# 打开消息提醒: 1000 金币(=¥0.1, 客户端原型展示口径; 量级与签到/里程碑相称)。
+# 注意: 已不再 = 兑换下限(MIN_EXCHANGE_COIN=10000), test_exchange_flow 改走 grant_coins 直接供款。
 TASK_REWARDS: dict[str, int] = {
-    TASK_ENABLE_NOTIFICATION: 10000,
+    TASK_ENABLE_NOTIFICATION: 1000,
 }
 
 
+# ===== 比价战绩里程碑(累计成功比价 N 次,逐档解锁领金币)=====
+# 第 1→6 次的金币奖励(1-based:第 N 次比价解锁第 N 档)。值沿用客户端原型档位。
+# 数据源是 comparison_record 里 status='success' 的条数;每档领一次,
+# comparison_milestone_claim 去重(仿一次性任务)。要调档位/金额直接改这里。
+RECORD_MILESTONES: tuple[int, ...] = (120, 180, 300, 500, 800, 1200)
+RECORD_MILESTONE_COUNT: int = len(RECORD_MILESTONES)
+
+
+def record_milestone_reward(milestone: int) -> int:
+    """第 milestone 档(1..RECORD_MILESTONE_COUNT)的金币。越界抛 IndexError。"""
+    return RECORD_MILESTONES[milestone - 1]
+
+
 # ===== 看激励视频发金币(穿山甲 S2S 服务端回调发奖)=====
-# 看完一个激励视频发的金币(100 金币 ≈¥0.01,汇率 10000 金币=1 元)。
+# 看完一个激励视频发的金币(666 金币 ≈¥0.0666,汇率 10000 金币=1 元)。
 # 作用:① 回调缺/坏 reward_amount 时的回退值;② 客户端进度接口展示的"单次预告金币";
 #       ③ test-grant 本地联调的发奖额。
 # 真实发放以穿山甲回调带回的 reward_amount 为准(见 resolve_ad_reward_coin),后台应把
-# 代码位"奖励数量"配成与本值一致(=100),保证"广告内展示 / 进度预告 / 实际到账"三者一致。
-AD_REWARD_COIN: int = 100
+# 代码位"奖励数量"配成与本值一致(=666),保证"广告内展示 / 进度预告 / 实际到账"三者一致。
+AD_REWARD_COIN: int = 666
 # 单次发奖金币上限:夹紧穿山甲回调里异常的 reward_amount(如后台多打一个 0),防刷爆余额。
 MAX_AD_REWARD_COIN: int = 1000
 # 每用户每日发奖次数上限,防刷 + 控成本。

app/core/security.py

@@ -14,6 +14,7 @@ from __future__ import annotations
 from datetime import datetime, timedelta, timezone
 from typing import Any, Literal
 
+import bcrypt
 import jwt
 
 from app.core.config import settings
@@ -84,3 +85,24 @@ def issue_token_pair(user_id: int) -> dict[str, Any]:
         "expires_in": int((access_exp - _now()).total_seconds()),
         "refresh_expires_in": int((refresh_exp - _now()).total_seconds()),
     }
+
+
+# ===================== 密码 hash(admin 后台账号用)=====================
+# 用户侧是手机号+验证码登录,不存密码;仅 admin 账号用 username+password 登录。
+
+def hash_password(plain: str) -> str:
+    """bcrypt 加盐 hash,返回可入库的字符串。
+
+    bcrypt 限制明文 ≤72 字节,超出抛 ValueError(实测 bcrypt 5.0:25 个中文=75 字节即触发)。
+    统一截断到 72 字节(bcrypt 标准做法)——72 字节仍是强密码,verify 同样截断保证一致。
+    """
+    return bcrypt.hashpw(plain.encode("utf-8")[:72], bcrypt.gensalt()).decode("utf-8")
+
+
+def verify_password(plain: str, hashed: str) -> bool:
+    """校验明文与 bcrypt hash。明文同样截断 72 字节(与 hash_password 一致,否则超长密码永远不匹配);
+    hash 串损坏/格式非法时返回 False,不抛异常。"""
+    try:
+        return bcrypt.checkpw(plain.encode("utf-8")[:72], hashed.encode("utf-8"))
+    except (ValueError, TypeError):
+        return False

app/integrations/sms.py

@@ -1,68 +1,211 @@
 """短信验证码服务。
 
-当前实现:**mock 模式**。
-  - send_code(): 不真发短信,仅 log。记录 phone → 发送时间(防 60s 内重复发)
-  - verify_code(): 任意 6 位数字均通过(配合前台 demo 行为)
+两种运行模式由 `SMS_MOCK` 切换:
+  - **mock**(开发/测试,默认):不真发短信,验证码打到日志;校验**放行任意 N 位数字**
+    (测试/开发便利)。真实校验逻辑(比对存码 / 一次性 / 防爆破)由 real 分支 + 单测覆盖。
+  - **real**(生产 `SMS_MOCK=false`):本服务生成 N 位验证码 → 调极光短信 REST
+    `/v1/messages` 发送(自定义验证码模式,极光只负责发,code 由本服务生成/保管/
+    校验)→ 鉴权复用极光一键登录的 `JG_APP_KEY`/`JG_MASTER_SECRET`(同一极光应用)。
 
-后续接真供应商(阿里云 / 腾讯云)时:
-  - send_code() 改为调供应商 API,把生成的 6 位码存到 cache(redis / sqlite)
-  - verify_code() 比对 cache 里的码,且验过即作废
+验证码存储:**进程内存**(单 worker uvicorn 够用)。重启丢失(用户重发即可)。多
+worker / 多机时内存不共享 → 冷却、每日上限、校验都会失效,届时迁移到 DB/Redis。
+见 docs/待办与技术债.md。
 
-进程内存方案占坑期够用;切真实供应商时一并切 redis。
+防刷三层(短信花钱 + `/sms/send` 在登录前无法 JWT 鉴权):
+  1. 单号 `SMS_SEND_INTERVAL_SEC` 冷却(本文件)
+  2. 单号每日 `SMS_DAILY_LIMIT_PER_PHONE` 条上限(本文件)
+  3. 单 IP 频控(api 层 rate_limit 依赖)+ 极光控制台 IP 白名单/防轰炸(运维侧)
+另:单码校验失败 `SMS_MAX_VERIFY_ATTEMPTS` 次即作废(防爆破),验过即作废(一次性)。
 """
 from __future__ import annotations
 
+import base64
 import logging
+import secrets
 import time
+from dataclasses import dataclass
+from datetime import datetime
 from threading import Lock
 
+import httpx
+
 from app.core.config import settings
 
 logger = logging.getLogger("shagua.sms")
 
-# 进程内最近发送时间表:{phone: epoch_seconds},用于 60s 内拒发
-_last_sent: dict[str, float] = {}
-_lock = Lock()
-
 
 class SmsError(Exception):
-    """业务异常:发送过频 / 验证码不对。api 层 catch 后翻成 4xx。"""
+    """业务异常。`status_code` 决定 api 层翻成哪个 HTTP 码:
+    过频/每日超限 = 429(客户端等会再来),供应商不可用 = 503,手机号无效 = 400。
+    """
+
+    def __init__(self, message: str, status_code: int = 429) -> None:
+        super().__init__(message)
+        self.status_code = status_code
+
+
+@dataclass
+class _CodeRecord:
+    code: str
+    expires_at: float
+    attempts: int = 0
+
+
+# 进程内存(单 worker 有效;多 worker 不共享,见模块 docstring)
+_codes: dict[str, _CodeRecord] = {}            # phone -> 当前有效验证码
+_last_sent: dict[str, float] = {}              # phone -> 上次发送 epoch(冷却)
+_daily_count: dict[str, tuple[str, int]] = {}  # phone -> (date_str, 当日发送数)
+_lock = Lock()
+_GC_THRESHOLD = 10000  # 任一内存 dict 超此阈值,send 时顺手清过期项(防无限增长,仿 ratelimit)
+
+
+def _today() -> str:
+    return datetime.now().strftime("%Y-%m-%d")
+
+
+def _gen_code() -> str:
+    """生成 N 位数字验证码(用 secrets 而非 random;允许前导 0)。"""
+    return "".join(secrets.choice("0123456789") for _ in range(settings.SMS_CODE_LENGTH))
+
+
+def _gc(now: float) -> None:
+    """顺手清理过期内存项,防三个 dict 无限增长。仅在持锁时调用,且某 dict 超
+    _GC_THRESHOLD 才扫它(低频,开销可忽略)。"""
+    if len(_codes) > _GC_THRESHOLD:
+        for p in [p for p, r in _codes.items() if now > r.expires_at]:
+            _codes.pop(p, None)
+    if len(_last_sent) > _GC_THRESHOLD:
+        cutoff = now - settings.SMS_SEND_INTERVAL_SEC
+        for p in [p for p, ts in _last_sent.items() if ts < cutoff]:
+            _last_sent.pop(p, None)
+    if len(_daily_count) > _GC_THRESHOLD:
+        today = _today()
+        for p in [p for p, (d, _c) in _daily_count.items() if d != today]:
+            _daily_count.pop(p, None)
 
 
 def send_code(phone: str) -> int:
-    """发送(或 mock 发送)验证码。
+    """发送验证码。
 
-    Returns: 距下一次可发的秒数(=0 表示刚刚已发,需等 SMS_SEND_INTERVAL_SEC 秒)
-    Raises: SmsError 如果上次发送在 SMS_SEND_INTERVAL_SEC 内
+    Returns: 距下次可发的秒数(= SMS_SEND_INTERVAL_SEC)
+    Raises: SmsError(过频 429 / 当日超限 429 / 供应商失败 503 / 手机号无效 400)
     """
     now = time.time()
+
+    # --- lock 内:防刷检查 + 预占(防并发重复发烧钱)---
     with _lock:
-        last = _last_sent.get(phone, 0.0)
-        elapsed = now - last
+        _gc(now)  # 顺手清过期内存(超阈值才扫)
+        elapsed = now - _last_sent.get(phone, 0.0)
         if elapsed < settings.SMS_SEND_INTERVAL_SEC:
             remain = int(settings.SMS_SEND_INTERVAL_SEC - elapsed)
-            raise SmsError(f"send too frequent, retry in {remain}s")
-        _last_sent[phone] = now
+            raise SmsError(f"发送过于频繁,请 {remain}s 后再试")
 
-    if settings.SMS_MOCK:
-        logger.info("[SMS-MOCK] send to %s****, code=any-6-digits", phone[:3])
-    else:
-        # TODO: 接真实短信供应商
-        logger.warning("[SMS] real provider not implemented yet, phone=%s****", phone[:3])
-        raise SmsError("sms provider not configured")
+        today = _today()
+        day, cnt = _daily_count.get(phone, ("", 0))
+        if day != today:
+            cnt = 0
+        if cnt >= settings.SMS_DAILY_LIMIT_PER_PHONE:
+            raise SmsError("今日验证码发送次数已达上限,请明天再试")
+
+        code = _gen_code()
+        # 预占:先记冷却/计数/存码,释放锁后再发网络(发失败保留冷却+计数,见下)
+        _last_sent[phone] = now
+        _daily_count[phone] = (today, cnt + 1)
+        _codes[phone] = _CodeRecord(code=code, expires_at=now + settings.SMS_CODE_TTL_SEC)
+
+    # --- lock 外:真正发送(网络 IO 不持锁)---
+    try:
+        if settings.SMS_MOCK:
+            logger.info("[SMS-MOCK] to %s**** code=%s (不真发)", phone[:3], code)
+        else:
+            _send_via_jiguang(phone, code)
+            logger.info("[SMS] sent to %s****", phone[:3])
+    except Exception as e:
+        # 发送失败:**保留冷却 + 每日计数**(失败也限速,挡住余额不足/签名失效时
+        # 前端重试狂打极光),只清掉没发出去的码(用户收不到,留着无意义且占内存)。
+        with _lock:
+            _codes.pop(phone, None)
+        if isinstance(e, SmsError):
+            raise
+        logger.exception("[SMS] send failed phone=%s****", phone[:3])
+        raise SmsError("验证码发送失败,请稍后重试", status_code=503) from e
 
     return settings.SMS_SEND_INTERVAL_SEC
 
 
 def verify_code(phone: str, code: str) -> bool:
-    """校验验证码。mock 模式下任意 6 位数字均通过。"""
+    """校验验证码。
+
+    - **mock 模式**:放行任意 N 位数字(测试/开发便利,不真校验)。
+    - **real 模式**:比对本服务存的码,匹配即作废(一次性);失败累计到上限也作废(防爆破)。
+    """
     if settings.SMS_MOCK:
-        if len(code) == 6 and code.isdigit():
-            logger.info("[SMS-MOCK] verify ok for %s****", phone[:3])
+        ok = len(code) == settings.SMS_CODE_LENGTH and code.isdigit()
+        logger.info("[SMS-MOCK] verify %s for %s****", "ok" if ok else "fail", phone[:3])
+        return ok
+
+    with _lock:
+        rec = _codes.get(phone)
+        if rec is None:
+            return False
+        if time.time() > rec.expires_at:
+            _codes.pop(phone, None)
+            return False
+        if rec.attempts >= settings.SMS_MAX_VERIFY_ATTEMPTS:
+            _codes.pop(phone, None)  # 试错过多,作废
+            return False
+        if secrets.compare_digest(code.encode("utf-8"), rec.code.encode("utf-8")):
+            _codes.pop(phone, None)  # 验过即作废
             return True
-        logger.info("[SMS-MOCK] verify fail (need 6 digits) for %s****", phone[:3])
+        rec.attempts += 1
         return False
 
-    # TODO: 比对供应商发出的真实验证码
-    logger.warning("[SMS] real provider not implemented yet, phone=%s****", phone[:3])
-    return False
+
+def _send_via_jiguang(phone: str, code: str) -> None:
+    """调极光短信 REST /v1/messages 发送(自定义验证码模式)。失败抛 SmsError。"""
+    if not settings.JG_APP_KEY or not settings.JG_MASTER_SECRET:
+        raise SmsError("短信服务未配置(缺 JG_APP_KEY/JG_MASTER_SECRET)", status_code=503)
+    if not settings.SMS_SIGN_ID or not settings.SMS_TEMPLATE_ID:
+        raise SmsError("短信服务未配置(缺 SMS_SIGN_ID/SMS_TEMPLATE_ID)", status_code=503)
+
+    auth_b64 = base64.b64encode(
+        f"{settings.JG_APP_KEY}:{settings.JG_MASTER_SECRET}".encode()
+    ).decode()
+    body = {
+        "mobile": phone,
+        "sign_id": settings.SMS_SIGN_ID,
+        "temp_id": settings.SMS_TEMPLATE_ID,
+        "temp_para": {"code": code},
+    }
+    try:
+        resp = httpx.post(
+            settings.SMS_SEND_ENDPOINT,
+            json=body,
+            headers={
+                "Content-Type": "application/json",
+                "Authorization": f"Basic {auth_b64}",
+            },
+            timeout=settings.JG_REQUEST_TIMEOUT_SEC,
+        )
+    except httpx.HTTPError as e:
+        raise SmsError(f"短信网关网络错误: {e}", status_code=503) from e
+
+    if resp.status_code == 200:
+        return  # {"msg_id": ...}
+
+    # 极光错误码映射(节选常见;完整码表见 docs/integrations/sms.md)
+    try:
+        err = resp.json().get("error", {})
+        ecode, emsg = err.get("code"), err.get("message", "")
+    except Exception:
+        ecode, emsg = None, resp.text[:200]
+    logger.error("[SMS] jiguang error http=%s code=%s msg=%s", resp.status_code, ecode, emsg)
+
+    if ecode == 50014:  # 余额不足:运维要立即告警充值
+        logger.critical("[SMS] 极光短信余额不足(50014),需充值!")
+        raise SmsError("短信服务暂不可用,请稍后重试", status_code=503)
+    if ecode == 50009:  # 极光侧超频
+        raise SmsError("发送过于频繁,请稍后再试", status_code=429)
+    if ecode == 50006:  # 手机号无效(schema 已挡格式,这里多是空号/停机)
+        raise SmsError("手机号无效", status_code=400)
+    raise SmsError(f"短信发送失败(code={ecode})", status_code=503)

app/main.py

@@ -17,10 +17,13 @@ from fastapi.staticfiles import StaticFiles
 from app.api.v1.ad import router as ad_router
 from app.api.v1.auth import router as auth_router
 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.feedback import router as feedback_router
 from app.api.v1.meituan import router as meituan_router
 from app.api.v1.order import router as order_router
+from app.api.v1.report import router as report_router
 from app.api.v1.savings import router as savings_router
 from app.api.v1.signin import router as signin_router
 from app.api.v1.tasks import router as tasks_router
@@ -75,6 +78,8 @@ app.include_router(user_router)
 app.include_router(feedback_router)
 app.include_router(coupon_router)
 app.include_router(compare_router)
+app.include_router(compare_record_router)
+app.include_router(compare_milestone_router)
 app.include_router(meituan_router)
 app.include_router(wallet_router)
 app.include_router(signin_router)
@@ -82,6 +87,7 @@ app.include_router(tasks_router)
 app.include_router(savings_router)
 app.include_router(ad_router)
 app.include_router(order_router)
+app.include_router(report_router)
 
 # 用户上传文件(头像)静态服务。生产可改由 nginx 直接 serve MEDIA_ROOT。
 _media_root = Path(settings.MEDIA_ROOT)

app/models/__init__.py

@@ -1,6 +1,11 @@
 """所有 ORM model 必须在这里 import 一次,Alembic / metadata 才能扫到。"""
+from app.models.ad_ecpm import AdEcpmRecord  # noqa: F401
 from app.models.ad_reward import AdRewardRecord  # noqa: F401
+from app.models.admin import AdminAuditLog, AdminUser  # noqa: F401
+from app.models.comparison import ComparisonRecord  # noqa: F401
+from app.models.comparison_milestone import ComparisonMilestoneClaim  # noqa: F401
 from app.models.feedback import Feedback  # noqa: F401
+from app.models.price_report import PriceReport  # noqa: F401
 from app.models.savings import SavingsRecord  # noqa: F401
 from app.models.signin import SigninRecord  # noqa: F401
 from app.models.task import UserTask  # noqa: F401

app/models/ad_ecpm.py

@@ -0,0 +1,49 @@
+"""广告展示 eCPM 上报记录(内部收益统计/对账)。
+
+每条 = 客户端一次广告展示(`onAdShow`)后读到的 eCPM 信息。和发奖记录
+[ad_reward.AdRewardRecord] 是**两条独立的数据流**:
+- 发奖走穿山甲 S2S 回调(后端 → 有 trans_id、无 ecpm);
+- eCPM 走客户端上报(客户端 → 有 ecpm、无 trans_id)。
+两者没有公共键,无法逐条一一对应,所以本表用于**按用户/按天聚合收益**口径的对账,
+不做"这条发奖 = 这条 ecpm"的精确关联。穿山甲后台报表才是结算权威,本表是细粒度补充。
+
+⚠️ `ecpm_raw` 原样存客户端上报的字符串——eCPM 单位(分 / 元)截至 2026-05-31 尚未最终确认,
+确认后再加一列解析好的数值;在此之前对账按"待定单位"处理。
+"""
+from __future__ import annotations
+
+from datetime import datetime
+
+from sqlalchemy import DateTime, ForeignKey, Integer, String, func
+from sqlalchemy.orm import Mapped, mapped_column
+
+from app.db.base import Base
+
+
+class AdEcpmRecord(Base):
+    __tablename__ = "ad_ecpm_record"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
+    user_id: Mapped[int] = mapped_column(
+        Integer, ForeignKey("user.id"), index=True, nullable=False
+    )
+    # 广告类型:reward_video(激励视频) / draw(Draw 信息流) 等;不强行统一代码位,各类型各自上报
+    ad_type: Mapped[str] = mapped_column(String(32), nullable=False)
+    # 实际投放的 ADN(穿山甲 getShowEcpm().getSdkName(),如 pangle / gdt)
+    adn: Mapped[str | None] = mapped_column(String(32), nullable=True)
+    # 实际展示用的代码位(底层 mediation rit,非客户端配置位)
+    slot_id: Mapped[str | None] = mapped_column(String(64), nullable=True)
+    # 客户端上报的 eCPM 原始字符串(单位待确认,原样存)
+    ecpm_raw: Mapped[str] = mapped_column(String(32), nullable=False)
+    # 北京时间日期串 'YYYY-MM-DD',按它等值做"按天聚合"(不在 SQL 里做跨时区 date 比较)
+    report_date: Mapped[str] = mapped_column(String(10), index=True, nullable=False)
+
+    created_at: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True), server_default=func.now(), index=True, nullable=False
+    )
+
+    def __repr__(self) -> str:  # pragma: no cover
+        return (
+            f"<AdEcpmRecord user_id={self.user_id} {self.ad_type} "
+            f"ecpm={self.ecpm_raw} adn={self.adn}>"
+        )

app/models/admin.py

@@ -0,0 +1,70 @@
+"""Admin 后台:管理员账号 + 操作审计日志。
+
+与 App 用户(user 表)完全隔离:admin 走独立 JWT secret、独立鉴权链(见 app/admin/)。
+- admin_user:账号密码(bcrypt)登录,带角色(super_admin / finance / operator)。
+- admin_audit_log:每个写操作落一条,记前后值,不可删,用于追溯"谁在何时改了谁的钱/状态"。
+  admin_username / target_id 冗余存字符串,即使关联对象被删/改名也能追溯。
+"""
+from __future__ import annotations
+
+from datetime import datetime
+
+from sqlalchemy import JSON, DateTime, ForeignKey, Integer, String, func
+from sqlalchemy.dialects.postgresql import JSONB
+from sqlalchemy.orm import Mapped, mapped_column
+
+from app.db.base import Base
+
+# PG 用 JSONB,SQLite(本地/测试)退化为通用 JSON(同 comparison_record.raw_payload)。
+_JSON = JSON().with_variant(JSONB(), "postgresql")
+
+
+class AdminUser(Base):
+    __tablename__ = "admin_user"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
+    username: Mapped[str] = mapped_column(String(64), unique=True, index=True, nullable=False)
+    password_hash: Mapped[str] = mapped_column(String(255), nullable=False)
+    # super_admin(全权+管账号)/ finance(钱:提现+金币)/ operator(用户+反馈+大盘)
+    role: Mapped[str] = mapped_column(String(20), nullable=False, default="operator")
+    # active / disabled
+    status: Mapped[str] = mapped_column(String(20), nullable=False, default="active")
+
+    created_at: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True), server_default=func.now(), nullable=False
+    )
+    last_login_at: Mapped[datetime | None] = mapped_column(
+        DateTime(timezone=True), nullable=True
+    )
+
+    def __repr__(self) -> str:  # pragma: no cover
+        return f"<AdminUser id={self.id} username={self.username} role={self.role}>"
+
+
+class AdminAuditLog(Base):
+    __tablename__ = "admin_audit_log"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
+    admin_id: Mapped[int] = mapped_column(
+        Integer, ForeignKey("admin_user.id"), index=True, nullable=False
+    )
+    # 冗余存操作者用户名:admin 改名/禁用后仍可追溯是谁干的
+    admin_username: Mapped[str] = mapped_column(String(64), nullable=False)
+    # 操作类型,如 user.coins.grant / user.status.set / withdraw.refresh / feedback.handle
+    action: Mapped[str] = mapped_column(String(64), index=True, nullable=False)
+    # 被操作对象类型 + id(id 用字符串以兼容 out_bill_no 等非整型主键)
+    target_type: Mapped[str] = mapped_column(String(32), nullable=False)
+    target_id: Mapped[str | None] = mapped_column(String(64), nullable=True)
+    # 上下文 + 前后值,如 {"amount": 1000, "reason": "...", "before": {...}, "after": {...}}
+    detail: Mapped[dict | None] = mapped_column(_JSON, nullable=True)
+    ip: Mapped[str | None] = mapped_column(String(64), nullable=True)
+
+    created_at: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True), server_default=func.now(), index=True, nullable=False
+    )
+
+    def __repr__(self) -> str:  # pragma: no cover
+        return (
+            f"<AdminAuditLog id={self.id} admin={self.admin_username} "
+            f"action={self.action} target={self.target_type}:{self.target_id}>"
+        )

app/models/comparison.py

@@ -0,0 +1,104 @@
+"""比价记录表。
+
+每完成一次比价(外卖/电商/领券),客户端在 done 帧后用带 JWT 的通道上报一条,落这里。
+是未来「我的比价记录」页的数据源,也沉淀用户级行为画像(哪个用户在哪两家之间比了什么)。
+
+与 savings_record 的区别:savings_record 是「省了多少钱」的视角(只有省到才有意义,当前由
+demo seeder 灌),本表是「每一次比价的完整明细」——不省钱、甚至失败的比价也照记一条。
+两表独立,互不影响。
+
+「越详细越好」的落地:结构化列给查询/排序/聚合用,raw_payload(JSONB)把客户端上报的
+原始 calibration + done.params 原样存一份,未来前端要展示什么都能拿到、不丢信息。
+"""
+from __future__ import annotations
+
+from datetime import datetime
+
+from sqlalchemy import (
+    JSON,
+    Boolean,
+    DateTime,
+    ForeignKey,
+    Integer,
+    String,
+    UniqueConstraint,
+    func,
+)
+from sqlalchemy.dialects.postgresql import JSONB
+from sqlalchemy.orm import Mapped, mapped_column
+
+from app.db.base import Base
+
+# PG 上用 JSONB(可建 GIN 索引),SQLite(本地/测试)退化为通用 JSON——
+# 否则 SQLite 无 JSONB,Base.metadata.create_all 编译报错(同 savings_record.dishes)。
+_JSON = JSON().with_variant(JSONB(), "postgresql")
+
+
+class ComparisonRecord(Base):
+    __tablename__ = "comparison_record"
+    __table_args__ = (
+        # 同一用户同一次比价(trace_id)只存一条:客户端重试/误点重复上报时幂等覆盖。
+        UniqueConstraint("user_id", "trace_id", name="uq_comparison_user_trace"),
+    )
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
+    user_id: Mapped[int] = mapped_column(
+        Integer, ForeignKey("user.id"), index=True, nullable=False
+    )
+    # 仍记录设备号(同一用户多设备的行为区分 / 与不鉴权期 device_id 数据对账)
+    device_id: Mapped[str | None] = mapped_column(String(64), nullable=True)
+    # 业务类型:food(外卖,当前唯一接通)/ ecom(电商)/ coupon(领券)。预留扩展。
+    business_type: Mapped[str] = mapped_column(
+        String(16), nullable=False, default="food", index=True
+    )
+    # pricebot 侧 trace_id:关联调试落盘 + 幂等去重键
+    trace_id: Mapped[str] = mapped_column(String(64), nullable=False)
+
+    # ===== 源平台(发起比价的那家)=====
+    source_platform_id: Mapped[str | None] = mapped_column(String(32), nullable=True)
+    source_platform_name: Mapped[str | None] = mapped_column(String(32), nullable=True)
+    source_package: Mapped[str | None] = mapped_column(String(128), nullable=True)
+    source_price_cents: Mapped[int | None] = mapped_column(Integer, nullable=True)
+
+    # ===== 最优结果(全平台最便宜的一家,= comparison_results 里 rank=1)=====
+    best_platform_id: Mapped[str | None] = mapped_column(String(32), nullable=True)
+    best_platform_name: Mapped[str | None] = mapped_column(String(32), nullable=True)
+    best_price_cents: Mapped[int | None] = mapped_column(Integer, nullable=True)
+    # 最优平台的商家/商品深链(客户端比价时从剪贴板采到 = collectedLinks[best_index]);
+    # 「再次比价」写剪贴板 + launch 该平台 App 直达。仅 2026-06 起新比价有,旧记录为 None。
+    best_deeplink: Mapped[str | None] = mapped_column(String(1024), nullable=True)
+    # 源价 - 最优价(可为 0 / 负:源平台本来就最便宜时没省到)
+    saved_amount_cents: Mapped[int | None] = mapped_column(Integer, nullable=True)
+    # 源平台就是最便宜的一家(= 这次没省到钱)
+    is_source_best: Mapped[bool | None] = mapped_column(Boolean, nullable=True)
+
+    # ===== 订单概要 =====
+    store_name: Mapped[str | None] = mapped_column(String(128), nullable=True)
+    total_dish_count: Mapped[int | None] = mapped_column(Integer, nullable=True)
+    skipped_dish_count: Mapped[int | None] = mapped_column(Integer, nullable=True)
+
+    # success(拿到有效对比)/ failed(出错或没采到目标价)
+    status: Mapped[str] = mapped_column(String(16), nullable=False, default="success")
+    # done 帧 information 文案。成功:"在美团找到同店,到手价 ¥X…";
+    # 失败:具体原因(如"美团、京东外卖均未找到该商品")。前端在比价失败时当原因展示。
+    information: Mapped[str | None] = mapped_column(String(256), nullable=True)
+
+    # ===== 明细(JSON,越详细越好)=====
+    # 下单菜品 [{name, qty, specs?}]
+    items: Mapped[list] = mapped_column(_JSON, nullable=False, default=list)
+    # 逐平台对比 [{platform_id, platform_name, package, price, is_source, rank, coupon_saved}](price/coupon_saved 单位:元,原样存)
+    comparison_results: Mapped[list] = mapped_column(_JSON, nullable=False, default=list)
+    # 目标平台未找到、跳过的菜名
+    skipped_dish_names: Mapped[list] = mapped_column(_JSON, nullable=False, default=list)
+    # 客户端上报的原始 payload(calibration + done.params 全量),未来取数兜底
+    raw_payload: Mapped[dict | None] = mapped_column(_JSON, nullable=True)
+
+    created_at: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True), server_default=func.now(), index=True, nullable=False
+    )
+
+    def __repr__(self) -> str:  # pragma: no cover
+        return (
+            f"<ComparisonRecord id={self.id} user_id={self.user_id} "
+            f"trace_id={self.trace_id} status={self.status}>"
+        )

app/models/comparison_milestone.py

@@ -0,0 +1,36 @@
+"""比价战绩里程碑领取记录表。
+
+「记录比价战绩」每档(第 1~6 次)只能领一次,领取后写一行,(user_id, milestone)
+唯一,防止重复领奖。解锁进度由 comparison_record 里 status='success' 的条数决定,
+不存进度本身——只在这里记"哪几档已领"。仿 user_task 的一次性领取模型。
+"""
+from __future__ import annotations
+
+from datetime import datetime
+
+from sqlalchemy import DateTime, ForeignKey, Integer, UniqueConstraint, func
+from sqlalchemy.orm import Mapped, mapped_column
+
+from app.db.base import Base
+
+
+class ComparisonMilestoneClaim(Base):
+    __tablename__ = "comparison_milestone_claim"
+    __table_args__ = (
+        UniqueConstraint("user_id", "milestone", name="uq_compare_milestone_user"),
+    )
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
+    user_id: Mapped[int] = mapped_column(
+        Integer, ForeignKey("user.id"), index=True, nullable=False
+    )
+    # 档位序号(1-based),见 app.core.rewards.RECORD_MILESTONES
+    milestone: Mapped[int] = mapped_column(Integer, nullable=False)
+    coin_awarded: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
+
+    claimed_at: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True), server_default=func.now(), nullable=False
+    )
+
+    def __repr__(self) -> str:  # pragma: no cover
+        return f"<ComparisonMilestoneClaim user_id={self.user_id} m={self.milestone}>"

app/models/price_report.py

@@ -0,0 +1,67 @@
+"""上报更低价记录表(price_report)。
+
+用户在「比价记录」里选一条记录,上报「某平台有比我们算出的最低价更低的价格」,带截图证明,
+人工审核通过奖励金币。与 feedback(自由文本反馈)不同:本表结构化——关联具体比价记录、
+原最低价 vs 上报价、审核状态、奖励。
+
+- 原最低价快照(original_*)由后端按 comparison_record_id 反查比价记录的 best_* 冗余填入,
+  避免被关联记录后续删/改后对不上。
+- 价格统一存「分」(cents),与 comparison_record / savings_record 一致。
+- status: pending(审核中)/ approved(已通过)/ rejected(未通过),对齐前端筛选与状态徽标。
+- images: 截图相对 URL 列表(/media/price_report/...,复用 app.core.media)。
+- 奖励发放(通过 → 钱包 +reward_coins)是人工审核后台动作,提交时一律 pending,本表只留字段。
+"""
+from __future__ import annotations
+
+from datetime import datetime
+
+from sqlalchemy import JSON, DateTime, ForeignKey, Integer, String, func
+from sqlalchemy.orm import Mapped, mapped_column
+
+from app.db.base import Base
+
+
+class PriceReport(Base):
+    __tablename__ = "price_report"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
+    user_id: Mapped[int] = mapped_column(
+        Integer, ForeignKey("user.id"), index=True, nullable=False
+    )
+    # 选中的那条比价记录(可空:记录被删后仍保留上报历史)
+    comparison_record_id: Mapped[int | None] = mapped_column(
+        Integer, ForeignKey("comparison_record.id"), index=True, nullable=True
+    )
+
+    # ===== 选中比价记录的快照(后端反查 comparison_record 填入,冗余存) =====
+    store_name: Mapped[str | None] = mapped_column(String(128), nullable=True)
+    dish_summary: Mapped[str | None] = mapped_column(String(256), nullable=True)
+    original_platform_id: Mapped[str | None] = mapped_column(String(32), nullable=True)
+    original_platform_name: Mapped[str | None] = mapped_column(String(32), nullable=True)
+    original_price_cents: Mapped[int | None] = mapped_column(Integer, nullable=True)
+
+    # ===== 用户上报的更低价 =====
+    reported_platform_id: Mapped[str] = mapped_column(String(32), nullable=False)
+    reported_platform_name: Mapped[str] = mapped_column(String(32), nullable=False)
+    reported_price_cents: Mapped[int] = mapped_column(Integer, nullable=False)
+    # 截图证明 URL 列表(相对路径,如 ["/media/price_report/u1_ab.jpg"])
+    images: Mapped[list[str]] = mapped_column(JSON, nullable=False, default=list)
+
+    # ===== 审核(人工后台) =====
+    status: Mapped[str] = mapped_column(
+        String(16), nullable=False, default="pending", index=True
+    )
+    reject_reason: Mapped[str | None] = mapped_column(String(256), nullable=True)
+    reward_coins: Mapped[int | None] = mapped_column(Integer, nullable=True)
+    reviewed_at: Mapped[datetime | None] = mapped_column(
+        DateTime(timezone=True), nullable=True
+    )
+
+    created_at: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True), server_default=func.now(), index=True, nullable=False
+    )
+
+    def __repr__(self) -> str:  # pragma: no cover
+        return (
+            f"<PriceReport id={self.id} user_id={self.user_id} status={self.status}>"
+        )

app/repositories/ad_ecpm.py

@@ -0,0 +1,49 @@
+"""广告 eCPM 上报 CRUD(内部收益统计/对账)。
+
+客户端在广告展示后(onAdShow)读到 eCPM,经鉴权接口上报,这里落库。鉴权接口已确保
+user 存在(JWT),故不做 UnknownUser 校验。best-effort 上报:丢一两条不影响业务,
+穿山甲后台报表是结算权威兜底。
+"""
+from __future__ import annotations
+
+from sqlalchemy import func, select
+from sqlalchemy.orm import Session
+
+from app.core.rewards import cn_today
+from app.models.ad_ecpm import AdEcpmRecord
+
+
+def create_ecpm_record(
+    db: Session,
+    user_id: int,
+    *,
+    ad_type: str,
+    ecpm_raw: str,
+    adn: str | None = None,
+    slot_id: str | None = None,
+) -> AdEcpmRecord:
+    """落一条 eCPM 上报记录。report_date 用北京时间当天,供按天聚合。"""
+    rec = AdEcpmRecord(
+        user_id=user_id,
+        ad_type=ad_type,
+        adn=adn,
+        slot_id=slot_id,
+        ecpm_raw=ecpm_raw,
+        report_date=cn_today().isoformat(),
+    )
+    db.add(rec)
+    db.commit()
+    db.refresh(rec)
+    return rec
+
+
+def count_today(db: Session, user_id: int) -> int:
+    """该用户今日(北京时间)上报的 eCPM 条数,排查/对账辅助用。"""
+    return db.execute(
+        select(func.count())
+        .select_from(AdEcpmRecord)
+        .where(
+            AdEcpmRecord.user_id == user_id,
+            AdEcpmRecord.report_date == cn_today().isoformat(),
+        )
+    ).scalar_one()

app/repositories/ad_reward.py

@@ -10,17 +10,16 @@
 """
 from __future__ import annotations
 
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timezone
 
 from sqlalchemy import func, select
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import Session
 
+from app.core.ad_cooldown import compute_cooldown
 from app.core.rewards import (
     AD_REWARD_COIN,
     DAILY_AD_REWARD_LIMIT,
-    VIDEO_ROUND_COOLDOWN_SECONDS,
-    VIDEO_ROUND_REQUIRED_COUNT,
     cn_today,
 )
 from app.repositories import wallet as crud_wallet
@@ -86,7 +85,7 @@ def grant_ad_reward(
     # 发金币 + 记一笔,同事务
     crud_wallet.grant_coins(
         db, user_id, coin,
-        biz_type="ad_reward", ref_id=trans_id, remark="看广告奖励",
+        biz_type="ad_reward", ref_id=trans_id, remark="看视频奖励金币",
     )
     rec = AdRewardRecord(
         trans_id=trans_id, user_id=user_id, coin=coin, status="granted",
@@ -110,26 +109,19 @@ def _commit_record(db: Session, rec: AdRewardRecord, trans_id: str) -> AdRewardR
     return rec
 
 
-def _last_completed_round_end_at(
-    db: Session, user_id: int, reward_date: str, round_count: int
-) -> datetime | None:
-    """当日 granted 记录中**最近一个已完成轮**末尾那次的 created_at。
-
-    思路:把当日 granted 按时间倒序排,跳过当前未完成轮的 round_count 条,下一条
-    即"上一轮最后一次"。round_count==0 且 used>=N 时跳 0 条直接取最近一条。
-    used<N(还没完成第一轮)调用方应直接判 None,不进这里。
-    """
-    return db.execute(
-        select(AdRewardRecord.created_at)
-        .where(
-            AdRewardRecord.user_id == user_id,
-            AdRewardRecord.reward_date == reward_date,
-            AdRewardRecord.status == "granted",
-        )
-        .order_by(AdRewardRecord.created_at.desc())
-        .offset(round_count)
-        .limit(1)
-    ).scalar_one_or_none()
+def _granted_times_today_desc(db: Session, user_id: int, reward_date: str) -> list[datetime]:
+    """当日 status=granted 记录的 created_at,按时间倒序(最新在前)——冷却策略的输入数据。"""
+    return list(
+        db.execute(
+            select(AdRewardRecord.created_at)
+            .where(
+                AdRewardRecord.user_id == user_id,
+                AdRewardRecord.reward_date == reward_date,
+                AdRewardRecord.status == "granted",
+            )
+            .order_by(AdRewardRecord.created_at.desc())
+        ).scalars()
+    )
 
 
 def today_status(
@@ -138,21 +130,16 @@ def today_status(
     """客户端查"今日看广告发奖"进度。
 
     返回 (今日已发次数, 每日上限, 单次金币, 本轮已看次数, 本轮冷却结束时间(UTC))。
-    - round_count = used % VIDEO_ROUND_REQUIRED_COUNT,展示用(0..N-1)
-    - cooldown_until 计算:取最近一个已完成轮末尾的 created_at + 10 min;若仍 > now 则返回,
-      否则返回 None。冷却 = UX 约束(客户端 CTA 倒计时不可点),后端发奖逻辑不受影响。
+    本函数只**取数据**(今日 granted 的 created_at 倒序),把"本轮已看几次 + 冷却到几点"的
+    **策略判断**委托给 [app.core.ad_cooldown.compute_cooldown](纯函数)——换冷却策略只动那个模块。
     """
     today = cn_today().isoformat()
-    used = _granted_today(db, user_id, today)
-    round_count = used % VIDEO_ROUND_REQUIRED_COUNT
-    cooldown_until: datetime | None = None
-    if used >= VIDEO_ROUND_REQUIRED_COUNT:
-        last_end = _last_completed_round_end_at(db, user_id, today, round_count)
-        if last_end is not None:
-            # SQLAlchemy 在 SQLite 上拿到的 created_at 可能是 naive,统一按 UTC 解读再比较
-            if last_end.tzinfo is None:
-                last_end = last_end.replace(tzinfo=timezone.utc)
-            cd_end = last_end + timedelta(seconds=VIDEO_ROUND_COOLDOWN_SECONDS)
-            if cd_end > datetime.now(timezone.utc):
-                cooldown_until = cd_end
-    return used, DAILY_AD_REWARD_LIMIT, AD_REWARD_COIN, round_count, cooldown_until
+    granted_desc = _granted_times_today_desc(db, user_id, today)
+    state = compute_cooldown(granted_desc, datetime.now(timezone.utc))
+    return (
+        len(granted_desc),
+        DAILY_AD_REWARD_LIMIT,
+        AD_REWARD_COIN,
+        state.round_count,
+        state.cooldown_until,
+    )

app/repositories/comparison.py

@@ -0,0 +1,173 @@
+"""比价记录 CRUD:上报 upsert(按 user_id+trace_id 幂等) + 派生字段 + 明细分页。
+
+派生逻辑:best_* / saved_amount_cents / is_source_best 全部从 comparison_results 算出
+(协议保证已按 price 升序、rank=1 最便宜),客户端不用自己算、也不可信它算。
+"""
+from __future__ import annotations
+
+from sqlalchemy import func, select
+from sqlalchemy.orm import Session
+
+from app.models.comparison import ComparisonRecord
+from app.models.savings import SavingsRecord
+from app.schemas.compare_record import ComparisonRecordIn
+
+
+def _yuan_to_cents(yuan: float | None) -> int | None:
+    """元(float)→ 分(int)。None 透传。"""
+    if yuan is None:
+        return None
+    return round(yuan * 100)
+
+
+def _derive(payload: ComparisonRecordIn) -> dict:
+    """从上报 payload 派生结构化列(best/saved/is_source_best/status)。"""
+    results = payload.comparison_results
+
+    # 最优 = rank 最小的一条;协议已升序,但不信顺序,显式按 rank/price 兜底取最小价。
+    best = None
+    priced = [r for r in results if r.price is not None]
+    if priced:
+        best = min(
+            priced,
+            key=lambda r: (r.rank if r.rank is not None else 10**9, r.price),
+        )
+
+    source_price_cents = _yuan_to_cents(payload.source_price)
+    if source_price_cents is None:
+        # 源价没单独给,从 comparison_results 里的 is_source 行兜底
+        src_row = next((r for r in results if r.is_source and r.price is not None), None)
+        if src_row is not None:
+            source_price_cents = _yuan_to_cents(src_row.price)
+
+    best_price_cents = _yuan_to_cents(best.price) if best else None
+
+    saved_amount_cents = None
+    if source_price_cents is not None and best_price_cents is not None:
+        saved_amount_cents = source_price_cents - best_price_cents
+
+    is_source_best = best.is_source if best is not None else None
+
+    # status:客户端显式给了就用;否则有"非源且有价"的结果=success,否则 failed
+    status = payload.status
+    if status is None:
+        has_valid_target = any(
+            (not r.is_source) and r.price is not None for r in results
+        )
+        status = "success" if has_valid_target else "failed"
+
+    return {
+        "source_price_cents": source_price_cents,
+        "best_platform_id": best.platform_id if best else None,
+        "best_platform_name": best.platform_name if best else None,
+        "best_price_cents": best_price_cents,
+        "saved_amount_cents": saved_amount_cents,
+        "is_source_best": is_source_best,
+        "status": status,
+    }
+
+
+def upsert_record(
+    db: Session, *, user_id: int, payload: ComparisonRecordIn
+) -> ComparisonRecord:
+    """按 (user_id, trace_id) 幂等写入:已存在则覆盖(更完整的重试上报胜出),否则新建。"""
+    derived = _derive(payload)
+    fields = dict(
+        device_id=payload.device_id,
+        business_type=payload.business_type,
+        store_name=payload.store_name,
+        source_platform_id=payload.source_platform_id,
+        source_platform_name=payload.source_platform_name,
+        source_package=payload.source_package,
+        information=payload.information,
+        best_deeplink=payload.best_deeplink,
+        total_dish_count=payload.total_dish_count,
+        skipped_dish_count=payload.skipped_dish_count,
+        items=[it.model_dump(exclude_none=True) for it in payload.items],
+        comparison_results=[r.model_dump() for r in payload.comparison_results],
+        skipped_dish_names=list(payload.skipped_dish_names),
+        raw_payload=payload.model_dump(),
+        **derived,
+    )
+
+    existing = db.execute(
+        select(ComparisonRecord).where(
+            ComparisonRecord.user_id == user_id,
+            ComparisonRecord.trace_id == payload.trace_id,
+        )
+    ).scalar_one_or_none()
+
+    if existing is not None:
+        for k, v in fields.items():
+            setattr(existing, k, v)
+        db.commit()
+        db.refresh(existing)
+        return existing
+
+    rec = ComparisonRecord(user_id=user_id, trace_id=payload.trace_id, **fields)
+    db.add(rec)
+    db.commit()
+    db.refresh(rec)
+    return rec
+
+
+def _ordered_shop_names(db: Session, user_id: int) -> set[str]:
+    """该用户「真实下单」(source='compare')覆盖到的店名集合,用来给比价记录打「已下单」。
+
+    只认 compare(归因命中后真实上报),demo 演示数据不算。下单上报不带 trace_id,
+    只能按店名对齐——两边店名同源(都来自比价意图识别阶段的门店名 query),精确相等即视为同店。
+    语义=店级:同一家店比价过多次,这些记录会一并标「已下单」。
+    """
+    rows = db.execute(
+        select(SavingsRecord.shop_name).where(
+            SavingsRecord.user_id == user_id,
+            SavingsRecord.source == "compare",
+            SavingsRecord.shop_name.is_not(None),
+        )
+    ).scalars().all()
+    return {s for s in rows if s}
+
+
+def list_records(
+    db: Session,
+    user_id: int,
+    *,
+    limit: int = 20,
+    cursor: int | None = None,
+) -> tuple[list[ComparisonRecord], int | None]:
+    """比价记录分页(按创建时间倒序、id 兜底,游标式)。附「已下单」店级标记(瞬态,不写库)。"""
+    stmt = select(ComparisonRecord).where(ComparisonRecord.user_id == user_id)
+    if cursor is not None:
+        stmt = stmt.where(ComparisonRecord.id < cursor)
+    stmt = stmt.order_by(ComparisonRecord.created_at.desc(), ComparisonRecord.id.desc()).limit(limit)
+
+    items = list(db.execute(stmt).scalars().all())
+    next_cursor = items[-1].id if len(items) == limit else None
+
+    # 「已下单」标记:本页记录的 store_name 若落在该用户真实下单的店名集合里即 True。
+    # ordered 非 ORM 列,仅挂实例上供 ComparisonRecordOut(from_attributes) 读出,不持久化。
+    ordered_shops = _ordered_shop_names(db, user_id)
+    for it in items:
+        it.ordered = bool(it.store_name and it.store_name in ordered_shops)
+
+    return items, next_cursor
+
+
+def count_success(db: Session, user_id: int) -> int:
+    """该用户成功比价(status='success')的条数。比价战绩里程碑的解锁进度源。"""
+    return db.execute(
+        select(func.count(ComparisonRecord.id)).where(
+            ComparisonRecord.user_id == user_id,
+            ComparisonRecord.status == "success",
+        )
+    ).scalar_one()
+
+
+def get_record(db: Session, user_id: int, record_id: int) -> ComparisonRecord | None:
+    """取单条(限本人,避免越权读他人记录)。"""
+    return db.execute(
+        select(ComparisonRecord).where(
+            ComparisonRecord.id == record_id,
+            ComparisonRecord.user_id == user_id,
+        )
+    ).scalar_one_or_none()

app/repositories/comparison_milestone.py

@@ -0,0 +1,115 @@
+"""比价战绩里程碑 CRUD:进度查询 + 逐档领奖。
+
+进度 = comparison_record 里 status='success' 的条数(crud_compare.count_success)。
+第 N 档在"成功次数 >= N"时解锁;每档领一次,写 comparison_milestone_claim 去重(标记已领)。
+⚠️ 当前产品定暂不真发金币(后续整体删除该功能):claim 只写领取记录,不调 grant_coins、
+不写 coin_transaction,coin_awarded 恒为 0,余额不变。仿一次性任务 (task.py)。
+"""
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+from sqlalchemy import select
+from sqlalchemy.orm import Session
+
+from app.core.rewards import (
+    RECORD_MILESTONE_COUNT,
+    RECORD_MILESTONES,
+)
+from app.models.comparison_milestone import ComparisonMilestoneClaim
+from app.repositories import comparison as crud_compare
+from app.repositories import wallet as crud_wallet
+
+
+class UnknownMilestoneError(Exception):
+    """档位序号越界(不在 1..RECORD_MILESTONE_COUNT)。"""
+
+
+class MilestoneLockedError(Exception):
+    """该档还没解锁(成功比价次数不够)。"""
+
+
+class AlreadyClaimedError(Exception):
+    """该档已经领过了。"""
+
+
+@dataclass
+class MilestoneState:
+    milestone: int  # 1-based 档位序号
+    coin: int
+    state: str  # claimed / active / locked
+
+
+@dataclass
+class MilestoneStatus:
+    success_count: int  # 累计成功比价次数(解锁进度)
+    claimable_count: int  # 当前可领(active)档数
+    milestones: list[MilestoneState]
+
+
+def _claimed_set(db: Session, user_id: int) -> set[int]:
+    rows = db.execute(
+        select(ComparisonMilestoneClaim.milestone).where(
+            ComparisonMilestoneClaim.user_id == user_id
+        )
+    ).scalars().all()
+    return set(rows)
+
+
+def get_status(db: Session, user_id: int) -> MilestoneStatus:
+    """各档领取状态:已领=claimed,已解锁未领=active(可领),未解锁=locked。"""
+    success_count = crud_compare.count_success(db, user_id)
+    claimed = _claimed_set(db, user_id)
+
+    milestones: list[MilestoneState] = []
+    claimable = 0
+    for m in range(1, RECORD_MILESTONE_COUNT + 1):
+        if m in claimed:
+            state = "claimed"
+        elif success_count >= m:
+            state = "active"
+            claimable += 1
+        else:
+            state = "locked"
+        milestones.append(
+            MilestoneState(milestone=m, coin=RECORD_MILESTONES[m - 1], state=state)
+        )
+
+    return MilestoneStatus(
+        success_count=success_count,
+        claimable_count=claimable,
+        milestones=milestones,
+    )
+
+
+def claim(db: Session, user_id: int, milestone: int) -> tuple[int, int]:
+    """领取第 milestone 档奖励。返回 (发放金币, 领奖后余额)。
+
+    越界抛 UnknownMilestoneError;未解锁抛 MilestoneLockedError;重复领抛 AlreadyClaimedError。
+    """
+    if milestone < 1 or milestone > RECORD_MILESTONE_COUNT:
+        raise UnknownMilestoneError
+
+    existing = db.execute(
+        select(ComparisonMilestoneClaim).where(
+            ComparisonMilestoneClaim.user_id == user_id,
+            ComparisonMilestoneClaim.milestone == milestone,
+        )
+    ).scalar_one_or_none()
+    if existing is not None:
+        raise AlreadyClaimedError
+
+    # 解锁校验:成功比价次数必须 >= 档位序号
+    if crud_compare.count_success(db, user_id) < milestone:
+        raise MilestoneLockedError
+
+    # ⚠️ 比价战绩里程碑暂不真发金币(产品定,后续整体删除该功能):仍记一条领取(去重/标记已领),
+    # 但不调 grant_coins、不写 coin_transaction,余额不变,返回发放 0 金币 + 当前余额。
+    db.add(
+        ComparisonMilestoneClaim(
+            user_id=user_id, milestone=milestone, coin_awarded=0
+        )
+    )
+    acc = crud_wallet.get_or_create_account(db, user_id, commit=False)
+    db.commit()
+    return 0, acc.coin_balance

app/repositories/report.py

@@ -0,0 +1,53 @@
+"""price_report 表读写。"""
+from __future__ import annotations
+
+from sqlalchemy import select
+from sqlalchemy.orm import Session
+
+from app.models.price_report import PriceReport
+
+
+def create_report(
+    db: Session,
+    *,
+    user_id: int,
+    comparison_record_id: int | None,
+    store_name: str | None,
+    dish_summary: str | None,
+    original_platform_id: str | None,
+    original_platform_name: str | None,
+    original_price_cents: int | None,
+    reported_platform_id: str,
+    reported_platform_name: str,
+    reported_price_cents: int,
+    images: list[str],
+) -> PriceReport:
+    rep = PriceReport(
+        user_id=user_id,
+        comparison_record_id=comparison_record_id,
+        store_name=store_name,
+        dish_summary=dish_summary,
+        original_platform_id=original_platform_id,
+        original_platform_name=original_platform_name,
+        original_price_cents=original_price_cents,
+        reported_platform_id=reported_platform_id,
+        reported_platform_name=reported_platform_name,
+        reported_price_cents=reported_price_cents,
+        images=images,
+        status="pending",
+    )
+    db.add(rep)
+    db.commit()
+    db.refresh(rep)
+    return rep
+
+
+def list_reports(
+    db: Session, user_id: int, status: str | None = None
+) -> list[PriceReport]:
+    """该用户的上报记录,按时间倒序;status 非空时按状态筛选。"""
+    stmt = select(PriceReport).where(PriceReport.user_id == user_id)
+    if status:
+        stmt = stmt.where(PriceReport.status == status)
+    stmt = stmt.order_by(PriceReport.created_at.desc(), PriceReport.id.desc())
+    return list(db.execute(stmt).scalars().all())

app/repositories/signin.py

@@ -119,7 +119,8 @@ def do_signin(db: Session, user_id: int) -> tuple[SigninRecord, int]:
     )
     db.add(record)
     acc, _ = crud_wallet.grant_coins(
-        db, user_id, coin, biz_type="signin", ref_id=today.isoformat()
+        db, user_id, coin, biz_type="signin", ref_id=today.isoformat(),
+        remark=f"每日签到 第{cycle_day}天",
     )
     db.commit()
     db.refresh(record)

app/schemas/ad.py

@@ -39,6 +39,24 @@ class AdRewardStatusOut(BaseModel):
     )
 
 
+class EcpmReportIn(BaseModel):
+    """客户端上报一次广告展示的 eCPM(内部收益统计/对账)。
+
+    user_id 不在 body 里——由 JWT 取(Bearer),防伪造。ecpm 原样上报字符串(单位待确认)。
+    """
+
+    ad_type: str = Field(..., description="广告类型:reward_video(激励视频) / draw(Draw 信息流) 等")
+    ecpm: str = Field(..., description="穿山甲 getShowEcpm().getEcpm() 原始字符串,单位待确认,原样上报")
+    adn: str | None = Field(None, description="实际投放 ADN(getSdkName),如 pangle")
+    slot_id: str | None = Field(None, description="实际展示代码位(底层 mediation rit)")
+
+
+class EcpmReportOut(BaseModel):
+    """eCPM 上报结果。best-effort,落库即 ok。"""
+
+    ok: bool = True
+
+
 class TestGrantOut(BaseModel):
     """[仅本地联调]模拟发奖结果。带上今日进度,客户端可直接据此刷新展示。"""
 

app/schemas/compare_record.py

@@ -0,0 +1,135 @@
+"""比价记录上报 / 读取 schemas。
+
+约定同 welfare:字段 snake_case、金额存整数(分)、时间 ISO 8601。
+
+上报请求(ComparisonRecordIn)的字段刻意对齐 pricebot 协议
+(docs/main/02_api_protocol.md 的 calibration + done.params.comparison_results),
+让客户端把 Phase1 的 calibration 和 done 帧的 params 字段**零翻译**直接映射上来,
+server 端负责拆成结构化列(best_*/saved/is_source_best 由 comparison_results 派生)。
+"""
+from __future__ import annotations
+
+from datetime import datetime
+
+from pydantic import BaseModel, ConfigDict, Field
+
+
+# ===== 上报请求 =====
+
+class ComparisonItemIn(BaseModel):
+    """下单菜品(来自 calibration.items)。"""
+
+    name: str
+    qty: int = 1
+    specs: list[str] | None = None
+
+
+class ComparisonResultIn(BaseModel):
+    """逐平台对比项(来自 done.params.comparison_results)。price 单位:元。"""
+
+    platform_id: str | None = None
+    platform_name: str | None = None
+    package: str | None = None
+    price: float | None = None
+    is_source: bool = False
+    rank: int | None = None
+    # 该平台本单用红包省的**纯红包优惠额**(元, 不含配送费/代金券/满减)。None=没用/没抠到。
+    # 必须显式声明: 落库走 model_dump(), pydantic 默认丢未知字段, 不声明这行会被悄悄吞掉。
+    # 各平台抠到红包即带值(2026-06 起源平台 Phase1 意图识别也抠, 当前仅淘宝源)。见 pricebot 侧 比价红包额留痕-实现方案.md。
+    coupon_saved: float | None = None
+
+
+class ComparisonRecordIn(BaseModel):
+    # 幂等键:同一用户同一 trace_id 重复上报只保留一条(覆盖)
+    trace_id: str = Field(..., min_length=1, description="pricebot 侧 trace_id")
+    business_type: str = Field("food", description="food / ecom / coupon")
+    device_id: str | None = None
+
+    # 源平台(来自 calibration)
+    store_name: str | None = Field(None, description="店铺名(外卖)")
+    source_platform_id: str | None = None
+    source_platform_name: str | None = None
+    source_package: str | None = None
+    source_price: float | None = Field(None, description="源平台到手价(元)")
+
+    # 明细
+    items: list[ComparisonItemIn] = Field(default_factory=list)
+    comparison_results: list[ComparisonResultIn] = Field(default_factory=list)
+    skipped_dish_count: int | None = None
+    skipped_dish_names: list[str] = Field(default_factory=list)
+    total_dish_count: int | None = None
+
+    information: str | None = Field(None, description="done 帧文案,留存备查")
+    # 不传则服务端按 comparison_results 派生(有非源有效价=success,否则 failed)
+    status: str | None = Field(None, description="success / failed,可不传由服务端派生")
+    # 最优平台商家/商品深链(客户端从 collectedLinks[best_index] 取);「再次比价」直达用
+    best_deeplink: str | None = Field(None, description="最优平台深链,再次比价直达")
+
+
+# ===== 读取出参 =====
+
+class ComparisonRecordOut(BaseModel):
+    """列表项:结构化概要字段(不含 raw_payload,减小列表 payload)。"""
+
+    model_config = ConfigDict(from_attributes=True)
+
+    id: int
+    business_type: str
+    trace_id: str
+    source_platform_id: str | None = None
+    source_platform_name: str | None = None
+    source_package: str | None = None
+    source_price_cents: int | None = None
+    best_platform_id: str | None = None
+    best_platform_name: str | None = None
+    best_price_cents: int | None = None
+    best_deeplink: str | None = None
+    saved_amount_cents: int | None = None
+    is_source_best: bool | None = None
+    store_name: str | None = None
+    total_dish_count: int | None = None
+    skipped_dish_count: int | None = None
+    status: str
+    information: str | None = None
+    items: list = []
+    comparison_results: list = []
+    skipped_dish_names: list = []
+    # 「已下单」(店级):该店名在该用户真实下单(source='compare')里出现过即 True。
+    # 由 list_records 动态算出挂在 ORM 实例上(非 DB 列),from_attributes 读出;缺省 False。
+    ordered: bool = False
+    created_at: datetime
+
+
+class ComparisonRecordDetailOut(ComparisonRecordOut):
+    """详情:在概要之上额外带 raw_payload 全量。"""
+
+    raw_payload: dict | None = None
+
+
+class ComparisonRecordPage(BaseModel):
+    items: list[ComparisonRecordOut]
+    next_cursor: int | None = Field(None, description="下一页游标(末条 id);为空表示到底")
+
+
+class ComparisonRecordCreatedOut(BaseModel):
+    id: int = Field(..., description="写入(或已存在)的记录 id")
+
+
+# ===== 比价战绩里程碑(福利页「记录比价战绩」)=====
+
+class MilestoneStateOut(BaseModel):
+    milestone: int = Field(..., description="档位序号 1-based(= 解锁所需的成功比价次数)")
+    coin: int = Field(..., description="该档应发金币额(产品规则值);当前领取暂不真发, 见 compare-milestone-claim 文档")
+    state: str = Field(..., description="claimed(已领) / active(可领) / locked(未解锁)")
+
+
+class MilestoneStatusOut(BaseModel):
+    success_count: int = Field(..., description="累计成功比价次数(解锁进度)")
+    claimable_count: int = Field(..., description="当前可领(active)档数")
+    milestones: list[MilestoneStateOut]
+
+
+class MilestoneClaimResultOut(BaseModel):
+    milestone: int = Field(..., description="本次领取的档位序号")
+    coin_awarded: int = Field(..., description="本次发放金币")
+    coin_balance: int = Field(..., description="领奖后金币余额")

app/schemas/report.py

@@ -0,0 +1,57 @@
+"""上报更低价 响应 schema。
+
+请求是 multipart 表单(comparison_record_id / reported_platform_id / reported_price / images),
+在路由里直接校验,不单独建请求 schema(同 feedback)。价格对外统一「分」(cents)。
+"""
+from __future__ import annotations
+
+from datetime import datetime
+
+from pydantic import BaseModel, ConfigDict, Field
+
+
+class ReportSubmitOut(BaseModel):
+    """提交上报后的回执。"""
+
+    model_config = ConfigDict(from_attributes=True)
+
+    id: int
+    status: str
+    created_at: datetime
+
+
+class ReportRecordOut(BaseModel):
+    """一条上报记录(「上报记录」列表用)。价格单位:分。"""
+
+    model_config = ConfigDict(from_attributes=True)
+
+    id: int
+    store_name: str | None = None
+    dish_summary: str | None = None
+    # 原最低价(上报前系统给出的最低,反查比价记录 best_*)
+    original_platform_id: str | None = None
+    original_platform_name: str | None = None
+    original_price_cents: int | None = None
+    # 用户上报的更低价
+    reported_platform_id: str
+    reported_platform_name: str
+    reported_price_cents: int
+    images: list[str] = Field(default_factory=list)
+    status: str  # pending / approved / rejected
+    reject_reason: str | None = None
+    reward_coins: int | None = None
+    created_at: datetime
+
+
+class ReportRecordCounts(BaseModel):
+    """四态计数,供前端筛选 chip 显示(全部/审核中/已通过/未通过)。"""
+
+    all: int = 0
+    pending: int = 0
+    approved: int = 0
+    rejected: int = 0
+
+
+class ReportRecordsOut(BaseModel):
+    records: list[ReportRecordOut]
+    counts: ReportRecordCounts

deploy/shaguabijia-admin.service

@@ -0,0 +1,23 @@
+[Unit]
+Description=Shaguabijia Admin Backend (FastAPI / uvicorn, 独立进程,复用 app-server codebase)
+After=network.target
+
+[Service]
+Type=simple
+User=root
+WorkingDirectory=/opt/shaguabijia-app-server
+Environment="PATH=/opt/shaguabijia-app-server/.venv/bin:/usr/bin:/bin"
+EnvironmentFile=/opt/shaguabijia-app-server/.env
+# 与主 App 后端(8770)复用同一 codebase / .env / .venv / DB,独立进程跑 admin app
+ExecStart=/opt/shaguabijia-app-server/.venv/bin/uvicorn app.admin.main:admin_app --host 127.0.0.1 --port 8771 --workers 1 --log-level info
+Restart=on-failure
+RestartSec=3
+
+NoNewPrivileges=true
+PrivateTmp=true
+ProtectSystem=strict
+ReadWritePaths=/opt/shaguabijia-app-server
+ProtectHome=true
+
+[Install]
+WantedBy=multi-user.target

docs/api/README.md

@@ -3,7 +3,7 @@
 > Base URL:生产 `https://app-api.shaguabijia.com`;本地联调 `http://<开发机>:8770`
 > 协议:HTTP / JSON,请求与响应体均 `application/json`,字段统一 **snake_case**
 > 鉴权:需鉴权的接口在请求头带 `Authorization: Bearer <access_token>`
-> 最后更新:2026-05-31
+> 最后更新:2026-05-31（+ 比价战绩里程碑 12d/12e）
 > 架构:`app/api/v1/` 只放很轻的接口层;穿山甲/微信支付/极光/短信/美团等 SDK 集成的重逻辑在 `app/integrations/`,实现细节见 [docs/integrations/](../integrations/README.md)。
 
 ---
@@ -26,6 +26,13 @@
 | **比价透传**（前缀 `/api/v1`,外卖 MVP；与 `coupon/step` 同为透传 pricebot-backend） |||
 | 12 | `POST /api/v1/intent/recognize` | 无 | [详情](./compare-intent-recognize.md) |
 | 13 | `POST /api/v1/price/step` | 无 | [详情](./compare-price-step.md) |
+| **比价记录**（前缀 `/api/v1/compare`；按用户落库，**鉴权**，区别于上面不鉴权的透传） |||
+| 12a | `POST /api/v1/compare/record` | Bearer | [详情](./compare-record-report.md) |
+| 12b | `GET /api/v1/compare/records` | Bearer | [详情](./compare-records.md) |
+| 12c | `GET /api/v1/compare/records/{id}` | Bearer | [详情](./compare-record-detail.md) |
+| **比价战绩里程碑**（前缀 `/api/v1/compare`；福利页「记录比价战绩」,按成功比价数解锁逐档发金币） |||
+| 12d | `GET /api/v1/compare/milestones` | Bearer | [详情](./compare-milestones.md) |
+| 12e | `POST /api/v1/compare/milestones/{milestone}/claim` | Bearer | [详情](./compare-milestone-claim.md) |
 | **钱包 / 我的资产**（前缀 `/api/v1/wallet`） |||
 | 14 | `GET /api/v1/wallet/account` | Bearer | [详情](./wallet-account.md) |
 | 15 | `GET /api/v1/wallet/coin-transactions` | Bearer | [详情](./wallet-coin-transactions.md) |
@@ -52,6 +59,7 @@
 | 32 | `GET /api/v1/ad/pangle-callback` | 验签 | [详情](./ad-pangle-callback.md) |
 | 33 | `GET /api/v1/ad/reward-status` | Bearer | [详情](./ad-reward-status.md) |
 | 34 | `POST /api/v1/ad/test-grant` | Bearer | [详情](./ad-test-grant.md) |
+| 35 | `POST /api/v1/ad/ecpm-report` | Bearer | [详情](./ad-ecpm-report.md) |
 | **用户资料**（前缀 `/api/v1/user`） |||
 | 35 | `PATCH /api/v1/user/profile` | Bearer | [详情](./user-profile.md) |
 | 36 | `POST /api/v1/user/avatar` | Bearer | [详情](./user-avatar.md) |

docs/api/ad-ecpm-report.md

@@ -0,0 +1,36 @@
+# POST /api/v1/ad/ecpm-report — 上报本次广告展示的 eCPM（内部收益统计）
+
+> 所属:Ad 组（前缀 `/api/v1/ad`） | 鉴权:Bearer | [← 返回 API 索引](./README.md)
+
+## 入参
+请求体:`EcpmReportIn`
+
+| 字段 | 类型 | 必填 | 说明 |
+|---|---|---|---|
+| `ad_type` | str | 是 | 广告类型:`reward_video`(激励视频) / `draw`(Draw 信息流) 等 |
+| `ecpm` | str | 是 | 穿山甲 `getShowEcpm().getEcpm()` 原始字符串,**单位待确认(分/元)**,原样上报 |
+| `adn` | str\|null | 否 | 实际投放 ADN(`getSdkName`),如 `pangle` |
+| `slot_id` | str\|null | 否 | 实际展示代码位(底层 mediation rit,非客户端配置位) |
+
+`user_id` 不在 body 里——由 JWT 取(Bearer),防伪造。
+
+## 出参
+响应 `200`:`EcpmReportOut`
+
+| 字段 | 类型 | 说明 |
+|---|---|---|
+| `ok` | bool | 落库即 `true` |
+
+## 说明
+客户端在广告**展示后**(`onAdShow` 读 `getShowEcpm()`)调用,把本次展示的 eCPM 落库做**内部收益统计/对账**。
+
+- **best-effort**:客户端 fire-and-forget,丢一两条不影响业务;穿山甲后台报表是结算权威兜底。
+- 落 `ad_ecpm_record` 表,`report_date` 用北京时间当天,供「按用户/按天聚合」对账。
+- **与发奖是两条独立流**:发奖走 [ad-pangle-callback](./ad-pangle-callback.md)(穿山甲 S2S,有 `trans_id`、无 ecpm),本接口客户端上报(有 ecpm、无 `trans_id`)。两者无公共键,**不逐条一一对应**,只做按用户/按天聚合口径。
+- eCPM 是**每千次展示预估**,单条展示预估收益 ≈ `ecpm / 1000`,且为客户端预估口径,非最终结算。
+- ⚠️ eCPM **单位(分/元)截至 2026-05-31 未最终确认**,故 `ecpm_raw` 原样存字符串;确认后再加一列解析好的数值。
+- 限流:同 IP 120 次/分钟。
+
+## 相关
+- [ad-pangle-callback](./ad-pangle-callback.md) — 穿山甲 S2S 发奖回调
+- [ad-reward-status](./ad-reward-status.md) — 今日看广告发奖进度

docs/api/compare-milestone-claim.md

@@ -0,0 +1,34 @@
+# POST /api/v1/compare/milestones/{milestone}/claim — 领取比价战绩里程碑奖励
+
+> 所属:比价记录组（前缀 `/api/v1/compare`） | 鉴权:Bearer | [← 返回 API 索引](./README.md)
+
+领取某一档(第 `milestone` 次)。⚠️ **当前不真发金币**(产品定,后续整体删除该功能):仍写
+`comparison_milestone_claim`((user_id, milestone) 唯一)标记该档已领、**每档只能领一次**,但不调
+`grant_coins`、不写 `coin_transaction`,余额不变,`coin_awarded` 恒为 0。进度口径见
+[milestones 进度接口](./compare-milestones.md)。
+
+## 入参
+- 路径参数 `milestone`(int):档位序号,1..6(= `RECORD_MILESTONES` 长度)。
+
+## 出参
+响应 `200`：
+
+| 字段 | 类型 | 说明 |
+|---|---|---|
+| `milestone` | int | 本次领取的档位序号 |
+| `coin_awarded` | int | 本次发放金币(当前恒为 `0`,暂不真发) |
+| `coin_balance` | int | 领奖后金币余额(当前不变) |
+
+```json
+{ "milestone": 1, "coin_awarded": 0, "coin_balance": 29087 }
+```
+
+## 错误
+- `401` 未鉴权
+- `404` 档位越界(`unknown milestone`,milestone < 1 或 > 档位总数)
+- `409` 该档还没解锁(`milestone locked`,成功比价次数 < milestone)
+- `409` 该档已领过(`milestone already claimed`)
+
+## 说明
+- 当前不发金币,客户端领取后只需把本档状态刷成 claimed 即可;若后续恢复发奖,再按 `coin_awarded` 刷新钱包余额([`GET /api/v1/wallet/account`](./wallet-account.md))。
+- 幂等:重复领同一档返回 409(唯一约束 + 领取前查重)。

docs/api/compare-milestones.md

@@ -0,0 +1,53 @@
+# GET /api/v1/compare/milestones — 比价战绩里程碑进度
+
+> 所属:比价记录组（前缀 `/api/v1/compare`） | 鉴权:Bearer | [← 返回 API 索引](./README.md)
+
+福利页「记录比价战绩」的数据源。返回各档(第 1~6 次)解锁/领取状态。
+
+**解锁进度** = 当前用户 `comparison_record` 里 `status='success'` 的条数(只算成功比价,失败的不计入)。第 N 档在「成功比价次数 ≥ N」时解锁;每档领一次(领取见 [claim 接口](./compare-milestone-claim.md))。
+
+档位金额是**产品规则**,定义在后端 `app/core/rewards.py` 的 `RECORD_MILESTONES`(当前 `120/180/300/500/800/1200`),客户端**不要写死**,以本接口返回为准。
+
+> ⚠️ **当前领取暂不真发金币**(产品定,后续整体删除该功能):`coin` 仍返回产品规则值仅供展示,但 [claim 接口](./compare-milestone-claim.md) 实际 `coin_awarded` 恒为 0、余额不变。前端展示须与之对齐,勿让用户误以为领取可到账。
+
+## 入参
+无(用户身份取自 Bearer token)。
+
+## 出参
+响应 `200`：
+
+| 字段 | 类型 | 说明 |
+|---|---|---|
+| `success_count` | int | 累计成功比价次数(解锁进度) |
+| `claimable_count` | int | 当前可领(state=active)的档数 |
+| `milestones` | Milestone[] | 各档状态,按 milestone 升序 |
+
+**Milestone**
+
+| 字段 | 类型 | 说明 |
+|---|---|---|
+| `milestone` | int | 档位序号(1-based),= 解锁所需的成功比价次数 |
+| `coin` | int | 该档**应发**金币额(产品规则值);⚠️ 当前领取不真发,见上方说明 |
+| `state` | string | `claimed`(已领) / `active`(已解锁可领) / `locked`(未解锁) |
+
+```json
+{
+  "success_count": 2,
+  "claimable_count": 1,
+  "milestones": [
+    {"milestone": 1, "coin": 120, "state": "claimed"},
+    {"milestone": 2, "coin": 180, "state": "active"},
+    {"milestone": 3, "coin": 300, "state": "locked"},
+    {"milestone": 4, "coin": 500, "state": "locked"},
+    {"milestone": 5, "coin": 800, "state": "locked"},
+    {"milestone": 6, "coin": 1200, "state": "locked"}
+  ]
+}
+```
+
+## 错误
+- `401` 未鉴权
+
+## 说明
+- 同时可有多档处于 `active`(如累计 3 次却一档没领,则前 3 档都可领),逐档调 claim。
+- 进度只增不减:领取不消耗成功次数,只是把对应档从 active→claimed。

docs/api/compare-record-detail.md

@@ -0,0 +1,25 @@
+# GET /api/v1/compare/records/{record_id} — 比价记录详情
+
+> 所属:比价记录组（前缀 `/api/v1/compare`） | 鉴权:Bearer | [← 返回 API 索引](./README.md)
+
+单条比价记录详情，在列表项基础上额外带 `raw_payload`（客户端上报的原始全量），供未来 UI 展示任意细节。
+
+## 入参（path）
+
+| 字段 | 类型 | 说明 |
+|---|---|---|
+| `record_id` | int | 记录 id |
+
+## 出参
+响应 `200`：**ComparisonRecordDetailOut** = [ComparisonRecordOut](./compare-records.md#出参) 全部字段 + 下列：
+
+| 字段 | 类型 | 说明 |
+|---|---|---|
+| `raw_payload` | object \| null | 客户端上报的原始 body 全量（calibration + done.params） |
+
+## 错误
+- `401` 未鉴权
+- `404` 记录不存在，或不属于当前用户（限本人，避免越权读他人记录）
+
+## 说明
+`404` 同时覆盖「id 不存在」和「id 属于他人」两种情况——不区分以免泄露他人记录是否存在。

docs/api/compare-record-report.md

@@ -0,0 +1,59 @@
+# POST /api/v1/compare/record — 上报一次比价结果(幂等)
+
+> 所属:比价记录组（前缀 `/api/v1/compare`） | 鉴权:Bearer | [← 返回 API 索引](./README.md)
+
+比价 `done` 帧后,客户端用**带 JWT 的通道**上报一条比价结果,落 `comparison_record` 表，作为「我的比价记录」数据源 + 用户级行为画像。
+
+> ⚠️ 与不鉴权的透传端点 [`/api/v1/price/step`](./compare-price-step.md) 不同：那是转发壳，本接口按用户维度落库，**必须鉴权**。
+> 本轮只做 server 端；客户端在 done 帧后调本接口的改动另起一轮（见 [待办与技术债.md](../待办与技术债.md) P1）。
+
+## 入参（JSON body）
+
+字段刻意对齐 pricebot 协议（[02_api_protocol.md](../../../pricebot-backend/docs/main/02_api_protocol.md) 的 `calibration` + `done.params`），客户端把 Phase1 的 calibration 和 done 帧 params **零翻译**映射上来即可。
+
+| 字段 | 类型 | 必填 | 默认 | 说明 |
+|---|---|---|---|---|
+| `trace_id` | string | ✅ | — | pricebot 侧 trace_id。**幂等键**：同用户同 trace_id 重复上报覆盖、返回同一 id |
+| `business_type` | string | ❌ | `food` | `food`(外卖,当前唯一接通) / `ecom`(电商) / `coupon`(领券) |
+| `device_id` | string \| null | ❌ | null | 设备号 |
+| `store_name` | string \| null | ❌ | null | 店铺名（外卖,来自 calibration.result） |
+| `source_platform_id` | string \| null | ❌ | null | 源平台代号，如 `taobao_flash` |
+| `source_platform_name` | string \| null | ❌ | null | 源平台中文名 |
+| `source_package` | string \| null | ❌ | null | 源平台 Android 包名 |
+| `source_price` | float \| null | ❌ | null | 源平台到手价（**元**） |
+| `items` | Item[] | ❌ | [] | 下单菜品，`{name, qty, specs?}` |
+| `comparison_results` | Result[] | ❌ | [] | 逐平台对比，见下表（price 单位**元**） |
+| `skipped_dish_count` | int \| null | ❌ | null | 目标平台未找到、跳过的菜品数 |
+| `skipped_dish_names` | string[] | ❌ | [] | 被跳过的菜名 |
+| `total_dish_count` | int \| null | ❌ | null | 原始菜品总数 |
+| `information` | string \| null | ❌ | null | done 帧文案(成功摘要 / 失败具体原因),持久化为列并在列表/详情返回,前端失败时当原因展示 |
+| `status` | string \| null | ❌ | null | `success` / `failed`。**不传则服务端派生** |
+
+**Item**：`{ name: string, qty: int=1, specs: string[]\|null }`
+
+**Result（comparison_results 元素）**：`{ platform_id, platform_name, package, price(元,float\|null), is_source(bool), rank(int\|null), coupon_saved(元,float\|null) }`
+
+- `coupon_saved`：该平台本单**平台主优惠额**（元）——美团红包 / 淘宝平台红包 / 京东优惠券·百亿补贴，**只取那一笔**，不含配送费减免/共减总额。仅外卖目标平台带值，源平台/没用为 `null`，前端记录页据此展示**「已优惠 ¥X」**（null 不展示）。
+
+## 服务端派生（客户端不用算）
+
+从 `comparison_results` 派生并落结构化列：
+
+- `best_*`：取最便宜的一家（按 `rank` 升序、再按 `price`），写 `best_platform_id/name/best_price_cents`
+- `source_price_cents`：优先用 `source_price`，缺失则取 `comparison_results` 里 `is_source=true` 行的价
+- `saved_amount_cents` = `源价 − 最优价`（可为 0 / 负：源平台本来就最便宜）
+- `is_source_best`：最便宜的一家是否为源平台（= 这次没省到）
+- `status`（未显式传时）：存在「非源且有价」的结果 → `success`，否则 → `failed`
+- 金额一律 `round(元 × 100)` 存**分**
+
+`comparison_results` / `items` / `skipped_dish_names` 原样存 JSON；完整上报 body 另存 `raw_payload`（详情接口可取回）。
+
+## 出参
+响应 `200`：`{ "id": int }`（写入或已存在记录的 id）
+
+## 错误
+- `401` 未鉴权
+- `422` 缺 `trace_id` 或字段类型不符
+
+## 说明
+失败的比价（done 帧只有源/空 comparison_results）也会落一条 `status=failed`——「越详细越好」，是否在 UI 展示由前端过滤。

docs/api/compare-records.md

@@ -0,0 +1,47 @@
+# GET /api/v1/compare/records — 比价记录列表(游标分页)
+
+> 所属:比价记录组（前缀 `/api/v1/compare`） | 鉴权:Bearer | [← 返回 API 索引](./README.md)
+
+「我的比价记录」列表页数据源。按 `id` 倒序（最新在前）。
+
+## 入参（query）
+
+| 字段 | 类型 | 必填 | 默认 | 说明 |
+|---|---|---|---|---|
+| `limit` | int | ❌ | 20 | 1–100 |
+| `cursor` | int | ❌ | null | 上一页末条 `id`,首页不传 |
+
+## 出参
+响应 `200`：`{ items: ComparisonRecordOut[], next_cursor: int|null }`（分页见 [索引#游标分页约定](./README.md#游标分页约定)）
+
+**ComparisonRecordOut**（列表项，不含 `raw_payload`，减小 payload）
+
+| 字段 | 类型 | 说明 |
+|---|---|---|
+| `id` | int | 记录 id（也是游标） |
+| `business_type` | string | `food` / `ecom` / `coupon` |
+| `trace_id` | string | pricebot trace_id |
+| `source_platform_id` | string \| null | 源平台代号 |
+| `source_platform_name` | string \| null | 源平台中文名 |
+| `source_package` | string \| null | 源平台包名 |
+| `source_price_cents` | int \| null | 源平台到手价（分） |
+| `best_platform_id` | string \| null | 最优平台代号 |
+| `best_platform_name` | string \| null | 最优平台中文名 |
+| `best_price_cents` | int \| null | 最优价（分） |
+| `saved_amount_cents` | int \| null | 省下（分，可 0/负） |
+| `is_source_best` | bool \| null | 源平台是否最便宜（= 没省到） |
+| `store_name` | string \| null | 店铺名 |
+| `total_dish_count` | int \| null | 菜品总数 |
+| `skipped_dish_count` | int \| null | 跳过菜品数 |
+| `status` | string | `success` / `failed` |
+| `information` | string \| null | done 帧文案。成功:"在美团找到同店,到手价 ¥X…";失败:具体原因(如"美团、京东外卖均未找到该商品"),前端在 `status=failed` 时当原因展示 |
+| `items` | object[] | 下单菜品 `{name, qty, specs?}` |
+| `comparison_results` | object[] | 逐平台对比（price 单位元，已按 rank 升序） |
+| `skipped_dish_names` | string[] | 被跳过的菜名 |
+| `created_at` | datetime | 时间 |
+
+## 错误
+- `401` 未鉴权
+
+## 说明
+只返回当前登录用户自己的记录。需要单条全量（含 `raw_payload`）走 [详情接口](./compare-record-detail.md)。

docs/database/README.md

@@ -0,0 +1,37 @@
+# 傻瓜比价 App 后端 — 数据库表文档(索引)
+
+> 数据库:SQLite 起步(`data/app.db`),生产可切 PostgreSQL(改 `DATABASE_URL`)。
+> ORM:SQLAlchemy 2.0(`app/models/`),迁移:Alembic(`alembic/versions/`,`render_as_batch` 兼容 SQLite)。
+> 金额字段一律存**整数**:金币=个数,现金=**分**(`*_cents`)。时间列 `DateTime(timezone=True)`。
+> 最后更新:2026-05-31
+
+---
+
+## 表总览
+
+| 表 | 用途 | 模型 | 关联模块 | 文档 |
+|---|---|---|---|---|
+| `user` | 用户(登录主体) | `models/user.py` | 登录/鉴权 | [详情](./user.md) |
+| `coin_account` | 金币+现金余额快照(一用户一行) | `models/wallet.py` | 钱包 | [详情](./coin_account.md) |
+| `coin_transaction` | 金币流水账本 | `models/wallet.py` | 钱包 | [详情](./coin_transaction.md) |
+| `cash_transaction` | 现金流水账本(分) | `models/wallet.py` | 钱包/提现 | [详情](./cash_transaction.md) |
+| `withdraw_order` | 提现单(现金→微信零钱) | `models/wallet.py` | 提现 | [详情](./withdraw_order.md) |
+| `signin_record` | 签到记录(7 天循环) | `models/signin.py` | 签到 | [详情](./signin_record.md) |
+| `user_task` | 一次性任务领取去重 | `models/task.py` | 任务 | [详情](./user_task.md) |
+| `savings_record` | 省钱记录(profile 省钱战绩源) | `models/savings.py` | 省钱 | [详情](./savings_record.md) |
+| `ad_reward_record` | 看激励视频发奖记录(S2S 回调) | `models/ad_reward.py` | 看广告发奖 | [详情](./ad_reward_record.md) |
+| `ad_ecpm_record` | 广告展示 eCPM 上报(收益对账) | `models/ad_ecpm.py` | 看广告 | [详情](./ad_ecpm_record.md) |
+| `feedback` | 用户帮助与反馈 | `models/feedback.py` | 反馈 | [详情](./feedback.md) |
+| `comparison_record` | 比价记录(每次比价完整明细) | `models/comparison.py` | 比价记录 | [详情](./comparison_record.md) |
+| `comparison_milestone_claim` | 比价战绩里程碑领取记录 | `models/comparison_milestone.py` | 比价记录/福利 | [详情](./comparison_milestone_claim.md) |
+
+---
+
+## 通用约定
+
+- **主键**:`id` Integer autoincrement(`coin_account` 例外:`user_id` 既是主键也是外键,一用户一行)。
+- **外键**:所有用户维度表 `user_id` → `user.id`,且建 index。
+- **金额**:整数;金币计数,现金/价格存「分」(`*_cents`)。
+- **时间**:`created_at` 等用 `DateTime(timezone=True)` + `server_default=func.now()`;业务"今天"按**北京时间**(见 `core/rewards.cn_today`),跨天计数用「日期串」列(如 `reward_date`/`report_date`)等值查,不在 SQL 里做跨时区 date 比较(SQLite 不可靠)。
+- **JSON 列**:用 `JSON().with_variant(JSONB(), "postgresql")` —— PG 上 JSONB(可建 GIN 索引),SQLite 退化为通用 JSON(否则 `create_all` 编译报错)。
+- **迁移**:改表必写 alembic 迁移并保持单 head;改表/建表同时更新本目录对应文档(一表一文件)。

docs/database/ad_ecpm_record.md

@@ -0,0 +1,26 @@
+# ad_ecpm_record — 广告展示 eCPM 上报(收益对账)
+
+> 模型 `app/models/ad_ecpm.py` | 关联接口 [ad-ecpm-report](../api/ad-ecpm-report.md) | [← 表索引](./README.md)
+
+每条 = 客户端一次广告展示(`onAdShow`)后读到的 eCPM。与发奖记录 `ad_reward_record` 是**两条独立数据流**(发奖走 S2S 有 trans_id 无 ecpm;eCPM 走客户端有 ecpm 无 trans_id),无公共键,只用于**按用户/按天聚合**收益对账,不做逐条精确关联。穿山甲后台报表才是结算权威。
+
+## 字段
+| 列 | 类型 | 约束 / 默认 | 说明 |
+|---|---|---|---|
+| `id` | Integer | PK, autoincrement | |
+| `user_id` | Integer | FK→user.id, index, NOT NULL | 归属用户 |
+| `ad_type` | String(32) | NOT NULL | 广告类型:`reward_video`(激励视频)/ `draw`(Draw 信息流)等 |
+| `adn` | String(32) | nullable | 实际投放 ADN(`getSdkName`,如 pangle/gdt) |
+| `slot_id` | String(64) | nullable | 实际展示代码位(底层 mediation rit) |
+| `ecpm_raw` | String(32) | NOT NULL | 客户端上报的 eCPM 原始串(单位待确认,原样存) |
+| `report_date` | String(10) | index, NOT NULL | 北京时间日期串 `YYYY-MM-DD`,按它做按天聚合 |
+| `created_at` | DateTime(tz) | server_default now(), index | 时间 |
+
+## 索引与约束
+- PK: `id`;index: `user_id`、`report_date`、`created_at`
+
+## 关系
+- `user_id` → `user.id`(多对一)
+
+## 说明
+- ⚠️ `ecpm_raw` 单位(分/元)截至 2026-05-31 未最终确认;确认后再加一列解析好的数值,在此之前对账按"待定单位"处理。

docs/database/ad_reward_record.md

@@ -0,0 +1,28 @@
+# ad_reward_record — 看激励视频发奖记录(S2S 回调)
+
+> 模型 `app/models/ad_reward.py` | 关联接口 [ad-pangle-callback](../api/ad-pangle-callback.md) / [ad-reward-status](../api/ad-reward-status.md) | [← 表索引](./README.md)
+
+每条 = 穿山甲一次发奖回调。`trans_id` 唯一做幂等键(穿山甲会重试,同号只发一次)。`reward_date`(北京时间日期串)给"每日上限"计数用,按日期串等值查。
+
+## 字段
+| 列 | 类型 | 约束 / 默认 | 说明 |
+|---|---|---|---|
+| `id` | Integer | PK, autoincrement | |
+| `trans_id` | String(64) | UNIQUE, index, NOT NULL | 穿山甲交易号(幂等键) |
+| `user_id` | Integer | FK→user.id, index, NOT NULL | 归属用户(回调 media_extra 带回) |
+| `coin` | Integer | NOT NULL, default 0 | 实发金币(capped 时为 0) |
+| `status` | String(16) | NOT NULL, default `granted` | `granted`(已发)/ `capped`(当日超限未发) |
+| `reward_date` | String(10) | index, NOT NULL | 北京时间日期串 `YYYY-MM-DD`,按它统计当日次数 |
+| `reward_name` | String(64) | nullable | 穿山甲上报奖励名(参考,不作发奖依据) |
+| `raw` | String(1024) | nullable | 回调原始参数(审计排查) |
+| `created_at` | DateTime(tz) | server_default now(), index | 时间 |
+
+## 索引与约束
+- PK: `id`;UNIQUE + index: `trans_id`;index: `user_id`、`reward_date`、`created_at`
+
+## 关系
+- `user_id` → `user.id`(多对一)
+
+## 说明
+- 三道闸:验签不过 403 → `trans_id` 唯一幂等(并发 catch IntegrityError)→ 当日次数 ≥ `DAILY_AD_REWARD_LIMIT` 记 `capped` 不发币。
+- 发币复用 `grant_coins(biz_type='ad_reward', ref_id=trans_id)`。

docs/database/cash_transaction.md

@@ -0,0 +1,26 @@
+# cash_transaction — 现金流水账本(分)
+
+> 模型 `app/models/wallet.py` | 关联接口 [wallet-cash-transactions](../api/wallet-cash-transactions.md) | [← 表索引](./README.md)
+
+现金每次变动一笔流水(单位:分)。金币兑现金、提现、提现退款都记这里。
+
+## 字段
+| 列 | 类型 | 约束 / 默认 | 说明 |
+|---|---|---|---|
+| `id` | Integer | PK, autoincrement | |
+| `user_id` | Integer | FK→user.id, index, NOT NULL | 归属用户 |
+| `amount_cents` | Integer | NOT NULL | 正=入账(兑入),负=出账(提现) |
+| `balance_after_cents` | Integer | NOT NULL | 本笔变动后现金余额(分) |
+| `biz_type` | String(32) | NOT NULL | `exchange_in`(兑入)/ `withdraw`(提现出账)/ `withdraw_refund`(提现退回) |
+| `ref_id` | String(64) | nullable | 关联业务 id(如提现 `out_bill_no`) |
+| `remark` | String(128) | nullable | 用户可见备注(如"提现未成功,金额已退回") |
+| `created_at` | DateTime(tz) | server_default now(), index | 时间 |
+
+## 索引与约束
+- PK: `id`;index: `user_id`、`created_at`
+
+## 关系
+- `user_id` → `user.id`(多对一)
+
+## 说明
+- 提现失败/取消退款写 `withdraw_refund`(+X);退款流水 `remark` 是用户可见文案,技术原因记在 `withdraw_order.fail_reason`。

docs/database/coin_account.md

@@ -0,0 +1,24 @@
+# coin_account — 金币 + 现金余额快照
+
+> 模型 `app/models/wallet.py` | 关联接口 [wallet-account](../api/wallet-account.md) | [← 表索引](./README.md)
+
+一个用户一行的余额快照,供读取展示用;每次余额变动都另写流水(`coin_transaction` / `cash_transaction`)并记 `balance_after`,出问题逐笔回溯。`user_id` 既是主键也是外键。
+
+## 字段
+| 列 | 类型 | 约束 / 默认 | 说明 |
+|---|---|---|---|
+| `user_id` | Integer | PK, FK→user.id | 用户(一用户一行) |
+| `coin_balance` | Integer | NOT NULL, default 0 | 当前金币余额 |
+| `cash_balance_cents` | Integer | NOT NULL, default 0 | 当前现金余额(分) |
+| `total_coin_earned` | Integer | NOT NULL, default 0 | 累计赚取金币(只增不减) |
+| `updated_at` | DateTime(tz) | server_default now(), onupdate now() | 最后更新时间 |
+
+## 索引与约束
+- PK: `user_id`(同时是 FK→user.id)
+
+## 关系
+- `user_id` → `user.id`(一对一)
+
+## 说明
+- **唯一发金币入口** `wallet.grant_coins` 更新本表余额快照 + 写 `coin_transaction`,不 commit,由调用方同事务提交。
+- 提现扣现金用带条件 `UPDATE ... WHERE cash_balance_cents >= amount` 原子扣减,防并发超额。

docs/database/coin_transaction.md

@@ -0,0 +1,27 @@
+# coin_transaction — 金币流水账本
+
+> 模型 `app/models/wallet.py` | 关联接口 [wallet-coin-transactions](../api/wallet-coin-transactions.md) | [← 表索引](./README.md)
+
+金币每次变动一笔流水,记变动后余额,用于对账与「金币明细」展示。
+
+## 字段
+| 列 | 类型 | 约束 / 默认 | 说明 |
+|---|---|---|---|
+| `id` | Integer | PK, autoincrement | |
+| `user_id` | Integer | FK→user.id, index, NOT NULL | 归属用户 |
+| `amount` | Integer | NOT NULL | 正=入账(赚),负=出账(花/兑换) |
+| `balance_after` | Integer | NOT NULL | 本笔变动后金币余额(对账用) |
+| `biz_type` | String(32) | NOT NULL | 业务类型:`signin` / `task_<key>` / `exchange_out` / `ad_reward` / `compare_milestone` … |
+| `ref_id` | String(64) | nullable | 关联业务 id(签到日期 / 任务 key / trans_id / 里程碑序号等) |
+| `remark` | String(128) | nullable | 备注 |
+| `created_at` | DateTime(tz) | server_default now(), index | 时间 |
+
+## 索引与约束
+- PK: `id`;index: `user_id`、`created_at`
+
+## 关系
+- `user_id` → `user.id`(多对一)
+
+## 说明
+- 明细接口按 `id` 倒序游标分页。
+- 各 `biz_type` 取值由各业务写入(签到/任务/兑换/看广告/比价里程碑),无独立枚举约束,靠写入方约定。

docs/database/comparison_milestone_claim.md

@@ -0,0 +1,26 @@
+# comparison_milestone_claim — 比价战绩里程碑领取记录
+
+> 模型 `app/models/comparison_milestone.py` | 关联接口 [compare-milestones](../api/compare-milestones.md) / [compare-milestone-claim](../api/compare-milestone-claim.md) | [← 表索引](./README.md)
+
+「记录比价战绩」每档(第 1~6 次)只能领一次,领取后写一行;解锁进度由 `comparison_record` 里 `status='success'` 的条数决定,本表只记"哪几档已领"。仿 `user_task` 的一次性领取模型。
+
+## 字段
+| 列 | 类型 | 约束 / 默认 | 说明 |
+|---|---|---|---|
+| `id` | Integer | PK, autoincrement | |
+| `user_id` | Integer | FK→user.id, index, NOT NULL | 归属用户 |
+| `milestone` | Integer | NOT NULL | 档位序号(1-based),见 `rewards.RECORD_MILESTONES` |
+| `coin_awarded` | Integer | NOT NULL, default 0 | 该档应发金币额;⚠️ 当前产品定暂不真发,实际恒为 0 |
+| `claimed_at` | DateTime(tz) | server_default now() | 领取时间 |
+
+## 索引与约束
+- PK: `id`;index: `user_id`
+- UNIQUE(`user_id`, `milestone`) = `uq_compare_milestone_user`(防同档重复领)
+
+## 关系
+- `user_id` → `user.id`(多对一)
+- 解锁进度依赖 `comparison_record`(`status='success'` 计数),本表不存进度本身。
+
+## 说明
+- ⚠️ 当前 claim 仅写本表标记已领(去重),**不调 `grant_coins`、不写 `coin_transaction`,`coin_awarded` 恒为 0、余额不变**(产品定暂不真发金币,后续整体删除该功能)。
+- 领取校验:档位越界 404、未解锁(成功数 < milestone)409、已领 409。

docs/database/comparison_record.md

@@ -0,0 +1,47 @@
+# comparison_record — 比价记录(每次比价完整明细)
+
+> 模型 `app/models/comparison.py` | 关联接口 [compare-record-report](../api/compare-record-report.md) / [compare-records](../api/compare-records.md) / [compare-record-detail](../api/compare-record-detail.md) | [← 表索引](./README.md)
+
+每完成一次比价(外卖/电商/领券),客户端 done 帧后用带 JWT 通道上报一条。「我的比价记录」页数据源,也是比价战绩里程碑解锁进度的计数源(`status='success'` 条数)。
+
+> 与 `savings_record` 的区别:本表是「每一次**比价行为**的完整明细」(不省钱、甚至失败也记);`savings_record` 是「真正**下单成交**省了多少」。两表独立、互不喂数据。
+
+## 字段
+| 列 | 类型 | 约束 / 默认 | 说明 |
+|---|---|---|---|
+| `id` | Integer | PK, autoincrement | |
+| `user_id` | Integer | FK→user.id, index, NOT NULL | 归属用户 |
+| `device_id` | String(64) | nullable | 设备号 |
+| `business_type` | String(16) | NOT NULL, default `food`, index | `food`(当前唯一接通)/ `ecom` / `coupon` |
+| `trace_id` | String(64) | NOT NULL | pricebot 侧 trace_id(关联调试落盘 + 幂等键) |
+| `source_platform_id` | String(32) | nullable | 源平台代号 |
+| `source_platform_name` | String(32) | nullable | 源平台中文名 |
+| `source_package` | String(128) | nullable | 源平台 Android 包名 |
+| `source_price_cents` | Integer | nullable | 源平台到手价(分) |
+| `best_platform_id` | String(32) | nullable | 最优平台代号(= rank=1) |
+| `best_platform_name` | String(32) | nullable | 最优平台中文名 |
+| `best_price_cents` | Integer | nullable | 最优价(分) |
+| `saved_amount_cents` | Integer | nullable | 源价 − 最优价(可 0/负) |
+| `is_source_best` | Boolean | nullable | 源平台就是最便宜(= 没省到) |
+| `store_name` | String(128) | nullable | 店铺名 |
+| `total_dish_count` | Integer | nullable | 菜品总数 |
+| `skipped_dish_count` | Integer | nullable | 跳过(没找到)菜品数 |
+| `status` | String(16) | NOT NULL, default `success` | `success`(拿到有效对比)/ `failed`(出错/没采到目标价) |
+| `information` | String(256) | nullable | done 帧文案;成功=摘要,失败=具体原因(前端失败时当原因展示) |
+| `items` | JSON(PG: JSONB) | NOT NULL, default [] | 下单菜品 `[{name, qty, specs?}]` |
+| `comparison_results` | JSON(PG: JSONB) | NOT NULL, default [] | 逐平台对比 `[{platform_id,platform_name,package,price(元),is_source,rank,coupon_saved}]`;`coupon_saved`=该平台主优惠额(元,美团红包/淘宝平台红包/京东优惠券·百亿补贴,只取那一笔,不含配送费/共减总额),各平台抠到红包即带值(2026-06 起源平台 Phase1 意图识别也抠,当前仅淘宝源),没用/没抠到为 null,前端展示「已优惠 ¥X」 |
+| `skipped_dish_names` | JSON(PG: JSONB) | NOT NULL, default [] | 被跳过的菜名 |
+| `raw_payload` | JSON(PG: JSONB) | nullable | 客户端原始上报(calibration + done.params 全量) |
+| `created_at` | DateTime(tz) | server_default now(), index | 时间 |
+
+## 索引与约束
+- PK: `id`;index: `user_id`、`business_type`、`created_at`
+- UNIQUE(`user_id`, `trace_id`) = `uq_comparison_user_trace`(同次比价重试/重复上报幂等覆盖)
+
+## 关系
+- `user_id` → `user.id`(多对一)
+- 被 `comparison_milestone_claim` 间接依赖:里程碑解锁进度 = 本表 `status='success'` 条数。
+
+## 说明
+- `best_*` / `saved_amount_cents` / `is_source_best` / `status` 由 `repositories/comparison.py:_derive` 从 `comparison_results` 派生,客户端不用自己算。
+- 4 个 JSON 列用 `JSON().with_variant(JSONB(),"postgresql")`(SQLite 退化 JSON)。金额结构化列存「分」,`comparison_results.price` 原样存「元」。

docs/database/feedback.md

@@ -0,0 +1,25 @@
+# feedback — 用户帮助与反馈
+
+> 模型 `app/models/feedback.py` | 关联接口 [feedback](../api/feedback.md) | [← 表索引](./README.md)
+
+每条 = 用户一次反馈提交。`content` 与 `contact` 必填,`images` 为可选截图 URL 列表。
+
+## 字段
+| 列 | 类型 | 约束 / 默认 | 说明 |
+|---|---|---|---|
+| `id` | Integer | PK, autoincrement | |
+| `user_id` | Integer | FK→user.id, index, NOT NULL | 提交用户 |
+| `content` | Text | NOT NULL | 反馈正文 |
+| `contact` | String(128) | NOT NULL | 联系方式(微信/QQ/手机,便于回访) |
+| `images` | JSON | nullable | 截图 URL 列表(相对路径 `/media/feedback/...`);无图为 NULL |
+| `status` | String(16) | NOT NULL, default `new` | `new`(待处理)/ `handled`(已处理) |
+| `created_at` | DateTime(tz) | server_default now(), index | 提交时间 |
+
+## 索引与约束
+- PK: `id`;index: `user_id`、`created_at`
+
+## 关系
+- `user_id` → `user.id`(多对一)
+
+## 说明
+- `images` 用通用 `JSON`(本表未用 JSONB variant);截图先经 `/media/feedback/` 上传拿到相对路径再随反馈提交。

docs/database/savings_record.md

@@ -0,0 +1,31 @@
+# savings_record — 省钱记录(profile 省钱战绩源)
+
+> 模型 `app/models/savings.py` | 关联接口 [savings-summary](../api/savings-summary.md) / [savings-battle](../api/savings-battle.md) / [savings-records](../api/savings-records.md) | [← 表索引](./README.md)
+
+profile 页「累计帮你省了 / 省钱战绩 / 省钱明细」的唯一数据源:**真正下单成交后**省了多少记一行。
+
+> ⚠️ **当前为 demo 假数据**:`crud/savings.py:ensure_seeded` 按 user_id 幂等灌 ~23 条(`source='demo'`),聚合(SUM/分组/连续天数)是生产级真实计算。真数据要靠**"用户真下单"信号**(app 目前无:AI 比价止于结算页/结果展示,付款用户手动)——**不是**把比价记录 `comparison_record` 喂过来(那是"比价行为",这是"成交省钱",两个维度)。详见 [[project_shaguabijia_app_server]]。
+
+## 字段
+| 列 | 类型 | 约束 / 默认 | 说明 |
+|---|---|---|---|
+| `id` | Integer | PK, autoincrement | |
+| `user_id` | Integer | FK→user.id, index, NOT NULL | 归属用户 |
+| `order_amount_cents` | Integer | NOT NULL | 订单到手价(分) |
+| `saved_amount_cents` | Integer | NOT NULL | 本单省下(分,可为 0) |
+| `platform` | String(32) | nullable | 下单平台(美团外卖/淘宝闪购/京东外卖) |
+| `title` | String(128) | nullable | 标题 |
+| `shop_name` | String(128) | nullable | 店铺名 |
+| `dishes` | JSON(PG: JSONB) | NOT NULL, default [] | 菜名列表(前 2 道展示,其余"还有 N 道") |
+| `source` | String(16) | NOT NULL, default `compare` | 来源:`demo`(演示)/ `compare`(真实下单上报,待启用) |
+| `created_at` | DateTime(tz) | server_default now(), index | 时间 |
+
+## 索引与约束
+- PK: `id`;index: `user_id`、`created_at`
+
+## 关系
+- `user_id` → `user.id`(多对一)
+
+## 说明
+- `dishes` 用 `JSON().with_variant(JSONB(),"postgresql")`(SQLite 退化 JSON)。
+- `beat_percent`(超过百分之多少用户)按各用户累计省下金额做真实分位;为有可比人群造了 5 个种子用户(`register_channel='seed'`)。

docs/database/signin_record.md

@@ -0,0 +1,26 @@
+# signin_record — 签到记录(7 天循环)
+
+> 模型 `app/models/signin.py` | 关联接口 [signin-status](../api/signin-status.md) / [signin-do](../api/signin-do.md) | [← 表索引](./README.md)
+
+每次签到一行,`(user_id, signin_date)` 唯一,天然防一天签两次。`cycle_day`(1..7)决定发多少金币(`rewards.SIGNIN_REWARDS`),断签重置回 1;`streak` 是连续签到天数(不封顶)用于展示。
+
+## 字段
+| 列 | 类型 | 约束 / 默认 | 说明 |
+|---|---|---|---|
+| `id` | Integer | PK, autoincrement | |
+| `user_id` | Integer | FK→user.id, index, NOT NULL | 归属用户 |
+| `signin_date` | Date | NOT NULL | 签到日期(北京时间 date) |
+| `cycle_day` | Integer | NOT NULL | 7 天循环里今天第几档(1..7),决定发币 |
+| `streak` | Integer | NOT NULL | 连续签到天数(不封顶) |
+| `coin_awarded` | Integer | NOT NULL | 本次发放金币 |
+| `created_at` | DateTime(tz) | server_default now() | 时间 |
+
+## 索引与约束
+- PK: `id`;index: `user_id`
+- UNIQUE(`user_id`, `signin_date`) = `uq_signin_user_date`(防一天签两次)
+
+## 关系
+- `user_id` → `user.id`(多对一)
+
+## 说明
+- 签到"今天"按北京时间 `cn_today()`(`CN_TZ=UTC+8`);发币与写本表记录同事务(`grant_coins(biz_type='signin', ref_id=日期)`)。

docs/database/user.md

@@ -0,0 +1,32 @@
+# user — 用户(登录主体)
+
+> 模型 `app/models/user.py` | 关联接口 [auth-me](../api/auth-me.md) 等 auth 组 | [← 表索引](./README.md)
+
+登录主体。极光一键登录与短信登录都映射到同一行,以 `phone` 唯一索引;注册即登录(phone 不存在则 insert,存在则更新 `last_login_at`)。后续加微信/Apple 登录新增 oauth_account 表,本表不动。
+
+## 字段
+| 列 | 类型 | 约束 / 默认 | 说明 |
+|---|---|---|---|
+| `id` | Integer | PK, autoincrement | 用户主键 |
+| `phone` | String(20) | UNIQUE, index, NOT NULL | 手机号(登录主键;注销后置 `deleted_<id>` 释放唯一约束) |
+| `register_channel` | String(20) | NOT NULL, default `jverify` | 注册渠道:`jverify` / `sms` |
+| `nickname` | String(64) | nullable | 通用昵称(用户改资料设) |
+| `avatar_url` | String(512) | nullable | 通用头像相对 URL(`/media/avatars/...`) |
+| `wechat_openid` | String(64) | UNIQUE, index, nullable | 微信 openid(绑定后存,提现转账用);一微信一账号 |
+| `wechat_nickname` | String(64) | nullable | 微信昵称(绑定时拉,展示在提现绑定卡) |
+| `wechat_avatar_url` | String(512) | nullable | 微信头像 URL |
+| `status` | String(20) | NOT NULL, default `active` | `active` / `disabled` / `deleted` |
+| `created_at` | DateTime(tz) | server_default now() | 注册时间 |
+| `last_login_at` | DateTime(tz) | default utcnow(应用层) | 最近登录时间 |
+
+## 索引与约束
+- PK: `id`
+- UNIQUE + index: `phone`
+- UNIQUE + index: `wechat_openid`(允许多个 NULL = 多个未绑定用户)
+
+## 关系
+- 被引用方:`coin_account` / `coin_transaction` / `cash_transaction` / `withdraw_order` / `signin_record` / `user_task` / `savings_record` / `ad_reward_record` / `ad_ecpm_record` / `feedback` / `comparison_record` / `comparison_milestone_claim` 的 `user_id` 均 → `user.id`。
+
+## 说明
+- `nickname/avatar_url`(通用)与 `wechat_nickname/wechat_avatar_url`(微信)**分开存,不互相覆盖**。
+- 注销账号:phone 改占位串、status=deleted,不物理删行(保留外键完整性)。

docs/database/user_task.md

@@ -0,0 +1,26 @@
+# user_task — 一次性任务领取去重
+
+> 模型 `app/models/task.py` | 关联接口 [tasks-list](../api/tasks-list.md) / [tasks-claim](../api/tasks-claim.md) | [← 表索引](./README.md)
+
+像"打开消息提醒"这类只能领一次的任务,完成后写一行,`(user_id, task_key)` 唯一防重复领奖。可循环领取的任务(签到)不走这张表,有专表 `signin_record`。
+
+## 字段
+| 列 | 类型 | 约束 / 默认 | 说明 |
+|---|---|---|---|
+| `id` | Integer | PK, autoincrement | |
+| `user_id` | Integer | FK→user.id, index, NOT NULL | 归属用户 |
+| `task_key` | String(48) | NOT NULL | 任务标识,见 `rewards.TASK_REWARDS`(如 `enable_notification`) |
+| `status` | String(16) | NOT NULL, default `completed` | 任务状态 |
+| `coin_awarded` | Integer | NOT NULL, default 0 | 该任务发放金币 |
+| `completed_at` | DateTime(tz) | server_default now() | 完成/领取时间 |
+
+## 索引与约束
+- PK: `id`;index: `user_id`
+- UNIQUE(`user_id`, `task_key`) = `uq_task_user_key`(防重复领)
+
+## 关系
+- `user_id` → `user.id`(多对一)
+
+## 说明
+- 领取:写本表 + `grant_coins(biz_type='task_<key>', ref_id=task_key)` 同事务;重复领抛 409,未知 key 抛 404。
+- 比价战绩里程碑虽是"领一次"模型但**不复用本表**,另有 `comparison_milestone_claim`(因 task_key 是固定字典,里程碑是按次数解锁的序号)。

docs/database/withdraw_order.md

@@ -0,0 +1,30 @@
+# withdraw_order — 提现单(现金 → 微信零钱)
+
+> 模型 `app/models/wallet.py` | 关联接口 [wallet-withdraw](../api/wallet-withdraw.md) / [wallet-withdraw-status](../api/wallet-withdraw-status.md) | [← 表索引](./README.md)
+
+提现状态机:`pending → success / failed`。扣现金 + 写 `cash_transaction(withdraw)` + 建本单在同一事务;失败/取消时退回现金并写 `cash_transaction(withdraw_refund)`。`wechat_state` 存微信侧原始状态,`status` 是归一化后的三态。
+
+## 字段
+| 列 | 类型 | 约束 / 默认 | 说明 |
+|---|---|---|---|
+| `id` | Integer | PK, autoincrement | |
+| `user_id` | Integer | FK→user.id, index, NOT NULL | 归属用户 |
+| `out_bill_no` | String(64) | UNIQUE, index, NOT NULL | 商户单号(幂等键 + 微信查单);客户端可传,不传则服务端生成 |
+| `amount_cents` | Integer | NOT NULL | 提现金额(分) |
+| `status` | String(16) | NOT NULL, default `pending` | 归一化状态:`pending` / `success` / `failed` |
+| `wechat_state` | String(32) | nullable | 微信原始状态:`WAIT_USER_CONFIRM` / `SUCCESS` / `FAIL` / `CANCELLED` … |
+| `transfer_bill_no` | String(64) | nullable | 微信转账单号 |
+| `package_info` | String(512) | nullable | 待用户确认时返回 App 拉起确认页用 |
+| `fail_reason` | String(256) | nullable | 失败技术原因(不外露,用户只看流水 remark) |
+| `created_at` | DateTime(tz) | server_default now(), index | 发起时间 |
+| `updated_at` | DateTime(tz) | server_default now(), onupdate now() | 更新时间 |
+
+## 索引与约束
+- PK: `id`;UNIQUE + index: `out_bill_no`;index: `user_id`、`created_at`
+
+## 关系
+- `user_id` → `user.id`(多对一)
+
+## 说明
+- 资金安全:原子扣款 + `out_bill_no` 幂等 + 模糊失败先查单再决定(绝不盲目退款)+ 孤儿单对账 `reconcile_pending_withdraws`。详见 [[project_shaguabijia_app_server]] 提现段。
+- `WITHDRAW_MIN_CENTS=10`(0.1 元,微信地板)。

docs/integrations/sms.md

@@ -3,22 +3,57 @@
 > 文件:`app/integrations/sms.py` | 关联接口:[auth-sms-send](../api/auth-sms-send.md) · [auth-sms-login](../api/auth-sms-login.md) | [← 集成索引](./README.md)
 
 ## 作用
-手机号 + 验证码登录的验证码发送 / 校验。**当前是 mock 模式**（占坑），未接真实短信供应商。
+手机号 + 验证码登录的验证码发送 / 校验。**已接极光短信 REST**,由 `SMS_MOCK` 切 mock / real。
+
+| | mock(`SMS_MOCK=true`,默认 / 开发测试) | real(`SMS_MOCK=false`,生产) |
+|---|---|---|
+| 发送 | 不真发,验证码打日志 | 调极光 `/v1/messages` 真发 |
+| 校验 | 放行任意 6 位数字(测试便利) | 比对本服务存的码(一次性 / 过期 / 防爆破) |
+
+## 为什么是"自己生成码"模式
+极光有两种验证码玩法:① `/v1/codes` 极光生成 + `/codes/{msg_id}/valid` 极光校验;② `/v1/messages` 本服务生成码、极光只负责发。**选 ②**:校验本地完成(不依赖极光二次往返)、有效期/错误次数/作废完全可控、跟原 mock 口子结构一致。
 
 ## 函数 / 异常
 | 函数 | 行为 |
 |---|---|
-| `send_code(phone) -> int` | mock 下不真发、只 log；返回距下次可发的秒数。进程内存表 `_last_sent` 记 `phone → 发送时间`，`SMS_SEND_INTERVAL_SEC` 内再发抛 `SmsError`（发送过频）。真供应商未接时抛 `SmsError("sms provider not configured")` |
-| `verify_code(phone, code) -> bool` | mock 下**任意 6 位数字**均通过（配合前台 demo）；真模式未实现返回 `False` |
-| 异常 `SmsError` | 发送过频 / 验证码不对，api 层 catch 后翻成 4xx（过频 `429`） |
+| `send_code(phone) -> int` | 防刷检查(冷却 + 每日上限)→ `secrets` 生成 N 位码 → **预占**(冷却/计数/存码)→ mock 打日志 / real 调极光 → 失败**回滚预占**。返回距下次可发秒数 |
+| `verify_code(phone, code) -> bool` | mock 放行任意 6 位;real 比对存码,匹配即作废,失败累计到上限作废 |
+| `SmsError(msg, status_code)` | `status_code` 决定 HTTP 码:过频/每日超限 **429**、供应商失败 **503**、号码无效 **400** |
 
 ## 配置
-| 配置项 | 说明 |
-|---|---|
-| `SMS_MOCK` | 是否 mock（当前 `true`） |
-| `SMS_SEND_INTERVAL_SEC` | 同号两次发送最小间隔（防过频） |
+| 配置项 | 默认 | 说明 |
+|---|---|---|
+| `SMS_MOCK` | `true` | mock / real 切换。**生产置 false** |
+| `SMS_CODE_TTL_SEC` | 300 | 验证码有效期(秒),与极光模板文案"5分钟"一致 |
+| `SMS_SEND_INTERVAL_SEC` | 60 | 单号两次发送最小间隔(冷却) |
+| `SMS_SEND_ENDPOINT` | 极光 `/v1/messages` | 短信发送地址 |
+| `SMS_SIGN_ID` | 31729 | 极光签名 ID |
+| `SMS_TEMPLATE_ID` | 1 | 极光模板 ID(变量名 `code`) |
+| `SMS_CODE_LENGTH` | 6 | 验证码位数(本服务生成;前端 code 4-8 位兼容) |
+| `SMS_DAILY_LIMIT_PER_PHONE` | 10 | 单号每日发送上限(防刷 + 控费) |
+| `SMS_MAX_VERIFY_ATTEMPTS` | 5 | 单码最多校验失败次数,超过作废(防爆破) |
 
-## 后续（接真实供应商时）
-- `send_code()` 改调供应商 API（阿里云 / 腾讯云），把生成的 6 位码存 cache（redis / sqlite）。
-- `verify_code()` 比对 cache 里的码，且**验过即作废**。
-- 进程内存方案占坑期够用；切真实供应商时一并切 redis（多进程/多机时内存表不共享，频控会失效）。
+> **鉴权复用极光一键登录**:`/v1/messages` 用 `base64(JG_APP_KEY:JG_MASTER_SECRET)` 做 HTTP Basic Auth——短信与一键登录是**同一个极光应用**(同 AppKey)。**上线不需要额外凭证,只需 `SMS_MOCK=false`**(`JG_*` 一键登录已配)。
+
+## 防刷(短信花钱 + `/sms/send` 在登录前无法 JWT 鉴权)
+1. 单号 `SMS_SEND_INTERVAL_SEC` 冷却
+2. 单号每日 `SMS_DAILY_LIMIT_PER_PHONE` 条上限
+3. 单 IP 频控:`/sms/send` 挂 `rate_limit(10,60)`、`/sms/login` 挂 `rate_limit(20,60)`
+4. 单码校验失败 `SMS_MAX_VERIFY_ATTEMPTS` 次即作废
+5. 运维侧建议在极光控制台叠加:**IP 白名单**(只许服务器 IP)+ **防轰炸设置**
+
+## 极光错误码(节选,映射在 `_send_via_jiguang`)
+| code | 含义 | 处理 |
+|---|---|---|
+| 50014 | 余额不足 | `logger.critical` 告警 + 503 |
+| 50009 | 极光侧超频 | 429 |
+| 50006 | 手机号无效 | 400 |
+| 其他 | — | 503 |
+
+## 上线步骤
+1. 极光控制台:企业实名 + 短信充值 + 签名审核(`sign_id=31729`)+ 模板审核(`temp_id=1`)——**均已就绪**
+2. `.env` 设 `SMS_MOCK=false`(`JG_APP_KEY`/`JG_MASTER_SECRET` 一键登录已配)
+3. 真机发一条验证:收到短信 + 能登录
+
+## 已知局限
+**验证码存进程内存**:单 worker uvicorn 够用;重启丢码(用户重发即可);**多 worker / 多机不共享 → 冷却 / 每日上限 / 校验失效**,扩 worker 前迁移到 DB/Redis。见 [待办与技术债](../待办与技术债.md)。

docs/后端技术实现.md

@@ -61,6 +61,7 @@ app/
 │       ├── feedback.py      # 帮助与反馈 1 端点(提交反馈含截图)
 │       ├── coupon.py        # 领券透传 /coupon/step(转发 pricebot,MVP 不鉴权)
 │       ├── compare.py       # 外卖比价透传 /intent/recognize + /price/step(转发 pricebot,MVP 不鉴权)
+│       ├── compare_record.py# 比价记录 3 端点(上报 /compare/record + 列表 /compare/records + 详情;鉴权,区别于上面透传)
 │       ├── meituan.py       # 美团 3 端点 + feed 拼接(_interleave / _TOPIC_ROUNDS),未配 MT_CPS 凭证降级返空
 │       ├── wallet.py        # 钱包/提现 11 端点(余额/流水/兑换/绑微信/提现/查单)
 │       ├── signin.py        # 签到 2 端点(状态 / 执行签到)
@@ -73,6 +74,7 @@ app/
 │   ├── feedback.py          # 反馈出参(请求是 multipart,在 router 直接校验)
 │   ├── meituan.py
 │   ├── welfare.py           # 钱包/签到/任务/省钱 收发模型
+│   ├── compare_record.py    # 比价记录上报/列表/详情 收发模型(字段对齐 pricebot calibration + done.params)
 │   └── ad.py                # 看广告发奖收发模型
 ├── integrations/            # 外部服务/SDK 客户端(重逻辑:签名/加解密/外部 HTTP)
 │   ├── jiguang.py           # 极光 REST 验 token + RSA 解密(多 padding 试错)
@@ -94,6 +96,7 @@ app/
 │   ├── signin.py            # 签到记录 / 连续天数 / 档位
 │   ├── task.py              # 一次性任务领取
 │   ├── savings.py           # 省钱汇总 / 战绩 / 明细
+│   ├── comparison.py        # 比价记录 upsert(user_id+trace_id 幂等)+ best/saved/status 派生 + 分页
 │   └── ad_reward.py         # 看广告发奖(按 trans_id 幂等 + 每日上限 + 本轮冷却派生)
 ├── models/                  # ORM 表结构
 │   ├── user.py              # user(含微信 openid/nickname/avatar)
@@ -102,6 +105,7 @@ app/
 │   ├── signin.py            # 签到记录
 │   ├── task.py              # 任务领取记录
 │   ├── savings.py           # 省钱明细 / 店铺菜品 / dishes(PG 上 JSONB)
+│   ├── comparison.py        # 比价记录(完整明细;含 4 个 JSON(B) 列 + raw_payload;独立于 savings)
 │   └── ad_reward.py         # 看广告发奖记录
 └── db/
     ├── base.py              # DeclarativeBase
@@ -156,7 +160,7 @@ Android SDK loginAuth → 客户端拿到 loginToken
 > **密钥对配对关系是关键**:极光用控制台上传的公钥加密,后端必须用**配对的私钥**解密。私钥不配对时 `jverify-login` 报 502 `all RSA paddings failed`(密钥不对,非 padding 问题);私钥文件缺失则报 502 `private key not found`。
 > **2026-05-27 现状**:历史遗留的两套本地密钥均**不配对**当前 AppKey 公钥,已重新生成一对 1024-bit/PKCS#8 密钥,公钥需在极光控制台更新。⚠️ 该 AppKey 公钥为全局配置,若占坑版后端仍在用同一 AppKey,换公钥会使其旧私钥失效,需同步部署新私钥。
 
-### 4.2 短信登录(mock 路径)
+### 4.2 短信登录(已接极光,SMS_MOCK 切 mock / real)
 
 ```
 POST /api/v1/auth/sms/send   { phone }       → 60s 冷却,不真发(SMS_MOCK=true)
@@ -165,6 +169,8 @@ POST /api/v1/auth/sms/login  { phone, code } → 任意 6 位通过 → upsert
 
 短信冷却表存进程内存(`--workers 1` 下够用,多 worker/重启即失效)。
 
+**real 模式(`SMS_MOCK=false`,生产)**:自定义验证码——本服务 `secrets` 生成 6 位码 → 极光 `/v1/messages` 只负责发 → 本地校验(一次性 / 防爆破),鉴权**复用 `JG_APP_KEY`/`JG_MASTER_SECRET`**(短信与一键登录同一极光应用,**上线只需 `SMS_MOCK=false`**)。防刷四层(单号冷却 + 单号每日上限 + 单 IP `rate_limit` + 单码失败次数)+ 错误码 429/503/400。详见 [integrations/sms](./integrations/sms.md)。
+
 ### 4.3 Token 与刷新
 
 - access(2h)+ refresh(30d),HS256 自包含,payload 含 `sub`/`typ`/`iat`/`exp`,**无 session 表、无 jti 黑名单**。
@@ -218,7 +224,7 @@ POST /api/v1/auth/sms/login  { phone, code } → 任意 6 位通过 → upsert
 
 ## 7. 数据模型
 
-10 张业务表 + `alembic_version` 框架表。生产 PG / 开发可回退 SQLite。
+业务表(下表)+ `alembic_version` 框架表。生产 PG / 开发可回退 SQLite。
 
 | 表 | models 文件 | 说明 |
 |---|---|---|
@@ -231,6 +237,7 @@ POST /api/v1/auth/sms/login  { phone, code } → 任意 6 位通过 → upsert
 | `signin_record` | `models/signin.py` | 签到记录(每日一行,索引 `(user_id, signin_date)`) |
 | `user_task` | `models/task.py` | 一次性任务领取记录 |
 | `savings_record` | `models/savings.py` | 省钱明细(`dishes` 在 PG 上为 JSONB,SQLite 上是 TEXT) |
+| `comparison_record` | `models/comparison.py` | 比价记录(每次比价完整明细;`(user_id, trace_id)` 唯一幂等;4 个 JSON(B) 列含 `raw_payload`;独立于 savings) |
 | `ad_reward_record` | `models/ad_reward.py` | 看广告发奖(`trans_id` 唯一,幂等) |
 
 **user 表字段速查**:
@@ -310,7 +317,7 @@ conda activate price          # 首次:pip install -e .
 | 美团接口未配凭证降级 | 未配 `MT_CPS_APP_KEY` 时 3 端点返空(不报 502),`/feed` 跟"已配但调用失败"路径无法区分——见 [integrations/meituan](./integrations/meituan.md) |
 | 领券/比价依赖 pricebot | `coupon/step` / `intent/recognize` / `price/step` 仅透传,真正逻辑在 pricebot-backend;前端已接通领券链路,比价 food MVP 也已接通 |
 | agent 系列接口 MVP 不鉴权 | 拿不到 user_id → 无法采集"哪个用户领了/买了什么"用户级画像(商业模式核心资产)。见 [待办与技术债.md](./待办与技术债.md) P1 |
-| SMS 为 mock | 上线接真实供应商 + `SMS_MOCK=false` |
+| SMS 已接极光(2026-06-03) | real 模式自定义验证码,上线只需 `SMS_MOCK=false`(复用极光凭证)。详见 [integrations/sms](./integrations/sms.md) |
 | 短信冷却存内存 | 扩 worker 前需迁移到 Redis |
 | `MEDIA_ROOT` 进程内 serve | 头像/反馈截图当前用 FastAPI StaticFiles,生产建议 nginx 直 serve 该目录 |
 | `init_postgres.py` 已知小 bug | 5 条小坑,见 [待办与技术债.md](./待办与技术债.md) |

docs/待办与技术债.md

@@ -11,8 +11,8 @@
 
 - **现状**：agent 系列接口 MVP 阶段**全部不鉴权**。领券 `coupon/step` **已落地不鉴权**(✅ 已去掉 `CurrentUser` 依赖);比价 4 个(`intent/recognize`、`price/step`、`ecom/intent/recognize`、`ecom/step`)端点尚未建(见 P2),建时同样先不加鉴权。
 - **代价(为什么记这笔账)**：不验 JWT → 转发时 server 拿不到 `user_id` → agent 行为只能绑到 `device_id`(设备级)，**采集不到"哪个用户领了/买了什么"的用户级画像**。而精准人群画像、私域分群运营是商业模式的核心资产，靠的就是这份用户级行为数据。`device_id` 仍照传(后端按设备串领券队列够用)。
-- **待补**：① agent 接口加 JWT 鉴权；② 建立 `device_id ↔ user_id` 绑定(登录后上报一次即可)；③ 领券/比价记录按 user 维度落库。
-- **连带**：补鉴权后，客户端引擎 `ApiClient` 要接回 JWT(复用 app 现有 `AuthInterceptor` 思路：注入带鉴权头的 OkHttpClient)。
+- **待补**：① agent 接口加 JWT 鉴权；② 建立 `device_id ↔ user_id` 绑定(登录后上报一次即可)；③ ~~领券/比价记录按 user 维度落库~~ → **比价记录已落地**(见文末「已解决」)：走**独立的鉴权端点** `POST /api/v1/compare/record`,客户端在 done 帧后用带 JWT 的通道上报、不依赖透传链路。**所以透传端点本身仍不鉴权、本条 P1 主诉求(给透传链路补 JWT + device↔user 绑定)未解**;领券记录尚未落库。
+- **连带**：补鉴权后，客户端引擎 `ApiClient` 要接回 JWT(复用 app 现有 `AuthInterceptor` 思路：注入带鉴权头的 OkHttpClient)。比价记录上报已**先行复用**这套(`authedClient` 挂 `AuthInterceptor`+`RefreshAuthenticator`),可作透传链路补鉴权的参考样板。
 
 ---
 
@@ -87,6 +87,11 @@
 
 ## 已解决
 
+- ✅ **短信验证码接入极光(real 模式,2026-06-03)**:`/sms/send`+`/sms/login` 从 mock 升级为真实可用。`integrations/sms.py` 走**自定义验证码模式**(本服务 `secrets` 生成 6 位码 + 进程内存存储 + 极光 `/v1/messages` 只负责发 + 本地校验一次性/防爆破);鉴权**复用极光一键登录的 `JG_APP_KEY`/`JG_MASTER_SECRET`**(同一极光应用,**上线只需 `SMS_MOCK=false`**,无需额外凭证;`sign_id=31729`/`temp_id=1` 已审核就绪)。防刷四层(单号冷却 + 单号每日上限 + 单 IP `rate_limit` + 单码失败次数上限);`SmsError.status_code` 让发送失败按类型返回 429/503/400。**mock 保留"任意6位通过"**(不动其他 11 个测试文件的 `_login` helper);`tests/test_auth.py` 加 real 模式单测(极光协议 / 一次性 / 防爆破 / 余额回滚)。文档 [integrations/sms.md](./integrations/sms.md)。**遗留**:验证码进程内存,多 worker 需迁 DB/Redis(下方技术债)。
+- ✅ **比价记录落库(server + client,2026-05-31)**:每次比价 done 后客户端上报、按 user 落库,作「我的比价记录」数据源 + 用户级画像沉淀。
+  - **server**(本仓):新表 `comparison_record`(独立于 `savings_record`;结构化列 + `items`/`comparison_results`/`skipped_dish_names`/`raw_payload` 四个 JSON(B) 列)+ 3 个**鉴权**端点 `POST /api/v1/compare/record`(`(user_id,trace_id)` 幂等 upsert,best/saved/is_source_best/status 服务端从 comparison_results 派生)/ `GET /api/v1/compare/records`(游标分页)/ `GET /records/{id}`(含 raw_payload);`models/comparison.py` + `repositories/comparison.py` + `schemas/compare_record.py` + `api/v1/compare_record.py` + 迁移 `comparison_record_table`(head `b2c3d4e5f6a7`)+ `tests/test_compare_record.py`(8 例全过)+ `docs/api/compare-record-*.md`。
+  - **client**(android 仓):`PriceBotService.runTask()` 比价 done 后(`lastDoneParams!=null`,成功/引擎失败都报)用独立 IO 协程尽力上报;`Protocol.CompareRecordRequest.fromComparison()` 从 calibration+done.params 零翻译组装;`ApiClient.reportCompareRecord()` 走新建的 `authedClient`(复用 `AuthInterceptor`+`RefreshAuthenticator`,自动 Bearer+401 刷新)。领券不报(非价格对比,本期范围只外卖)。
+  - **未做**:UI(「我的比价记录」页)等原型;真机端到端待验。
 - ✅ **领券链路接通**(阶段 1):首页「去领取」→ `CouponPromptDialog` → 权限检查 → `startCouponClaim` → 循环 `/api/v1/coupon/step`;Running 悬浮窗换皮(ComposeView 承载 `CouponProgressPanel`/AgentFloat,`OverlayLifecycleOwner` 撑 Compose)。
 - ✅ **coupon/step 去鉴权**:去掉 `CurrentUser`,MVP 不鉴权(device_id 透传)。
 - ✅ **ApiClient 改址**:`BuildConfig.BASE_URL` + `/api/v1/` 前缀。

pyproject.toml

@@ -31,6 +31,9 @@ dependencies = [
 
     # multipart form (FastAPI 表单上传依赖)
     "python-multipart>=0.0.9",
+
+    # admin 后台账号密码 hash(用户侧是手机号+验证码登录,不需要密码;admin 才用)
+    "bcrypt>=4.0.0",
 ]
 
 [project.optional-dependencies]

scripts/create_admin.py

@@ -0,0 +1,58 @@
+"""创建 / 重置一个 admin 后台账号。
+
+用法(在项目根、已 pip install -e . 的环境里跑):
+  python scripts/create_admin.py --username admin --role super_admin
+      不传 --password → 自动生成强随机密码,打印一次,务必当场保存
+  python scripts/create_admin.py --username ops --role operator --password 'xxx'
+
+幂等:username 已存在则重置其密码 + 角色 + 置为 active(忘记密码时用它重置)。
+角色:super_admin(全权+管账号)/ finance(钱)/ operator(用户+反馈+大盘)。
+"""
+from __future__ import annotations
+
+import argparse
+import secrets
+
+from app.admin.repositories import admin_user as admin_repo
+from app.core.security import hash_password
+from app.db.session import SessionLocal
+
+_ROLES = ("super_admin", "finance", "operator")
+
+
+def main() -> None:
+    parser = argparse.ArgumentParser(description="创建或重置 admin 账号")
+    parser.add_argument("--username", required=True)
+    parser.add_argument("--role", default="super_admin", choices=_ROLES)
+    parser.add_argument("--password", default=None, help="不传则自动生成强随机密码")
+    args = parser.parse_args()
+
+    password = args.password or secrets.token_urlsafe(16)
+    generated = args.password is None
+
+    db = SessionLocal()
+    try:
+        existing = admin_repo.get_by_username(db, args.username)
+        if existing is None:
+            admin = admin_repo.create_admin(
+                db, username=args.username, password=password, role=args.role
+            )
+            action = "创建"
+        else:
+            existing.password_hash = hash_password(password)
+            existing.role = args.role
+            existing.status = "active"
+            db.commit()
+            db.refresh(existing)
+            admin = existing
+            action = "重置"
+    finally:
+        db.close()
+
+    print(f"✅ 已{action} admin: id={admin.id} username={admin.username} role={admin.role}")
+    if generated:
+        print(f"🔑 自动生成的密码(只显示这一次,请立即保存):\n   {password}")
+
+
+if __name__ == "__main__":
+    main()

tests/conftest.py

@@ -18,6 +18,7 @@ _tmp_db.close()
 
 os.environ["DATABASE_URL"] = f"sqlite:///{_tmp_db.name}"
 os.environ.setdefault("JWT_SECRET_KEY", "test-secret-please-ignore-this-is-only-for-pytest-not-real")
+os.environ.setdefault("ADMIN_JWT_SECRET", "test-admin-secret-please-ignore-only-for-pytest-not-real")
 os.environ.setdefault("JG_APP_KEY", "test-key")
 os.environ.setdefault("JG_MASTER_SECRET", "test-secret")
 os.environ.setdefault("SMS_MOCK", "true")

tests/test_ad_reward.py

@@ -84,7 +84,7 @@ def test_callback_uses_reward_amount(client) -> None:
     assert _callback(client, _signed(uid, "ra_ok", reward_amount="250")).status_code == 200
     assert _coin_balance(client, token) == 250
 
-    # ≤0 / 非数字 → 回退 AD_REWARD_COIN(累加 100)
+    # ≤0 / 非数字 → 回退 AD_REWARD_COIN(累加 AD_REWARD_COIN,当前 666)
     assert _callback(client, _signed(uid, "ra_zero", reward_amount="0")).status_code == 200
     assert _coin_balance(client, token) == 250 + AD_REWARD_COIN
 

tests/test_admin.py

@@ -0,0 +1,155 @@
+"""Admin 后台 M1 测试:登录闭环 + 与 App 用户鉴权的彻底隔离。
+
+admin app 是独立的 FastAPI(app.admin.main:admin_app),用独立 TestClient。
+admin 表由 conftest 的 Base.metadata.create_all 一起建好(models/__init__ 已登记)。
+"""
+from __future__ import annotations
+
+import pytest
+from fastapi.testclient import TestClient
+
+from app.admin.main import admin_app
+from app.admin.repositories import admin_user as admin_repo
+from app.core.security import create_token, hash_password
+from app.db.session import SessionLocal
+
+
+@pytest.fixture()
+def admin_client() -> TestClient:
+    return TestClient(admin_app)
+
+
+def _ensure_admin(
+    username: str = "test_admin",
+    password: str = "admin-pass-123",
+    role: str = "super_admin",
+) -> tuple[str, str]:
+    """create-or-reset 一个 admin(测试 DB 跨用例共享,需幂等)。"""
+    db = SessionLocal()
+    try:
+        a = admin_repo.get_by_username(db, username)
+        if a is None:
+            admin_repo.create_admin(db, username=username, password=password, role=role)
+        else:
+            a.password_hash = hash_password(password)
+            a.role = role
+            a.status = "active"
+            db.commit()
+    finally:
+        db.close()
+    return username, password
+
+
+def test_admin_login_and_me(admin_client: TestClient) -> None:
+    username, password = _ensure_admin()
+
+    r = admin_client.post(
+        "/admin/api/auth/login", json={"username": username, "password": password}
+    )
+    assert r.status_code == 200, r.text
+    data = r.json()
+    assert "access_token" in data
+    assert data["admin"]["username"] == username
+    assert data["admin"]["role"] == "super_admin"
+
+    token = data["access_token"]
+    r = admin_client.get("/admin/api/auth/me", headers={"Authorization": f"Bearer {token}"})
+    assert r.status_code == 200, r.text
+    assert r.json()["username"] == username
+
+
+def test_admin_login_wrong_password(admin_client: TestClient) -> None:
+    username, _ = _ensure_admin()
+    r = admin_client.post(
+        "/admin/api/auth/login", json={"username": username, "password": "definitely-wrong"}
+    )
+    assert r.status_code == 401
+
+
+def test_admin_me_requires_token(admin_client: TestClient) -> None:
+    assert admin_client.get("/admin/api/auth/me").status_code == 401
+
+
+def test_disabled_admin_cannot_login(admin_client: TestClient) -> None:
+    username, password = _ensure_admin(username="disabled_admin")
+    db = SessionLocal()
+    try:
+        a = admin_repo.get_by_username(db, username)
+        a.status = "disabled"
+        db.commit()
+    finally:
+        db.close()
+    r = admin_client.post(
+        "/admin/api/auth/login", json={"username": username, "password": password}
+    )
+    assert r.status_code == 403
+
+
+# ============================ 关键:鉴权隔离 ============================
+
+def test_app_user_token_cannot_access_admin(admin_client: TestClient) -> None:
+    """App 用户的 access_token(用 JWT_SECRET_KEY 签)不能访问 admin。
+
+    admin 用独立 ADMIN_JWT_SECRET 验签 → App token 直接验签失败 → 401。
+    这是后台防越权的第一道线。
+    """
+    user_token, _ = create_token(user_id=1, token_type="access")
+    r = admin_client.get(
+        "/admin/api/auth/me", headers={"Authorization": f"Bearer {user_token}"}
+    )
+    assert r.status_code == 401
+
+
+def test_admin_token_cannot_access_app_api(client: TestClient, admin_client: TestClient) -> None:
+    """反向:admin token 也不能访问 App 用户接口(App 用 JWT_SECRET_KEY 验签,admin token 失败)。"""
+    username, password = _ensure_admin()
+    r = admin_client.post(
+        "/admin/api/auth/login", json={"username": username, "password": password}
+    )
+    admin_token = r.json()["access_token"]
+    r = client.get("/api/v1/auth/me", headers={"Authorization": f"Bearer {admin_token}"})
+    assert r.status_code == 401
+
+
+# ============================ 回归:review 修掉的两个 bug ============================
+
+def test_long_password_does_not_crash(admin_client: TestClient) -> None:
+    """>72 UTF-8 字节的密码(如多个中文)不能让建账号/登录崩(bcrypt 72 字节限制)。"""
+    username = "longpw_admin"
+    long_pw = "超长密码测试" * 8  # 6 中文 ×8 = 48 字 ≈ 144 字节 UTF-8,远超 72
+    _ensure_admin(username=username, password=long_pw)  # 建账号不应抛 ValueError
+    r = admin_client.post(
+        "/admin/api/auth/login", json={"username": username, "password": long_pw}
+    )
+    assert r.status_code == 200, r.text
+
+
+def test_audit_log_pagination_no_gap() -> None:
+    """审计游标分页跨页不丢/不重(回归 next_cursor off-by-one)。"""
+    from app.admin.repositories import admin_user as admin_repo
+    from app.admin.repositories import audit_log as audit_repo
+
+    _ensure_admin()  # 确保有 test_admin 供 FK 引用
+    db = SessionLocal()
+    try:
+        admin = admin_repo.get_by_username(db, "test_admin")
+        action = "test.pagination.probe"
+        created_ids = []
+        for i in range(5):
+            log = audit_repo.add_audit_log(
+                db, admin_id=admin.id, admin_username=admin.username,
+                action=action, target_type="probe", target_id=str(i),
+            )
+            created_ids.append(log.id)
+
+        # limit=2 翻 5 条,收集所有 id,应正好覆盖创建的 5 条(无丢无重)
+        seen: list[int] = []
+        cursor = None
+        for _ in range(10):  # 上限防死循环
+            rows, cursor = audit_repo.list_audit_logs(db, action=action, limit=2, cursor=cursor)
+            seen.extend(r.id for r in rows)
+            if cursor is None:
+                break
+        assert sorted(seen) == sorted(created_ids), f"分页丢/重: want={created_ids} got={seen}"
+    finally:
+        db.close()

tests/test_admin_read.py

@@ -0,0 +1,124 @@
+"""Admin M2 读接口测试:大盘聚合 + 用户/流水/提现/反馈列表 + 鉴权拦截。"""
+from __future__ import annotations
+
+import pytest
+from fastapi.testclient import TestClient
+
+from app.admin.main import admin_app
+from app.admin.repositories import admin_user as admin_repo
+from app.db.session import SessionLocal
+from app.models.feedback import Feedback
+from app.models.wallet import CashTransaction, WithdrawOrder
+from app.repositories import user as user_repo
+from app.repositories import wallet as wallet_repo
+
+
+@pytest.fixture()
+def admin_client() -> TestClient:
+    return TestClient(admin_app)
+
+
+@pytest.fixture()
+def admin_token() -> str:
+    db = SessionLocal()
+    try:
+        if admin_repo.get_by_username(db, "m2_admin") is None:
+            admin_repo.create_admin(db, username="m2_admin", password="m2-pass", role="super_admin")
+    finally:
+        db.close()
+    c = TestClient(admin_app)
+    r = c.post("/admin/api/auth/login", json={"username": "m2_admin", "password": "m2-pass"})
+    return r.json()["access_token"]
+
+
+def _auth(token: str) -> dict:
+    return {"Authorization": f"Bearer {token}"}
+
+
+def _seed_user_with_data(phone: str) -> int:
+    """造一个用户 + 金币流水 + 现金流水 + 提现单 + 反馈,返回 user_id。"""
+    db = SessionLocal()
+    try:
+        user = user_repo.upsert_user_for_login(db, phone=phone, register_channel="sms")
+        uid = user.id
+        wallet_repo.grant_coins(db, uid, 5000, biz_type="signin", remark="测试发金币")
+        db.commit()
+        db.add(CashTransaction(
+            user_id=uid, amount_cents=-100, balance_after_cents=0, biz_type="withdraw", remark="t"
+        ))
+        db.add(WithdrawOrder(
+            user_id=uid, out_bill_no=f"test{uid}billno0001", amount_cents=100, status="success"
+        ))
+        db.add(Feedback(user_id=uid, content="测试反馈内容", contact="wx_test", status="new"))
+        db.commit()
+        return uid
+    finally:
+        db.close()
+
+
+def test_dashboard_overview(admin_client: TestClient, admin_token: str) -> None:
+    _seed_user_with_data("13800000001")
+    r = admin_client.get("/admin/api/stats/overview", headers=_auth(admin_token))
+    assert r.status_code == 200, r.text
+    data = r.json()
+    assert data["users"]["total"] >= 1
+    assert data["coins"]["granted_total"] >= 5000
+    assert "success_rate" in data["comparison"]
+    assert data["cps"]["available"] is False
+
+
+def test_user_list_and_detail(admin_client: TestClient, admin_token: str) -> None:
+    uid = _seed_user_with_data("13800000002")
+    r = admin_client.get("/admin/api/users", headers=_auth(admin_token))
+    assert r.status_code == 200, r.text
+    assert "items" in r.json()
+
+    r = admin_client.get(f"/admin/api/users/{uid}", headers=_auth(admin_token))
+    assert r.status_code == 200, r.text
+    d = r.json()
+    assert d["user"]["id"] == uid
+    assert d["coin_balance"] == 5000
+    assert d["withdraw_total"] >= 1
+    assert d["feedback_total"] >= 1
+
+    assert admin_client.get("/admin/api/users/999999", headers=_auth(admin_token)).status_code == 404
+
+
+def test_user_filter_by_status(admin_client: TestClient, admin_token: str) -> None:
+    _seed_user_with_data("13800000003")
+    r = admin_client.get("/admin/api/users", params={"status": "active"}, headers=_auth(admin_token))
+    assert r.status_code == 200
+    assert all(u["status"] == "active" for u in r.json()["items"])
+
+
+def test_wallet_and_withdraw_lists(admin_client: TestClient, admin_token: str) -> None:
+    uid = _seed_user_with_data("13800000004")
+    r = admin_client.get(
+        "/admin/api/wallet/coin-transactions", params={"user_id": uid}, headers=_auth(admin_token)
+    )
+    assert r.status_code == 200
+    assert len(r.json()["items"]) >= 1
+
+    r = admin_client.get("/admin/api/withdraws", params={"user_id": uid}, headers=_auth(admin_token))
+    assert r.status_code == 200
+    assert len(r.json()["items"]) >= 1
+    assert all(o["status"] == "success" for o in r.json()["items"])
+
+
+def test_feedback_list(admin_client: TestClient, admin_token: str) -> None:
+    _seed_user_with_data("13800000005")
+    r = admin_client.get("/admin/api/feedbacks", params={"status": "new"}, headers=_auth(admin_token))
+    assert r.status_code == 200
+    assert all(f["status"] == "new" for f in r.json()["items"])
+
+
+def test_read_apis_require_auth(admin_client: TestClient) -> None:
+    """所有 M2 读接口未带 token → 401(router 级 get_current_admin 守卫)。"""
+    for path in [
+        "/admin/api/stats/overview",
+        "/admin/api/users",
+        "/admin/api/wallet/coin-transactions",
+        "/admin/api/withdraws",
+        "/admin/api/feedbacks",
+    ]:
+        assert admin_client.get(path).status_code == 401, path

tests/test_admin_write.py

@@ -0,0 +1,278 @@
+"""Admin M3 写接口测试:调金币/封号/反馈/提现/admin账号。
+
+验证:写操作落审计 + 金币写流水 + 扣负拒绝 + 角色守卫 + 提现复用 wallet(mock wxpay)。
+"""
+from __future__ import annotations
+
+import pytest
+from fastapi.testclient import TestClient
+from sqlalchemy import select
+
+from app.admin.main import admin_app
+from app.admin.repositories import admin_user as admin_repo
+from app.core.security import hash_password
+from app.db.session import SessionLocal
+from app.models.admin import AdminAuditLog
+from app.models.feedback import Feedback
+from app.models.user import User
+from app.models.wallet import CoinAccount, CoinTransaction, WithdrawOrder
+from app.repositories import user as user_repo
+
+
+@pytest.fixture()
+def admin_client() -> TestClient:
+    return TestClient(admin_app)
+
+
+def _token(username: str, role: str) -> str:
+    db = SessionLocal()
+    try:
+        a = admin_repo.get_by_username(db, username)
+        if a is None:
+            admin_repo.create_admin(db, username=username, password="pass1234", role=role)
+        else:
+            a.password_hash = hash_password("pass1234")
+            a.role = role
+            a.status = "active"
+            db.commit()
+    finally:
+        db.close()
+    c = TestClient(admin_app)
+    return c.post(
+        "/admin/api/auth/login", json={"username": username, "password": "pass1234"}
+    ).json()["access_token"]
+
+
+@pytest.fixture()
+def super_token() -> str:
+    return _token("w_super", "super_admin")
+
+
+@pytest.fixture()
+def finance_token() -> str:
+    return _token("w_finance", "finance")
+
+
+@pytest.fixture()
+def operator_token() -> str:
+    return _token("w_operator", "operator")
+
+
+def _auth(token: str) -> dict:
+    return {"Authorization": f"Bearer {token}"}
+
+
+def _seed_user(phone: str) -> int:
+    db = SessionLocal()
+    try:
+        return user_repo.upsert_user_for_login(db, phone=phone, register_channel="sms").id
+    finally:
+        db.close()
+
+
+def _seed_feedback(phone: str) -> int:
+    uid = _seed_user(phone)
+    db = SessionLocal()
+    try:
+        fb = Feedback(user_id=uid, content="测试", contact="wx", status="new")
+        db.add(fb)
+        db.commit()
+        return fb.id
+    finally:
+        db.close()
+
+
+# ===== 调金币 =====
+
+def test_grant_coins_writes_txn_and_audit(admin_client: TestClient, finance_token: str) -> None:
+    uid = _seed_user("13900000001")
+    r = admin_client.post(
+        f"/admin/api/users/{uid}/coins", json={"amount": 1000, "reason": "补偿"},
+        headers=_auth(finance_token),
+    )
+    assert r.status_code == 200, r.text
+    db = SessionLocal()
+    try:
+        assert db.get(CoinAccount, uid).coin_balance == 1000
+        txns = db.execute(
+            select(CoinTransaction).where(
+                CoinTransaction.user_id == uid, CoinTransaction.biz_type == "admin_grant"
+            )
+        ).scalars().all()
+        assert len(txns) == 1 and txns[0].amount == 1000
+        logs = db.execute(
+            select(AdminAuditLog).where(
+                AdminAuditLog.action == "user.coins.grant", AdminAuditLog.target_id == str(uid)
+            )
+        ).scalars().all()
+        assert len(logs) == 1 and logs[0].detail["amount"] == 1000
+    finally:
+        db.close()
+
+
+def test_deduct_below_zero_rejected(admin_client: TestClient, finance_token: str) -> None:
+    uid = _seed_user("13900000002")
+    r = admin_client.post(
+        f"/admin/api/users/{uid}/coins", json={"amount": -999999, "reason": "扣"},
+        headers=_auth(finance_token),
+    )
+    assert r.status_code == 400
+    db = SessionLocal()
+    try:
+        txns = db.execute(
+            select(CoinTransaction).where(CoinTransaction.user_id == uid)
+        ).scalars().all()
+        assert len(txns) == 0  # 拒绝后无流水(原子:都不发生)
+    finally:
+        db.close()
+
+
+def test_grant_zero_rejected(admin_client: TestClient, finance_token: str) -> None:
+    uid = _seed_user("13900000008")
+    r = admin_client.post(
+        f"/admin/api/users/{uid}/coins", json={"amount": 0, "reason": "x"},
+        headers=_auth(finance_token),
+    )
+    assert r.status_code == 400
+
+
+# ===== 封号 =====
+
+def test_set_user_status_and_audit(admin_client: TestClient, operator_token: str) -> None:
+    uid = _seed_user("13900000003")
+    r = admin_client.post(
+        f"/admin/api/users/{uid}/status", json={"status": "disabled"}, headers=_auth(operator_token)
+    )
+    assert r.status_code == 200, r.text
+    db = SessionLocal()
+    try:
+        assert db.get(User, uid).status == "disabled"
+        logs = db.execute(
+            select(AdminAuditLog).where(
+                AdminAuditLog.action == "user.status.set", AdminAuditLog.target_id == str(uid)
+            )
+        ).scalars().all()
+        assert logs[0].detail == {"before": "active", "after": "disabled"}
+    finally:
+        db.close()
+    assert admin_client.post(
+        f"/admin/api/users/{uid}/status", json={"status": "active"}, headers=_auth(operator_token)
+    ).status_code == 200
+
+
+# ===== 角色守卫 =====
+
+def test_operator_cannot_grant_coins(admin_client: TestClient, operator_token: str) -> None:
+    uid = _seed_user("13900000004")
+    r = admin_client.post(
+        f"/admin/api/users/{uid}/coins", json={"amount": 100, "reason": "x"},
+        headers=_auth(operator_token),
+    )
+    assert r.status_code == 403
+
+
+def test_finance_cannot_manage_admins(admin_client: TestClient, finance_token: str) -> None:
+    assert admin_client.get("/admin/api/admins", headers=_auth(finance_token)).status_code == 403
+
+
+def test_super_admin_can_grant_coins(admin_client: TestClient, super_token: str) -> None:
+    uid = _seed_user("13900000005")
+    r = admin_client.post(
+        f"/admin/api/users/{uid}/coins", json={"amount": 50, "reason": "x"},
+        headers=_auth(super_token),
+    )
+    assert r.status_code == 200
+
+
+# ===== 反馈处理 =====
+
+def test_handle_feedback(admin_client: TestClient, operator_token: str) -> None:
+    fid = _seed_feedback("13900000006")
+    r = admin_client.post(f"/admin/api/feedbacks/{fid}/handle", headers=_auth(operator_token))
+    assert r.status_code == 200
+    db = SessionLocal()
+    try:
+        assert db.get(Feedback, fid).status == "handled"
+    finally:
+        db.close()
+
+
+# ===== admin 账号管理(super_admin) =====
+
+def test_create_and_update_admin(admin_client: TestClient, super_token: str) -> None:
+    r = admin_client.post(
+        "/admin/api/admins",
+        json={"username": "new_op", "password": "pass1234", "role": "operator"},
+        headers=_auth(super_token),
+    )
+    assert r.status_code == 200, r.text
+    new_id = r.json()["id"]
+    r = admin_client.patch(
+        f"/admin/api/admins/{new_id}", json={"role": "finance"}, headers=_auth(super_token)
+    )
+    assert r.status_code == 200 and r.json()["role"] == "finance"
+    r = admin_client.post(
+        "/admin/api/admins", json={"username": "new_op", "password": "pass1234"},
+        headers=_auth(super_token),
+    )
+    assert r.status_code == 409
+
+
+def test_cannot_disable_self(admin_client: TestClient, super_token: str) -> None:
+    me = admin_client.get("/admin/api/auth/me", headers=_auth(super_token)).json()
+    r = admin_client.patch(
+        f"/admin/api/admins/{me['id']}", json={"status": "disabled"}, headers=_auth(super_token)
+    )
+    assert r.status_code == 400
+
+
+# ===== 提现重试 / 对账(mock wxpay,不真调微信) =====
+
+def test_withdraw_refresh(admin_client: TestClient, finance_token: str, monkeypatch) -> None:
+    uid = _seed_user("13900000007")
+    db = SessionLocal()
+    try:
+        db.add(WithdrawOrder(
+            user_id=uid, out_bill_no="adminrefresh0001", amount_cents=100, status="pending"
+        ))
+        db.commit()
+    finally:
+        db.close()
+    from app.repositories import wallet as wr
+    monkeypatch.setattr(
+        wr.wxpay, "query_transfer",
+        lambda obn: {"status_code": 200, "data": {"state": "SUCCESS"}},
+    )
+    r = admin_client.post(
+        "/admin/api/withdraws/adminrefresh0001/refresh", headers=_auth(finance_token)
+    )
+    assert r.status_code == 200, r.text
+    assert r.json()["status"] == "success"
+    db = SessionLocal()
+    try:
+        logs = db.execute(
+            select(AdminAuditLog).where(AdminAuditLog.action == "withdraw.refresh")
+        ).scalars().all()
+        assert any(x.target_id == "adminrefresh0001" for x in logs)
+    finally:
+        db.close()
+
+
+def test_withdraw_refresh_404(admin_client: TestClient, finance_token: str) -> None:
+    assert admin_client.post(
+        "/admin/api/withdraws/nope999notexist/refresh", headers=_auth(finance_token)
+    ).status_code == 404
+
+
+def test_withdraw_reconcile(admin_client: TestClient, finance_token: str, monkeypatch) -> None:
+    from app.repositories import wallet as wr
+    monkeypatch.setattr(
+        wr.wxpay, "query_transfer",
+        lambda obn: {"status_code": 200, "data": {"state": "SUCCESS"}},
+    )
+    r = admin_client.post(
+        "/admin/api/withdraws/reconcile", params={"older_than_minutes": 0},
+        headers=_auth(finance_token),
+    )
+    assert r.status_code == 200, r.text
+    assert "checked" in r.json() and "resolved" in r.json()

tests/test_auth.py

@@ -1,48 +1,68 @@
-"""auth 流程测试(不依赖真实极光,只测 sms mock 路径 + JWT 闭环)。"""
+"""auth 流程测试。
+
+- mock 路径(SMS_MOCK=true,conftest 设置):验证码不真发,校验放行任意 6 位,测 JWT 闭环。
+- real 路径:monkeypatch SMS_MOCK=false + 拦 httpx,测极光发送协议 + 真实校验(一次性/
+  防爆破/余额回滚),不真发短信。
+"""
 from __future__ import annotations
 
+import time
+
+import pytest
+
+from app.integrations import sms
+
+
+def _reset(phone: str) -> None:
+    """清该号的进程内存状态,隔离 real 模式用例。"""
+    sms._codes.pop(phone, None)
+    sms._last_sent.pop(phone, None)
+    sms._daily_count.pop(phone, None)
+
+
+class _OkResp:
+    """模拟极光发送成功响应。"""
+    status_code = 200
+
+    def json(self):
+        return {"msg_id": "test-msg-id"}
+
+
+# ============================ mock 路径(JWT 闭环)============================
 
 def test_sms_login_and_me_flow(client) -> None:
-    """sms_send → sms_login → 用 access_token 调 /me 拿到自己。"""
+    """sms_send → sms_login(mock 任意6位)→ /me → refresh/logout 全闭环。"""
     phone = "13800138000"
 
-    # 1. 发短信(mock,任意 6 位均通过)
     r = client.post("/api/v1/auth/sms/send", json={"phone": phone})
     assert r.status_code == 200, r.text
     body = r.json()
     assert body["sent"] is True
     assert body["mock"] is True
 
-    # 2. 登录
     r = client.post("/api/v1/auth/sms/login", json={"phone": phone, "code": "123456"})
     assert r.status_code == 200, r.text
     data = r.json()
-    assert "access_token" in data
-    assert "refresh_token" in data
+    assert "access_token" in data and "refresh_token" in data
     assert data["user"]["phone"] == phone
     assert data["user"]["register_channel"] == "sms"
-    access = data["access_token"]
-    refresh = data["refresh_token"]
+    access, refresh = data["access_token"], data["refresh_token"]
 
-    # 3. /me
     r = client.get("/api/v1/auth/me", headers={"Authorization": f"Bearer {access}"})
     assert r.status_code == 200, r.text
     assert r.json()["phone"] == phone
 
-    # 4. /me 不带 token → 401
     r = client.get("/api/v1/auth/me")
     assert r.status_code == 401
 
-    # 5. 用 refresh 换新 token
     r = client.post("/api/v1/auth/refresh", json={"refresh_token": refresh})
     assert r.status_code == 200, r.text
     assert "access_token" in r.json()
 
-    # 6. 用 access 当 refresh 拒绝(防 token 类型混用)
+    # 用 access 当 refresh → 拒绝(防 token 类型混用)
     r = client.post("/api/v1/auth/refresh", json={"refresh_token": access})
     assert r.status_code == 401
 
-    # 7. logout
     r = client.post("/api/v1/auth/logout", headers={"Authorization": f"Bearer {access}"})
     assert r.status_code == 200
     assert r.json()["ok"] is True
@@ -50,14 +70,12 @@ def test_sms_login_and_me_flow(client) -> None:
 
 def test_sms_send_too_frequent(client) -> None:
     phone = "13900139000"
-    r1 = client.post("/api/v1/auth/sms/send", json={"phone": phone})
-    assert r1.status_code == 200
-    r2 = client.post("/api/v1/auth/sms/send", json={"phone": phone})
-    assert r2.status_code == 429
+    assert client.post("/api/v1/auth/sms/send", json={"phone": phone}).status_code == 200
+    assert client.post("/api/v1/auth/sms/send", json={"phone": phone}).status_code == 429
 
 
 def test_sms_login_bad_code(client) -> None:
-    """mock 模式下,5 位通过 schema 长度校验,但业务层只接受 6 位 → 400。"""
+    """mock 下校验位数:5 位过 schema 但业务要 6 位 → 400。"""
     phone = "13700137000"
     client.post("/api/v1/auth/sms/send", json={"phone": phone})
     r = client.post("/api/v1/auth/sms/login", json={"phone": phone, "code": "12345"})
@@ -68,3 +86,123 @@ def test_sms_login_bad_code(client) -> None:
 def test_phone_format_validation(client) -> None:
     r = client.post("/api/v1/auth/sms/send", json={"phone": "1234567"})
     assert r.status_code == 422
+
+
+def test_sms_daily_limit(monkeypatch) -> None:
+    """单号每日上限(send 的防刷逻辑 mock/real 都跑;函数级绕开 60s 冷却)。"""
+    phone = "13511135000"
+    _reset(phone)
+    limit = 3
+    monkeypatch.setattr(sms.settings, "SMS_DAILY_LIMIT_PER_PHONE", limit)
+
+    for _ in range(limit):
+        sms.send_code(phone)
+        sms._last_sent.pop(phone, None)  # 绕开冷却,只测每日上限
+
+    with pytest.raises(sms.SmsError, match="上限"):
+        sms.send_code(phone)
+
+
+# ============================ real 路径(不真发)============================
+
+def test_sms_real_send_calls_jiguang(monkeypatch) -> None:
+    """real 模式:本服务生成 code 并按协议调极光 /v1/messages(拦 httpx,不真发)。"""
+    phone = "13422134000"
+    _reset(phone)
+    captured: dict = {}
+
+    def _fake_post(url, json, headers, timeout):  # noqa: A002
+        captured.update(url=url, body=json, auth=headers.get("Authorization", ""))
+        return _OkResp()
+
+    monkeypatch.setattr(sms.settings, "SMS_MOCK", False)
+    monkeypatch.setattr(sms.httpx, "post", _fake_post)
+
+    sms.send_code(phone)
+
+    assert captured["url"] == sms.settings.SMS_SEND_ENDPOINT
+    assert captured["body"]["mobile"] == phone
+    assert captured["body"]["sign_id"] == sms.settings.SMS_SIGN_ID
+    assert captured["body"]["temp_id"] == sms.settings.SMS_TEMPLATE_ID
+    assert captured["body"]["temp_para"]["code"] == sms._codes[phone].code
+    assert captured["auth"].startswith("Basic ")
+
+
+def test_sms_real_verify_one_time_and_wrong(monkeypatch) -> None:
+    """real 校验:错误码拒(不消费)→ 正确码成功 → 验过即作废。"""
+    phone = "13455134000"
+    _reset(phone)
+    monkeypatch.setattr(sms.settings, "SMS_MOCK", False)
+    monkeypatch.setattr(sms.httpx, "post", lambda *a, **k: _OkResp())
+
+    sms.send_code(phone)
+    code = sms._codes[phone].code
+    wrong = "000000" if code != "000000" else "111111"
+
+    assert sms.verify_code(phone, wrong) is False
+    assert sms.verify_code(phone, code) is True
+    assert sms.verify_code(phone, code) is False  # 已作废
+
+
+def test_sms_real_verify_attempts_exhausted(monkeypatch) -> None:
+    """real 校验:错误次数到上限即作废,正确码也不再通过(防爆破)。"""
+    phone = "13466134000"
+    _reset(phone)
+    monkeypatch.setattr(sms.settings, "SMS_MOCK", False)
+    monkeypatch.setattr(sms.settings, "SMS_MAX_VERIFY_ATTEMPTS", 3)
+    monkeypatch.setattr(sms.httpx, "post", lambda *a, **k: _OkResp())
+
+    sms.send_code(phone)
+    code = sms._codes[phone].code
+    wrong = "000000" if code != "000000" else "111111"
+
+    for _ in range(3):
+        assert sms.verify_code(phone, wrong) is False
+    assert sms.verify_code(phone, code) is False  # 超限作废
+
+
+def test_sms_real_balance_error_keeps_cooldown(monkeypatch) -> None:
+    """极光余额不足(50014)→ SmsError(503);保留冷却(失败也限速,防重试狂打),只清未发出的码。"""
+    phone = "13433134000"
+    _reset(phone)
+
+    class _ErrResp:
+        status_code = 403
+
+        def json(self):
+            return {"error": {"code": 50014, "message": "no money"}}
+
+    monkeypatch.setattr(sms.settings, "SMS_MOCK", False)
+    monkeypatch.setattr(sms.httpx, "post", lambda *a, **k: _ErrResp())
+
+    with pytest.raises(sms.SmsError) as ei:
+        sms.send_code(phone)
+    assert ei.value.status_code == 503
+    assert phone not in sms._codes      # 没发出去的码已清
+    assert phone in sms._last_sent      # 冷却保留:失败也限速
+
+    # 立即重试 → 被冷却挡下(429),不会再打极光
+    with pytest.raises(sms.SmsError) as ei2:
+        sms.send_code(phone)
+    assert ei2.value.status_code == 429
+
+
+def test_sms_gc_purges_stale_only(monkeypatch) -> None:
+    """GC 清过期码 / 旧冷却 / 隔日计数,但不动今天有效的(阈值设 0 强制每次扫)。"""
+    monkeypatch.setattr(sms, "_GC_THRESHOLD", 0)
+    sms._codes.clear()
+    sms._last_sent.clear()
+    sms._daily_count.clear()
+    now = time.time()
+    sms._codes["stale"] = sms._CodeRecord(code="111111", expires_at=now - 1)
+    sms._codes["fresh"] = sms._CodeRecord(code="222222", expires_at=now + 999)
+    sms._last_sent["old"] = now - 99999
+    sms._last_sent["recent"] = now
+    sms._daily_count["yesterday"] = ("2000-01-01", 3)
+    sms._daily_count["today"] = (sms._today(), 1)
+
+    sms._gc(now)
+
+    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

tests/test_compare_milestone.py

@@ -0,0 +1,136 @@
+"""比价战绩里程碑测试:进度随成功比价数解锁 / 逐档领奖发金币 / 幂等 / 边界。
+
+复用比价记录上报接口造成功记录(每条 trace 一次成功比价),再验里程碑。
+"""
+from __future__ import annotations
+
+from app.core.rewards import RECORD_MILESTONES
+
+
+def _login(client, phone: str) -> str:
+    client.post("/api/v1/auth/sms/send", json={"phone": phone})
+    r = client.post("/api/v1/auth/sms/login", json={"phone": phone, "code": "123456"})
+    assert r.status_code == 200, r.text
+    return r.json()["access_token"]
+
+
+def _auth(token: str) -> dict[str, str]:
+    return {"Authorization": f"Bearer {token}"}
+
+
+def _report_success(client, token: str, trace_id: str) -> None:
+    """上报一条成功比价(有非源有效价 → status 派生 success)。"""
+    payload = {
+        "trace_id": trace_id,
+        "business_type": "food",
+        "store_name": "测试店",
+        "source_platform_id": "taobao_flash",
+        "source_price": 30.0,
+        "comparison_results": [
+            {"platform_id": "meituan", "platform_name": "美团", "price": 25.0,
+             "is_source": False, "rank": 1},
+            {"platform_id": "taobao_flash", "platform_name": "淘宝闪购", "price": 30.0,
+             "is_source": True, "rank": 2},
+        ],
+    }
+    r = client.post("/api/v1/compare/record", json=payload, headers=_auth(token))
+    assert r.status_code == 200, r.text
+
+
+def _report_failed(client, token: str, trace_id: str) -> None:
+    """上报一条失败比价(只有源 → status 派生 failed,不计入解锁)。"""
+    payload = {
+        "trace_id": trace_id,
+        "business_type": "food",
+        "comparison_results": [
+            {"platform_id": "taobao_flash", "platform_name": "淘宝闪购", "price": 30.0,
+             "is_source": True, "rank": 1},
+        ],
+    }
+    r = client.post("/api/v1/compare/record", json=payload, headers=_auth(token))
+    assert r.status_code == 200, r.text
+
+
+def test_status_empty(client) -> None:
+    """没比价过:成功数 0,所有档 locked,无可领。"""
+    token = _login(client, "13800003001")
+    r = client.get("/api/v1/compare/milestones", headers=_auth(token))
+    assert r.status_code == 200, r.text
+    d = r.json()
+    assert d["success_count"] == 0
+    assert d["claimable_count"] == 0
+    assert len(d["milestones"]) == len(RECORD_MILESTONES)
+    assert all(m["state"] == "locked" for m in d["milestones"])
+    # 第 1 档金币对齐配置
+    assert d["milestones"][0]["coin"] == RECORD_MILESTONES[0]
+    assert d["milestones"][0]["milestone"] == 1
+
+
+def test_unlock_progresses_with_success(client) -> None:
+    """成功比价 2 次:前 2 档 active 可领,其余 locked。失败记录不计入。"""
+    token = _login(client, "13800003002")
+    _report_success(client, token, "s-1")
+    _report_success(client, token, "s-2")
+    _report_failed(client, token, "f-1")  # 失败不计
+
+    d = client.get("/api/v1/compare/milestones", headers=_auth(token)).json()
+    assert d["success_count"] == 2
+    assert d["claimable_count"] == 2
+    states = [m["state"] for m in d["milestones"]]
+    assert states[0] == "active"
+    assert states[1] == "active"
+    assert states[2] == "locked"
+
+
+def test_claim_marks_claimed_without_coin(client) -> None:
+    """领第 1 档:暂不真发金币(产品定,后续删该功能),余额不变,但该档变 claimed。"""
+    token = _login(client, "13800003003")
+    _report_success(client, token, "s-1")
+
+    bal_before = client.get("/api/v1/wallet/account", headers=_auth(token)).json()["coin_balance"]
+
+    r = client.post("/api/v1/compare/milestones/1/claim", headers=_auth(token))
+    assert r.status_code == 200, r.text
+    res = r.json()
+    assert res["milestone"] == 1
+    assert res["coin_awarded"] == 0          # 不再发金币
+    assert res["coin_balance"] == bal_before  # 余额不变
+
+    d = client.get("/api/v1/compare/milestones", headers=_auth(token)).json()
+    assert d["milestones"][0]["state"] == "claimed"
+    assert d["claimable_count"] == 0  # 第 1 档领掉了,成功数 1 没解锁第 2 档
+
+
+def test_claim_idempotent_409(client) -> None:
+    """同档重复领 → 409,且不重复发金币。"""
+    token = _login(client, "13800003004")
+    _report_success(client, token, "s-1")
+    assert client.post("/api/v1/compare/milestones/1/claim", headers=_auth(token)).status_code == 200
+    bal = client.get("/api/v1/wallet/account", headers=_auth(token)).json()["coin_balance"]
+
+    r = client.post("/api/v1/compare/milestones/1/claim", headers=_auth(token))
+    assert r.status_code == 409
+    bal2 = client.get("/api/v1/wallet/account", headers=_auth(token)).json()["coin_balance"]
+    assert bal2 == bal  # 没重复发
+
+
+def test_claim_locked_409(client) -> None:
+    """领还没解锁的档(成功数不够)→ 409 locked。"""
+    token = _login(client, "13800003005")
+    _report_success(client, token, "s-1")  # 只解锁第 1 档
+    r = client.post("/api/v1/compare/milestones/2/claim", headers=_auth(token))
+    assert r.status_code == 409
+
+
+def test_claim_unknown_milestone_404(client) -> None:
+    """档位越界 → 404。"""
+    token = _login(client, "13800003006")
+    assert client.post("/api/v1/compare/milestones/0/claim", headers=_auth(token)).status_code == 404
+    big = len(RECORD_MILESTONES) + 1
+    assert client.post(f"/api/v1/compare/milestones/{big}/claim", headers=_auth(token)).status_code == 404
+
+
+def test_requires_auth(client) -> None:
+    """不带 token → 401。"""
+    assert client.get("/api/v1/compare/milestones").status_code == 401
+    assert client.post("/api/v1/compare/milestones/1/claim").status_code == 401

tests/test_compare_record.py

@@ -0,0 +1,204 @@
+"""比价记录测试:上报派生 / 幂等 / 分页 / 详情 / 鉴权 / 失败帧。
+
+用 sms mock 登录拿 token,再跑各接口闭环。
+"""
+from __future__ import annotations
+
+
+def _login(client, phone: str) -> str:
+    client.post("/api/v1/auth/sms/send", json={"phone": phone})
+    r = client.post("/api/v1/auth/sms/login", json={"phone": phone, "code": "123456"})
+    assert r.status_code == 200, r.text
+    return r.json()["access_token"]
+
+
+def _auth(token: str) -> dict[str, str]:
+    return {"Authorization": f"Bearer {token}"}
+
+
+def _food_payload(trace_id: str) -> dict:
+    """一次淘宝闪购→美团/京东 的成功比价(美团最便宜)。"""
+    return {
+        "trace_id": trace_id,
+        "business_type": "food",
+        "device_id": "dev-abc",
+        "store_name": "海底捞(朝阳店)",
+        "source_platform_id": "taobao_flash",
+        "source_platform_name": "淘宝闪购",
+        "source_package": "com.taobao.taobao",
+        "source_price": 128.50,
+        "items": [
+            {"name": "麻辣午餐肉", "qty": 2},
+            {"name": "黑牛肉卷", "qty": 1, "specs": ["大份"]},
+        ],
+        "comparison_results": [
+            {"platform_id": "meituan", "platform_name": "美团", "package": "com.sankuai.meituan",
+             "price": 123.50, "is_source": False, "rank": 1, "coupon_saved": 7.0},
+            {"platform_id": "taobao_flash", "platform_name": "淘宝闪购", "package": "com.taobao.taobao",
+             "price": 128.50, "is_source": True, "rank": 2},
+            {"platform_id": "jd_waimai", "platform_name": "京东外卖", "package": "com.jingdong.app.mall",
+             "price": 130.00, "is_source": False, "rank": 3},
+        ],
+        "skipped_dish_count": 1,
+        "skipped_dish_names": ["黑牛肉卷"],
+        "total_dish_count": 3,
+        "information": "在美团找到同店,到手价 ¥123.50",
+    }
+
+
+def test_report_and_derive(client) -> None:
+    """上报成功比价:服务端派生 best/saved/is_source_best/分,详情可读回。"""
+    token = _login(client, "13800002001")
+
+    r = client.post("/api/v1/compare/record", json=_food_payload("trace-1"), headers=_auth(token))
+    assert r.status_code == 200, r.text
+    rec_id = r.json()["id"]
+    assert isinstance(rec_id, int)
+
+    r = client.get(f"/api/v1/compare/records/{rec_id}", headers=_auth(token))
+    assert r.status_code == 200, r.text
+    d = r.json()
+    # 金额转分
+    assert d["source_price_cents"] == 12850
+    assert d["best_price_cents"] == 12350
+    # 省 = 源价 - 最优价 = 5.00 元
+    assert d["saved_amount_cents"] == 500
+    # 最优是美团(rank=1),非源平台 → 没"源平台最便宜"
+    assert d["best_platform_id"] == "meituan"
+    assert d["is_source_best"] is False
+    assert d["status"] == "success"
+    assert d["information"] == "在美团找到同店,到手价 ¥123.50"
+    assert d["store_name"] == "海底捞(朝阳店)"
+    assert d["total_dish_count"] == 3
+    assert d["skipped_dish_count"] == 1
+    assert d["skipped_dish_names"] == ["黑牛肉卷"]
+    assert len(d["comparison_results"]) == 3
+    assert len(d["items"]) == 2
+    # 详情带 raw_payload 全量
+    assert d["raw_payload"]["trace_id"] == "trace-1"
+
+
+def test_coupon_saved_passthrough(client) -> None:
+    """红包优惠额 coupon_saved 上报→落库→读出;仅目标平台带值,源平台不带(null)。"""
+    token = _login(client, "13800002010")
+    rid = client.post(
+        "/api/v1/compare/record", json=_food_payload("trace-coupon"), headers=_auth(token)
+    ).json()["id"]
+    d = client.get(f"/api/v1/compare/records/{rid}", headers=_auth(token)).json()
+    by_pid = {x["platform_id"]: x for x in d["comparison_results"]}
+    assert by_pid["meituan"]["coupon_saved"] == 7.0            # 目标平台带值
+    assert by_pid["taobao_flash"].get("coupon_saved") is None  # 源平台不带/为 null
+
+
+def test_source_is_cheapest_no_saving(client) -> None:
+    """源平台本来就最便宜:saved<=0,is_source_best=True,仍记一条 success。"""
+    token = _login(client, "13800002002")
+    payload = _food_payload("trace-2")
+    # 把源平台价改到最低 + rank=1
+    payload["source_price"] = 100.00
+    payload["comparison_results"] = [
+        {"platform_id": "taobao_flash", "platform_name": "淘宝闪购", "package": "com.taobao.taobao",
+         "price": 100.00, "is_source": True, "rank": 1},
+        {"platform_id": "meituan", "platform_name": "美团", "package": "com.sankuai.meituan",
+         "price": 123.50, "is_source": False, "rank": 2},
+    ]
+    r = client.post("/api/v1/compare/record", json=payload, headers=_auth(token))
+    rec_id = r.json()["id"]
+    d = client.get(f"/api/v1/compare/records/{rec_id}", headers=_auth(token)).json()
+    assert d["best_platform_id"] == "taobao_flash"
+    assert d["is_source_best"] is True
+    assert d["saved_amount_cents"] == 0  # 100 - 100
+    assert d["status"] == "success"  # 有非源有效价(美团)
+
+
+def test_failed_comparison_recorded(client) -> None:
+    """比价失败(只有源、无目标有效价):status=failed 也落一条。"""
+    token = _login(client, "13800002003")
+    payload = _food_payload("trace-3")
+    payload["comparison_results"] = [
+        {"platform_id": "taobao_flash", "platform_name": "淘宝闪购", "package": "com.taobao.taobao",
+         "price": 128.50, "is_source": True, "rank": 1},
+    ]
+    r = client.post("/api/v1/compare/record", json=payload, headers=_auth(token))
+    rec_id = r.json()["id"]
+    d = client.get(f"/api/v1/compare/records/{rec_id}", headers=_auth(token)).json()
+    assert d["status"] == "failed"
+    assert d["best_platform_id"] == "taobao_flash"  # 唯一一条
+    # 源价有、最优价=源价 → saved=0(没采到更便宜目标)
+    assert d["saved_amount_cents"] == 0
+
+
+def test_idempotent_same_trace(client) -> None:
+    """同 trace_id 重复上报:返回同一 id,只一条记录,后报覆盖。"""
+    token = _login(client, "13800002004")
+    p = _food_payload("trace-dup")
+    r1 = client.post("/api/v1/compare/record", json=p, headers=_auth(token))
+    id1 = r1.json()["id"]
+
+    # 改个值再报一次(同 trace)
+    p["store_name"] = "改名后的店"
+    r2 = client.post("/api/v1/compare/record", json=p, headers=_auth(token))
+    id2 = r2.json()["id"]
+    assert id1 == id2  # 同一条
+
+    # 列表里只有一条
+    page = client.get("/api/v1/compare/records", headers=_auth(token)).json()
+    assert len(page["items"]) == 1
+    # 覆盖生效
+    assert page["items"][0]["store_name"] == "改名后的店"
+
+
+def test_records_pagination_and_isolation(client) -> None:
+    """分页 id 倒序 + 游标;只看得到自己的记录。"""
+    token_a = _login(client, "13800002005")
+    for i in range(5):
+        client.post("/api/v1/compare/record", json=_food_payload(f"a-{i}"), headers=_auth(token_a))
+
+    # 另一个用户的记录不应混入
+    token_b = _login(client, "13800002006")
+    client.post("/api/v1/compare/record", json=_food_payload("b-0"), headers=_auth(token_b))
+
+    r = client.get("/api/v1/compare/records?limit=3", headers=_auth(token_a))
+    page1 = r.json()
+    assert len(page1["items"]) == 3
+    assert page1["next_cursor"] is not None
+    ids = [it["id"] for it in page1["items"]]
+    assert ids == sorted(ids, reverse=True)
+
+    r = client.get(
+        f"/api/v1/compare/records?limit=3&cursor={page1['next_cursor']}",
+        headers=_auth(token_a),
+    )
+    page2 = r.json()
+    assert len(page2["items"]) == 2  # A 共 5 条
+    assert max(it["id"] for it in page2["items"]) < min(ids)
+
+    # B 只看到自己那一条
+    pb = client.get("/api/v1/compare/records", headers=_auth(token_b)).json()
+    assert len(pb["items"]) == 1
+
+
+def test_detail_cross_user_404(client) -> None:
+    """读他人记录详情 → 404(限本人)。"""
+    token_a = _login(client, "13800002007")
+    rid = client.post(
+        "/api/v1/compare/record", json=_food_payload("x-0"), headers=_auth(token_a)
+    ).json()["id"]
+
+    token_b = _login(client, "13800002008")
+    r = client.get(f"/api/v1/compare/records/{rid}", headers=_auth(token_b))
+    assert r.status_code == 404
+
+
+def test_requires_auth(client) -> None:
+    """不带 token 统一 401。"""
+    assert client.post("/api/v1/compare/record", json={"trace_id": "t"}).status_code == 401
+    assert client.get("/api/v1/compare/records").status_code == 401
+    assert client.get("/api/v1/compare/records/1").status_code == 401
+
+
+def test_trace_id_required(client) -> None:
+    """缺 trace_id → 422(pydantic 校验)。"""
+    token = _login(client, "13800002009")
+    r = client.post("/api/v1/compare/record", json={"business_type": "food"}, headers=_auth(token))
+    assert r.status_code == 422

tests/test_welfare.py

@@ -12,6 +12,9 @@ from app.core.rewards import (
     TASK_ENABLE_NOTIFICATION,
     TASK_REWARDS,
 )
+from app.db.session import SessionLocal
+from app.repositories import wallet as crud_wallet
+from app.repositories.user import get_user_by_phone
 
 
 def _login(client, phone: str) -> str:
@@ -130,10 +133,19 @@ def test_exchange_info(client) -> None:
 
 
 def test_exchange_flow(client) -> None:
-    """先用任务领够金币 → 兑换 1 元 → 金币扣、现金加 → 现金流水有记录。"""
-    token = _login(client, "13800001005")
-    # 领"打开消息提醒"得 10000 金币(= 1 元额度)
-    client.post(f"/api/v1/tasks/{TASK_ENABLE_NOTIFICATION}/claim", headers=_auth(token))
+    """先供款够兑换下限的金币 → 兑换 1 元 → 金币扣、现金加 → 现金流水有记录。
+
+    打开消息提醒任务已降到 1000 金币(不再 = 兑换下限), 不能再靠领任务供款;
+    直接 grant_coins 注入 MIN_EXCHANGE_COIN(= COIN_PER_YUAN = 10000)当种子。
+    """
+    phone = "13800001005"
+    token = _login(client, phone)
+    # 供款: 直接注入 1 元额度金币(替代原先靠 notification=10000 领任务供款)
+    with SessionLocal() as db:
+        user = get_user_by_phone(db, phone)
+        assert user is not None
+        crud_wallet.grant_coins(db, user.id, MIN_EXCHANGE_COIN, biz_type="test_seed", remark="测试供款")
+        db.commit()
 
     # 兑换 10000 金币 → 100 分
     r = client.post(