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

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

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

app/models/comparison.py

@@ -64,6 +64,9 @@ class ComparisonRecord(Base):
     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)
     # 源平台就是最便宜的一家(= 这次没省到钱)

app/repositories/comparison.py

@@ -9,6 +9,7 @@ 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
 
 
@@ -79,6 +80,7 @@ def upsert_record(
         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],
@@ -109,6 +111,23 @@ def upsert_record(
     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,
@@ -116,14 +135,21 @@ def list_records(
     limit: int = 20,
     cursor: int | None = None,
 ) -> tuple[list[ComparisonRecord], int | None]:
-    """比价记录分页(按 id 倒序,游标式)。"""
+    """比价记录分页(按创建时间倒序、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.id.desc()).limit(limit)
+    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
 
 

app/schemas/compare_record.py

@@ -62,6 +62,8 @@ class ComparisonRecordIn(BaseModel):
     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="最优平台深链,再次比价直达")
 
 
 # ===== 读取出参 =====
@@ -81,6 +83,7 @@ class ComparisonRecordOut(BaseModel):
     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
@@ -91,6 +94,9 @@ class ComparisonRecordOut(BaseModel):
     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