feat(wx): 截图比价 PoC 后端 — 收图打信号 + 心跳下发 pending_compare

- wx_poc_signal 进程内存信号(device_id→source), 只对 WX_POC_TEST_DEVICE_ID 生效
- 收图 image → set_pending(测试设备, meituan)
- POST /device/heartbeat 返回 HeartbeatResponse, 该设备有信号则带回 pending_compare 并清除
- 心跳 schema OkResponse→HeartbeatResponse, 老前端不读 body 向后兼容
- WX_POC_TEST_DEVICE_ID 空=不触发任何设备(部署零风险, 待填测试机 id)

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

app/admin/repositories/coupon_data.py

@@ -86,12 +86,7 @@ def _success_rates(rows: list) -> dict:
     }
 
 
-def _session_to_row(
-    r,
-    phone: str | None = None,
-    nickname: str | None = None,
-    ad_revenue_yuan: float | None = None,
-) -> dict:
+def _session_to_row(r, phone: str | None = None, nickname: str | None = None, ad_revenue_yuan: float = 0.0) -> dict:
     """CouponSession ORM → 明细行 dict(主表「领券数据」与「用户全部领券」抽屉共用)。"""
     return {
         "id": r.id,
@@ -257,7 +252,7 @@ def coupon_data_report(
     items = []
     for r in page:
         phone, nickname = user_map.get(r.user_id, (None, None)) if r.user_id is not None else (None, None)
-        items.append(_session_to_row(r, phone, nickname, ad_revenue_yuan=rev_map.get(r.trace_id)))
+        items.append(_session_to_row(r, phone, nickname, ad_revenue_yuan=rev_map.get(r.trace_id, 0.0)))
 
     return {
         "summary": summary,
@@ -281,7 +276,7 @@ def coupon_user_records(db: Session, *, user_id: int, limit: int = 100) -> dict:
     ).scalar_one()
     rev_map = crud_ecpm.revenue_yuan_by_trace(db, [r.trace_id for r in rows])
     return {
-        "items": [_session_to_row(r, ad_revenue_yuan=rev_map.get(r.trace_id)) for r in rows],
+        "items": [_session_to_row(r, ad_revenue_yuan=rev_map.get(r.trace_id, 0.0)) for r in rows],
         "total": int(total),
     }
 

app/admin/repositories/stats.py

@@ -7,7 +7,7 @@ from __future__ import annotations
 
 from collections import Counter
 from datetime import date, datetime, time, timedelta, timezone
-from decimal import ROUND_HALF_UP, Decimal, InvalidOperation
+from decimal import Decimal, InvalidOperation
 
 from sqlalchemy import case, func, select
 from sqlalchemy.orm import Session
@@ -109,23 +109,6 @@ def _date_range(date_from: date, date_to: date) -> list[date]:
     return [date_from + timedelta(days=i) for i in range(days + 1)]
 
 
-def _duration_percentile(sorted_values: list[int], q: float) -> int | None:
-    """Linear-interpolated percentile with the same half-up rounding as Math.round."""
-    if not sorted_values:
-        return None
-    if len(sorted_values) == 1:
-        return sorted_values[0]
-    index = (len(sorted_values) - 1) * q
-    lower = int(index)
-    upper = min(lower + 1, len(sorted_values) - 1)
-    fraction = Decimal(str(index - lower))
-    value = (
-        Decimal(sorted_values[lower]) * (Decimal(1) - fraction)
-        + Decimal(sorted_values[upper]) * fraction
-    )
-    return int(value.quantize(Decimal("1"), rounding=ROUND_HALF_UP))
-
-
 def _id_set(db: Session, stmt) -> set[int]:
     return {int(v) for v in db.execute(stmt).scalars().all() if v is not None}
 
@@ -259,46 +242,16 @@ def dashboard_overview(
         ComparisonRecord.created_at >= start_local,
         ComparisonRecord.created_at < end_local,
     )
-    period_comparison_stats = db.execute(
-        select(
-            func.count(ComparisonRecord.id),
-            func.coalesce(
-                func.sum(
-                    case(
-                        (ComparisonRecord.status.in_(("success", "failed")), 1),
-                        else_=0,
-                    )
-                ),
-                0,
-            ),
-            func.coalesce(
-                func.sum(
-                    case((ComparisonRecord.status == "cancelled", 1), else_=0)
-                ),
-                0,
-            ),
-            func.coalesce(
-                func.sum(case((ComparisonRecord.status == "success", 1), else_=0)),
-                0,
-            ),
-            func.coalesce(func.sum(ComparisonRecord.llm_cost_yuan), 0.0),
-        ).where(*period_comparison_conds)
-    ).one()
-    period_comparison_total = int(period_comparison_stats[0])
-    period_comparison_completed = int(period_comparison_stats[1])
-    period_comparison_cancelled = int(period_comparison_stats[2])
-    period_comparison_success = int(period_comparison_stats[3])
-    period_comparison_token_cost_yuan = float(period_comparison_stats[4])
-    period_comparison_success_denominator = (
-        period_comparison_total - period_comparison_cancelled
+    period_comparison_total = _count(ComparisonRecord, *period_comparison_conds)
+    period_comparison_success = _count(
+        ComparisonRecord,
+        *period_comparison_conds,
+        ComparisonRecord.status == "success",
     )
     period_comparison_success_rate = (
-        round(
-            period_comparison_success / period_comparison_success_denominator,
-            4,
-        )
-        if period_comparison_success_denominator > 0
-        else None
+        round(period_comparison_success / period_comparison_total, 4)
+        if period_comparison_total
+        else 0.0
     )
     period_saved_positive_count = _count(
         ComparisonRecord,
@@ -329,47 +282,6 @@ def dashboard_overview(
         if period_avg_duration_ms is not None
         else None
     )
-    completed_duration_conds = (
-        *period_comparison_conds,
-        ComparisonRecord.status.in_(("success", "failed")),
-        ComparisonRecord.total_ms.is_not(None),
-    )
-    if db.bind is not None and db.bind.dialect.name == "postgresql":
-        period_median_duration_ms, period_p95_duration_ms = db.execute(
-            select(
-                func.percentile_cont(0.5).within_group(ComparisonRecord.total_ms),
-                func.percentile_cont(0.95).within_group(ComparisonRecord.total_ms),
-            ).where(*completed_duration_conds)
-        ).one()
-        period_median_duration_ms = (
-            int(
-                Decimal(str(period_median_duration_ms)).quantize(
-                    Decimal("1"), rounding=ROUND_HALF_UP
-                )
-            )
-            if period_median_duration_ms is not None
-            else None
-        )
-        period_p95_duration_ms = (
-            int(
-                Decimal(str(period_p95_duration_ms)).quantize(
-                    Decimal("1"), rounding=ROUND_HALF_UP
-                )
-            )
-            if period_p95_duration_ms is not None
-            else None
-        )
-    else:
-        # SQLite 测试环境没有 percentile_cont；仅回退读取耗时单列，不加载完整记录。
-        completed_durations = list(
-            db.execute(
-                select(ComparisonRecord.total_ms)
-                .where(*completed_duration_conds)
-                .order_by(ComparisonRecord.total_ms)
-            ).scalars()
-        )
-        period_median_duration_ms = _duration_percentile(completed_durations, 0.5)
-        period_p95_duration_ms = _duration_percentile(completed_durations, 0.95)
 
     ordered_exists = (
         select(SavingsRecord.id)
@@ -710,16 +622,11 @@ def dashboard_overview(
             },
             "comparison": {
                 "total": period_comparison_total,
-                "completed": period_comparison_completed,
-                "cancelled": period_comparison_cancelled,
                 "success": period_comparison_success,
                 "success_rate": period_comparison_success_rate,
                 "ordered": period_ordered_count,
                 "average_duration_ms": period_avg_duration_ms,
-                "median_duration_ms": period_median_duration_ms,
-                "p95_duration_ms": period_p95_duration_ms,
                 "average_saved_cents": period_avg_saved_cents,
-                "token_cost_total_yuan": period_comparison_token_cost_yuan,
             },
             "coupon": {
                 "started": coupon_started,

app/admin/schemas/coupon_data.py

@@ -70,9 +70,8 @@ class CouponDataRow(BaseModel):
     started_at: datetime = Field(..., description="发起时刻(明细「时间」列)")
     claimed_count: int | None = None
     trace_url: str | None = Field(None, description="pricebot 公网 trace 链接(仅 completed 有);admin 渲染可点链接,无则显示可复制 trace_id")
-    ad_revenue_yuan: float | None = Field(
-        None,
-        description="本次领券看的信息流广告预估收益(元);按 trace_id 聚合 ad_ecpm_record;无填充记录为 null",
+    ad_revenue_yuan: float = Field(
+        0.0, description="本次领券看的信息流广告预估收益(元);按 trace_id 聚合 ad_ecpm_record"
     )
 
 

app/admin/schemas/dashboard.py

@@ -53,16 +53,11 @@ class DashboardPeriodUsers(BaseModel):
 
 class DashboardPeriodComparison(BaseModel):
     total: int
-    completed: int
-    cancelled: int
     success: int
-    success_rate: float | None = None
+    success_rate: float
     ordered: int
     average_duration_ms: int | None = None
-    median_duration_ms: int | None = None
-    p95_duration_ms: int | None = None
     average_saved_cents: int | None = None
-    token_cost_total_yuan: float = 0.0
 
 
 class DashboardPeriodCoupon(BaseModel):

app/api/v1/device.py

@@ -14,18 +14,24 @@ import logging
 from fastapi import APIRouter
 
 from app.api.deps import CurrentUser, DbSession
+from app.core import wx_poc_signal
 from app.repositories import device as device_repo
 from app.schemas.device import (
     DeviceOut,
     DeviceRegisterRequest,
     HeartbeatRequest,
+    HeartbeatResponse,
     LivenessAckRequest,
     LivenessOut,
     OkResponse,
+    PendingCompare,
 )
 
 logger = logging.getLogger("shagua.device")
 
+# PoC:源平台代号 → Android 包名(前端 launch 用)。当前只用美团。
+_SOURCE_PACKAGES = {"meituan": "com.sankuai.meituan"}
+
 router = APIRouter(prefix="/api/v1/device", tags=["device"])
 
 
@@ -52,12 +58,12 @@ def register_device(
     return DeviceOut.model_validate(device)
 
 
-@router.post("/heartbeat", response_model=OkResponse, summary="上报心跳")
+@router.post("/heartbeat", response_model=HeartbeatResponse, summary="上报心跳")
 def report_heartbeat(
     req: HeartbeatRequest,
     user: CurrentUser,
     db: DbSession,
-) -> OkResponse:
+) -> HeartbeatResponse:
     device_repo.touch_heartbeat(
         db,
         user_id=user.id,
@@ -65,7 +71,16 @@ def report_heartbeat(
         accessibility_enabled=req.accessibility_enabled,
         registration_id=req.registration_id,
     )
-    return OkResponse()
+    # PoC:该设备有"待比价"信号则带回(只对写死的测试设备生效, 取走即清、只弹一次)
+    source = wx_poc_signal.pop_pending(req.device_id)
+    pending = None
+    if source:
+        pending = PendingCompare(
+            source_platform=source,
+            source_package=_SOURCE_PACKAGES.get(source, ""),
+        )
+        logger.info("heartbeat 下发比价信号 device=%s source=%s", req.device_id, source)
+    return HeartbeatResponse(pending_compare=pending)
 
 
 @router.get("/liveness", response_model=LivenessOut, summary="查询本机掉线告警(后置检测)")

app/api/v1/wx_mp.py

@@ -0,0 +1,112 @@
+"""微信服务号消息接收回调 /wx/mp/callback(裸路径, 非 /api/v1)。
+
+对应公众平台"设置与开发 → 基本配置 → 服务器配置"里填的 URL。
+  GET  : URL 接入验证 → 校验 signature → 原样返回 echostr(明文)
+  POST : 收用户消息(安全模式密文) → msg_signature 验签 → AES 解密 → 解析 XML
+         图片消息(MsgType=image): 打日志(openid/PicUrl/MediaId) + 用 PicUrl 下载落盘
+         其余消息/事件: 记一条日志忽略。一律返回 "success"(微信据此不再重试)。
+
+MVP 只做"收到图片并落盘"证明链路通;后续接:识别平台+订单 → 打 pending_compare 标记
+→ 心跳带回前端弹窗,以及 openid↔device 绑定。任何异常都返回 "success"、不让微信重试轰炸。
+"""
+from __future__ import annotations
+
+import logging
+import xml.etree.ElementTree as ET
+from pathlib import Path
+
+import httpx
+from fastapi import APIRouter, Request
+from fastapi.responses import PlainTextResponse
+
+from app.core import wx_poc_signal
+from app.core.config import settings
+from app.integrations import wx_mp_crypto
+
+logger = logging.getLogger("shagua.wx_mp")
+
+router = APIRouter(prefix="/wx/mp", tags=["wx-mp"])
+
+# 收到的截图暂存目录(MVP 验证用;接上识别后可改为不落盘或定期清理)
+_INBOX = Path(settings.MEDIA_ROOT) / "wx_inbox"
+
+
+@router.get("/callback", include_in_schema=False)
+async def verify(
+    signature: str = "", timestamp: str = "", nonce: str = "", echostr: str = ""
+) -> PlainTextResponse:
+    """微信 URL 接入验证:校验 signature 通过则原样返回 echostr。"""
+    if not settings.WX_MP_TOKEN:
+        logger.warning("wx_mp verify: WX_MP_TOKEN 未配置")
+        return PlainTextResponse("", status_code=503)
+    if wx_mp_crypto.verify_url_signature(
+        settings.WX_MP_TOKEN, timestamp, nonce, signature
+    ):
+        return PlainTextResponse(echostr)
+    logger.warning("wx_mp verify: signature 校验失败 ts=%s nonce=%s", timestamp, nonce)
+    return PlainTextResponse("invalid signature", status_code=403)
+
+
+@router.post("/callback", include_in_schema=False)
+async def receive(request: Request) -> PlainTextResponse:
+    """收用户消息(安全模式)。任何异常都吞掉返回 success,不让微信重试轰炸,靠日志排查。"""
+    if not settings.wx_mp_callback_configured:
+        logger.warning("wx_mp receive: 回调凭证未配齐(Token/AESKey/AppID)")
+        return PlainTextResponse("success")
+    try:
+        body = (await request.body()).decode("utf-8")
+        qp = request.query_params
+        # 安全模式外层 XML 只有 ToUserName + Encrypt。来源=微信服务器(HTTPS)+ 下面验签,
+        # 且 stdlib ET 不扩展外部实体, XXE 不适用。
+        encrypt = ET.fromstring(body).findtext("Encrypt") or ""
+        if not wx_mp_crypto.verify_msg_signature(
+            settings.WX_MP_TOKEN,
+            qp.get("timestamp", ""),
+            qp.get("nonce", ""),
+            encrypt,
+            qp.get("msg_signature", ""),
+        ):
+            logger.warning("wx_mp receive: msg_signature 校验失败")
+            return PlainTextResponse("success")
+        xml = wx_mp_crypto.decrypt_message(
+            settings.WX_MP_AES_KEY, settings.WX_MP_APPID, encrypt
+        )
+        await _handle_message(ET.fromstring(xml))
+    except Exception:
+        logger.exception("wx_mp receive: 处理异常")
+    return PlainTextResponse("success")
+
+
+async def _handle_message(root: ET.Element) -> None:
+    openid = root.findtext("FromUserName") or ""
+    msg_type = root.findtext("MsgType") or ""
+    if msg_type == "image":
+        pic_url = root.findtext("PicUrl") or ""
+        media_id = root.findtext("MediaId") or ""
+        logger.info(
+            "wx_mp 收到图片: openid=%s media_id=%s pic_url=%s", openid, media_id, pic_url
+        )
+        # PoC: 写死"该测试设备要从美团比价", 下次心跳带回前端弹选平台窗
+        poc_dev = settings.WX_POC_TEST_DEVICE_ID
+        if poc_dev:
+            wx_poc_signal.set_pending(poc_dev, "meituan")
+            logger.info("wx_mp PoC: 已给测试设备 %s 打比价信号 source=meituan", poc_dev)
+        await _download(pic_url, openid, media_id)
+    else:
+        logger.info("wx_mp 收到消息(暂忽略): openid=%s type=%s", openid, msg_type)
+
+
+async def _download(pic_url: str, openid: str, media_id: str) -> None:
+    """用 PicUrl 直接下载图片落盘。PicUrl 是临时公网链接,无需 access_token / IP 白名单。"""
+    if not pic_url:
+        return
+    try:
+        _INBOX.mkdir(parents=True, exist_ok=True)
+        async with httpx.AsyncClient(timeout=15) as client:
+            resp = await client.get(pic_url)
+            resp.raise_for_status()
+        dest = _INBOX / f"{openid[:12]}_{media_id[:16]}.jpg"
+        dest.write_bytes(resp.content)
+        logger.info("wx_mp 图片已落盘: %s (%d bytes)", dest, len(resp.content))
+    except Exception:
+        logger.exception("wx_mp 图片下载失败 pic_url=%s", pic_url)

app/core/config.py

@@ -136,6 +136,17 @@ class Settings(BaseSettings):
     # (不跳授权、不拿 openid),整套微信代码保留。审核通过后 .env 置 true + 重启即启用,无需改代码。
     WX_MP_OAUTH_ENABLED: bool = False
 
+    # ===== 微信服务号(消息接收回调) =====
+    # 用户发消息给服务号 → 微信 POST 到 /wx/mp/callback(安全模式:Token 验签 + AESKey 解密)。
+    # 区别于上面的网页授权(那是落地页拿 openid);这里是被动收用户主动发来的消息(截图比价入口)。
+    WX_MP_TOKEN: str = ""            # 公众平台"服务器配置"的 Token(URL 验签 + 消息验签)
+    WX_MP_AES_KEY: str = ""          # EncodingAESKey(43 位, 消息 AES-256-CBC 加解密)
+
+    # ===== 微信截图比价 PoC(临时验证链路, 验证后删) =====
+    # 只对这台写死的测试设备下发"从美团比价"信号;空=不触发任何设备(部署上线零风险)。
+    # 收图 → 给此 device_id 打 pending → 该设备下次心跳带回 → 前端弹选平台窗。
+    WX_POC_TEST_DEVICE_ID: str = ""
+
     @property
     def wx_mp_configured(self) -> bool:
         """服务号网页授权凭证齐全(缺则落地页不发起授权,降级为无 openid)。"""
@@ -146,6 +157,11 @@ class Settings(BaseSettings):
         """落地页是否真正发起微信授权 = 凭证齐全 且 总开关开。"""
         return self.wx_mp_configured and self.WX_MP_OAUTH_ENABLED
 
+    @property
+    def wx_mp_callback_configured(self) -> bool:
+        """消息接收回调凭证齐全(Token + AESKey + AppID)。缺则回调端点拒绝处理消息。"""
+        return bool(self.WX_MP_TOKEN and self.WX_MP_AES_KEY and self.WX_MP_APPID)
+
     # ===== 微信支付(商家转账到零钱 / 提现)=====
     # 真实凭证放 .env(已 gitignore),证书 .pem 放 secrets/。WECHAT_APP_ID 同时用于
     # 微信登录(code 换 openid)与转账,必须与 App 端开放平台 appid 一致。

app/core/wx_poc_signal.py

@@ -0,0 +1,27 @@
+"""微信截图比价 PoC:进程内存的"待比价"信号(单 worker 够用, 重启即失效, PoC 可接受)。
+
+收图端点 set_pending(device_id, source) → 该设备下次心跳 pop_pending 取走并清除 →
+心跳响应带回 → 前端弹选平台窗。只对 settings.WX_POC_TEST_DEVICE_ID 写入, 不碰其他设备。
+后续接真识别 / openid↔device 绑定时整体替换本模块。
+"""
+from __future__ import annotations
+
+import threading
+
+_lock = threading.Lock()
+_pending: dict[str, str] = {}  # device_id -> source_platform(如 "meituan")
+
+
+def set_pending(device_id: str, source_platform: str) -> None:
+    if not device_id:
+        return
+    with _lock:
+        _pending[device_id] = source_platform
+
+
+def pop_pending(device_id: str) -> str | None:
+    """取出并清除该设备的待比价信号;无则 None。心跳每帧调, 取到即消费(只弹一次)。"""
+    if not device_id:
+        return None
+    with _lock:
+        return _pending.pop(device_id, None)

app/integrations/wx_mp_crypto.py

@@ -0,0 +1,69 @@
+"""微信服务号消息接收回调的验签与解密(安全模式)。
+
+服务号"服务器配置"选安全模式后:
+  - URL 接入验证(GET): sha1(sort(token, timestamp, nonce)) == signature → 原样返回 echostr
+  - 消息(POST): body 里 <Encrypt> 是密文;
+      msg_signature = sha1(sort(token, timestamp, nonce, encrypt))
+      密文 AES-256-CBC 解出: random(16B) + msg_len(4B big-endian) + msg + appid, 去 PKCS7(块=32) padding
+
+只做验签 + 解密(收消息)。被动回复(加密)MVP 不需要 —— 收到后走客服消息异步回执。
+密钥/口令来自 settings(WX_MP_TOKEN / WX_MP_AES_KEY / WX_MP_APPID),本模块只做纯算法、不读配置。
+"""
+from __future__ import annotations
+
+import base64
+import hashlib
+import hmac
+
+from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
+
+
+def verify_url_signature(token: str, timestamp: str, nonce: str, signature: str) -> bool:
+    """GET 接入验证:token/timestamp/nonce 三者字典序排序拼接后 sha1。"""
+    return _consteq(_sha1(token, timestamp, nonce), signature)
+
+
+def verify_msg_signature(
+    token: str, timestamp: str, nonce: str, encrypt: str, msg_signature: str
+) -> bool:
+    """POST 消息验签:四者(含密文 encrypt)字典序排序拼接后 sha1。"""
+    return _consteq(_sha1(token, timestamp, nonce, encrypt), msg_signature)
+
+
+def decrypt_message(aes_key_b64: str, expected_appid: str, encrypt_b64: str) -> str:
+    """解密 <Encrypt> 密文, 返回明文消息 XML。appid 不符抛 ValueError。
+
+    aes_key_b64: EncodingAESKey(43 位, 不含结尾 '='), 补 '=' 后 base64 解出 32 字节 AES-256 key。
+    """
+    aes_key = base64.b64decode(aes_key_b64 + "=")  # 43 → 32 bytes
+    iv = aes_key[:16]
+    decryptor = Cipher(algorithms.AES(aes_key), modes.CBC(iv)).decryptor()
+    plain = decryptor.update(base64.b64decode(encrypt_b64)) + decryptor.finalize()
+    plain = _pkcs7_unpad(plain)
+
+    # random(16) + msg_len(4, big-endian) + msg(msg_len) + from_appid
+    content = plain[16:]
+    msg_len = int.from_bytes(content[:4], "big")
+    msg = content[4 : 4 + msg_len]
+    from_appid = content[4 + msg_len :].decode("utf-8")
+    if expected_appid and from_appid != expected_appid:
+        raise ValueError(f"appid mismatch: {from_appid!r} != {expected_appid!r}")
+    return msg.decode("utf-8")
+
+
+def _sha1(*parts: str) -> str:
+    return hashlib.sha1("".join(sorted(parts)).encode("utf-8")).hexdigest()
+
+
+def _consteq(a: str, b: str) -> bool:
+    return hmac.compare_digest(a, b)
+
+
+def _pkcs7_unpad(data: bytes) -> bytes:
+    """微信用块大小 32 的 PKCS7,末字节即 padding 长度(1..32)。越界则原样返回(容错)。"""
+    if not data:
+        return data
+    pad = data[-1]
+    if pad < 1 or pad > 32:
+        return data
+    return data[:-pad]

app/main.py

@@ -39,6 +39,7 @@ from app.api.v1.signin import router as signin_router
 from app.api.v1.tasks import router as tasks_router
 from app.api.v1.user import router as user_router
 from app.api.v1.wallet import router as wallet_router
+from app.api.v1.wx_mp import router as wx_mp_router
 from app.api.v1.wxpay import router as wxpay_router
 from app.core.config import settings
 from app.core.daily_exchange_worker import (
@@ -140,6 +141,8 @@ app.include_router(internal_launch_confirm_router)
 app.include_router(platform_router)
 # CPS 群发短链跳转 /c/{code}(公网无鉴权:记点击 → 302 跳美团)
 app.include_router(cps_redirect_router)
+# 微信服务号消息接收回调 /wx/mp/callback(公网无鉴权:微信服务器验签, 截图比价入口)
+app.include_router(wx_mp_router)
 
 # 用户上传文件(头像)静态服务。生产可改由 nginx 直接 serve MEDIA_ROOT。
 _media_root = Path(settings.MEDIA_ROOT)

app/schemas/device.py

@@ -36,6 +36,20 @@ class OkResponse(BaseModel):
     ok: bool = True
 
 
+class PendingCompare(BaseModel):
+    """PoC:后端通过心跳下发的"用户要从某源平台比价"信号。前端据此弹选平台窗 + launch 源平台。"""
+    source_platform: str            # pricebot 源平台代号(PoC 写死 "meituan")
+    source_package: str             # 源平台 Android 包名(前端 launch 用)
+
+
+class HeartbeatResponse(BaseModel):
+    """心跳响应。常规只回 ok;PoC 期带回 pending_compare 触发比价(exclude_none 省略 null)。"""
+    model_config = ConfigDict()
+
+    ok: bool = True
+    pending_compare: PendingCompare | None = None
+
+
 class LivenessOut(BaseModel):
     """本机掉线告警状态(后置检测 pull 版)。客户端只需这一个布尔判断要不要弹「开启自启动」引导,
     故只返回 kill_alert_pending(不暴露设备详情 / 内部 liveness_state 等)。从未注册过 → 默认 False(无告警)。"""

tests/test_admin_read.py

@@ -1,15 +1,12 @@
 """Admin M2 读接口测试:大盘聚合 + 用户/流水/提现/反馈列表 + 鉴权拦截。"""
 from __future__ import annotations
 
-from datetime import datetime
-
 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.comparison import ComparisonRecord
 from app.models.feedback import Feedback
 from app.models.wallet import CashTransaction, WithdrawOrder
 from app.repositories import user as user_repo
@@ -72,49 +69,6 @@ def test_dashboard_overview(admin_client: TestClient, admin_token: str) -> None:
     assert "jd_order_count" in data["cps"]
 
 
-def test_dashboard_period_comparison_is_aggregated_by_backend(
-    admin_client: TestClient, admin_token: str
-) -> None:
-    created_at = datetime(2037, 1, 15, 12)
-    rows = [
-        ("dashboard-aggregate-success", "success", 101, 0.1),
-        ("dashboard-aggregate-failed", "failed", 200, 0.2),
-        ("dashboard-aggregate-cancelled", "cancelled", 300, 0.3),
-        ("dashboard-aggregate-running", "running", 400, 0.4),
-    ]
-    db = SessionLocal()
-    try:
-        for trace_id, status, total_ms, llm_cost_yuan in rows:
-            db.add(
-                ComparisonRecord(
-                    trace_id=trace_id,
-                    status=status,
-                    total_ms=total_ms,
-                    llm_cost_yuan=llm_cost_yuan,
-                    created_at=created_at,
-                )
-            )
-        db.commit()
-    finally:
-        db.close()
-
-    response = admin_client.get(
-        "/admin/api/stats/overview",
-        params={"date_from": "2037-01-15", "date_to": "2037-01-15"},
-        headers=_auth(admin_token),
-    )
-    assert response.status_code == 200, response.text
-    comparison = response.json()["period"]["comparison"]
-    assert comparison["total"] == 4
-    assert comparison["completed"] == 2
-    assert comparison["cancelled"] == 1
-    assert comparison["success"] == 1
-    assert comparison["success_rate"] == 0.3333
-    assert comparison["median_duration_ms"] == 151
-    assert comparison["p95_duration_ms"] == 195
-    assert comparison["token_cost_total_yuan"] == pytest.approx(1.0)
-
-
 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))

tests/test_board_ad_revenue.py

@@ -43,35 +43,6 @@ def test_coupon_data_report_includes_ad_revenue() -> None:
         db.close()
 
 
-def test_coupon_data_report_distinguishes_unfilled_from_zero_revenue() -> None:
-    """无 eCPM 记录返回 None；已填充但 eCPM=0 返回 0.0。"""
-    db = SessionLocal()
-    try:
-        db.add_all([
-            CouponSession(
-                trace_id="rev-cp-unfilled", device_id="d-unfilled", status="completed", app_env="prod",
-                platforms=["meituan-waimai"], platform_success=["meituan-waimai"],
-                started_at=datetime(2020, 1, 3, tzinfo=UTC), started_date=date(2020, 1, 3),
-            ),
-            CouponSession(
-                trace_id="rev-cp-zero", device_id="d-zero", status="completed", app_env="prod",
-                platforms=["meituan-waimai"], platform_success=["meituan-waimai"],
-                started_at=datetime(2020, 1, 3, tzinfo=UTC), started_date=date(2020, 1, 3),
-            ),
-            _ecpm("rev-cp-zero", "0", "cp-sess-zero", "coupon"),
-        ])
-        db.flush()
-
-        res = coupon_data_report(db, date_from="2020-01-03", date_to="2020-01-03", app_env="prod")
-        rows = {row["trace_id"]: row for row in res["items"]}
-
-        assert rows["rev-cp-unfilled"]["ad_revenue_yuan"] is None
-        assert rows["rev-cp-zero"]["ad_revenue_yuan"] == 0.0
-    finally:
-        db.rollback()
-        db.close()
-
-
 def test_comparison_list_includes_ad_revenue() -> None:
     """比价记录列表项带本次广告收益;200 分 → 0.002 元。