Merge remote-tracking branch 'origin/main' into feat/feed-ad-realcoin-orb

2026-06-17 22:39:58 +08:00
parent 2472cfc44a a2fd666203
commit b01b251f83
46 changed files with 870 additions and 87 deletions
@@ -19,6 +19,7 @@ from fastapi import APIRouter, HTTPException, Query, status

 from app.api.deps import CurrentUser, DbSession
 from app.repositories import comparison as crud_compare
+from app.services.pricebot_llm_calls import fetch_llm_calls
 from app.schemas.compare_record import (
    CompareStatsOut,
    ComparisonRecordCreatedOut,
@@ -42,13 +43,22 @@ def report_record(
    payload: ComparisonRecordIn, user: CurrentUser, db: DbSession
 ) -> ComparisonRecordCreatedOut:
    rec = crud_compare.upsert_record(db, user_id=user.id, payload=payload)
+    # 同机拉 pricebot 本次比价的 LLM 调用明细落库(best-effort,失败不阻断上报)。
+    # llm_call_count/retry_count 直接由明细派生:次数=条数,重试=带 error 的条数。
+    calls = fetch_llm_calls(rec.trace_id)
+    if calls:
+        rec.llm_calls = calls
+        rec.llm_call_count = len(calls)
+        rec.retry_count = sum(1 for c in calls if c.get("error"))
+        db.commit()
    logger.info(
-        "compare record user=%s trace=%s biz=%s status=%s saved=%s",
+        "compare record user=%s trace=%s biz=%s status=%s saved=%s llm_calls=%d",
        user.id,
        rec.trace_id,
        rec.business_type,
        rec.status,
        rec.saved_amount_cents,
+        len(calls),
    )
    return ComparisonRecordCreatedOut(id=rec.id)

@@ -6,13 +6,16 @@
 """
 from __future__ import annotations

+import html
 import json

 from fastapi import APIRouter, Depends, Request
 from fastapi.responses import HTMLResponse, RedirectResponse
 from sqlalchemy.orm import Session

+from app.core import media
 from app.db.session import get_db
+from app.models.cps_activity import CpsActivity
 from app.models.cps_link import CpsLink
 from app.repositories import cps_link as cps_link_repo

@@ -21,6 +24,9 @@ router = APIRouter(tags=["cps-redirect"])
 # code 不存在/失效时的兜底落地
 _FALLBACK_URL = "https://www.meituan.com/"

+# 淘宝活动未设图时的兜底主视觉(存量已回填,基本只在老 link/异常时触发)
+_DEFAULT_TAOBAO_IMAGE = "/media/taobao_landing.jpg"
+

 def _client_ip(request: Request) -> str | None:
    xff = request.headers.get("x-forwarded-for")
@@ -46,7 +52,9 @@ def cps_landing(code: str, request: Request, db: Session = Depends(get_db)):
        return RedirectResponse(_FALLBACK_URL, status_code=302)
    _record(db, link, request, "visit")
    if link.platform == "taobao":
-        return HTMLResponse(_taobao_landing_html(link.target_url))
+        activity = db.get(CpsActivity, link.activity_id)
+        image_url = (activity.image_url if activity else None) or _DEFAULT_TAOBAO_IMAGE
+        return HTMLResponse(_taobao_landing_html(link.target_url, image_url))
    # 美团短链 / 京东链接:直接 302 跳
    return RedirectResponse(link.target_url, status_code=302)

@@ -59,9 +67,18 @@ def cps_copy(code: str, request: Request, db: Session = Depends(get_db)) -> dict
    return {"ok": True}


-def _taobao_landing_html(token: str) -> str:
-    """淘宝落地页 H5(主视觉为设计图 /media/taobao_landing.jpg,复制淘口令按钮在 75% 屏高)。token 安全嵌入 JS。"""
-    return _TAOBAO_HTML.replace("__TOKEN_JS__", json.dumps(token))
+def _taobao_landing_html(token: str, image_url: str) -> str:
+    """淘宝落地页 H5(主视觉图按活动传入,复制淘口令按钮在 75% 屏高)。
+
+    image_url 转绝对(落地页 coupon 域,相对也可达,绝对更稳)后经 html.escape 嵌入
+    <img src>(防属性注入);token 经 json.dumps 安全嵌入 JS。
+    """
+    safe_img = html.escape(media.to_abs_media_url(image_url) or image_url, quote=True)
+    return (
+        _TAOBAO_HTML
+        .replace("__IMAGE_URL__", safe_img)
+        .replace("__TOKEN_JS__", json.dumps(token))
+    )


 _TAOBAO_HTML = """<!DOCTYPE html>
@@ -82,7 +99,7 @@ body{font-family:-apple-system,"PingFang SC",sans-serif;background:#fff0ef;color
 </style>
 </head>
 <body>
-<img class="hero" src="/media/taobao_landing.jpg" alt="淘宝闪购 天天领红包">
+<img class="hero" src="__IMAGE_URL__" alt="淘宝闪购 天天领红包">
 <div class="btn-wrap"><button class="btn" onclick="copyToken()">复制口令去淘宝领红包</button></div>
 <div class="toast" id="toast"></div>
 <script>