Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7269e27e24 | |||
| e3ab28addc | |||
| d5acf3d1e1 | |||
| 26e468766b | |||
| 03d1003c3c | |||
| 557348bd6b | |||
| bc677817e4 | |||
| 33c80d6927 | |||
| b1bdb66a76 | |||
| c905e15ec9 | |||
| dd84d771f9 |
@@ -0,0 +1,101 @@
|
||||
# 点位成功率改为「按券成功率的算术平均」设计
|
||||
|
||||
- **日期**:2026-07-11
|
||||
- **范围**:纯前端 `shaguabijia-admin-web`,**后端零改动、零 schema 改动、零迁移**
|
||||
- **涉及文件**:`src/app/(main)/coupon-data/page.tsx`(单文件)
|
||||
|
||||
## 目标
|
||||
|
||||
「领券数据」看板汇总卡里的 **分平台点位成功率**(美团/淘宝/京东)与 **点位成功率(合计)**,改为
|
||||
**该平台(/全部)几张券成功率的算术平均**,让平台数字与下方「按券明细」自洽,便于快速揪出坏券。
|
||||
|
||||
## 背景
|
||||
|
||||
现状:分平台 / 合计点位成功率来自后端 `_success_rates`(**会话口径**,数据源 `coupon_session.platform_success`),
|
||||
与页面下方「按券成功率」(数据源 `coupon_claim_record`)口径不同,导致同一平台的平台数(如淘宝 71.4%)
|
||||
与其券明细(100%/80%/80%)对不上,甚至出现「合计低于每个平台」的反直觉现象。
|
||||
|
||||
关键点:**本页已经把全量按券数据拉到前端**——`couponSlots`(来自 `/admin/api/coupon-data/coupons`,
|
||||
后端 `coupon_slot_report` 不分页、返回全量),每行含 `platform` 与 `success_rate`。因此直接在前端
|
||||
对其求算术平均即可,**无需后端改动**。
|
||||
|
||||
## 口径(改动后)
|
||||
|
||||
- **分平台点位成功率** = 该平台所有券 `success_rate` 的算术平均(每张券等权;`success_rate` 为空的券跳过;无券 → 显示 `-`)。
|
||||
- **点位成功率(合计)** = `couponSlots` 全部券 `success_rate` 的算术平均。
|
||||
- **每张券成功率**(按券明细,不变):成功(success + already_claimed) ÷ 尝试(+ failed),skipped 排除(后端 `coupon_slot_report`)。
|
||||
|
||||
例:淘宝三张券 100% / 80% / 80% → 淘宝点位 = (100+80+80)/3 = **86.7%**。
|
||||
|
||||
## 不改(其他保持不变)
|
||||
|
||||
- **后端**:`coupon_slot_report` / `_success_rates` / `CouponDataSummary` schema 全不动。
|
||||
`summary.per_platform`、`summary.point_success_rate` 仍会返回(会话口径),只是前端这两处不再引用它们(留着不删,接口稳定)。
|
||||
- **整单成功率**:会话口径不变。
|
||||
- **按券明细表**:排序、列等不动。
|
||||
- **筛选联动**:整单 / 发起 / 完成 / 耗时仍随「用户 / 状态 / 日期 / 环境」全部筛选;
|
||||
点位随 `couponSlots` 走(= 日期 + 环境,不随「用户 / 状态」搜索变——与按券表现状一致)。
|
||||
|
||||
## 实现(单文件 `page.tsx`)
|
||||
|
||||
### 1. 加一个求均值 helper(放 `fmtPct` 附近)
|
||||
|
||||
```ts
|
||||
// 一组按券行的 success_rate 算术平均;无有效券 → null(显示 -)
|
||||
const slotRateMean = (rows: CouponSlotRow[]): number | null => {
|
||||
const rates = rows
|
||||
.map((r) => r.success_rate)
|
||||
.filter((v): v is number => v != null);
|
||||
return rates.length ? rates.reduce((a, b) => a + b, 0) / rates.length : null;
|
||||
};
|
||||
```
|
||||
|
||||
### 2. 合计:改 value
|
||||
|
||||
把
|
||||
```tsx
|
||||
value={fmtPct(summary.point_success_rate)}
|
||||
```
|
||||
改成
|
||||
```tsx
|
||||
value={fmtPct(slotRateMean(couponSlots))}
|
||||
```
|
||||
|
||||
### 3. 分平台卡:改 rate 来源
|
||||
|
||||
把每个平台卡里的
|
||||
```tsx
|
||||
const rate = summary.per_platform?.[pid];
|
||||
```
|
||||
改成
|
||||
```tsx
|
||||
const rate = slotRateMean(couponSlots.filter((r) => r.platform === pid));
|
||||
```
|
||||
|
||||
### 4. 更新口径 tooltip 文案
|
||||
|
||||
`POINT_RATE_HINT` 改成(去掉旧的会话口径描述):
|
||||
```ts
|
||||
const POINT_RATE_HINT =
|
||||
'点位成功率(合计):当前区间内全部券成功率的算术平均(每张券等权);' +
|
||||
'单券成功率=成功(含已领)÷尝试(不含跳过),源自领券每券记录。';
|
||||
```
|
||||
分平台卡标题(`${SLOT_PLATFORM[pid]}点位成功率`)如需补口径,注明「该平台各券成功率的算术平均」。
|
||||
|
||||
## 边角 / 注意
|
||||
|
||||
- **精度**:`success_rate` 后端已 round 到 4 位,前端再平均,展示只到 1 位小数(`fmtPct`),误差可忽略。
|
||||
- **依赖按券请求**:点位现在依赖 `couponSlots`(独立请求,失败时 `setCouponSlots([])`)。若该请求失败,点位卡显示 `-`(优雅降级)。此前它来自主 `summary` 请求。
|
||||
- **platform=null 的券**:coupon_id 前缀无法识别的券(实践中 pricebot 都是 `mt_`/`tb_`/`ele_`/`elm_`/`jd_`,基本不出现)会计入 **合计**、但不在任何分平台卡里。可接受。
|
||||
|
||||
## 验证
|
||||
|
||||
- **手动**:选一天,展开某平台「查看明细」,核对该平台卡数字 = 明细表各券成功率的算术平均;合计 = 全部券的算术平均。
|
||||
- `npx tsc --noEmit` 通过;`npm run lint` 无新增 error。
|
||||
|
||||
## 不做(YAGNI)
|
||||
|
||||
- 最小尝试数阈值 / 低量券滤噪 / 坏券标红。
|
||||
- 按券表默认升序(坏券置顶)。
|
||||
- 「数据大盘」overview 的领券点位成功率(另一页、另一口径)。
|
||||
- 删除后端已不再被前端使用的 `per_platform` / `point_success_rate` 字段。
|
||||
@@ -490,7 +490,7 @@ export default function AdRevenueReportPage() {
|
||||
|
||||
// 派生指标(全部基于全量 total_* 字段,不受分页影响,准):
|
||||
// 发奖成本(元)= 实发金币÷汇率;预估毛利 = 收益−发奖成本;发奖占收益比 = 发奖成本÷收益;
|
||||
// 应发实发差额(金币)= 应发−实发(正=少发/负=多发);ARPU = 预估收益÷今日DAU(仅今日)。
|
||||
// 应发实发差额(金币)= 应发−实发(正=少发/负=多发);ARPU = 区间预估收益÷区间活跃用户(见 dau)。
|
||||
const derived = data
|
||||
? {
|
||||
payoutYuan: data.total_actual_coin / COIN_PER_YUAN,
|
||||
@@ -500,11 +500,23 @@ export default function AdRevenueReportPage() {
|
||||
? (data.total_actual_coin / COIN_PER_YUAN / data.total_revenue_yuan) * 100
|
||||
: null,
|
||||
coinGap: data.total_expected_coin - data.total_actual_coin,
|
||||
// ARPU(今日)= 预估广告收益 ÷ 今日 DAU;dau 为 null(历史/多天)或 0 时不可算 → null,前端显示「-」。
|
||||
// ARPU = 区间预估广告收益 ÷ 区间去重活跃用户(dau,口径同数据大盘);dau 为 0 时不可算 → null,显示「-」。
|
||||
arpu: data.dau && data.dau > 0 ? data.total_revenue_yuan / data.dau : null,
|
||||
}
|
||||
: null;
|
||||
|
||||
// DAU / ARPU 的统计区间 = 本次查询的 date_from~date_to(后端 period_active_dau 同口径按此区间算);
|
||||
// 今日单天特殊标注「今日」,便于「今日 / 近 7 天 / 近 30 天」三个时段分别看 ARPU。
|
||||
const dauRangeIsToday =
|
||||
!!data && data.date_from === data.date_to && data.date_to === dayjs().format('YYYY-MM-DD');
|
||||
const dauRangeLabel = !data
|
||||
? ''
|
||||
: data.date_from === data.date_to
|
||||
? dauRangeIsToday
|
||||
? '今日'
|
||||
: data.date_from
|
||||
: `${data.date_from} ~ ${data.date_to}`;
|
||||
|
||||
// 第二行大盘「分广告类型」:draw / 激励视频 各自 收益 / eCPM / 展示条数;eCPM = 收益÷展示×1000。
|
||||
const drawStat = data?.type_stats?.draw;
|
||||
const rvStat = data?.type_stats?.reward_video;
|
||||
@@ -657,7 +669,7 @@ export default function AdRevenueReportPage() {
|
||||
<Card size="small" style={{ marginBottom: 16 }}>
|
||||
<Divider orientation="left" plain style={{ marginTop: 0, marginBottom: 16 }}>
|
||||
<Typography.Text type="secondary" style={{ fontSize: 12 }}>
|
||||
核心指标
|
||||
核心指标{dauRangeLabel ? ` · 统计区间 ${dauRangeLabel}` : ''}
|
||||
</Typography.Text>
|
||||
</Divider>
|
||||
<Row gutter={[16, 12]}>
|
||||
@@ -667,9 +679,11 @@ export default function AdRevenueReportPage() {
|
||||
<Col flex="1 1 0">
|
||||
<Statistic
|
||||
title={
|
||||
<Tooltip title="每活跃用户广告预估收入 = 预估收益 ÷ 今日 DAU;DAU 仅今日口径,历史/多天显示 -">
|
||||
<Tooltip
|
||||
title={`每活跃用户广告预估收入 = 区间预估收益 ÷ 区间去重活跃用户(口径同数据大盘)。统计区间:${dauRangeLabel || '—'}`}
|
||||
>
|
||||
<span>
|
||||
ARPU(今日)
|
||||
{dauRangeIsToday ? 'ARPU(今日)' : 'ARPU'}
|
||||
<InfoCircleOutlined style={{ marginLeft: 4 }} />
|
||||
</span>
|
||||
</Tooltip>
|
||||
@@ -681,9 +695,11 @@ export default function AdRevenueReportPage() {
|
||||
<Col flex="1 1 0">
|
||||
<Statistic
|
||||
title={
|
||||
<Tooltip title="今日活跃用户(复用大盘口径 last_login_at = 今日登录过);仅查询=今日时有值,历史/多天显示 -">
|
||||
<Tooltip
|
||||
title={`区间去重活跃用户,口径同数据大盘:登录 + 开始比价 + 开始领券,按用户去重。全局口径,不随用户/类型/场景/应用筛选变化。统计区间:${dauRangeLabel || '—'}`}
|
||||
>
|
||||
<span>
|
||||
今日活跃 DAU
|
||||
{dauRangeIsToday ? '今日活跃 DAU' : '活跃用户'}
|
||||
<InfoCircleOutlined style={{ marginLeft: 4 }} />
|
||||
</span>
|
||||
</Tooltip>
|
||||
|
||||
@@ -22,6 +22,10 @@ function genPassword(len = 10): string {
|
||||
|
||||
type View = 'list' | 'person' | 'roles' | 'roleForm';
|
||||
|
||||
// 「自定义」哨兵角色:不是共享角色,选它时可见页由本人逐页勾选(存 pages_override),与后端一致。
|
||||
const CUSTOM_ROLE = 'custom';
|
||||
const CUSTOM_LABEL = '自定义';
|
||||
|
||||
// ===== 只读权限矩阵:角色详情 / 人员「可见页面」预览共用(深色=有,灰色=无)=====
|
||||
function PermMatrix({ catalog, pages }: { catalog: PermissionGroup[]; pages: string[] }) {
|
||||
const has = useMemo(() => new Set(pages), [pages]);
|
||||
@@ -109,6 +113,11 @@ export default function AdminsPage() {
|
||||
return m;
|
||||
}, [roles]);
|
||||
const roleOptions = roles.map((r) => ({ value: r.name, label: r.label }));
|
||||
// 人员表单角色下拉:真实角色 + 末尾「自定义」。选「自定义」→ 下方可见页改为逐页勾选。
|
||||
const personRoleOptions = [...roleOptions, { value: CUSTOM_ROLE, label: CUSTOM_LABEL }];
|
||||
// 角色 key → 展示名(custom 显示「自定义」;查不到回退 key 原文)
|
||||
const roleLabelOf = (name: string) =>
|
||||
(name === CUSTOM_ROLE ? CUSTOM_LABEL : roleByName[name]?.label ?? name);
|
||||
|
||||
const loadAll = async () => {
|
||||
setLoading(true);
|
||||
@@ -134,11 +143,14 @@ export default function AdminsPage() {
|
||||
const [personName, setPersonName] = useState('');
|
||||
const [personRole, setPersonRole] = useState('');
|
||||
const [initPw, setInitPw] = useState('');
|
||||
// 「自定义」角色时逐页勾选的可见页集(role==custom 才用到)
|
||||
const [personPages, setPersonPages] = useState<string[]>([]);
|
||||
|
||||
const openCreatePerson = () => {
|
||||
setPersonEditing(null);
|
||||
setPersonName('');
|
||||
setPersonRole(roles.find((r) => !r.is_builtin)?.name ?? roles[0]?.name ?? 'operator');
|
||||
setPersonPages([]);
|
||||
setInitPw(genPassword());
|
||||
setView('person');
|
||||
};
|
||||
@@ -146,6 +158,8 @@ export default function AdminsPage() {
|
||||
setPersonEditing(a);
|
||||
setPersonName(a.username);
|
||||
setPersonRole(a.role);
|
||||
// 编辑「自定义」用户时,回填其已勾选的可见页(供继续增删)
|
||||
setPersonPages(a.role === CUSTOM_ROLE ? (a.pages_override ?? []) : []);
|
||||
setInitPw(''); // 编辑态密码只读展示 a.password(已确定的登录密码),不用 initPw
|
||||
setView('person');
|
||||
};
|
||||
@@ -160,18 +174,30 @@ export default function AdminsPage() {
|
||||
<Button onClick={() => copyText(value)}>复制</Button>
|
||||
</div>
|
||||
);
|
||||
const isCustom = personRole === CUSTOM_ROLE;
|
||||
const submitPerson = async () => {
|
||||
if (isCustom && personPages.length === 0) { message.error('自定义角色请至少勾选一个可见页面'); return; }
|
||||
try {
|
||||
if (personEditing) {
|
||||
// 密码只读、不改;只提交变更的角色
|
||||
if (personRole !== personEditing.role) {
|
||||
await api.patch(`/admin/api/admins/${personEditing.id}`, { role: personRole });
|
||||
// 密码只读、不改;提交变更的角色 +(自定义时)勾选的可见页
|
||||
const roleChanged = personRole !== personEditing.role;
|
||||
const pagesChanged = isCustom
|
||||
&& JSON.stringify(personPages) !== JSON.stringify(personEditing.pages_override ?? []);
|
||||
if (roleChanged || pagesChanged) {
|
||||
const payload: Record<string, unknown> = {};
|
||||
if (roleChanged) payload.role = personRole;
|
||||
// 自定义:带上勾选集(切到 custom 或改现有 custom 勾选都要);切回普通角色不带,后端会清空 override
|
||||
if (isCustom) payload.pages_override = personPages;
|
||||
await api.patch(`/admin/api/admins/${personEditing.id}`, payload);
|
||||
}
|
||||
message.success('已保存');
|
||||
} else {
|
||||
if (personName.trim().length < 3) { message.error('用户名至少 3 位'); return; }
|
||||
await api.post('/admin/api/admins', {
|
||||
username: personName.trim(), password: initPw, role: personRole,
|
||||
username: personName.trim(),
|
||||
password: initPw,
|
||||
role: personRole,
|
||||
...(isCustom ? { pages_override: personPages } : {}),
|
||||
});
|
||||
message.success('已创建,请把初始密码转交本人');
|
||||
}
|
||||
@@ -184,8 +210,10 @@ export default function AdminsPage() {
|
||||
// ===== 列表操作 =====
|
||||
const changeRole = (a: AdminInfo, role: string) => {
|
||||
if (role === a.role) return;
|
||||
// 改成「自定义」需要逐页勾选 → 转去编辑页(列表里没有页选择器,直接切会得到空可见页)
|
||||
if (role === CUSTOM_ROLE) { openEditPerson({ ...a, role: CUSTOM_ROLE }); return; }
|
||||
modal.confirm({
|
||||
title: `把 ${a.username} 的角色改为 ${role}?`,
|
||||
title: `把 ${a.username} 的角色改为 ${roleLabelOf(role)}?`,
|
||||
onOk: async () => {
|
||||
try { await api.patch(`/admin/api/admins/${a.id}`, { role }); message.success('已更新'); loadAll(); }
|
||||
catch (e) { message.error(errMsg(e)); }
|
||||
@@ -266,8 +294,9 @@ export default function AdminsPage() {
|
||||
{ title: '用户名', dataIndex: 'username' },
|
||||
{
|
||||
title: '角色', dataIndex: 'role', width: 170,
|
||||
// options 含「自定义」→ custom 用户在列表里显示为「自定义」;选它会转去编辑页勾选(见 changeRole)
|
||||
render: (r: string, a: AdminInfo) => (
|
||||
<Select size="small" value={r} style={{ width: 150 }} options={roleOptions} onChange={(v) => changeRole(a, v)} />
|
||||
<Select size="small" value={r} style={{ width: 150 }} options={personRoleOptions} onChange={(v) => changeRole(a, v)} />
|
||||
),
|
||||
},
|
||||
{ title: '状态', dataIndex: 'status', width: 90, render: (s: string) => <Tag color={s === 'active' ? 'green' : 'default'}>{s === 'active' ? 'active' : '已禁用'}</Tag> },
|
||||
@@ -341,16 +370,26 @@ export default function AdminsPage() {
|
||||
<span>选择角色<span style={{ color: '#cf1322' }}> *</span></span>
|
||||
{isSuper && <a onClick={openRoles}>设置角色权限 ›</a>}
|
||||
</div>
|
||||
<Select value={personRole} options={roleOptions} onChange={setPersonRole} style={{ width: '100%' }} />
|
||||
<div style={{ color: '#999', fontSize: 12, marginTop: 6 }}>可见页面完全由所选角色决定;如需调整请到「角色设置」修改该角色</div>
|
||||
<Select value={personRole} options={personRoleOptions} onChange={setPersonRole} style={{ width: '100%' }} />
|
||||
<div style={{ color: '#999', fontSize: 12, marginTop: 6 }}>
|
||||
{isCustom
|
||||
? '「自定义」:下方逐页勾选该成员可见的页面,仅对本人生效(不影响任何角色)'
|
||||
: '可见页面完全由所选角色决定;如需调整请到「角色设置」修改该角色'}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: 8 }}>
|
||||
<span>可见页面</span>
|
||||
<span style={{ color: '#999', fontSize: 12 }}>跟随所选角色,此处只读(深色=可见)</span>
|
||||
<span style={{ color: '#999', fontSize: 12 }}>
|
||||
{isCustom ? '勾选本成员可见的页面' : '跟随所选角色,此处只读(深色=可见)'}
|
||||
</span>
|
||||
</div>
|
||||
<PermMatrix catalog={catalog} pages={personRole === 'super_admin' ? catalog.flatMap((g) => g.pages.map((p) => p.key)) : rolePagesPreview} />
|
||||
{isCustom ? (
|
||||
<PermEditor catalog={catalog} value={personPages} onChange={setPersonPages} />
|
||||
) : (
|
||||
<PermMatrix catalog={catalog} pages={personRole === 'super_admin' ? catalog.flatMap((g) => g.pages.map((p) => p.key)) : rolePagesPreview} />
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div style={{ marginTop: 24, textAlign: 'right' }}>
|
||||
|
||||
@@ -0,0 +1,350 @@
|
||||
'use client';
|
||||
|
||||
// 埋点 / 上报成功率大盘:度量客户端埋点数据可信度,两段漏斗两个大率。
|
||||
// 数据源 analytics_selfstat 快照差分(与埋点日志表无关);三个只读端点在 admin 服务(8771)。
|
||||
// 时区:端点吃 UTC 时刻(见 toUtcRange);trend.day 已是北京日,直接展示不再换算。
|
||||
import { useCallback, useEffect, useMemo, useState } from 'react';
|
||||
import dynamic from 'next/dynamic';
|
||||
import type { ColumnsType } from 'antd/es/table';
|
||||
import {
|
||||
App,
|
||||
Button,
|
||||
Card,
|
||||
Col,
|
||||
DatePicker,
|
||||
Empty,
|
||||
Row,
|
||||
Segmented,
|
||||
Space,
|
||||
Statistic,
|
||||
Table,
|
||||
Tag,
|
||||
Tooltip,
|
||||
Typography,
|
||||
} from 'antd';
|
||||
import { InfoCircleOutlined, ReloadOutlined } from '@ant-design/icons';
|
||||
import dayjs, { type Dayjs } from 'dayjs';
|
||||
import utc from 'dayjs/plugin/utc';
|
||||
import timezone from 'dayjs/plugin/timezone';
|
||||
import { api, errMsg } from '@/lib/api';
|
||||
import type { HealthBreakdownRow, HealthMetrics, HealthTrendPoint } from '@/lib/types';
|
||||
|
||||
dayjs.extend(utc);
|
||||
dayjs.extend(timezone);
|
||||
const CN = 'Asia/Shanghai';
|
||||
|
||||
// @ant-design/plots 依赖 DOM,关掉 SSR 仅客户端渲染(否则 Next 预渲染报 document undefined)。
|
||||
// 用仓内 v2 写法(colorField/scale/axis/interaction),非指南里的 v1(seriesField/yAxis)。
|
||||
const Line = dynamic(() => import('@ant-design/plots').then((m) => m.Line), { ssr: false });
|
||||
|
||||
const { RangePicker } = DatePicker;
|
||||
type Dim = 'event' | 'app_ver' | 'oem';
|
||||
const DIM_LABEL: Record<Dim, string> = { event: '事件', app_ver: '版本', oem: 'ROM' };
|
||||
const LOW = 0.9; // 成功率低于此阈值标红(定位掉数据最狠的点位/版本/ROM)
|
||||
|
||||
// 北京日范围 → UTC ISO 瞬时(右开区间;date_to = 结束日 +1 天的北京零点)。
|
||||
// 端点按 UTC 时刻比较 created_at,直接传 YYYY-MM-DD 会被当 UTC 零点,与北京日差 8 小时。
|
||||
function toUtcRange(start: Dayjs, end: Dayjs) {
|
||||
return {
|
||||
date_from: dayjs.tz(start.format('YYYY-MM-DD'), CN).utc().toISOString(),
|
||||
date_to: dayjs.tz(end.add(1, 'day').format('YYYY-MM-DD'), CN).utc().toISOString(),
|
||||
};
|
||||
}
|
||||
|
||||
// 率:null → "-"(分母为 0 ≠ 0%);否则百分比一位小数。
|
||||
const pct = (v: number | null | undefined) => (v == null ? '-' : `${(v * 100).toFixed(1)}%`);
|
||||
const int = (v: number | null | undefined) =>
|
||||
v == null ? '-' : new Intl.NumberFormat('zh-CN').format(v);
|
||||
|
||||
// 四原子计数说明(总览卡标题 + 下钻表头 tooltip 共用,一处改两处同步)。
|
||||
const METRIC_TIP = {
|
||||
attempted: '端上 track() 被调用的次数,是埋点段分母。埋点成功率 =(attempted − drop_capture)/ attempted。',
|
||||
drop_capture: '采集环节因异常(队列满 / 序列化失败等)被丢弃、未能落地的事件数,计入埋点失败。',
|
||||
delivered: '成功送达并入库后端的事件数。上报成功率 = delivered /(delivered + drop_undelivered)。',
|
||||
drop_undelivered:
|
||||
'已落盘但久未送达、被队列淘汰的事件数(弱网 / 被 ROM 杀后台等);在途未送达的不计入。',
|
||||
} as const;
|
||||
|
||||
// 标题/表头后跟一个说明图标(hover 出 tooltip)。
|
||||
const withTip = (label: string, tip: string) => (
|
||||
<Space size={4}>
|
||||
{label}
|
||||
<Tooltip title={tip}>
|
||||
<InfoCircleOutlined style={{ color: '#bfbfbf', cursor: 'help' }} />
|
||||
</Tooltip>
|
||||
</Space>
|
||||
);
|
||||
|
||||
// 大率卡:率偏低标红 + 「偏低」标。
|
||||
function RateStat({
|
||||
title,
|
||||
value,
|
||||
loading,
|
||||
}: {
|
||||
title: string;
|
||||
value: number | null | undefined;
|
||||
loading: boolean;
|
||||
}) {
|
||||
const low = value != null && value < LOW;
|
||||
return (
|
||||
<Card loading={loading}>
|
||||
<Statistic
|
||||
title={
|
||||
<Space size={6}>
|
||||
{title}
|
||||
{low && <Tag color="error">偏低</Tag>}
|
||||
</Space>
|
||||
}
|
||||
value={value == null ? '-' : (value * 100).toFixed(1)}
|
||||
suffix={value == null ? undefined : '%'}
|
||||
valueStyle={low ? { color: '#cf1322' } : undefined}
|
||||
/>
|
||||
</Card>
|
||||
);
|
||||
}
|
||||
|
||||
// 原子量卡(attempted / drop_capture / delivered / drop_undelivered)。
|
||||
function CountStat({
|
||||
title,
|
||||
value,
|
||||
loading,
|
||||
warn,
|
||||
tip,
|
||||
}: {
|
||||
title: string;
|
||||
value: number | null | undefined;
|
||||
loading: boolean;
|
||||
warn?: boolean; // drop_* > 0 时橙色提示
|
||||
tip?: string;
|
||||
}) {
|
||||
const bad = warn && value != null && value > 0;
|
||||
return (
|
||||
<Card loading={loading}>
|
||||
<Statistic
|
||||
title={tip ? withTip(title, tip) : title}
|
||||
value={value == null ? '-' : value}
|
||||
valueStyle={bad ? { color: '#d46b08' } : undefined}
|
||||
/>
|
||||
</Card>
|
||||
);
|
||||
}
|
||||
|
||||
export default function AnalyticsHealthPage() {
|
||||
const { message } = App.useApp();
|
||||
const [range, setRange] = useState<[Dayjs, Dayjs]>([
|
||||
dayjs().tz(CN).subtract(6, 'day'),
|
||||
dayjs().tz(CN),
|
||||
]);
|
||||
const [dim, setDim] = useState<Dim>('event');
|
||||
const [overview, setOverview] = useState<HealthMetrics | null>(null);
|
||||
const [trend, setTrend] = useState<HealthTrendPoint[]>([]);
|
||||
const [rows, setRows] = useState<HealthBreakdownRow[]>([]);
|
||||
const [loading, setLoading] = useState(false); // 总览 + 趋势
|
||||
const [rowsLoading, setRowsLoading] = useState(false); // 下钻表
|
||||
const [updatedAt, setUpdatedAt] = useState<string | null>(null);
|
||||
|
||||
// 总览 + 趋势:只随区间变。
|
||||
const loadMain = useCallback(async () => {
|
||||
const params = toUtcRange(range[0], range[1]);
|
||||
setLoading(true);
|
||||
try {
|
||||
const [ov, tr] = await Promise.all([
|
||||
api.get<HealthMetrics>('/admin/api/analytics-health/overview', { params }),
|
||||
api.get<HealthTrendPoint[]>('/admin/api/analytics-health/trend', { params }),
|
||||
]);
|
||||
setOverview(ov.data);
|
||||
setTrend(tr.data);
|
||||
setUpdatedAt(dayjs().tz(CN).format('YYYY-MM-DD HH:mm'));
|
||||
} catch (e) {
|
||||
message.error(errMsg(e, '加载成功率数据失败'));
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
}, [range, message]);
|
||||
|
||||
// 下钻表:随区间或维度变(切 dim 只重拉表,不动总览/趋势)。
|
||||
const loadRows = useCallback(async () => {
|
||||
const params = toUtcRange(range[0], range[1]);
|
||||
setRowsLoading(true);
|
||||
try {
|
||||
const bd = await api.get<HealthBreakdownRow[]>('/admin/api/analytics-health/breakdown', {
|
||||
params: { ...params, dim },
|
||||
});
|
||||
setRows(bd.data);
|
||||
} catch (e) {
|
||||
message.error(errMsg(e, '加载下钻数据失败'));
|
||||
} finally {
|
||||
setRowsLoading(false);
|
||||
}
|
||||
}, [range, dim, message]);
|
||||
|
||||
useEffect(() => {
|
||||
void loadMain();
|
||||
}, [loadMain]);
|
||||
useEffect(() => {
|
||||
void loadRows();
|
||||
}, [loadRows]);
|
||||
|
||||
const refresh = () => {
|
||||
void loadMain();
|
||||
void loadRows();
|
||||
};
|
||||
|
||||
// 折线长表:每天 ×{埋点率, 上报率}。保留 rate=null 的点(不 filter)→ G2 在断点处断线,
|
||||
// 真正实现「null 点跳过不连线」;若 filter 掉 null 会把两侧点连成一条误导直线。
|
||||
const trendLong = useMemo(
|
||||
() =>
|
||||
trend.flatMap((p) => [
|
||||
{ day: p.day, metric: '埋点成功率', rate: p.track_success_rate },
|
||||
{ day: p.day, metric: '上报成功率', rate: p.report_success_rate },
|
||||
]),
|
||||
[trend],
|
||||
);
|
||||
|
||||
const chartConfig = {
|
||||
data: trendLong,
|
||||
xField: 'day',
|
||||
yField: 'rate',
|
||||
colorField: 'metric',
|
||||
height: 300,
|
||||
scale: {
|
||||
y: { domainMin: 0, domainMax: 1, nice: false },
|
||||
color: { range: ['#1677ff', '#fa8c16'] }, // 埋点率蓝 / 上报率橙(按长表首次出现序)
|
||||
},
|
||||
axis: { y: { labelFormatter: (v: number) => `${(v * 100).toFixed(0)}%` } },
|
||||
point: { style: { r: 3 } },
|
||||
legend: { color: { position: 'top' as const } },
|
||||
tooltip: { items: [{ channel: 'y' as const, valueFormatter: (v: number) => pct(v) }] },
|
||||
interaction: { tooltip: { shared: true } },
|
||||
};
|
||||
|
||||
const columns: ColumnsType<HealthBreakdownRow> = [
|
||||
{ title: DIM_LABEL[dim], dataIndex: 'key', key: 'key', render: (v: string) => v || '(unknown)' },
|
||||
{
|
||||
title: '埋点成功率',
|
||||
key: 'track',
|
||||
width: 110,
|
||||
align: 'right',
|
||||
render: (_: unknown, r: HealthBreakdownRow) => (
|
||||
<span style={r.track_success_rate != null && r.track_success_rate < LOW ? { color: '#cf1322', fontWeight: 600 } : undefined}>
|
||||
{pct(r.track_success_rate)}
|
||||
</span>
|
||||
),
|
||||
},
|
||||
{
|
||||
title: '上报成功率',
|
||||
key: 'report',
|
||||
width: 110,
|
||||
align: 'right',
|
||||
render: (_: unknown, r: HealthBreakdownRow) => (
|
||||
<span style={r.report_success_rate != null && r.report_success_rate < LOW ? { color: '#cf1322', fontWeight: 600 } : undefined}>
|
||||
{pct(r.report_success_rate)}
|
||||
</span>
|
||||
),
|
||||
},
|
||||
{ title: withTip('尝试总数', METRIC_TIP.attempted), dataIndex: 'attempted', key: 'attempted', width: 120, align: 'right', render: (v: number) => int(v) },
|
||||
{ title: withTip('采集丢弃', METRIC_TIP.drop_capture), dataIndex: 'drop_capture', key: 'drop_capture', width: 128, align: 'right', render: (v: number) => int(v) },
|
||||
{ title: withTip('送达', METRIC_TIP.delivered), dataIndex: 'delivered', key: 'delivered', width: 108, align: 'right', render: (v: number) => int(v) },
|
||||
{ title: withTip('淘汰未送达', METRIC_TIP.drop_undelivered), dataIndex: 'drop_undelivered', key: 'drop_undelivered', width: 150, align: 'right', render: (v: number) => int(v) },
|
||||
];
|
||||
|
||||
return (
|
||||
<div>
|
||||
<div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', flexWrap: 'wrap', gap: 12, marginBottom: 16 }}>
|
||||
<Space align="center">
|
||||
<h2 style={{ margin: 0 }}>埋点成功率</h2>
|
||||
<Typography.Text type="secondary" style={{ fontSize: 12 }}>
|
||||
端上埋点/上报可信度;数据分钟级延迟,非实时
|
||||
</Typography.Text>
|
||||
</Space>
|
||||
<Space align="center">
|
||||
{updatedAt && (
|
||||
<Typography.Text type="secondary" style={{ fontSize: 12 }}>
|
||||
数据更新于 {updatedAt}
|
||||
</Typography.Text>
|
||||
)}
|
||||
<Button icon={<ReloadOutlined />} onClick={refresh} loading={loading || rowsLoading}>
|
||||
刷新
|
||||
</Button>
|
||||
</Space>
|
||||
</div>
|
||||
|
||||
<Card size="small" style={{ marginBottom: 16 }}>
|
||||
<Space size={6} align="center">
|
||||
<Typography.Text type="secondary">日期(北京)</Typography.Text>
|
||||
<RangePicker
|
||||
value={range}
|
||||
onChange={(v) => v && v[0] && v[1] && setRange([v[0], v[1]])}
|
||||
allowClear={false}
|
||||
presets={[
|
||||
{ label: '今天', value: [dayjs().tz(CN), dayjs().tz(CN)] },
|
||||
{ label: '近 7 天', value: [dayjs().tz(CN).subtract(6, 'day'), dayjs().tz(CN)] },
|
||||
{ label: '近 30 天', value: [dayjs().tz(CN).subtract(29, 'day'), dayjs().tz(CN)] },
|
||||
]}
|
||||
/>
|
||||
</Space>
|
||||
</Card>
|
||||
|
||||
{/* 总览:两大率居前,四原子量次之 */}
|
||||
<Row gutter={[16, 16]} style={{ marginBottom: 16 }}>
|
||||
<Col xs={24} sm={12}>
|
||||
<RateStat title="埋点成功率" value={overview?.track_success_rate} loading={loading} />
|
||||
</Col>
|
||||
<Col xs={24} sm={12}>
|
||||
<RateStat title="上报成功率" value={overview?.report_success_rate} loading={loading} />
|
||||
</Col>
|
||||
</Row>
|
||||
<Row gutter={[16, 16]} style={{ marginBottom: 16 }}>
|
||||
<Col xs={12} sm={6}>
|
||||
<CountStat title="尝试总数 attempted" value={overview?.attempted} loading={loading} tip={METRIC_TIP.attempted} />
|
||||
</Col>
|
||||
<Col xs={12} sm={6}>
|
||||
<CountStat title="采集丢弃 drop_capture" value={overview?.drop_capture} loading={loading} warn tip={METRIC_TIP.drop_capture} />
|
||||
</Col>
|
||||
<Col xs={12} sm={6}>
|
||||
<CountStat title="送达 delivered" value={overview?.delivered} loading={loading} tip={METRIC_TIP.delivered} />
|
||||
</Col>
|
||||
<Col xs={12} sm={6}>
|
||||
<CountStat title="淘汰未送达 drop_undelivered" value={overview?.drop_undelivered} loading={loading} warn tip={METRIC_TIP.drop_undelivered} />
|
||||
</Col>
|
||||
</Row>
|
||||
|
||||
{/* 趋势:两条率折线,Y 轴锁 [0,1] 显示百分比,null 断线 */}
|
||||
<Card title="按天趋势(北京时间)" size="small" style={{ marginBottom: 16 }}>
|
||||
{trendLong.length > 0 ? (
|
||||
<Line {...chartConfig} />
|
||||
) : (
|
||||
<Empty style={{ padding: '60px 0' }} description={loading ? '加载中…' : '该区间暂无埋点数据'} />
|
||||
)}
|
||||
</Card>
|
||||
|
||||
{/* 下钻:后端已按上报率升序(最差在前),率 < 90% 标红 */}
|
||||
<Card
|
||||
title="维度下钻(按上报成功率升序,最差在前)"
|
||||
size="small"
|
||||
extra={
|
||||
<Segmented
|
||||
value={dim}
|
||||
onChange={(v) => setDim(v as Dim)}
|
||||
options={[
|
||||
{ label: '按事件', value: 'event' },
|
||||
{ label: '按版本', value: 'app_ver' },
|
||||
{ label: '按 ROM', value: 'oem' },
|
||||
]}
|
||||
/>
|
||||
}
|
||||
>
|
||||
<Table<HealthBreakdownRow>
|
||||
rowKey="key"
|
||||
dataSource={rows}
|
||||
columns={columns}
|
||||
loading={rowsLoading}
|
||||
pagination={false}
|
||||
size="small"
|
||||
scroll={{ x: 820 }}
|
||||
locale={{ emptyText: rowsLoading ? '加载中…' : '该区间暂无数据' }}
|
||||
/>
|
||||
</Card>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -184,6 +184,18 @@ export default function ComparisonRecordsPage() {
|
||||
<b style={{ color: r.saved_amount_cents > 0 ? '#3f8600' : '#999' }}>{yuan(r.saved_amount_cents)}</b>
|
||||
),
|
||||
},
|
||||
{
|
||||
title: '广告收益',
|
||||
key: 'ad_revenue',
|
||||
width: 96,
|
||||
align: 'right',
|
||||
render: (_, r) =>
|
||||
r.ad_revenue_yuan > 0 ? (
|
||||
<span style={{ color: '#3f8600' }}>¥{r.ad_revenue_yuan.toFixed(4)}</span>
|
||||
) : (
|
||||
<span style={{ color: '#ccc' }}>-</span>
|
||||
),
|
||||
},
|
||||
{ title: '耗时', dataIndex: 'total_ms', width: 64, render: fmtMs },
|
||||
{ title: '步', dataIndex: 'step_count', width: 48, render: (v) => v ?? '-' },
|
||||
{ title: 'LLM', dataIndex: 'llm_call_count', width: 56, render: (v) => v ?? '-' },
|
||||
@@ -297,7 +309,7 @@ export default function ComparisonRecordsPage() {
|
||||
showTotal: (t) => `共 ${t} 条`,
|
||||
onChange,
|
||||
}}
|
||||
scroll={{ x: 1820 }}
|
||||
scroll={{ x: 1920 }}
|
||||
onRow={(r) => ({ onClick: () => openDetail(r.id), style: { cursor: 'pointer' } })}
|
||||
/>
|
||||
|
||||
|
||||
@@ -42,13 +42,15 @@ interface BulkVals {
|
||||
enabled: boolean;
|
||||
}
|
||||
|
||||
interface PreviewItem {
|
||||
interface RealRecord {
|
||||
masked_user: string;
|
||||
saved_amount_cents: number;
|
||||
time: string;
|
||||
created_at: string;
|
||||
user_id: number;
|
||||
}
|
||||
|
||||
const yuan = (cents: number) => (cents / 100).toFixed(2);
|
||||
const MODE_LABEL: Record<string, string> = { mixed: '混播', real: '只真实', seed: '只种子' };
|
||||
|
||||
/** 首页轮播「种子」管理(真实记录不足时的兜底假数据,现为「生成规则」)。「系统配置 / 首页」里的一个区块。 */
|
||||
export default function HomeMarqueeSeeds() {
|
||||
@@ -66,9 +68,12 @@ export default function HomeMarqueeSeeds() {
|
||||
const [bulkOpen, setBulkOpen] = useState(false);
|
||||
const [bulkForm] = Form.useForm<BulkVals>();
|
||||
|
||||
const [previewOpen, setPreviewOpen] = useState(false);
|
||||
const [previewItems, setPreviewItems] = useState<PreviewItem[]>([]);
|
||||
const [previewLoading, setPreviewLoading] = useState(false);
|
||||
// 「可展示的真实记录」分页浏览(替代原随机预览):翻遍所有 success+省>0 的真实记录
|
||||
const REC_PAGE_SIZE = 8;
|
||||
const [recItems, setRecItems] = useState<RealRecord[]>([]);
|
||||
const [recTotal, setRecTotal] = useState(0);
|
||||
const [recPage, setRecPage] = useState(0); // 0-based
|
||||
const [recLoading, setRecLoading] = useState(false);
|
||||
|
||||
const load = async () => {
|
||||
setLoading(true);
|
||||
@@ -94,6 +99,7 @@ export default function HomeMarqueeSeeds() {
|
||||
const changeMode = async (m: string) => {
|
||||
const prev = mode;
|
||||
setMode(m);
|
||||
setRecPage(0); // 切模式回第 1 页(不同模式条数不同,避免停在越界页)
|
||||
setModeSaving(true);
|
||||
try {
|
||||
await api.patch('/admin/api/marquee-seeds/mode', { mode: m });
|
||||
@@ -168,22 +174,29 @@ export default function HomeMarqueeSeeds() {
|
||||
}
|
||||
};
|
||||
|
||||
// ===== 预览实际 feed =====
|
||||
const fetchPreview = async () => {
|
||||
setPreviewLoading(true);
|
||||
// ===== 可展示的记录:按「当前模式」分页浏览全部(不去重)=====
|
||||
// 只真实=真实记录;只种子=各启用种子按生成逻辑各出一行;混播=真实+种子。与 app 同口径洗牌+去连簇,
|
||||
// 后端固定种子 → 翻页稳定、能翻遍全部。
|
||||
const fetchRecords = async (page: number, m: string) => {
|
||||
setRecLoading(true);
|
||||
try {
|
||||
const { data } = await api.get<{ items: PreviewItem[] }>('/admin/api/marquee-seeds/preview?limit=8');
|
||||
setPreviewItems(data.items);
|
||||
const { data } = await api.get<{ items: RealRecord[]; total: number }>(
|
||||
'/admin/api/marquee-seeds/real-records',
|
||||
{ params: { offset: page * REC_PAGE_SIZE, limit: REC_PAGE_SIZE, mode: m } },
|
||||
);
|
||||
setRecItems(data.items);
|
||||
setRecTotal(data.total);
|
||||
} catch (e) {
|
||||
message.error(errMsg(e));
|
||||
} finally {
|
||||
setPreviewLoading(false);
|
||||
setRecLoading(false);
|
||||
}
|
||||
};
|
||||
const openPreview = () => {
|
||||
setPreviewOpen(true);
|
||||
fetchPreview();
|
||||
};
|
||||
// 页码或模式变化都重拉(切模式时 changeMode 会把页码重置到 0)。
|
||||
useEffect(() => {
|
||||
fetchRecords(recPage, mode);
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [recPage, mode]);
|
||||
|
||||
const toggle = async (s: Seed, enabled: boolean) => {
|
||||
try {
|
||||
@@ -300,6 +313,84 @@ export default function HomeMarqueeSeeds() {
|
||||
混播=真实优先+种子补位;只真实=不掺假数据(真实不足则少显示);只种子=只用下方种子/合成(演示用)
|
||||
</span>
|
||||
</Space>
|
||||
|
||||
{/* 可展示的真实记录:分页浏览全部(success+省>0,不去重、稳定倒序);app 轮播即从这些记录
|
||||
随机打乱、同一用户去连簇后展示。翻页可看全所有真实用户的展示信息。 */}
|
||||
<div
|
||||
style={{
|
||||
marginBottom: 16,
|
||||
border: '1px solid #f0f0f0',
|
||||
borderRadius: 8,
|
||||
padding: '10px 12px',
|
||||
background: '#fafafa',
|
||||
}}
|
||||
>
|
||||
<div
|
||||
style={{
|
||||
display: 'flex',
|
||||
justifyContent: 'space-between',
|
||||
alignItems: 'center',
|
||||
marginBottom: 6,
|
||||
flexWrap: 'wrap',
|
||||
gap: 8,
|
||||
}}
|
||||
>
|
||||
<span style={{ fontSize: 13, fontWeight: 500 }}>
|
||||
可展示的记录 · {MODE_LABEL[mode] ?? mode} · 共 {recTotal} 条
|
||||
<span style={{ color: '#999', fontWeight: 400, fontSize: 12, marginLeft: 8 }}>
|
||||
当前模式下 app 轮播能露出的全部记录(不去重):只真实=真实、只种子=各种子生成、混播=真实+种子;
|
||||
已按 app 口径洗牌+去连簇,顺序固定便于翻页看全
|
||||
</span>
|
||||
</span>
|
||||
<Space size="small">
|
||||
<Button size="small" disabled={recPage <= 0} onClick={() => setRecPage((p) => Math.max(0, p - 1))}>
|
||||
上一页
|
||||
</Button>
|
||||
<span style={{ fontSize: 12, color: '#666' }}>
|
||||
第 {recTotal === 0 ? 0 : recPage + 1}/{Math.max(1, Math.ceil(recTotal / REC_PAGE_SIZE))} 页
|
||||
</span>
|
||||
<Button
|
||||
size="small"
|
||||
disabled={(recPage + 1) * REC_PAGE_SIZE >= recTotal}
|
||||
onClick={() => setRecPage((p) => p + 1)}
|
||||
>
|
||||
下一页
|
||||
</Button>
|
||||
</Space>
|
||||
</div>
|
||||
<Spin spinning={recLoading}>
|
||||
<div style={{ minHeight: 120 }}>
|
||||
{recItems.length === 0 && !recLoading ? (
|
||||
<div style={{ color: '#bbb', textAlign: 'center', padding: '36px 0', fontSize: 13 }}>
|
||||
当前模式暂无可展示的记录
|
||||
</div>
|
||||
) : (
|
||||
recItems.map((it, i) => (
|
||||
<div
|
||||
key={i}
|
||||
style={{
|
||||
display: 'flex',
|
||||
justifyContent: 'space-between',
|
||||
alignItems: 'center',
|
||||
padding: '6px 4px',
|
||||
borderBottom: '1px solid #f0f0f0',
|
||||
}}
|
||||
>
|
||||
<span>
|
||||
{it.masked_user} 比价后节省{' '}
|
||||
<b style={{ color: '#fa541c' }}>{yuan(it.saved_amount_cents)} 元</b>
|
||||
<span style={{ color: '#ccc', fontSize: 12, marginLeft: 8 }}>
|
||||
{it.user_id > 0 ? `u${it.user_id}` : '种子'}
|
||||
</span>
|
||||
</span>
|
||||
<span style={{ color: '#999', fontSize: 12 }}>{it.created_at}</span>
|
||||
</div>
|
||||
))
|
||||
)}
|
||||
</div>
|
||||
</Spin>
|
||||
</div>
|
||||
|
||||
<Space style={{ marginBottom: 12 }} wrap>
|
||||
<Button type="primary" size="small" onClick={openAdd}>
|
||||
新增种子
|
||||
@@ -307,9 +398,6 @@ export default function HomeMarqueeSeeds() {
|
||||
<Button size="small" onClick={openBulk}>
|
||||
批量生成
|
||||
</Button>
|
||||
<Button size="small" onClick={openPreview}>
|
||||
预览效果
|
||||
</Button>
|
||||
<span style={{ borderLeft: '1px solid #eee', height: 18 }} />
|
||||
<Button size="small" disabled={!selectedRowKeys.length} onClick={() => batchSetEnabled(true)}>
|
||||
批量启用
|
||||
@@ -413,48 +501,6 @@ export default function HomeMarqueeSeeds() {
|
||||
</Form.Item>
|
||||
</Form>
|
||||
</Modal>
|
||||
|
||||
{/* 预览实际 feed */}
|
||||
<Modal
|
||||
title="预览轮播效果"
|
||||
open={previewOpen}
|
||||
onCancel={() => setPreviewOpen(false)}
|
||||
footer={
|
||||
<Space>
|
||||
<Button size="small" onClick={fetchPreview}>
|
||||
换一批
|
||||
</Button>
|
||||
<Button size="small" type="primary" onClick={() => setPreviewOpen(false)}>
|
||||
关闭
|
||||
</Button>
|
||||
</Space>
|
||||
}
|
||||
>
|
||||
<p style={{ color: '#999', marginTop: 0 }}>
|
||||
客户端实际会看到的混播结果:真实记录会插队,种子随机抽取、金额/用户名每次都不同。点「换一批」可重新随机。
|
||||
</p>
|
||||
<Spin spinning={previewLoading}>
|
||||
<div style={{ minHeight: 120 }}>
|
||||
{previewItems.map((it, i) => (
|
||||
<div
|
||||
key={i}
|
||||
style={{
|
||||
display: 'flex',
|
||||
justifyContent: 'space-between',
|
||||
padding: '7px 4px',
|
||||
borderBottom: '1px solid #f0f0f0',
|
||||
}}
|
||||
>
|
||||
<span>
|
||||
{it.masked_user} 比价后节省{' '}
|
||||
<b style={{ color: '#fa541c' }}>{yuan(it.saved_amount_cents)} 元</b>
|
||||
</span>
|
||||
<span style={{ color: '#999' }}>{it.time}</span>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</Spin>
|
||||
</Modal>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -16,8 +16,10 @@ import {
|
||||
Statistic,
|
||||
Table,
|
||||
Tag,
|
||||
Tooltip,
|
||||
Typography,
|
||||
} from 'antd';
|
||||
import { DownOutlined, InfoCircleOutlined } from '@ant-design/icons';
|
||||
import dayjs, { type Dayjs } from 'dayjs';
|
||||
import { api, errMsg } from '@/lib/api';
|
||||
import { formatUtcTime } from '@/lib/format';
|
||||
@@ -34,6 +36,13 @@ interface CouponDataSummary {
|
||||
p50_ms: number | null;
|
||||
p95_ms: number | null;
|
||||
p99_ms: number | null;
|
||||
// 平台粒度成功率(见 shaguabijia-app-server docs/guides/领券成功率指标-设计与埋点.md §3/§12)
|
||||
full_success_count: number;
|
||||
full_success_rate: number | null;
|
||||
point_success_count: number;
|
||||
point_total_count: number;
|
||||
point_success_rate: number | null;
|
||||
per_platform: Record<string, number | null>; // {平台id: rate|null};恒含美团/淘宝/京东三档
|
||||
}
|
||||
interface CouponDataDaily {
|
||||
date: string;
|
||||
@@ -64,6 +73,7 @@ interface CouponDataRow {
|
||||
started_at: string;
|
||||
claimed_count: number | null;
|
||||
trace_url: string | null;
|
||||
ad_revenue_yuan: number; // 本次领券看的信息流广告预估收益(元)
|
||||
}
|
||||
interface CouponDataReport {
|
||||
date_from: string;
|
||||
@@ -74,6 +84,20 @@ interface CouponDataReport {
|
||||
total: number;
|
||||
items: CouponDataRow[];
|
||||
}
|
||||
// 按券成功率(§13):coupon_id 粒度,数据源 coupon_claim_record;成功率=成功/(成功+失败),skipped 排除。
|
||||
interface CouponSlotRow {
|
||||
coupon_id: string;
|
||||
coupon_name: string | null;
|
||||
platform: string | null;
|
||||
tried: number;
|
||||
succeeded: number;
|
||||
success_rate: number | null;
|
||||
}
|
||||
interface CouponSlotsOut {
|
||||
date_from: string;
|
||||
date_to: string;
|
||||
items: CouponSlotRow[];
|
||||
}
|
||||
|
||||
// 发起来源 App 包名 → 中文(「发起平台」列):空=傻瓜比价首页发起,外卖 App 包名→对应平台。
|
||||
function originLabel(pkg: string | null): string {
|
||||
@@ -96,6 +120,45 @@ const STATUS_TAG: Record<string, { color: string; label: string }> = {
|
||||
const fmtSec = (ms: number | null | undefined): string =>
|
||||
ms == null ? '-' : `${(ms / 1000).toFixed(1)}s`;
|
||||
|
||||
// rate(0..1)→ "60.0%"(空值显示 -)
|
||||
const fmtPct = (v: number | null | undefined): string =>
|
||||
v == null ? '-' : `${(v * 100).toFixed(1)}%`;
|
||||
|
||||
// 元(小数)→ "¥0.0050"(空/≤0 显示 -)。单次广告收益很小,保留 4 位。
|
||||
const fmtYuan = (v: number | null | undefined): string =>
|
||||
v == null || v <= 0 ? '-' : `¥${v.toFixed(4)}`;
|
||||
|
||||
// 一组按券行的 success_rate 算术平均(每张券等权;空值券跳过);无有效券 → null(显示 -)。
|
||||
// 汇总卡「分平台/合计点位成功率」据此由按券明细上卷,口径与下方按券表一致。
|
||||
const slotRateMean = (rows: CouponSlotRow[]): number | null => {
|
||||
const rates = rows
|
||||
.map((r) => r.success_rate)
|
||||
.filter((v): v is number => v != null);
|
||||
return rates.length ? rates.reduce((a, b) => a + b, 0) / rates.length : null;
|
||||
};
|
||||
|
||||
// 汇总卡成功率口径 tooltip 文案
|
||||
const FULL_RATE_HINT =
|
||||
'整单成功率:一次领券勾选的平台全部至少领到一张的场次 ÷ 领券发起数;基数含未完成/失败/中途退出。';
|
||||
const POINT_RATE_HINT =
|
||||
'点位成功率(合计):当前区间内全部券成功率的算术平均(每张券等权);' +
|
||||
'单券成功率=成功(含已领)÷尝试(不含跳过),源自领券每券记录。';
|
||||
|
||||
// 按券表:coupon_id 平台 → 中文
|
||||
const SLOT_PLATFORM: Record<string, string> = {
|
||||
'meituan-waimai': '美团',
|
||||
'taobao-shanguang': '淘宝',
|
||||
'jd-waimai': '京东',
|
||||
};
|
||||
const slotPlatformLabel = (p: string | null): string => (p ? SLOT_PLATFORM[p] ?? p : '其他');
|
||||
|
||||
// 三平台品牌色(平台名前小圆点用):美团黄 / 淘宝闪购橙 / 京东红。
|
||||
const SLOT_PLATFORM_COLOR: Record<string, string> = {
|
||||
'meituan-waimai': '#FFB300',
|
||||
'taobao-shanguang': '#FF6A00',
|
||||
'jd-waimai': '#E1251B',
|
||||
};
|
||||
|
||||
// 点手机号弹出的「该用户全部领券」抽屉列(精简版:单用户,不含用户/手机号列)。
|
||||
const RECORD_COLUMNS: ColumnsType<CouponDataRow> = [
|
||||
{ title: '时间', dataIndex: 'started_at', width: 160, render: (v: string) => formatUtcTime(v) },
|
||||
@@ -286,6 +349,8 @@ export default function CouponDataPage() {
|
||||
const [range, setRange] = useState<[Dayjs, Dayjs]>([dayjs().subtract(6, 'day'), dayjs()]);
|
||||
const [user, setUser] = useState<string>('');
|
||||
const [appEnv, setAppEnv] = useState<string>('prod');
|
||||
// 领券状态多选(方案 A:整视图联动),默认全选四态(= 现状,不改口径)。
|
||||
const [statuses, setStatuses] = useState<string[]>(['started', 'completed', 'failed', 'abandoned']);
|
||||
const [granularity, setGranularity] = useState<'day' | 'hour'>('day');
|
||||
const [sortBy, setSortBy] = useState<'time' | 'elapsed'>('time');
|
||||
const [limit, setLimit] = useState<number>(100);
|
||||
@@ -294,6 +359,9 @@ export default function CouponDataPage() {
|
||||
const [queriedMultiDay, setQueriedMultiDay] = useState(false);
|
||||
const [queriedLimit, setQueriedLimit] = useState<number>(100);
|
||||
const [data, setData] = useState<CouponDataReport | null>(null);
|
||||
const [couponSlots, setCouponSlots] = useState<CouponSlotRow[]>([]);
|
||||
// 按券表:默认隐藏,点某平台点位成功率卡 → 展开该平台的券表(null=隐藏)。
|
||||
const [selectedSlotPlatform, setSelectedSlotPlatform] = useState<string | null>(null);
|
||||
const [loading, setLoading] = useState(false);
|
||||
// 点手机号:抽屉看该用户全部领券(总次数 + 记录)
|
||||
const [recordsUser, setRecordsUser] = useState<{ userId: number; phone: string | null } | null>(null);
|
||||
@@ -318,13 +386,23 @@ export default function CouponDataPage() {
|
||||
date_to: to,
|
||||
user: user.trim() || undefined,
|
||||
app_env: appEnv,
|
||||
status: statuses,
|
||||
granularity: gran,
|
||||
limit: targetLimit,
|
||||
offset: (targetPage - 1) * targetLimit,
|
||||
sort: targetSort,
|
||||
},
|
||||
// status 是数组:repeat 无方括号序列化(status=a&status=b),对齐 FastAPI list[str] Query
|
||||
paramsSerializer: { indexes: null },
|
||||
});
|
||||
setData(res.data);
|
||||
// 并行拉「按券成功率」(独立端点,失败不影响主报表)
|
||||
api
|
||||
.get<CouponSlotsOut>('/admin/api/coupon-data/coupons', {
|
||||
params: { date_from: from, date_to: to, app_env: appEnv },
|
||||
})
|
||||
.then((r) => setCouponSlots(r.data.items))
|
||||
.catch(() => setCouponSlots([]));
|
||||
setPage(targetPage);
|
||||
setQueriedLimit(targetLimit);
|
||||
setQueriedGranularity(gran);
|
||||
@@ -335,7 +413,7 @@ export default function CouponDataPage() {
|
||||
setLoading(false);
|
||||
}
|
||||
},
|
||||
[range, user, appEnv, granularity, limit, sortBy, message],
|
||||
[range, user, appEnv, statuses, granularity, limit, sortBy, message],
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
@@ -393,6 +471,12 @@ export default function CouponDataPage() {
|
||||
width: 110,
|
||||
render: (pkg: string | null) => originLabel(pkg),
|
||||
},
|
||||
{
|
||||
title: '时间',
|
||||
dataIndex: 'started_at',
|
||||
width: 165,
|
||||
render: (v: string) => formatUtcTime(v),
|
||||
},
|
||||
{
|
||||
title: '耗时',
|
||||
dataIndex: 'elapsed_ms',
|
||||
@@ -400,6 +484,13 @@ export default function CouponDataPage() {
|
||||
align: 'right',
|
||||
render: (v: number | null) => fmtSec(v),
|
||||
},
|
||||
{
|
||||
title: '广告收益',
|
||||
dataIndex: 'ad_revenue_yuan',
|
||||
width: 100,
|
||||
align: 'right',
|
||||
render: (v: number) => fmtYuan(v),
|
||||
},
|
||||
{
|
||||
title: '美团耗时',
|
||||
key: 'mt_elapsed',
|
||||
@@ -430,12 +521,6 @@ export default function CouponDataPage() {
|
||||
return parts.length ? parts.join(' / ') : <Typography.Text type="secondary">-</Typography.Text>;
|
||||
},
|
||||
},
|
||||
{
|
||||
title: '时间',
|
||||
dataIndex: 'started_at',
|
||||
width: 165,
|
||||
render: (v: string) => formatUtcTime(v),
|
||||
},
|
||||
{
|
||||
title: '领券 trace',
|
||||
dataIndex: 'trace_id',
|
||||
@@ -454,6 +539,31 @@ export default function CouponDataPage() {
|
||||
},
|
||||
];
|
||||
|
||||
const slotColumns: ColumnsType<CouponSlotRow> = [
|
||||
{
|
||||
title: '券名',
|
||||
dataIndex: 'coupon_name',
|
||||
render: (v: string | null, r: CouponSlotRow) => v || r.coupon_id,
|
||||
},
|
||||
{
|
||||
title: '尝试',
|
||||
dataIndex: 'tried',
|
||||
width: 90,
|
||||
align: 'right',
|
||||
sorter: (a: CouponSlotRow, b: CouponSlotRow) => a.tried - b.tried,
|
||||
},
|
||||
{ title: '成功', dataIndex: 'succeeded', width: 90, align: 'right' },
|
||||
{
|
||||
title: '成功率',
|
||||
dataIndex: 'success_rate',
|
||||
width: 100,
|
||||
align: 'right',
|
||||
defaultSortOrder: 'descend',
|
||||
render: (v: number | null) => fmtPct(v),
|
||||
sorter: (a: CouponSlotRow, b: CouponSlotRow) => (a.success_rate ?? 0) - (b.success_rate ?? 0),
|
||||
},
|
||||
];
|
||||
|
||||
const summary = data?.summary;
|
||||
const items = data?.items ?? [];
|
||||
|
||||
@@ -505,6 +615,18 @@ export default function CouponDataPage() {
|
||||
]}
|
||||
/>
|
||||
</Space>
|
||||
<Space size={6}>
|
||||
<Typography.Text type="secondary">状态</Typography.Text>
|
||||
<Select
|
||||
mode="multiple"
|
||||
value={statuses}
|
||||
onChange={setStatuses}
|
||||
style={{ minWidth: 240 }}
|
||||
maxTagCount="responsive"
|
||||
placeholder="全部状态"
|
||||
options={Object.entries(STATUS_TAG).map(([value, t]) => ({ value, label: t.label }))}
|
||||
/>
|
||||
</Space>
|
||||
<Space size={6}>
|
||||
<Typography.Text type="secondary">粒度</Typography.Text>
|
||||
<Select
|
||||
@@ -580,6 +702,114 @@ export default function CouponDataPage() {
|
||||
<Statistic title="耗时 99 分位" value={fmtSec(summary.p99_ms)} />
|
||||
</Col>
|
||||
</Row>
|
||||
<Divider style={{ marginTop: 16, marginBottom: 16 }} />
|
||||
<Row gutter={[16, 12]}>
|
||||
<Col flex="1 1 0">
|
||||
<Statistic
|
||||
title={
|
||||
<span>
|
||||
整单成功率{' '}
|
||||
<Tooltip title={FULL_RATE_HINT}>
|
||||
<InfoCircleOutlined style={{ color: '#999' }} />
|
||||
</Tooltip>
|
||||
</span>
|
||||
}
|
||||
value={fmtPct(summary.full_success_rate)}
|
||||
/>
|
||||
</Col>
|
||||
<Col flex="1 1 0">
|
||||
<Statistic
|
||||
title={
|
||||
<span>
|
||||
点位成功率(合计){' '}
|
||||
<Tooltip title={POINT_RATE_HINT}>
|
||||
<InfoCircleOutlined style={{ color: '#999' }} />
|
||||
</Tooltip>
|
||||
</span>
|
||||
}
|
||||
value={fmtPct(slotRateMean(couponSlots))}
|
||||
/>
|
||||
</Col>
|
||||
</Row>
|
||||
<Divider style={{ marginTop: 16, marginBottom: 16 }} />
|
||||
<Row gutter={[16, 12]}>
|
||||
{(['meituan-waimai', 'taobao-shanguang', 'jd-waimai'] as const).map((pid) => {
|
||||
const active = selectedSlotPlatform === pid;
|
||||
// 点位成功率 = 该平台各券成功率的算术平均(源自按券明细 couponSlots,与下方展开的按券表一致)
|
||||
const rate = slotRateMean(couponSlots.filter((r) => r.platform === pid));
|
||||
// 平台名(前置品牌色圆点) | 大数字成功率 | 「查看明细」按钮;仅按钮可展开表格。
|
||||
return (
|
||||
<Col flex="1 1 0" key={pid}>
|
||||
<div
|
||||
style={{
|
||||
border: `1px solid ${active ? '#91caff' : '#f0f0f0'}`,
|
||||
borderRadius: 8,
|
||||
background: active ? '#f0f7ff' : '#fff',
|
||||
transition: 'all .2s',
|
||||
padding: '10px 14px',
|
||||
}}
|
||||
>
|
||||
{/* 平台名前放小品牌色圆点(取代原左侧竖条),克制地标记平台身份,不打破页面灰度。 */}
|
||||
<div style={{ fontSize: 13, color: '#666', display: 'flex', alignItems: 'center', gap: 6 }}>
|
||||
<span
|
||||
style={{
|
||||
width: 8,
|
||||
height: 8,
|
||||
borderRadius: '50%',
|
||||
flex: '0 0 auto',
|
||||
background: SLOT_PLATFORM_COLOR[pid],
|
||||
}}
|
||||
/>
|
||||
{`${SLOT_PLATFORM[pid]}点位成功率`}
|
||||
</div>
|
||||
<div style={{ fontSize: 26, fontWeight: 600, lineHeight: 1.1, margin: '4px 0 10px' }}>
|
||||
{fmtPct(rate)}
|
||||
</div>
|
||||
<Button
|
||||
size="small"
|
||||
type={active ? 'primary' : 'default'}
|
||||
onClick={() => setSelectedSlotPlatform(active ? null : pid)}
|
||||
>
|
||||
查看明细{' '}
|
||||
<DownOutlined
|
||||
style={{
|
||||
fontSize: 10,
|
||||
transform: active ? 'rotate(180deg)' : 'none',
|
||||
transition: 'transform .2s',
|
||||
}}
|
||||
/>
|
||||
</Button>
|
||||
</div>
|
||||
</Col>
|
||||
);
|
||||
})}
|
||||
</Row>
|
||||
{selectedSlotPlatform && (
|
||||
// 表格区域:浅灰底 + 内边距,和上方指标卡主体分层区分。
|
||||
<div
|
||||
style={{
|
||||
marginTop: 12,
|
||||
background: '#fafafa',
|
||||
border: '1px solid #f0f0f0',
|
||||
borderRadius: 8,
|
||||
padding: 12,
|
||||
}}
|
||||
>
|
||||
<div
|
||||
style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 8 }}
|
||||
>
|
||||
<span style={{ fontWeight: 500 }}>{`${slotPlatformLabel(selectedSlotPlatform)} · 按券成功率`}</span>
|
||||
<a onClick={() => setSelectedSlotPlatform(null)}>收起</a>
|
||||
</div>
|
||||
<Table<CouponSlotRow>
|
||||
rowKey="coupon_id"
|
||||
size="small"
|
||||
pagination={false}
|
||||
dataSource={couponSlots.filter((r) => r.platform === selectedSlotPlatform)}
|
||||
columns={slotColumns}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
</Card>
|
||||
)}
|
||||
|
||||
@@ -656,7 +886,7 @@ export default function CouponDataPage() {
|
||||
onChange: (p) => load(p, queriedLimit),
|
||||
}}
|
||||
size="small"
|
||||
scroll={{ x: 1450 }}
|
||||
scroll={{ x: 1560 }}
|
||||
/>
|
||||
|
||||
<UserRecordsDrawer<CouponDataRow>
|
||||
|
||||
@@ -10,6 +10,7 @@ import {
|
||||
FlagOutlined,
|
||||
GiftOutlined,
|
||||
HeartOutlined,
|
||||
LineChartOutlined,
|
||||
LogoutOutlined,
|
||||
MessageOutlined,
|
||||
MoneyCollectOutlined,
|
||||
@@ -57,6 +58,7 @@ const NAV_GROUPS: NavGroup[] = [
|
||||
{ key: '/comparison-records', icon: <ProfileOutlined />, label: '比价记录' },
|
||||
{ key: '/cps', icon: <ShareAltOutlined />, label: 'CPS收益' },
|
||||
{ key: '/device-liveness', icon: <HeartOutlined />, label: '设备存活' },
|
||||
{ key: '/analytics-health', icon: <LineChartOutlined />, label: '埋点成功率' },
|
||||
],
|
||||
},
|
||||
{
|
||||
|
||||
@@ -23,6 +23,7 @@ import { canDo } from '@/lib/auth';
|
||||
import { formatUtcTime, formatWallTime, yuan } from '@/lib/format';
|
||||
import { useCursorList } from '@/lib/useCursorList';
|
||||
import { AdjustCashModal, AdjustCoinModal } from '@/components/AdjustBalanceModals';
|
||||
import { DeleteUserModal } from '@/components/DeleteUserModal';
|
||||
import type { CashTxn, CoinTxn, UserOverview, WithdrawOrder } from '@/lib/types';
|
||||
|
||||
export default function UserDetailPage() {
|
||||
@@ -33,6 +34,7 @@ export default function UserDetailPage() {
|
||||
const [err, setErr] = useState<string | null>(null);
|
||||
const [coinOpen, setCoinOpen] = useState(false);
|
||||
const [cashOpen, setCashOpen] = useState(false);
|
||||
const [delOpen, setDelOpen] = useState(false);
|
||||
|
||||
const loadData = useCallback(() => {
|
||||
setErr(null);
|
||||
@@ -52,6 +54,7 @@ export default function UserDetailPage() {
|
||||
|
||||
const canCoins = canDo(['finance']);
|
||||
const canStatus = canDo(['operator']);
|
||||
const canDelete = canDo(['super_admin']); // 注销账号最高危,仅 super_admin(与后端 require_role 对齐)
|
||||
|
||||
const toggleStatus = () => {
|
||||
if (!data) return;
|
||||
@@ -154,6 +157,11 @@ export default function UserDetailPage() {
|
||||
{data.user.status === 'active' ? '封禁' : '解封'}
|
||||
</Button>
|
||||
)}
|
||||
{canDelete && data.user.status !== 'deleted' && (
|
||||
<Button danger onClick={() => setDelOpen(true)}>
|
||||
注销账号
|
||||
</Button>
|
||||
)}
|
||||
</Space>
|
||||
</Space>
|
||||
<Card style={{ marginBottom: 16 }}>
|
||||
@@ -272,6 +280,12 @@ export default function UserDetailPage() {
|
||||
cash.reload();
|
||||
}}
|
||||
/>
|
||||
<DeleteUserModal
|
||||
user={data.user}
|
||||
open={delOpen}
|
||||
onClose={() => setDelOpen(false)}
|
||||
onDone={loadData}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -12,6 +12,7 @@ import { canDo } from '@/lib/auth';
|
||||
import { formatUtcTime } from '@/lib/format';
|
||||
import { usePagedList } from '@/lib/usePagedList';
|
||||
import { AdjustCashModal, AdjustCoinModal } from '@/components/AdjustBalanceModals';
|
||||
import { DeleteUserModal } from '@/components/DeleteUserModal';
|
||||
import type { UserListItem } from '@/lib/types';
|
||||
|
||||
const { RangePicker } = DatePicker;
|
||||
@@ -43,9 +44,11 @@ export default function UsersPage() {
|
||||
|
||||
const canCoins = canDo(['finance']);
|
||||
const canStatus = canDo(['operator']);
|
||||
const canDelete = canDo(['super_admin']); // 注销账号最高危,仅 super_admin(与后端 require_role 对齐)
|
||||
|
||||
const [coinUser, setCoinUser] = useState<UserListItem | null>(null);
|
||||
const [cashUser, setCashUser] = useState<UserListItem | null>(null);
|
||||
const [delUser, setDelUser] = useState<UserListItem | null>(null);
|
||||
const [selectedRowKeys, setSelectedRowKeys] = useState<Key[]>([]);
|
||||
|
||||
// 筛选/排序变化后清空已选(避免选中项跨筛选错位)
|
||||
@@ -253,7 +256,7 @@ export default function UsersPage() {
|
||||
title: '操作',
|
||||
key: 'op',
|
||||
fixed: 'right',
|
||||
width: 300,
|
||||
width: 340,
|
||||
render: (_: unknown, u: UserListItem) => (
|
||||
<Space wrap={false} onClick={(e) => e.stopPropagation()}>
|
||||
<a onClick={() => router.push(`/users/${u.id}`)}>详情</a>
|
||||
@@ -276,6 +279,11 @@ export default function UsersPage() {
|
||||
) : (
|
||||
<a onClick={() => setForceOnboarding(u, true)}>开启新手引导</a>
|
||||
))}
|
||||
{canDelete && u.status !== 'deleted' && (
|
||||
<a style={{ color: '#cf1322' }} onClick={() => setDelUser(u)}>
|
||||
注销
|
||||
</a>
|
||||
)}
|
||||
</Space>
|
||||
),
|
||||
},
|
||||
@@ -384,12 +392,18 @@ export default function UsersPage() {
|
||||
showTotal: (t) => `共 ${t} 个用户`,
|
||||
onChange: onPageChange,
|
||||
}}
|
||||
scroll={{ x: 1160 }}
|
||||
scroll={{ x: 1200 }}
|
||||
onChange={onTableChange}
|
||||
/>
|
||||
|
||||
<AdjustCoinModal user={coinUser} open={!!coinUser} onClose={() => setCoinUser(null)} />
|
||||
<AdjustCashModal user={cashUser} open={!!cashUser} onClose={() => setCashUser(null)} />
|
||||
<DeleteUserModal
|
||||
user={delUser}
|
||||
open={!!delUser}
|
||||
onClose={() => setDelUser(null)}
|
||||
onDone={reload}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -624,12 +624,27 @@ export default function WithdrawsPage() {
|
||||
const rejectAmount = rejectTargets.reduce((sum, item) => sum + item.amount_cents, 0);
|
||||
const ledgerIssues = ledger
|
||||
? [
|
||||
ledger.balance_diff_cents ? `余额差额 ${yuan(ledger.balance_diff_cents)}` : '',
|
||||
ledger.missing_withdraw_txn_count ? `缺扣款流水 ${ledger.missing_withdraw_txn_count} 笔` : '',
|
||||
ledger.missing_refund_txn_count ? `缺退款流水 ${ledger.missing_refund_txn_count} 笔` : '',
|
||||
ledger.duplicate_refund_txn_count ? `重复退款流水 ${ledger.duplicate_refund_txn_count} 类` : '',
|
||||
// 普通现金账(coin_cash)
|
||||
ledger.balance_diff_cents ? `现金余额差额 ${yuan(ledger.balance_diff_cents)}` : '',
|
||||
ledger.missing_withdraw_txn_count ? `现金缺扣款流水 ${ledger.missing_withdraw_txn_count} 笔` : '',
|
||||
ledger.missing_refund_txn_count ? `现金缺退款流水 ${ledger.missing_refund_txn_count} 笔` : '',
|
||||
ledger.duplicate_refund_txn_count ? `现金重复退款流水 ${ledger.duplicate_refund_txn_count} 类` : '',
|
||||
ledger.refund_txn_on_non_terminal_count
|
||||
? `非退款终态存在退款流水 ${ledger.refund_txn_on_non_terminal_count} 笔`
|
||||
? `现金非退款终态存在退款流水 ${ledger.refund_txn_on_non_terminal_count} 笔`
|
||||
: '',
|
||||
// 邀请奖励金账(invite_cash)
|
||||
ledger.invite_balance_diff_cents ? `邀请金余额差额 ${yuan(ledger.invite_balance_diff_cents)}` : '',
|
||||
ledger.invite_missing_withdraw_txn_count
|
||||
? `邀请金缺扣款流水 ${ledger.invite_missing_withdraw_txn_count} 笔`
|
||||
: '',
|
||||
ledger.invite_missing_refund_txn_count
|
||||
? `邀请金缺退款流水 ${ledger.invite_missing_refund_txn_count} 笔`
|
||||
: '',
|
||||
ledger.invite_duplicate_refund_txn_count
|
||||
? `邀请金重复退款流水 ${ledger.invite_duplicate_refund_txn_count} 类`
|
||||
: '',
|
||||
ledger.invite_refund_txn_on_non_terminal_count
|
||||
? `邀请金非退款终态存在退款流水 ${ledger.invite_refund_txn_on_non_terminal_count} 笔`
|
||||
: '',
|
||||
].filter(Boolean)
|
||||
: [];
|
||||
@@ -669,7 +684,7 @@ export default function WithdrawsPage() {
|
||||
message={ledger.ok ? '现金账本校验正常' : '现金账本存在异常'}
|
||||
description={
|
||||
ledger.ok
|
||||
? `账户余额合计 ${yuan(ledger.cash_balance_total_cents)},现金流水净额 ${yuan(ledger.cash_transaction_total_cents)}`
|
||||
? `现金 余额 ${yuan(ledger.cash_balance_total_cents)} / 流水 ${yuan(ledger.cash_transaction_total_cents)};邀请金 余额 ${yuan(ledger.invite_cash_balance_total_cents)} / 流水 ${yuan(ledger.invite_cash_transaction_total_cents)}`
|
||||
: ledgerIssues.join(';')
|
||||
}
|
||||
action={
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
'use client';
|
||||
|
||||
// 注销/删除账号弹窗(受控)。列表页与用户详情页共用,避免两处各写一套(同 AdjustBalanceModals)。
|
||||
// 复用 C 端自助注销同一套后端清理:物理删除个人内容/行为/PII 表 + 清零余额 + 匿名化 user 行,
|
||||
// 保留资金流水/邀请关系/广告幂等+对账表。仅 super_admin 可见入口;后端亦 require_role("super_admin") 兜底。
|
||||
// 后端资金前置闸(有未提现现金/邀请金 / 在审提现单 → 409)带明确 detail,errMsg 原样透出。
|
||||
import { App, Form, Input, Modal } from 'antd';
|
||||
import { api, errMsg } from '@/lib/api';
|
||||
|
||||
export type DeleteTargetUser = { id: number; phone: string };
|
||||
|
||||
interface Props {
|
||||
user: DeleteTargetUser | null;
|
||||
open: boolean;
|
||||
onClose: () => void;
|
||||
onDone?: () => void; // 删除成功后回调(刷新详情/列表)
|
||||
}
|
||||
|
||||
export function DeleteUserModal({ user, open, onClose, onDone }: Props) {
|
||||
const { message } = App.useApp();
|
||||
const [form] = Form.useForm();
|
||||
|
||||
const submit = async () => {
|
||||
if (!user) return;
|
||||
const v = await form.validateFields(); // 原因必填,缺失即红字阻断
|
||||
try {
|
||||
// axios 的 DELETE 带 body 要放在 config.data 里
|
||||
await api.delete(`/admin/api/users/${user.id}`, { data: { reason: v.reason } });
|
||||
message.success('账号已注销');
|
||||
onClose();
|
||||
onDone?.();
|
||||
} catch (e) {
|
||||
message.error(errMsg(e));
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<Modal
|
||||
title={`注销账号 - ${user?.phone ?? ''}`}
|
||||
open={open}
|
||||
onOk={submit}
|
||||
onCancel={onClose}
|
||||
okText="确认注销"
|
||||
okButtonProps={{ danger: true }}
|
||||
afterOpenChange={(o) => {
|
||||
if (o) form.resetFields();
|
||||
}}
|
||||
destroyOnHidden
|
||||
>
|
||||
<p style={{ color: '#cf1322', marginBottom: 12 }}>
|
||||
将永久删除该账号的个人数据(比价/省钱/签到/领券/埋点/设备/邀请指纹等)并清零余额、匿名化手机号,
|
||||
<strong>不可恢复</strong>。资金流水/邀请关系/广告对账记录按合规保留。
|
||||
</p>
|
||||
<Form form={form} layout="vertical">
|
||||
<Form.Item name="reason" label="注销原因(入审计)" rules={[{ required: true, message: '请填写注销原因' }]}>
|
||||
<Input.TextArea rows={2} />
|
||||
</Form.Item>
|
||||
</Form>
|
||||
</Modal>
|
||||
);
|
||||
}
|
||||
+38
-3
@@ -3,11 +3,12 @@
|
||||
export interface AdminInfo {
|
||||
id: number;
|
||||
username: string;
|
||||
role: string; // super_admin / finance / operator / 自定义角色名
|
||||
role: string; // super_admin / finance / operator / custom(自定义) / 自定义角色名
|
||||
status: string;
|
||||
created_at: string;
|
||||
last_login_at: string | null;
|
||||
pages?: string[]; // 当前角色有效可见页 key(登录 / /me 下发);super_admin = 全部页。左侧导航按此过滤
|
||||
pages?: string[]; // 当前有效可见页 key(登录 / /me 下发);super_admin = 全部页;role==custom = pages_override。左侧导航按此过滤
|
||||
pages_override?: string[] | null; // 「自定义」勾选的可见页原始集(role==custom 时非空);列表接口下发,供编辑回填勾选
|
||||
password?: string | null; // 明文登录密码(仅账号列表下发);无留存(脚本建的超管)为 null → 不显示
|
||||
}
|
||||
|
||||
@@ -233,6 +234,7 @@ export interface WithdrawBulkResult {
|
||||
|
||||
export interface WithdrawLedgerCheck {
|
||||
ok: boolean;
|
||||
// 普通现金账(coin_cash)
|
||||
cash_balance_total_cents: number;
|
||||
cash_transaction_total_cents: number;
|
||||
balance_diff_cents: number;
|
||||
@@ -240,6 +242,14 @@ export interface WithdrawLedgerCheck {
|
||||
missing_refund_txn_count: number;
|
||||
duplicate_refund_txn_count: number;
|
||||
refund_txn_on_non_terminal_count: number;
|
||||
// 邀请奖励金账(invite_cash:与普通现金物理隔离,各自对账)
|
||||
invite_cash_balance_total_cents: number;
|
||||
invite_cash_transaction_total_cents: number;
|
||||
invite_balance_diff_cents: number;
|
||||
invite_missing_withdraw_txn_count: number;
|
||||
invite_missing_refund_txn_count: number;
|
||||
invite_duplicate_refund_txn_count: number;
|
||||
invite_refund_txn_on_non_terminal_count: number;
|
||||
}
|
||||
|
||||
export interface WxpayHealthCheck {
|
||||
@@ -349,6 +359,7 @@ export interface ComparisonRecordListItem {
|
||||
rom_name: string | null;
|
||||
android_version: string | null;
|
||||
app_version: string | null;
|
||||
ad_revenue_yuan: number; // 本次比价看的信息流广告预估收益(元)
|
||||
created_at: string;
|
||||
}
|
||||
|
||||
@@ -486,7 +497,7 @@ export interface AdRevenueReport {
|
||||
string,
|
||||
{ ad_type: string; impressions: number; revenue_yuan: number; expected_coin: number; actual_coin: number }
|
||||
>;
|
||||
dau: number | null; // 今日活跃(复用大盘 last_login_at);仅查询=今日时有值,否则 null
|
||||
dau: number | null; // 区间去重活跃用户(口径同数据大盘 period.users.active:登录+开始比价+开始领券);按查询区间统计、含今日,全局口径不随筛选变化
|
||||
total: number; // 当前筛选下的分页总条数(全量,不受分页影响)
|
||||
truncated: boolean; // 当前页之后是否还有更多事件(分页后前端不再据此报警)
|
||||
total_impressions: number;
|
||||
@@ -717,3 +728,27 @@ export interface CpsStats {
|
||||
total_est_commission_cents: number;
|
||||
total_settled_commission_cents: number;
|
||||
}
|
||||
|
||||
// ===== 埋点 / 上报成功率大盘(analytics_selfstat 快照差分聚合)=====
|
||||
// 后端 feat/analytics-success-rate 分支的三个只读端点(/admin/api/analytics-health/*)。
|
||||
// rate 分母为 0 时后端给 null(前端显示 "-",不是 0%)。
|
||||
|
||||
/** 一组区间聚合指标:两大率 + 四原子量。 */
|
||||
export interface HealthMetrics {
|
||||
attempted: number; // track 被调用次数(埋点段分母)
|
||||
drop_capture: number; // 采集时异常丢弃(队列/序列化失败)
|
||||
delivered: number; // 成功送达后端
|
||||
drop_undelivered: number; // 已落盘但久未送达被队列淘汰
|
||||
track_success_rate: number | null; // 埋点成功率 ∈ [0,1]:(attempted − drop_capture) / attempted
|
||||
report_success_rate: number | null; // 上报成功率 ∈ [0,1]:delivered / (delivered + drop_undelivered)
|
||||
}
|
||||
|
||||
/** 趋势点:某北京天的指标(trend 端点,按北京天升序)。 */
|
||||
export interface HealthTrendPoint extends HealthMetrics {
|
||||
day: string; // 北京日期 "YYYY-MM-DD"
|
||||
}
|
||||
|
||||
/** 下钻行:某维度值的指标(breakdown 端点,已按上报率升序,最差在前)。 */
|
||||
export interface HealthBreakdownRow extends HealthMetrics {
|
||||
key: string; // 维度值(event 名 / app_ver / oem);缺失为 "(unknown)"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user