Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 32fde71c96 | |||
| bc677817e4 | |||
| 33c80d6927 | |||
| b1bdb66a76 | |||
| c905e15ec9 | |||
| dd84d771f9 |
@@ -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' }}>
|
||||
|
||||
@@ -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>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -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>
|
||||
);
|
||||
}
|
||||
+13
-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 {
|
||||
@@ -486,7 +496,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;
|
||||
|
||||
Reference in New Issue
Block a user