Compare commits

..

7 Commits

Author SHA1 Message Date
linkeyu 08a3bcb683 修复:完善限制策略页面稳定性
统一白名单时间口径并接入带乱序保护的分页列表;优化风控页路由跳转、无手机号禁用提示及后端分组计数复用。
2026-07-31 16:50:27 +08:00
linkeyu 9e150c64aa 优化:白名单菜单更名为限制策略
菜单名称调整为限制策略,页面标题同步为限制策略与白名单,并更新相关配置提示,准确表达全局阈值与白名单管理能力。
2026-07-31 15:01:56 +08:00
linkeyu be6fa0aa9e 优化:明确白名单主体类型展示
将主体类型与手机号或设备 ID 分列展示,补充类型筛选,并移除白名单配置标题后的主体数量。
2026-07-31 14:57:38 +08:00
linkeyu 776682fe0f 优化:允许设备白名单跨分类选择
移除设备来源分组造成的互斥逻辑,保留规则主体类型校验,允许同一设备字符串选择多个业务分类。
2026-07-31 14:38:31 +08:00
linkeyu f417722c91 优化:完善白名单主体录入与编辑交互
手机号与设备 ID 统一为手动录入并禁止推荐,修复跨分类勾选互相清空,补充独立编辑入口及表单告警处理。
2026-07-31 11:59:55 +08:00
linkeyu e98402d75c 优化:完善白名单配置交互与展示 2026-07-30 20:21:20 +08:00
linkeyu 4d163c7676 功能:新增统一限制白名单管理页面
新增全局限制分组管理、多限制项临时不限白名单、设备搜索选择和风控记录快捷加入入口,并同步引导视频配置展示。
2026-07-29 19:06:57 +08:00
6 changed files with 29 additions and 1449 deletions
File diff suppressed because it is too large Load Diff
@@ -1,176 +0,0 @@
# admin 比价记录「技术成功/失败」口径与缺失提示设计
- **日期**2026-08-04
- **范围**:后端 `shaguabijia-app-server`admin 层,**方案 A**:无 schema 变更、无迁移、不碰 #209 落库与 C 端)+ 前端 `shaguabijia-admin-web`
- **涉及文件**
- 后端:`app/admin/repositories/comparison_outcome.py`**新建**:共享常量 + Python 派生 + SQL 判定)、`app/admin/repositories/queries.py`(列表派生 + 概览口径)、`app/admin/schemas/comparison.py`(新增两字段)、`app/admin/repositories/stats.py`(大盘成功率分子口径)
- 前端:`src/app/(main)/comparison-records/page.tsx``src/lib/types.ts`
- 文档:`shaguabijia-app-server/docs/guides/比价结果卡片-状态口径与交互参考.md`(补 admin 口径说明)
## 目标
比价记录页(管理员排查工具)把「流程正常跑完、只是外部原因导致结果缺失」的记录——未找到店 / 未找到菜 / 门店打烊 / 单点不配送 / 平台·场景不支持 / 未满起送——从「失败」改判为 **🟢 成功 ⚠**(hover 看具体缺失原因)。让「失败」红标签**只剩真正的技术故障**,管理员一眼定位系统问题。改动范围:**admin 后台内部统一**(比价记录页状态列 + 概览成功率 + 数据大盘),不动 C 端。
## 背景与现状冲突
- **#209** 把 `store_closed / store_not_found / items_not_found / no_delivery / unsupported` 归一化成记录级 `failed` 落库,`below_minimum``success`;成功率按此算。
- 前端 `STATUS_LABEL` 把这些细分值 + `failed` 全显示「失败」([page.tsx:35](../../src/app/(main)/comparison-records/page.tsx))。
- 问题:这些是「跑完流程、外部结果缺失」,不是系统故障。全归「失败」粒度太粗,管理员无法区分「系统的锅」vs「目标平台本来就没有这家店 / 这些菜」。
- **数据来源已坐实**:原始业务结局保存在 `raw_payload["record_status"]`(优先)或 `raw_payload["status"]`(兜底),**每条记录都有**(harvest 与 POST 两条写路径都落,见 `repositories/comparison.py:810` 注释)。admin 列表用裸 `select(ComparisonRecord)`、**本就全量加载 `raw_payload`**C 端 `list_records``defer`),故列表派生**零额外查询**。概览/大盘用 `raw_payload["record_status"].as_string()` 在 SQL 里分类(跨方言写法,#209 迁移已验证可用)。
## admin 口径(核心)
**原始结局** `original = raw_payload["record_status"] or raw_payload["status"]`
| original | admin_status | outcome_hinthover |
|---|---|---|
| success | success | (无) |
| below_minimum | success | 未满起送 |
| store_closed | success | 门店打烊 |
| store_not_found | success | 未找到店 |
| items_not_found | success | 未找到菜 |
| no_delivery | success | 单点不配送 |
| unsupported | success | 平台·场景不支持 |
| failed / 其他未知 | failed | (无,这才是要排查的技术故障) |
| cancelled 记录,status 列) | cancelled | (无) |
| running 记录,status 列) | running | (无) |
**派生规则**
- 记录 `status == "cancelled"``admin_status=cancelled``status == "running"``admin_status=running`(生命周期状态直接取 `status`,不看 original)。
- 否则看 original:∈ **admin 成功集** `S``admin_status=success``outcome_hint=_OUTCOME_HINTS.get(original)``success` 本身 → `None`)。
- original 为 `failed` 或未知非 `S``admin_status=failed``outcome_hint=None`
- **兜底**`raw_payload` 缺 original(极老记录)→ 用 `status` 列(`success→success` / `failed→failed`),`outcome_hint=None`
其中 `S = {success, below_minimum, store_closed, store_not_found, items_not_found, no_delivery, unsupported}`
## 数据契约(新增两字段)
`AdminComparisonListItem``AdminComparisonDetail` 继承)新增:
```python
admin_status: str # success / failed / cancelled / runningadmin 口径)
outcome_hint: str | None = None # 缺失提示文案;None = 无缺失
```
`status` 字段**保留原样下发**(排查时可看后端落库原值)。前端只认 `admin_status` + `outcome_hint`,不自己算口径。
## 后端实现(方案 A
### 1. 新模块 `app/admin/repositories/comparison_outcome.py`(供 `queries.py` 与 `stats.py` 共用,避免循环 import
```python
from sqlalchemy import func
from app.models.comparison import ComparisonRecord
ADMIN_SUCCESS_OUTCOMES = frozenset({
"success", "below_minimum", "store_closed",
"store_not_found", "items_not_found", "no_delivery", "unsupported",
})
OUTCOME_HINTS = {
"below_minimum": "未满起送", "store_closed": "门店打烊",
"store_not_found": "未找到店", "items_not_found": "未找到菜",
"no_delivery": "单点不配送", "unsupported": "平台·场景不支持",
}
def derive_admin_outcome(raw_payload: dict | None, status: str) -> tuple[str, str | None]:
"""Python 层派生(列表用;raw_payload 已随 ORM 加载,零额外查询)。"""
if status in ("cancelled", "running"):
return status, None
raw = raw_payload or {}
original = raw.get("record_status") or raw.get("status")
if original is None: # 极老记录兜底
return ("success" if status == "success" else "failed"), None
if original in ADMIN_SUCCESS_OUTCOMES:
return "success", OUTCOME_HINTS.get(original)
return "failed", None
def _original_expr():
return func.coalesce(
ComparisonRecord.raw_payload["record_status"].as_string(),
ComparisonRecord.raw_payload["status"].as_string(),
)
def admin_success_sql():
"""SQL 层 admin 成功判定(概览/大盘的 case/where 共用)。"""
original = _original_expr()
return original.in_(tuple(ADMIN_SUCCESS_OUTCOMES)) | (
original.is_(None) & (ComparisonRecord.status == "success")
)
```
### 2. 列表 `list_comparison_records`
在现有瞬态挂载段(`_attach_*` / `ad_revenue_yuan` 之后)对每条 `record`
```python
record.admin_status, record.outcome_hint = _derive_admin_outcome(record.raw_payload, record.status)
```
`raw_payload` 列表已加载,无 N+1。schema 加上述两字段(`from_attributes` 读出)。
### 3. 概览 `comparison_records_summary`
`success` / `completed``case` 改用 original 口径:
```python
_original_expr = func.coalesce(
ComparisonRecord.raw_payload["record_status"].as_string(),
ComparisonRecord.raw_payload["status"].as_string(),
)
# admin 成功 = original ∈ S OR (original IS NULL AND status == 'success')
# completed = admin 成功 + 纯 failed(展示字段;admin 口径)
# success_rate = admin 成功 / (started - cancelled) # 分母不变,见 queries.py:532
```
**耗时分位**avg / p50 / p95`_comparison_duration_aggregate*`):统计集从「`status == "success"`」改为「admin 成功集」——用户已确认**统一口径纳入**这 6 类。改动点:`_comparison_status_condition` 系的耗时过滤条件改用 `_original_expr ∈ S`(或复用一个 `_admin_success_condition()` 表达式,列表/概览/大盘共用)。
### 4. 大盘 `stats.py` `dashboard_overview`
`period_comparison_stats` 的 success 分子([stats.py:278-281](../../../shaguabijia-app-server/app/admin/repositories/stats.py) 的 `case(status=='success')`)现在**不含 below_minimum**#209 只改了概览、没同步大盘)。改用 `admin_success_sql()``original ∈ S`)口径,与概览一致。
**范围界定**:两页成功率**分母都是 `total - cancelled`**(概览 [queries.py:532](../../src/../../../shaguabijia-app-server/app/admin/repositories/queries.py)、大盘 [stats.py:290](../../../shaguabijia-app-server/app/admin/repositories/stats.py)),口径一致、本次不动。真正的既有差异在**分子**:概览 success 含 `below_minimum`、大盘不含。本次把两处分子都统一为 `original ∈ S`,改完两页口径**完全一致**。副作用:大盘成功率因补上 `below_minimum` + 5 类而上升,概览因补上 5 类上升——均属口径调整、非数据异常。
## 前端实现
### 1. 状态列([page.tsx:416](../../src/app/(main)/comparison-records/page.tsx)
`render` 改用 `admin_status` 出标签(`STATUS_LABEL/COLOR`success→绿「成功」/ failed→红「失败」/ cancelled→「中途退出」/ running→「进行中」);`outcome_hint` 非空 → 标签后跟 `<Tooltip title={outcome_hint}>` 包一个 ⚠(antd `WarningOutlined`)。
### 2. 详情页状态([page.tsx:627](../../src/app/(main)/comparison-records/page.tsx)
同步用 `admin_status` + `outcome_hint`
### 3. `STATUS_LABEL` / `STATUS_COLOR`[page.tsx:35](../../src/app/(main)/comparison-records/page.tsx)
精简:移除把 `store_closed/store_not_found/items_not_found/no_delivery/unsupported` 直接映射「失败」的行(统一走 `admin_status`);保留 `success/failed/cancelled/running``below_minimum` 同理不再单列。
### 4. `types.ts`
`ComparisonRecordListItem``admin_status: string``outcome_hint: string | null`
### 5. 概览成功率
前端只展示后端返回的数字,口径变化对前端透明;检查概览区有无「成功率」口径说明文案需同步。
## 不改 / 一致性
- `status` 列语义、#209 落库、完成奖励幂等、C 端「我的比价」/ 首页轮播 / 省钱战绩口径:**全不动**。
- admin 口径(跑完即成功)**刻意宽于** C 端业务口径;因大盘也一并改,**admin 后台内部自洽**。
- 在状态口径文档补一段「admin 记录页口径」:说明 admin 成功率是「技术完成率」,与 C 端业务口径不同,避免以后有人拿两者对不上而误判为 bug。
## 边界
- `raw_payload``record_status/status`(极老记录):`admin_status``status` 列,`outcome_hint=None`,不加 ⚠。
- 多平台 `platform_results`:以记录级 `record_status` 为准(pricebot 已归纳),不逐平台判。
- 迁移未覆盖、`status` 列仍是细分值的老记录:`original` 优先,仍正确归类(细分值本身 ∈ S)。
## 测试
- 后端新增 `_derive_admin_outcome` 单测:各 original + cancelled/running + raw_payload 缺失兜底,验 `(admin_status, outcome_hint)`
- `tests/test_comparison_admin_summary.py`:造含 6 类 + success + failed + cancelled 的记录,验 `success` / `completed` / `success_rate` / 耗时分位按新口径。
- `tests/test_admin_read.py`:列表返回 `admin_status` / `outcome_hint`(成功·有缺失、纯失败、纯成功各一条)。
## 影响面 / 风险
- 概览/大盘 SQL 读 JSONB`raw_payload['record_status'].as_string()`):PG 上是 JSONB,跨方言 `.as_string()` #209 迁移已用;SQLite 测试走 JSON1。admin 低频、P0 量级,性能可忽略。
- **admin 成功率数字会上升**(这 6 类从失败转成功):需知会运营这是**口径调整、非数据异常**。C 端 / 大盘之外的成功率不受影响。
+20 -207
View File
@@ -4,9 +4,8 @@ import { useEffect, useState } from 'react';
import type { CSSProperties, ReactNode } from 'react';
import {
App, Button, Card, Col, Collapse, DatePicker, Descriptions, Divider, Drawer, Input, InputNumber,
Row, Select, Space, Spin, Statistic, Table, Tag, Tooltip, Typography,
Row, Select, Space, Spin, Statistic, Table, Tag, Typography,
} from 'antd';
import { ExclamationCircleOutlined } from '@ant-design/icons';
import type { ColumnsType } from 'antd/es/table';
import dayjs, { type Dayjs } from 'dayjs';
import { api, errMsg } from '@/lib/api';
@@ -20,142 +19,19 @@ import type {
const { RangePicker } = DatePicker;
// admin_status 只有四个生命周期值;外部缺失由 outcome_hint(感叹号)承载。
const STATUS_COLOR: Record<string, string> = {
success: 'green',
failed: 'red',
cancelled: 'default',
running: 'blue',
};
const STATUS_LABEL: Record<string, string> = {
const STATUS_COLOR: Record<string, string> = { success: 'green', failed: 'red', cancelled: 'default' };
const STATUS_LABEL: Record<string, string> = { success: '成功', failed: '失败', cancelled: '中途退出' };
// 「卡在哪一步」: platform_results[*].status 翻成人话(找店/加菜/起送/读价)
const STUCK_LABEL: Record<string, string> = {
success: '成功',
store_not_found: '没找到店',
items_not_found: '菜没匹配上',
below_minimum: '未达起送',
unsupported: '平台不支持',
failed: '失败',
cancelled: '中途退出',
running: '进行中',
};
type PlatformResultRow = Record<string, unknown> & {
platform_id?: string;
platform_name?: string;
status?: string;
reason?: string;
};
function isRecord(value: unknown): value is Record<string, unknown> {
return value != null && typeof value === 'object' && !Array.isArray(value);
}
function platformResultRows(
platforms: Record<string, unknown>[] | null | undefined,
rawPayload: Record<string, unknown> | null | undefined,
): PlatformResultRow[] {
if ((platforms?.length ?? 0) > 0) return platforms as PlatformResultRow[];
const rawPlatforms = rawPayload?.platforms;
if (Array.isArray(rawPlatforms)) {
const rows = rawPlatforms.filter(isRecord) as PlatformResultRow[];
if (rows.length > 0) return rows;
}
// 灰度期旧记录没有 platforms,才回退 platform_results。这里的 success/source 是旧枚举,
// 展示时兼容折算为逐平台成功态 ok。
const resultValue = rawPayload?.platform_results;
if (Array.isArray(resultValue)) return resultValue.filter(isRecord) as PlatformResultRow[];
if (isRecord(resultValue)) {
return Object.entries(resultValue).flatMap(([platformId, result]) => (
isRecord(result) ? [{ platform_id: platformId, ...result } as PlatformResultRow] : []
));
}
return [];
}
function stringList(value: unknown): string[] {
return Array.isArray(value) ? value.filter((item): item is string => typeof item === 'string') : [];
}
function hasDishDiff(row: PlatformResultRow): boolean {
if (typeof row.has_dish_diff === 'boolean') return row.has_dish_diff;
const items = Array.isArray(row.items) ? row.items.filter(isRecord) : [];
return items.some((item) => item.similar === true)
|| stringList(row.approx_dish_names).length > 0
|| stringList(row.skipped_dish_names).length > 0
|| Number(row.skipped_dish_count || 0) > 0;
}
type PlatformDisplay = {
label: string;
color: string;
rawStatus: string;
category: string;
dishDiff: boolean;
fallbackReason: string;
};
function platformDisplay(row: PlatformResultRow): PlatformDisplay {
const rawStatus = typeof row.status === 'string' && row.status ? row.status : 'unknown';
const legacySource = rawStatus === 'source';
const normalizedStatus = rawStatus === 'success' || legacySource ? 'ok' : rawStatus;
const dishDiff = hasDishDiff(row);
if (normalizedStatus === 'ok') {
const isSource = row.role === 'source' || row.is_user_original === true || legacySource;
const isLowest = row.is_best === true && !dishDiff;
return {
label: '成功',
color: 'green',
rawStatus,
category: isLowest ? '#1 全网最低赢家' : isSource ? '#2 原选择' : '#3 其他成功',
dishDiff,
fallbackReason: dishDiff ? '已比出价格,但存在菜品差异,仅供参考' : '已成功比出价格',
};
}
const known: Record<string, Omit<PlatformDisplay, 'rawStatus' | 'dishDiff'>> = {
below_minimum: { label: '未满起送', color: 'gold', category: '#5 未满起送', fallbackReason: '购物车未达到起送门槛' },
store_closed: { label: '门店打烊', color: 'orange', category: '#6 门店打烊', fallbackReason: '门店当前已打烊,无法比价' },
items_not_found: { label: '商品未找到', color: 'orange', category: '#7 没有您点的商品', fallbackReason: '该店没有找到本次所选商品' },
store_not_found: { label: '店铺未找到', color: 'orange', category: '#8 无对应商家', fallbackReason: '未找到可对应的商家' },
failed: { label: '比价失败', color: 'red', category: '#9 失败兜底', fallbackReason: '本平台比价流程未完成' },
unsupported: { label: '比价失败', color: 'red', category: '#9 失败兜底', fallbackReason: '当前版本暂不支持该平台' },
no_delivery: { label: '单点不配送', color: 'orange', category: '表外 · 单点不配送', fallbackReason: '所选商品不支持单点配送' },
not_installed: { label: '未安装', color: 'default', category: '#10 端侧本地 · 未安装', fallbackReason: '该状态仅由 App 端根据装机情况补齐' },
not_compared_this_time: { label: '本次未比', color: 'default', category: '#11 端侧本地 · 未选择', fallbackReason: '该状态仅由 App 端根据本次勾选情况补齐' },
};
const mapped = known[normalizedStatus];
if (mapped) return { ...mapped, rawStatus, dishDiff: false };
return {
label: '比价失败',
color: 'red',
rawStatus,
category: '#9 未知状态兜底',
dishDiff: false,
fallbackReason: `端侧未识别状态 ${rawStatus},按比价失败兜底`,
};
}
function dishDiffSummary(row: PlatformResultRow): string | null {
if (!hasDishDiff(row)) return null;
const parts: string[] = [];
const items = Array.isArray(row.items) ? row.items.filter(isRecord) : [];
const similarPairs = items
.filter((item) => item.similar === true && typeof item.name === 'string')
.map((item) => (typeof item.orig === 'string' ? `${item.orig}${item.name}` : String(item.name)));
if (similarPairs.length) parts.push(`近似替换:${similarPairs.join('、')}`);
const approx = stringList(row.approx_dish_names);
if (approx.length) parts.push(`规格近似:${approx.join('、')}`);
const skipped = stringList(row.skipped_dish_names);
if (skipped.length) parts.push(`完全缺失:${skipped.join('、')}`);
if (!skipped.length && Number(row.skipped_dish_count || 0) > 0) {
parts.push(`缺少 ${Number(row.skipped_dish_count)} 个菜品`);
}
return parts.join('') || '存在菜品差异';
}
function complexSpecSummary(row: PlatformResultRow): string | null {
const names = stringList(row.complex_spec_dish_names);
return names.length > 0 ? `复杂规格需核对:${names.join('、')}` : null;
}
const fmtMs = (ms: number | null) => (ms == null ? '-' : `${(ms / 1000).toFixed(1)}s`);
const cents = (c: number | null) => (c == null ? '-' : yuan(c));
@@ -397,21 +273,12 @@ export default function ComparisonRecordsPage() {
width: 140,
render: (_, r) => (
<div style={{ color: '#1677ff' }}>
<div>{r.phone || (r.user_id != null ? `#${r.user_id}` : '匿名')}</div>
<div>{r.phone || `#${r.user_id}`}</div>
{r.nickname && <div style={{ fontSize: 12 }}>{r.nickname}</div>}
</div>
),
},
{ title: '状态', dataIndex: 'admin_status', width: 108, render: (_: string, r) => (
<span>
<Tag color={STATUS_COLOR[r.admin_status]}>{STATUS_LABEL[r.admin_status] || r.admin_status}</Tag>
{r.outcome_hint && (
<Tooltip title={r.outcome_hint}>
<ExclamationCircleOutlined style={{ color: '#faad14', marginLeft: 2 }} />
</Tooltip>
)}
</span>
) },
{ title: '状态', dataIndex: 'status', width: 72, render: (s: string) => <Tag color={STATUS_COLOR[s]}>{STATUS_LABEL[s] || s}</Tag> },
// 产品文档指定展示“原平台”;字段名仍沿用后端 source_platform_name。
{ title: '原平台', dataIndex: 'source_platform_name', width: 90, render: (v) => v || '-' },
{
@@ -502,7 +369,8 @@ export default function ComparisonRecordsPage() {
},
];
const platformResults = platformResultRows(detail?.platforms, detail?.raw_payload);
const platformResults =
(detail?.raw_payload?.platform_results as Record<string, unknown>[] | undefined) || [];
return (
<div>
@@ -555,7 +423,6 @@ export default function ComparisonRecordsPage() {
{ value: 'success', label: '成功' },
{ value: 'failed', label: '失败' },
{ value: 'cancelled', label: '中途退出' },
{ value: 'running', label: '进行中' },
]}
/>
<Button type="primary" onClick={search}></Button>
@@ -620,12 +487,9 @@ export default function ComparisonRecordsPage() {
<Space direction="vertical" size="middle" style={{ width: '100%' }}>
<Descriptions size="small" column={2} bordered>
<Descriptions.Item label="用户">
{detail.phone || (detail.user_id != null ? `#${detail.user_id}` : '匿名')}{detail.nickname ? `(${detail.nickname})` : ''}
</Descriptions.Item>
<Descriptions.Item label="状态">
<Tag color={STATUS_COLOR[detail.admin_status]}>{STATUS_LABEL[detail.admin_status] || detail.admin_status}</Tag>
{detail.outcome_hint && <Tooltip title={detail.outcome_hint}><ExclamationCircleOutlined style={{ color: '#faad14', marginLeft: 4 }} /></Tooltip>}
{detail.phone || `#${detail.user_id}`}{detail.nickname ? `(${detail.nickname})` : ''}
</Descriptions.Item>
<Descriptions.Item label="状态"><Tag color={STATUS_COLOR[detail.status]}>{STATUS_LABEL[detail.status] || detail.status}</Tag></Descriptions.Item>
<Descriptions.Item label="业务">{detail.business_type}</Descriptions.Item>
<Descriptions.Item label="耗时">{fmtMs(detail.total_ms)}</Descriptions.Item>
<Descriptions.Item label="步数">{detail.step_count ?? '-'}</Descriptions.Item>
@@ -715,67 +579,16 @@ export default function ComparisonRecordsPage() {
)}
{platformResults.length > 0 && (
<Card size="small" title="逐平台结果卡片判定">
<Typography.Paragraph type="secondary" style={{ marginBottom: 12 }}>
platforms[].status=ok is_bestrolehas_dish_diff #10 #11
App
</Typography.Paragraph>
<Card size="small" title="逐平台结局(卡在哪一步)">
<Table
size="small"
rowKey={(_, i) => String(i)}
pagination={false}
dataSource={platformResults}
scroll={{ x: 1050 }}
columns={[
{
title: '平台', dataIndex: 'platform_name', width: 150,
render: (v, r: PlatformResultRow) => (v as string) || r.platform_id || '-',
},
{
title: '逐平台状态', dataIndex: 'status', width: 135,
render: (_, r: PlatformResultRow) => {
const display = platformDisplay(r);
return (
<Space direction="vertical" size={0}>
<Tag color={display.color}>{display.label}</Tag>
<Typography.Text type="secondary" code>{display.rawStatus}</Typography.Text>
</Space>
);
},
},
{
title: '卡片分类', key: 'category', width: 210,
render: (_, r: PlatformResultRow) => {
const display = platformDisplay(r);
const hasComplexSpec = complexSpecSummary(r) != null;
return (
<Space size={[4, 4]} wrap>
<Tag color={display.color}>{display.category}</Tag>
{display.dishDiff ? <Tag color="gold">#4 </Tag> : null}
{hasComplexSpec ? <Tag color="blue"></Tag> : null}
</Space>
);
},
},
{
title: '价格', dataIndex: 'price', width: 90,
render: (v) => (typeof v === 'number' ? `¥${v.toFixed(2)}` : '-'),
},
{
title: '说明 / 判定字段', key: 'reason',
render: (_, r: PlatformResultRow) => {
const display = platformDisplay(r);
const diff = dishDiffSummary(r);
const complexSpec = complexSpecSummary(r);
return (
<Space direction="vertical" size={0}>
<span>{typeof r.reason === 'string' && r.reason ? r.reason : display.fallbackReason}</span>
{diff ? <Typography.Text type="warning">{diff}</Typography.Text> : null}
{complexSpec ? <Typography.Text type="secondary">{complexSpec}</Typography.Text> : null}
</Space>
);
},
},
{ title: '平台', dataIndex: 'platform_name', render: (v, r: Record<string, unknown>) => (v as string) || (r.platform_id as string) || '-' },
{ title: '结局', dataIndex: 'status', render: (s: string) => <Tag color={s === 'success' ? 'green' : 'orange'}>{STUCK_LABEL[s] || s || '-'}</Tag> },
{ title: '说明', dataIndex: 'reason', render: (v) => (v as string) || '-' },
]}
/>
</Card>
+5 -21
View File
@@ -76,7 +76,6 @@ interface CouponDataRow {
claimed_count: number | null;
point_success_count: number | null;
point_total_count: number | null;
point_event_count?: number;
// 兼容旧后端的内嵌明细;新后端不再返回,改为点击后按 trace 加载。
point_details?: CouponPointDetail[];
trace_url: string | null;
@@ -146,22 +145,15 @@ function PointScorePopover({ row }: { row: CouponDataRow }) {
const [loading, setLoading] = useState(false);
const [loadError, setLoadError] = useState<string | null>(null);
const abandonedWithoutScoredResult =
row.status === 'abandoned' && row.point_success_count === 0 && row.point_total_count === 0;
if (
row.point_success_count == null ||
row.point_total_count == null ||
(row.point_total_count <= 0 && !abandonedWithoutScoredResult)
) {
if (row.point_success_count == null || row.point_total_count == null || row.point_total_count <= 0) {
return <Typography.Text type="secondary">-</Typography.Text>;
}
const score = `${row.point_success_count}/${row.point_total_count}`;
const hasPointDetails = (row.point_event_count ?? 0) > 0;
const scoreWithRate = abandonedWithoutScoredResult
? `0.0%${hasPointDetails ? '无有效结果' : '退出前无结果'}`
: `${score}${(row.point_success_count / row.point_total_count * 100).toFixed(1)}%`;
const scoreWithRate = `${score}${(
row.point_success_count / row.point_total_count * 100
).toFixed(1)}%`;
const scoreColor =
row.point_total_count > 0 && row.point_success_count === row.point_total_count
row.point_success_count === row.point_total_count
? STATUS_TAG.completed.color
: STATUS_TAG.abandoned.color;
const loadDetails = async () => {
@@ -182,14 +174,6 @@ function PointScorePopover({ row }: { row: CouponDataRow }) {
}
};
if (abandonedWithoutScoredResult && !hasPointDetails) {
return (
<Tooltip title="本次在第一张券产生终态前中途退出,没有可计入成功/尝试的单券结果;按运营展示口径记为 0.0%,不虚构失败券数量。">
<Typography.Text type="warning">{scoreWithRate}</Typography.Text>
</Tooltip>
);
}
return (
<Popover
trigger="click"
+3 -6
View File
@@ -550,7 +550,6 @@ export default function DashboardPage() {
const couponPeriod = periodData?.coupon ?? null;
const previousCouponPeriod = previousPeriodData?.coupon ?? null;
const couponStartedDelta = percentDelta(couponPeriod?.started, previousCouponPeriod?.started);
const couponSuccessDenominator = couponPeriod?.success_denominator ?? null;
const couponSuccessRateValue =
couponPeriod?.success_rate == null ? '--' : (couponPeriod.success_rate * 100).toFixed(1);
const couponSuccessRateDelta = pointDelta(couponPeriod?.success_rate, previousCouponPeriod?.success_rate);
@@ -876,11 +875,9 @@ export default function DashboardPage() {
unit="%"
delta={couponSuccessRateDelta.value}
deltaTone={couponSuccessRateDelta.tone}
hint={`全部点位领成功的次数 ÷(领券发起数-中途退出数);本期 ${fmtInt(
couponPeriod?.all_success,
)} ÷(${fmtInt(couponPeriod?.started)}${fmtInt(couponPeriod?.abandoned)}),分母为 ${fmtInt(
couponSuccessDenominator,
)}。中途退出不计入分母,点位成功口径含「今日已领过」。`}
hint={`全部点位领成功的次数 / 领券发起数;本期 ${fmtInt(couponPeriod?.all_success)} / ${fmtInt(
couponPeriod?.started,
)} 次。点位成功口径含「今日已领过」。`}
/>
<StatCard
title="点位成功率"
+1 -6
View File
@@ -443,15 +443,13 @@ export interface AuditLog {
// ===== 比价记录(admin debug 页)=====
export interface ComparisonRecordListItem {
id: number;
user_id: number | null; // 软鉴权/匿名下帧0 建行时可能暂缺,admin 全看含孤儿行
user_id: number;
phone: string | null;
nickname: string | null;
business_type: string;
trace_id: string;
trace_url: string | null;
status: string;
admin_status: string; // admin 展示口径:success/failed/cancelled/running
outcome_hint: string | null; // 有缺失的成功提示(未找到店/未满起送...);null=无缺失
information: string | null;
store_name: string | null;
product_names: string | null; // 下单商品名派生串(顿号分隔),「商品」列展示
@@ -520,7 +518,6 @@ export interface ComparisonRecordDetail extends ComparisonRecordListItem {
skipped_dish_count: number | null;
device_id: string | null;
items: { name: string; qty?: number; specs?: string[] }[];
platforms: Record<string, unknown>[];
comparison_results: Record<string, unknown>[];
skipped_dish_names: string[];
device_manufacturer: string | null;
@@ -709,8 +706,6 @@ export interface DashboardOverview {
// 点位=一张券;成功口径 success+already_claimed;点位成功率分母=发起数×应领点位数(未跑到视为失败)。
coupon?: {
started: number;
abandoned: number;
success_denominator: number;
all_success: number; // 全部点位领成功的完成场次数
success_rate: number | null;
point_success: number;