Compare commits

..

3 Commits

Author SHA1 Message Date
lowmaster-chen 1db0c3f834 fix: 同步数据大盘活跃用户口径文案 2026-06-30 19:49:49 +08:00
lowmaster-chen aaea458f1a feat: 优化数据大盘环比展示并移除总用户卡 2026-06-30 15:50:32 +08:00
lowmaster-chen 464d8dd183 feat: 补齐数据大盘京东 CPS 与金币展示
改了什么:数据大盘总收入/CPS 收入纳入京东 CPS;京东 CPS 卡片展示有效/无效订单;刷新按钮改为同步全部 CPS 订单;ARPU 展示产品确认的昨日活跃用户分母;激励视频金币展示真实值并标注已计入领券奖励。

验证方式:npx tsc --noEmit;浏览器验证 /dashboard 已显示京东 CPS、ARPU 分母和激励视频金币。
2026-06-30 10:23:49 +08:00
5 changed files with 24 additions and 725 deletions
-677
View File
@@ -1,677 +0,0 @@
'use client';
import { useCallback, useEffect, useState } from 'react';
import type { ColumnsType } from 'antd/es/table';
import {
App,
Button,
Card,
Col,
DatePicker,
Divider,
Input,
Row,
Select,
Space,
Statistic,
Table,
Tag,
Typography,
} from 'antd';
import dayjs, { type Dayjs } from 'dayjs';
import { api, errMsg } from '@/lib/api';
import { formatUtcTime } from '@/lib/format';
import UserRecordsDrawer from '@/components/UserRecordsDrawer';
const { RangePicker } = DatePicker;
// ── 领券数据看板类型(仅本页用,内联定义)──
interface CouponDataSummary {
started_count: number;
completed_count: number;
avg_elapsed_ms: number | null;
p5_ms: number | null;
p50_ms: number | null;
p95_ms: number | null;
p99_ms: number | null;
}
interface CouponDataDaily {
date: string;
started_count: number;
completed_count: number;
avg_elapsed_ms: number | null;
}
interface CouponDataHourly {
hour: number;
started_count: number;
completed_count: number;
avg_elapsed_ms: number | null;
}
interface CouponDataRow {
id: number;
trace_id: string;
user_id: number | null;
user_phone: string | null;
user_nickname: string | null;
status: string;
platforms: string[] | null;
origin_package: string | null;
elapsed_ms: number | null;
platform_elapsed: Record<string, number> | null;
device_model: string | null;
rom: string | null;
app_env: string | null;
started_at: string;
claimed_count: number | null;
trace_url: string | null;
}
interface CouponDataReport {
date_from: string;
date_to: string;
summary: CouponDataSummary;
daily: CouponDataDaily[];
hourly: CouponDataHourly[];
total: number;
items: CouponDataRow[];
}
// 发起来源 App 包名 → 中文(「发起平台」列):空=傻瓜比价首页发起,外卖 App 包名→对应平台。
function originLabel(pkg: string | null): string {
if (!pkg) return '傻瓜比价';
if (pkg.includes('meituan') || pkg.includes('sankuai')) return '美团';
if (pkg.includes('taobao') || pkg.includes('ele')) return '淘宝';
if (pkg.includes('jingdong') || pkg.includes('jd')) return '京东';
return pkg;
}
// 领券状态 → 颜色 + 中文(started 无终态 = 中途流失)
const STATUS_TAG: Record<string, { color: string; label: string }> = {
started: { color: 'default', label: '未完成' },
completed: { color: 'green', label: '完成' },
failed: { color: 'red', label: '失败' },
abandoned: { color: 'orange', label: '中途退出' },
};
// ms → "1.5s"(空值显示 -)
const fmtSec = (ms: number | null | undefined): string =>
ms == null ? '-' : `${(ms / 1000).toFixed(1)}s`;
// 点手机号弹出的「该用户全部领券」抽屉列(精简版:单用户,不含用户/手机号列)。
const RECORD_COLUMNS: ColumnsType<CouponDataRow> = [
{ title: '时间', dataIndex: 'started_at', width: 160, render: (v: string) => formatUtcTime(v) },
{
title: '状态',
dataIndex: 'status',
width: 80,
render: (s: string) => {
const t = STATUS_TAG[s] ?? { color: 'default', label: s };
return <Tag color={t.color}>{t.label}</Tag>;
},
},
{ title: '发起平台', dataIndex: 'origin_package', width: 90, render: (pkg: string | null) => originLabel(pkg) },
{ title: '耗时', dataIndex: 'elapsed_ms', width: 80, align: 'right', render: (v: number | null) => fmtSec(v) },
{ title: '美团', key: 'mt', width: 70, align: 'right', render: (_: unknown, r: CouponDataRow) => fmtSec(r.platform_elapsed?.['meituan-waimai']) },
{ title: '淘宝', key: 'tb', width: 70, align: 'right', render: (_: unknown, r: CouponDataRow) => fmtSec(r.platform_elapsed?.['taobao-shanguang']) },
{ title: '京东', key: 'jd', width: 70, align: 'right', render: (_: unknown, r: CouponDataRow) => fmtSec(r.platform_elapsed?.['jd-waimai']) },
{
title: 'trace',
dataIndex: 'trace_id',
width: 90,
render: (v: string, r: CouponDataRow) =>
r.trace_url ? (
<a href={r.trace_url} target="_blank" rel="noreferrer" title={v}>trace</a>
) : (
<Typography.Text type="secondary" style={{ fontSize: 12 }}>{v.slice(0, 6)}</Typography.Text>
),
},
];
// ── 趋势图(纯 SVG,零依赖,复用广告报表同款):浅蓝柱=发起数、深蓝柱=完成数(左轴 次数),橙线=平均耗时(右轴 秒)──
const CHART_BAR_STARTED = '#bae0ff';
const CHART_BAR_COMPLETED = '#1677ff';
const CHART_LINE = '#fa8c16';
interface TrendPoint {
label: string; // x 轴刻度(小时数 / MM-DD)
tip: string; // hover 原生 tooltip
started: number;
completed: number;
avgSec: number | null; // 平均耗时(秒);该桶无完成为 null(不画线点)
}
// 按天聚合:用 from..to 补齐空缺日为 0,轴连续。
function aggregateDaily(dateFrom: string, dateTo: string, daily: CouponDataDaily[]): TrendPoint[] {
const map = new Map(daily.map((d) => [d.date, d]));
const out: TrendPoint[] = [];
let cur = dayjs(dateFrom);
let guard = 0;
while (cur.format('YYYY-MM-DD') <= dateTo && guard < 400) {
const ds = cur.format('YYYY-MM-DD');
const d = map.get(ds);
const started = d?.started_count ?? 0;
const completed = d?.completed_count ?? 0;
const avgSec = d?.avg_elapsed_ms != null ? d.avg_elapsed_ms / 1000 : null;
out.push({
label: ds.slice(5),
tip: `${ds} 发起 ${started} · 完成 ${completed} · 平均耗时 ${avgSec == null ? '-' : avgSec.toFixed(1) + 's'}`,
started,
completed,
avgSec,
});
cur = cur.add(1, 'day');
guard += 1;
}
return out;
}
// 按小时聚合(023)。
function aggregateHourly(rows: CouponDataHourly[]): TrendPoint[] {
const byHour = new Map(rows.map((r) => [r.hour, r]));
return Array.from({ length: 24 }, (_, h) => {
const r = byHour.get(h);
const started = r?.started_count ?? 0;
const completed = r?.completed_count ?? 0;
const avgSec = r?.avg_elapsed_ms != null ? r.avg_elapsed_ms / 1000 : null;
return {
label: String(h),
tip: `${String(h).padStart(2, '0')}:00 发起 ${started} · 完成 ${completed} · 平均耗时 ${avgSec == null ? '-' : avgSec.toFixed(1) + 's'}`,
started,
completed,
avgSec,
};
});
}
function TrendChart({ points }: { points: TrendPoint[] }) {
const n = points.length;
const maxBar = Math.max(1, ...points.map((p) => p.started));
const maxSec = Math.max(1e-9, ...points.map((p) => p.avgSec ?? 0));
const W = 960;
const H = 280;
const padL = 48;
const padR = 56;
const padT = 16;
const padB = 32;
const plotW = W - padL - padR;
const plotH = H - padT - padB;
const step = plotW / Math.max(1, n);
const barW = Math.min(24, step * 0.5);
const yBase = padT + plotH;
const barX = (i: number) => padL + i * step + (step - barW) / 2;
const cx = (i: number) => padL + i * step + step / 2;
const barH = (v: number) => (v / maxBar) * plotH;
const secY = (v: number) => yBase - (v / maxSec) * plotH;
// X 轴刻度按天/按小时尽量每格都标(≤31 个点每个都标,超出才抽稀),避免跨度稍大就隔天显示。
const labelEvery = Math.max(1, Math.ceil(n / 31));
// 平均耗时线:仅 avgSec 非 null 的点连线(无完成的桶断开)。
const linePts = points
.map((p, i) => (p.avgSec == null ? null : `${cx(i)},${secY(p.avgSec)}`))
.filter((x): x is string => x !== null)
.join(' ');
return (
<svg viewBox={`0 0 ${W} ${H}`} width="100%" style={{ display: 'block' }} role="img" aria-label="趋势图">
{[0, 0.25, 0.5, 0.75, 1].map((t) => {
const y = yBase - t * plotH;
return (
<g key={t}>
<line x1={padL} y1={y} x2={W - padR} y2={y} stroke="#f0f0f0" />
<text x={padL - 8} y={y + 4} textAnchor="end" fontSize={11} fill={CHART_BAR_COMPLETED}>
{Math.round(maxBar * t)}
</text>
<text x={W - padR + 8} y={y + 4} textAnchor="start" fontSize={11} fill={CHART_LINE}>
{(maxSec * t).toFixed(1)}
</text>
</g>
);
})}
{/* 发起数柱(浅) */}
{points.map((p, i) => (
<rect
key={`s-${i}`}
x={barX(i)}
y={yBase - barH(p.started)}
width={barW}
height={barH(p.started)}
fill={CHART_BAR_STARTED}
rx={2}
>
<title>{p.tip}</title>
</rect>
))}
{/* 完成数柱(深,窄,叠中间) */}
{points.map((p, i) => {
const cw = barW * 0.55;
return (
<rect
key={`c-${i}`}
x={cx(i) - cw / 2}
y={yBase - barH(p.completed)}
width={cw}
height={barH(p.completed)}
fill={CHART_BAR_COMPLETED}
rx={1}
>
<title>{p.tip}</title>
</rect>
);
})}
{/* 平均耗时线(橙,右轴) */}
<polyline points={linePts} fill="none" stroke={CHART_LINE} strokeWidth={2} />
{points.map((p, i) =>
p.avgSec == null ? null : (
<circle key={`p-${i}`} cx={cx(i)} cy={secY(p.avgSec)} r={2.5} fill={CHART_LINE}>
<title>{p.tip}</title>
</circle>
),
)}
{points.map((p, i) =>
i % labelEvery === 0 || i === n - 1 ? (
<text key={`x-${i}`} x={cx(i)} y={H - 14} textAnchor="middle" fontSize={11} fill="#999">
{p.label}
</text>
) : null,
)}
</svg>
);
}
// 领券数据看板:上半汇总卡 + 按天/小时趋势(参考广告收益大盘),下半逐条领券明细。
// 数据源 coupon_session(客户端 /api/v1/coupon/session 两段上报);耗时统计只算 completed。
export default function CouponDataPage() {
const { message } = App.useApp();
const [range, setRange] = useState<[Dayjs, Dayjs]>([dayjs().subtract(6, 'day'), dayjs()]);
const [user, setUser] = useState<string>('');
const [appEnv, setAppEnv] = useState<string>('prod');
const [granularity, setGranularity] = useState<'day' | 'hour'>('day');
const [sortBy, setSortBy] = useState<'time' | 'elapsed'>('time');
const [limit, setLimit] = useState<number>(100);
const [page, setPage] = useState<number>(1);
const [queriedGranularity, setQueriedGranularity] = useState<'day' | 'hour'>('day');
const [queriedMultiDay, setQueriedMultiDay] = useState(false);
const [queriedLimit, setQueriedLimit] = useState<number>(100);
const [data, setData] = useState<CouponDataReport | null>(null);
const [loading, setLoading] = useState(false);
// 点手机号:抽屉看该用户全部领券(总次数 + 记录)
const [recordsUser, setRecordsUser] = useState<{ userId: number; phone: string | null } | null>(null);
const openUserRecords = (r: CouponDataRow) => {
if (r.user_id != null) setRecordsUser({ userId: r.user_id, phone: r.user_phone });
};
// 跨多天时「按小时」无意义,粒度强制按天(同广告报表)。
const rangeMultiDay = range[0].format('YYYY-MM-DD') !== range[1].format('YYYY-MM-DD');
const load = useCallback(
async (targetPage = 1, targetLimit = limit, targetSort = sortBy) => {
const from = range[0].format('YYYY-MM-DD');
const to = range[1].format('YYYY-MM-DD');
const multiDay = from !== to;
const gran = multiDay ? 'day' : granularity;
setLoading(true);
try {
const res = await api.get<CouponDataReport>('/admin/api/coupon-data', {
params: {
date_from: from,
date_to: to,
user: user.trim() || undefined,
app_env: appEnv,
granularity: gran,
limit: targetLimit,
offset: (targetPage - 1) * targetLimit,
sort: targetSort,
},
});
setData(res.data);
setPage(targetPage);
setQueriedLimit(targetLimit);
setQueriedGranularity(gran);
setQueriedMultiDay(multiDay);
} catch (e) {
message.error(errMsg(e));
} finally {
setLoading(false);
}
},
[range, user, appEnv, granularity, limit, sortBy, message],
);
useEffect(() => {
load();
// 仅首次自动拉近 7 天;之后由「查询」按钮触发
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
const columns: ColumnsType<CouponDataRow> = [
{
title: '用户',
dataIndex: 'user_nickname',
width: 140,
render: (_: unknown, r: CouponDataRow) => {
if (r.user_nickname) {
return (
<span>
{r.user_nickname}
{r.user_id != null && (
<Typography.Text type="secondary" style={{ fontSize: 11, marginLeft: 6 }}>
#{r.user_id}
</Typography.Text>
)}
</span>
);
}
if (r.user_id != null) return <Typography.Text type="secondary">#{r.user_id}</Typography.Text>;
return <Typography.Text type="secondary"></Typography.Text>;
},
},
{
title: '手机号',
dataIndex: 'user_phone',
width: 130,
// 点手机号 → 抽屉看该用户全部领券(参考低价审核/反馈页)。游客(无 user_id)不可点。
render: (phone: string | null, r: CouponDataRow) =>
r.user_id != null ? (
<a onClick={() => openUserRecords(r)}>{phone || `#${r.user_id}`}</a>
) : (
<Typography.Text type="secondary"></Typography.Text>
),
},
{
title: '状态',
dataIndex: 'status',
width: 90,
render: (s: string) => {
const t = STATUS_TAG[s] ?? { color: 'default', label: s };
return <Tag color={t.color}>{t.label}</Tag>;
},
},
{
title: '发起平台',
dataIndex: 'origin_package',
width: 110,
render: (pkg: string | null) => originLabel(pkg),
},
{
title: '耗时',
dataIndex: 'elapsed_ms',
width: 90,
align: 'right',
render: (v: number | null) => fmtSec(v),
},
{
title: '美团耗时',
key: 'mt_elapsed',
width: 90,
align: 'right',
render: (_: unknown, r: CouponDataRow) => fmtSec(r.platform_elapsed?.['meituan-waimai']),
},
{
title: '淘宝耗时',
key: 'tb_elapsed',
width: 90,
align: 'right',
render: (_: unknown, r: CouponDataRow) => fmtSec(r.platform_elapsed?.['taobao-shanguang']),
},
{
title: '京东耗时',
key: 'jd_elapsed',
width: 90,
align: 'right',
render: (_: unknown, r: CouponDataRow) => fmtSec(r.platform_elapsed?.['jd-waimai']),
},
{
title: '机型/ROM',
key: 'device',
width: 200,
render: (_: unknown, r: CouponDataRow) => {
const parts = [r.device_model, r.rom].filter(Boolean);
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',
width: 150,
// 有 trace_url(pricebot 上云,仅 completed)→ 可点链接打开完整现场;否则降级为可复制 trace_id。
render: (v: string, r: CouponDataRow) =>
r.trace_url ? (
<a href={r.trace_url} target="_blank" rel="noreferrer" title={v}>
trace{v.slice(0, 8)}
</a>
) : (
<Typography.Text copyable={{ text: v }} style={{ fontSize: 12 }}>
{v.slice(0, 8)}
</Typography.Text>
),
},
];
const summary = data?.summary;
const items = data?.items ?? [];
return (
<div>
<Space align="center" style={{ display: 'flex', marginBottom: 16 }}>
<h2 style={{ margin: 0 }}></h2>
<Typography.Text type="secondary" style={{ fontSize: 12 }}>
;/
</Typography.Text>
</Space>
<Card size="small" style={{ marginBottom: 16 }}>
<Space wrap size="middle" align="center">
<Space size={6}>
<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(), dayjs()] },
{ label: '近 7 天', value: [dayjs().subtract(6, 'day'), dayjs()] },
{ label: '近 30 天', value: [dayjs().subtract(29, 'day'), dayjs()] },
]}
/>
</Space>
<Space size={6}>
<Typography.Text type="secondary"></Typography.Text>
<Input
placeholder="手机号/昵称"
value={user}
onChange={(e) => setUser(e.target.value)}
onPressEnter={() => load(1)}
allowClear
style={{ width: 150 }}
/>
</Space>
<Space size={6}>
<Typography.Text type="secondary"></Typography.Text>
<Select
value={appEnv}
onChange={setAppEnv}
style={{ width: 120 }}
options={[
{ value: 'prod', label: '正式(prod)' },
{ value: 'dev', label: '测试(dev)' },
{ value: 'all', label: '全部' },
]}
/>
</Space>
<Space size={6}>
<Typography.Text type="secondary"></Typography.Text>
<Select
value={rangeMultiDay ? 'day' : granularity}
onChange={setGranularity}
disabled={rangeMultiDay}
style={{ width: 110 }}
title={rangeMultiDay ? '跨多天仅支持按天' : undefined}
options={[
{ value: 'day', label: '按天' },
{ value: 'hour', label: '按小时' },
]}
/>
</Space>
<Space size={6}>
<Typography.Text type="secondary"></Typography.Text>
<Select
value={sortBy}
onChange={(v) => {
setSortBy(v);
load(1, limit, v);
}}
style={{ width: 130 }}
options={[
{ value: 'time', label: '时间倒序' },
{ value: 'elapsed', label: '耗时倒序' },
]}
/>
</Space>
<Space size={6}>
<Typography.Text type="secondary"></Typography.Text>
<Select
value={limit}
onChange={(v) => {
setLimit(v);
load(1, v);
}}
style={{ width: 120 }}
options={[20, 50, 100, 200, 500].map((nn) => ({ value: nn, label: `${nn} 条/页` }))}
/>
</Space>
<Button type="primary" onClick={() => load(1)} loading={loading}>
</Button>
</Space>
</Card>
{summary && (
<Card size="small" style={{ marginBottom: 16 }}>
<Row gutter={[16, 12]}>
<Col flex="1 1 0">
<Statistic title="领券发起数" value={summary.started_count} />
</Col>
<Col flex="1 1 0">
<Statistic title="领券完成数" value={summary.completed_count} />
</Col>
<Col flex="1 1 0">
<Statistic title="平均耗时" value={fmtSec(summary.avg_elapsed_ms)} />
</Col>
</Row>
<Divider style={{ marginTop: 16, marginBottom: 16 }} />
<Row gutter={[16, 12]}>
<Col flex="1 1 0">
<Statistic title="耗时 5 分位" value={fmtSec(summary.p5_ms)} />
</Col>
<Col flex="1 1 0">
<Statistic title="耗时 50 分位" value={fmtSec(summary.p50_ms)} />
</Col>
<Col flex="1 1 0">
<Statistic title="耗时 95 分位" value={fmtSec(summary.p95_ms)} />
</Col>
<Col flex="1 1 0">
<Statistic title="耗时 99 分位" value={fmtSec(summary.p99_ms)} />
</Col>
</Row>
</Card>
)}
{data &&
(queriedMultiDay
? (data.daily?.length ?? 0) > 0
: queriedGranularity === 'hour' && (data.hourly?.length ?? 0) > 0) && (
<Card
size="small"
title={queriedMultiDay ? '按天趋势' : '按小时趋势'}
style={{ marginBottom: 16 }}
extra={
<Space size={16}>
<span style={{ fontSize: 12, color: '#666' }}>
<span
style={{
display: 'inline-block',
width: 10,
height: 10,
background: CHART_BAR_STARTED,
borderRadius: 2,
marginRight: 4,
}}
/>
</span>
<span style={{ fontSize: 12, color: '#666' }}>
<span
style={{
display: 'inline-block',
width: 10,
height: 10,
background: CHART_BAR_COMPLETED,
borderRadius: 2,
marginRight: 4,
}}
/>
</span>
<span style={{ fontSize: 12, color: '#666' }}>
<span
style={{
display: 'inline-block',
width: 14,
borderTop: `2px solid ${CHART_LINE}`,
marginRight: 4,
verticalAlign: 'middle',
}}
/>
()
</span>
</Space>
}
>
{queriedMultiDay ? (
<TrendChart points={aggregateDaily(data.date_from, data.date_to, data.daily)} />
) : (
<TrendChart points={aggregateHourly(data.hourly)} />
)}
</Card>
)}
<Table
rowKey="trace_id"
columns={columns}
dataSource={items}
loading={loading}
pagination={{
current: page,
pageSize: queriedLimit,
total: data?.total ?? 0,
showSizeChanger: false,
showTotal: (t) => `${t}`,
onChange: (p) => load(p, queriedLimit),
}}
size="small"
scroll={{ x: 1450 }}
/>
<UserRecordsDrawer<CouponDataRow>
open={recordsUser != null}
onClose={() => setRecordsUser(null)}
userId={recordsUser?.userId ?? null}
phone={recordsUser?.phone ?? null}
endpoint="/admin/api/coupon-data/user-records"
columns={RECORD_COLUMNS}
recordLabel="领券"
countLabel="领券次数"
rewardLabel="领到券张数"
rewardSuffix="张"
rewardOf={(r) => r.claimed_count ?? 0}
/>
</div>
);
}
-2
View File
@@ -8,7 +8,6 @@ import {
DatabaseOutlined,
FileSearchOutlined,
FlagOutlined,
GiftOutlined,
HeartOutlined,
LogoutOutlined,
MessageOutlined,
@@ -36,7 +35,6 @@ const MENU = [
{ key: '/price-reports', icon: <FlagOutlined />, label: '低价审核' },
{ key: '/comparison-records', icon: <ProfileOutlined />, label: '比价记录' },
{ key: '/feedbacks', icon: <MessageOutlined />, label: '用户反馈' },
{ key: '/coupon-data', icon: <GiftOutlined />, label: '领券数据' },
{ key: '/ad-revenue', icon: <NotificationOutlined />, label: '广告配置' },
{ key: '/ad-revenue-report', icon: <BarChartOutlined />, label: '广告收益' },
{ key: '/cps', icon: <ShareAltOutlined />, label: 'CPS 分发' },
+23 -42
View File
@@ -3,7 +3,7 @@
// 调金币 / 调现金弹窗(受控)。列表页与用户详情页共用,避免两处各写一套。
// 每个弹窗自带「增减 / 设为指定值」两种模式;打开时拉一次 360 概览展示当前余额。
import { useEffect, useState } from 'react';
import { App, Form, Input, InputNumber, Modal, Radio, Segmented } from 'antd';
import { App, Form, Input, InputNumber, Modal, Segmented } from 'antd';
import { api, errMsg } from '@/lib/api';
import { yuan } from '@/lib/format';
import type { UserOverview } from '@/lib/types';
@@ -17,19 +17,15 @@ interface ModalProps {
onDone?: () => void; // 调整成功后回调(刷新余额/列表)
}
type Balances = { coin: number; cashCents: number; inviteCashCents: number };
const balanceLine = (balances: Balances | null) => (
const balanceLine = (balances: { coin: number; cashCents: number } | null) => (
<p style={{ color: '#888', marginBottom: 12 }}>
当前余额:金币 {balances ? balances.coin : '…'} (){' '}
{balances ? yuan(balances.cashCents) : '…'} {' '}
{balances ? yuan(balances.inviteCashCents) : '…'}
当前余额:金币 {balances ? balances.coin : '…'} {balances ? yuan(balances.cashCents) : ''}
</p>
);
// 弹窗打开时拉一次该用户余额;用户切换/关闭时丢弃过期响应(alive 标记防竞态)。
function useBalances(userId: number | undefined, open: boolean) {
const [balances, setBalances] = useState<Balances | null>(null);
const [balances, setBalances] = useState<{ coin: number; cashCents: number } | null>(null);
useEffect(() => {
if (!open || userId == null) {
setBalances(null);
@@ -40,12 +36,7 @@ function useBalances(userId: number | undefined, open: boolean) {
api
.get<UserOverview>(`/admin/api/users/${userId}`)
.then((r) => {
if (alive)
setBalances({
coin: r.data.coin_balance,
cashCents: r.data.cash_balance_cents,
inviteCashCents: r.data.invite_cash_balance_cents,
});
if (alive) setBalances({ coin: r.data.coin_balance, cashCents: r.data.cash_balance_cents });
})
.catch(() => {});
return () => {
@@ -122,39 +113,39 @@ export function AdjustCoinModal({ user, open, onClose, onDone }: ModalProps) {
export function AdjustCashModal({ user, open, onClose, onDone }: ModalProps) {
const { message } = App.useApp();
const [form] = Form.useForm();
// 操作方式改为表单必选项(无默认、手动选);用 watch 驱动金额栏文案/最小值
const mode = Form.useWatch('mode', form) as 'delta' | 'set' | undefined;
const [mode, setMode] = useState<'delta' | 'set'>('delta');
const balances = useBalances(user?.id, open);
useEffect(() => {
if (open) form.resetFields(); // 目标账户 / 操作方式 都重置为「未选」
if (open) {
setMode('delta');
form.resetFields();
}
}, [open, form]);
// 输入元,×100 转分后调后端(主要给无现金用户发钱直接测试提现)
const submit = async () => {
if (!user) return;
const v = await form.validateFields(); // 任一必填/必选缺失 → 该项下方红字 + 阻断提交
const v = await form.validateFields();
const amountCents = Math.round(Number(v.amount_yuan) * 100);
if (v.mode === 'delta' && amountCents === 0) {
if (mode === 'delta' && amountCents === 0) {
message.warning('金额不能为 0(且不小于 1 分)');
return;
}
if (v.mode === 'set' && amountCents < 0) {
if (mode === 'set' && amountCents < 0) {
message.warning('目标金额不能为负');
return;
}
const acctName = v.account === 'invite_cash' ? '邀请奖励金' : '现金';
try {
await api.post(`/admin/api/users/${user.id}/cash`, {
account: v.account,
mode: v.mode,
mode,
amount_cents: amountCents,
reason: v.reason,
});
message.success(
v.mode === 'set'
? `已设为 ¥${(amountCents / 100).toFixed(2)} ${acctName}`
: `${amountCents > 0 ? '发放' : '扣减'} ¥${(Math.abs(amountCents) / 100).toFixed(2)} ${acctName}`,
mode === 'set'
? `已设为 ¥${(amountCents / 100).toFixed(2)} 现金`
: `${amountCents > 0 ? '发放' : '扣减'} ¥${(Math.abs(amountCents) / 100).toFixed(2)} 现金`,
);
onClose();
onDone?.();
@@ -173,20 +164,10 @@ export function AdjustCashModal({ user, open, onClose, onDone }: ModalProps) {
>
{balanceLine(balances)}
<Form form={form} layout="vertical">
<Form.Item name="account" label="目标账户" rules={[{ required: true, message: '请选择目标账户' }]}>
<Radio.Group
optionType="button"
buttonStyle="solid"
options={[
{ label: '金币兑现金账户', value: 'coin_cash' },
{ label: '邀请账户', value: 'invite_cash' },
]}
/>
</Form.Item>
<Form.Item name="mode" label="操作方式" rules={[{ required: true, message: '请选择操作方式' }]}>
<Radio.Group
optionType="button"
buttonStyle="solid"
<Form.Item label="操作方式">
<Segmented
value={mode}
onChange={(v) => setMode(v as 'delta' | 'set')}
options={[
{ label: '增减', value: 'delta' },
{ label: '设为指定值', value: 'set' },
@@ -201,7 +182,7 @@ export function AdjustCashModal({ user, open, onClose, onDone }: ModalProps) {
: '现金变动(元,正=发放,负=扣减;不可扣成负)'
}
rules={[
{ required: true, message: '请输入现金变动金额' },
{ required: true },
...(mode === 'set' ? [{ type: 'number' as const, min: 0, message: '目标值不能为负' }] : []),
]}
>
@@ -213,7 +194,7 @@ export function AdjustCashModal({ user, open, onClose, onDone }: ModalProps) {
min={mode === 'set' ? 0 : undefined}
/>
</Form.Item>
<Form.Item name="reason" label="原因(入审计)" rules={[{ required: true, message: '请填写原因' }]}>
<Form.Item name="reason" label="原因(入审计)" rules={[{ required: true }]}>
<Input.TextArea rows={2} />
</Form.Item>
</Form>
+1 -3
View File
@@ -21,7 +21,6 @@ interface Props<T> {
countLabel: string; // 顶部计数卡标题,如「提交总计」/「上报总计」
rewardLabel: string; // 顶部奖励卡标题,如「提交奖励总计」/「上报奖励总计」
rewardOf: (item: T) => number; // 单条已发奖励金币(未采纳/未通过返回 0)
rewardSuffix?: string; // 第二个汇总卡单位,默认「金币」;领券场景可传「张」(领到券张数)等
}
export default function UserRecordsDrawer<T extends { id: number }>({
@@ -35,7 +34,6 @@ export default function UserRecordsDrawer<T extends { id: number }>({
countLabel,
rewardLabel,
rewardOf,
rewardSuffix = '金币',
}: Props<T>) {
const [items, setItems] = useState<T[]>([]);
const [total, setTotal] = useState(0);
@@ -93,7 +91,7 @@ export default function UserRecordsDrawer<T extends { id: number }>({
<>
<Space size={48} style={{ marginBottom: 20 }}>
<Statistic title={countLabel} value={total} />
<Statistic title={rewardLabel} value={rewardTotal} suffix={rewardSuffix} />
<Statistic title={rewardLabel} value={rewardTotal} suffix="金币" />
</Space>
{items.length === 0 ? (
<Empty description={`该用户暂无${recordLabel}`} style={{ marginTop: 24 }} />
-1
View File
@@ -81,7 +81,6 @@ export interface UserOverview {
user: UserListItem;
coin_balance: number;
cash_balance_cents: number;
invite_cash_balance_cents: number; // 邀请奖励金余额(与 cash_balance_cents 物理隔离)
total_coin_earned: number;
comparison_total: number;
comparison_success: number;