Compare commits

...

3 Commits

Author SHA1 Message Date
linkeyu a189c7df9a 修复:同步提现审核列表与统计
邀请提现和其他提现页在窗口聚焦、恢复可见及每分钟自动刷新当前列表和统计。
2026-07-27 10:20:04 +08:00
linkeyu 4cd92539a7 功能:完善提现审核与用户管理页面 2026-07-26 11:36:35 +08:00
linkeyu 694944cb5e 优化:移除提现类型字段 (#73)
## 修改内容
- 删除提现审核 6 个状态子页面共用的提现类型筛选项
- 删除列表和详情抽屉中的提现类型字段
- 筛选栏仅保留:用户手机号、开始时间-结束时间、倒序、重置
- 日期与排序字段固定为申请时间,并同步清理无用前端状态和请求参数
- 同步收窄表格横向滚动宽度

## 后端评估
- 无需后端改动
- source 仍是提现账本分流、扣款、退款与对账所需的业务字段,保留 API 兼容性

## 本地验证
- npx tsc --noEmit
- npm run build
- git diff --check

---------

Co-authored-by: guke <guke@wonderable.ai>
Co-authored-by: linkeyu <798648091@qq.com>
Reviewed-on: #73
Co-authored-by: linkeyu <linkeyu@wonderable.ai>
Co-committed-by: linkeyu <linkeyu@wonderable.ai>
2026-07-25 18:29:50 +08:00
11 changed files with 1540 additions and 1150 deletions
@@ -15,6 +15,8 @@ interface UserOverviewResp {
id: number;
phone: string;
nickname: string | null;
is_high_risk: boolean;
high_risk_note: string | null;
status: string;
wechat_nickname: string | null;
created_at: string;
@@ -49,6 +51,8 @@ export default function UserAdRevenueDrawer({ open, onClose, userId, phone }: Pr
id: o.user.id,
phone: o.user.phone,
nickname: o.user.nickname,
is_high_risk: o.user.is_high_risk,
high_risk_note: o.user.high_risk_note,
status: o.user.status,
wechat_nickname: o.user.wechat_nickname, // 概览接口已返回微信昵称
wechat_avatar_url: null,
+5
View File
@@ -0,0 +1,5 @@
import { WithdrawReviewPage } from '../withdraws/WithdrawReviewPage';
export default function InviteWithdrawsPage() {
return <WithdrawReviewPage mode="invite" />;
}
+10 -3
View File
@@ -75,7 +75,8 @@ const NAV_GROUPS: NavGroup[] = [
icon: <MoneyCollectOutlined />,
label: '奖励审核',
children: [
{ key: '/withdraws', icon: <MoneyCollectOutlined />, label: '提现审核' },
{ key: '/invite-withdraws', icon: <MoneyCollectOutlined />, label: '邀请提现审核' },
{ key: '/withdraws', icon: <MoneyCollectOutlined />, label: '其他提现审核' },
{ key: '/price-reports', icon: <FlagOutlined />, label: '低价审核' },
{ key: '/feedbacks', icon: <MessageOutlined />, label: '用户反馈' },
],
@@ -144,8 +145,13 @@ export default function MainLayout({ children }: { children: React.ReactNode })
const version = (reviewRefreshVersion.current[key] ?? 0) + 1;
reviewRefreshVersion.current[key] = version;
let count: number;
if (key === '/withdraws') {
count = (await api.get<WithdrawSummary>('/admin/api/withdraws/summary')).data.reviewing_count;
if (key === '/withdraws' || key === '/invite-withdraws') {
const source = key === '/invite-withdraws' ? 'invite_cash' : 'coin_cash';
count = (
await api.get<WithdrawSummary>('/admin/api/withdraws/summary', {
params: { source },
})
).data.reviewing_count;
} else if (key === '/price-reports') {
count = (await api.get<PriceReportSummary>('/admin/api/price-reports/summary')).data.pending;
} else {
@@ -158,6 +164,7 @@ export default function MainLayout({ children }: { children: React.ReactNode })
const refreshSafely = (key: ReviewBadgeKey) => refresh(key).catch(() => {});
void Promise.all([
refreshSafely('/withdraws'),
refreshSafely('/invite-withdraws'),
refreshSafely('/price-reports'),
refreshSafely('/feedbacks'),
]);
+65 -10
View File
@@ -13,6 +13,11 @@ import { formatUtcTime } from '@/lib/format';
import { usePagedList } from '@/lib/usePagedList';
import { AdjustCashModal, AdjustCoinModal } from '@/components/AdjustBalanceModals';
import { DeleteUserModal } from '@/components/DeleteUserModal';
import {
clearUserRisk,
UserRiskModal,
type RiskUser,
} from '@/components/UserRiskModal';
import type { UserListItem } from '@/lib/types';
const { RangePicker } = DatePicker;
@@ -49,6 +54,7 @@ export default function UsersPage() {
const [coinUser, setCoinUser] = useState<UserListItem | null>(null);
const [cashUser, setCashUser] = useState<UserListItem | null>(null);
const [delUser, setDelUser] = useState<UserListItem | null>(null);
const [riskUser, setRiskUser] = useState<RiskUser | null>(null);
const [selectedRowKeys, setSelectedRowKeys] = useState<Key[]>([]);
// 筛选/排序变化后清空已选(避免选中项跨筛选错位)
@@ -134,6 +140,22 @@ export default function UsersPage() {
});
};
const markNormalRisk = (u: UserListItem) => {
modal.confirm({
title: `确认将用户 ${u.phone} 标记为非高风险?`,
content: '确认后将清空当前高风险备注。',
onOk: async () => {
try {
await clearUserRisk(u.id);
message.success('已标记为非高风险');
reload();
} catch (error) {
message.error(errMsg(error));
}
},
});
};
// 一次性操作:点一下把该用户标记为「未看过引导」,下次打开 App 重看一遍,看完后端自动恢复(只触发这一次)。
// 用户尚未重看前可「撤销」(把 force_onboarding 置回 false),纠正误点。
const setForceOnboarding = (u: UserListItem, enable: boolean) => {
@@ -213,26 +235,38 @@ export default function UsersPage() {
};
const columns: ColumnsType<UserListItem> = [
{ title: 'ID', dataIndex: 'id', width: 80, sorter: true, sortOrder: sortOrderOf('id') },
{ title: '手机号', dataIndex: 'phone', width: 130 },
{ title: 'ID', dataIndex: 'id', width: 60, sorter: true, sortOrder: sortOrderOf('id') },
{ title: '手机号', dataIndex: 'phone', width: 115 },
{
title: '昵称',
dataIndex: 'nickname',
width: 150,
width: 130,
ellipsis: true,
render: (v: string | null) => v || '-',
},
{ title: '渠道', dataIndex: 'register_channel', width: 90 },
{
title: '用户标识',
dataIndex: 'is_high_risk',
width: 95,
render: (_: boolean, user: UserListItem) => (
<Tooltip title={user.is_high_risk ? user.high_risk_note || '暂无高风险备注' : undefined}>
<Tag color={user.is_high_risk ? 'red' : 'default'}>
{user.is_high_risk ? '高风险' : '非高风险'}
</Tag>
</Tooltip>
),
},
{ title: '渠道', dataIndex: 'register_channel', width: 70 },
{
title: '状态',
dataIndex: 'status',
width: 90,
width: 80,
render: (s: string) => <Tag color={STATUS_COLOR[s]}>{s}</Tag>,
},
{
title: '注册时间',
dataIndex: 'created_at',
width: 160,
width: 140,
sorter: true,
sortOrder: sortOrderOf('created_at'),
render: (v: string) => formatUtcTime(v),
@@ -245,7 +279,7 @@ export default function UsersPage() {
</Tooltip>
),
dataIndex: 'last_active_at',
width: 160,
width: 140,
sorter: true,
// 关掉 antd 默认的「点击升序/降序」表头提示,否则与上面自定义口径 Tooltip 同时弹出互相遮挡
showSorterTooltip: false,
@@ -256,9 +290,14 @@ export default function UsersPage() {
title: '操作',
key: 'op',
fixed: 'right',
width: 340,
width: 540,
render: (_: unknown, u: UserListItem) => (
<Space wrap={false} onClick={(e) => e.stopPropagation()}>
<Space
size={6}
wrap={false}
style={{ whiteSpace: 'nowrap' }}
onClick={(e) => e.stopPropagation()}
>
<a onClick={() => router.push(`/users/${u.id}`)}></a>
{canCoins && <a onClick={() => setCoinUser(u)}></a>}
{canCoins && <a onClick={() => setCashUser(u)}></a>}
@@ -270,6 +309,16 @@ export default function UsersPage() {
{u.debug_trace_enabled ? '关调试链接' : '开调试链接'}
</a>
)}
{canStatus &&
u.status !== 'deleted' &&
(u.is_high_risk ? (
<>
<a onClick={() => setRiskUser(u)}></a>
<a onClick={() => markNormalRisk(u)}></a>
</>
) : (
<a onClick={() => setRiskUser(u)}></a>
))}
{canStatus &&
u.status !== 'deleted' &&
(u.force_onboarding ? (
@@ -392,7 +441,7 @@ export default function UsersPage() {
showTotal: (t) => `${t} 个用户`,
onChange: onPageChange,
}}
scroll={{ x: 1200 }}
scroll={{ x: 1400 }}
onChange={onTableChange}
/>
@@ -404,6 +453,12 @@ export default function UsersPage() {
onClose={() => setDelUser(null)}
onDone={reload}
/>
<UserRiskModal
user={riskUser}
open={!!riskUser}
onClose={() => setRiskUser(null)}
onDone={reload}
/>
</div>
);
}
+51 -20
View File
@@ -4,11 +4,13 @@ import { useCallback, useEffect, useState } from 'react';
import {
DatePicker,
Descriptions,
Input,
Radio,
Space,
Table,
Tag,
Typography,
Tooltip,
message,
} from 'antd';
import type { ColumnsType } from 'antd/es/table';
@@ -39,12 +41,18 @@ const PAGE_SIZE = 10; // 金币记录每页条数
interface Props {
userId: number;
user: WithdrawUserSnapshot | null;
withdrawSource?: 'coin_cash' | 'invite_cash';
// 统计区字段集:withdraw(默认,提现详情:含提现细分) / ad(广告收益详情:只看看广告观看统计,对齐参考图 6 项)
statsVariant?: 'withdraw' | 'ad';
}
/** 用户看广告/提现详情:基本信息 + 互斥时间筛选 + 统计区(按 statsVariant 取字段集)+ 金币发放记录表。 */
export default function UserRewardPanel({ userId, user, statsVariant = 'withdraw' }: Props) {
export default function UserRewardPanel({
userId,
user,
withdrawSource,
statsVariant = 'withdraw',
}: Props) {
const [mode, setMode] = useState<'all' | 'range'>('all'); // all=注册至今 / range=自定义区间
const [range, setRange] = useState<[Dayjs, Dayjs] | null>(null);
const [stats, setStats] = useState<UserRewardStats | null>(null);
@@ -69,7 +77,10 @@ export default function UserRewardPanel({ userId, user, statsVariant = 'withdraw
setStatsLoading(true);
try {
const { data } = await api.get<UserRewardStats>(`/admin/api/users/${userId}/reward-stats`, {
params: JSON.parse(paramsKey),
params: {
...JSON.parse(paramsKey),
...(withdrawSource ? { withdraw_source: withdrawSource } : {}),
},
});
setStats(data);
} catch (e) {
@@ -77,7 +88,7 @@ export default function UserRewardPanel({ userId, user, statsVariant = 'withdraw
} finally {
setStatsLoading(false);
}
}, [userId, paramsKey]);
}, [userId, paramsKey, withdrawSource]);
const loadRecords = useCallback(
async (p: number) => {
@@ -135,6 +146,13 @@ export default function UserRewardPanel({ userId, user, statsVariant = 'withdraw
<Space size="large" wrap>
<span>
<Text strong>{user?.phone || '-'}</Text>
{user && (
<Tooltip title={user.is_high_risk ? user.high_risk_note || '暂无高风险备注' : undefined}>
<Tag color={user.is_high_risk ? 'red' : 'default'} style={{ marginInlineStart: 8 }}>
{user.is_high_risk ? '高风险' : '非高风险'}
</Tag>
</Tooltip>
)}
</span>
<span>
<Text strong>{user?.nickname || '-'}</Text>
@@ -160,6 +178,7 @@ export default function UserRewardPanel({ userId, user, statsVariant = 'withdraw
<RangePicker
size="small"
disabled={mode !== 'range'}
allowEmpty={[true, true]}
value={range}
onChange={(v) => setRange(v as [Dayjs, Dayjs] | null)}
/>
@@ -168,7 +187,7 @@ export default function UserRewardPanel({ userId, user, statsVariant = 'withdraw
{/* 统计区(受时间筛选;现金余额为当前快照)。ad 视图只保留看广告观看统计(对齐参考图 6 项) */}
<Descriptions bordered size="small" column={2} style={{ marginBottom: 8 }}>
<Descriptions.Item label="累计提现">
<Descriptions.Item label="累计成功提现">
{stats ? yuan(stats.withdraw_success_cents) : '-'}
</Descriptions.Item>
<Descriptions.Item label="现金余额">
@@ -176,40 +195,40 @@ export default function UserRewardPanel({ userId, user, statsVariant = 'withdraw
</Descriptions.Item>
{statsVariant === 'ad' ? (
<>
<Descriptions.Item label="激励视频观看数">
<Descriptions.Item label="激励视频成功发奖次数">
{stats?.reward_video_count ?? '-'}
</Descriptions.Item>
{/* eCPM 均按元展示(reward_video / feed avg_ecpm 原始为分/千次,÷100 转元) */}
<Descriptions.Item label="平均激励视频ECPM">
<Descriptions.Item label="预估平均激励视频ECPM">
{stats ? `${(stats.reward_video_avg_ecpm / 100).toFixed(2)} 元/千` : '-'}
</Descriptions.Item>
<Descriptions.Item label="draw信息流视频观看数">
<Descriptions.Item label="Draw信息流奖励份数">
{stats?.feed_count ?? '-'}
</Descriptions.Item>
<Descriptions.Item label="平均draw信息流ECPM">
<Descriptions.Item label="预估平均Draw信息流ECPM">
{stats ? `${(stats.feed_avg_ecpm / 100).toFixed(2)} 元/千` : '-'}
</Descriptions.Item>
</>
) : (
<>
<Descriptions.Item label="提现总次数">{stats?.withdraw_total ?? '-'}</Descriptions.Item>
<Descriptions.Item label="传统任务提现">
<Descriptions.Item label="提现申请总次数">{stats?.withdraw_total ?? '-'}</Descriptions.Item>
<Descriptions.Item label="传统任务累计收益">
{stats ? yuan(stats.traditional_task_cash_cents) : '-'}
</Descriptions.Item>
<Descriptions.Item label="累计激励视频数">
<Descriptions.Item label="激励视频成功发奖次数">
{stats?.reward_video_count ?? '-'}
</Descriptions.Item>
<Descriptions.Item label="平均激励视频ECPM">
<Descriptions.Item label="预估平均激励视频ECPM">
{stats ? `${stats.reward_video_avg_ecpm} 分/千` : '-'}
</Descriptions.Item>
<Descriptions.Item label="激励视频提现">
<Descriptions.Item label="激励视频累计收益">
{stats ? yuan(stats.reward_video_cash_cents) : '-'}
</Descriptions.Item>
<Descriptions.Item label="累计信息流广告数">{stats?.feed_count ?? '-'}</Descriptions.Item>
<Descriptions.Item label="平均信息流广告ECPM">
<Descriptions.Item label="信息流奖励份数">{stats?.feed_count ?? '-'}</Descriptions.Item>
<Descriptions.Item label="预估平均信息流广告ECPM">
{stats ? `${stats.feed_avg_ecpm} 分/千` : '-'}
</Descriptions.Item>
<Descriptions.Item label="信息流广告提现">
<Descriptions.Item label="信息流广告累计收益">
{stats ? yuan(stats.feed_cash_cents) : '-'}
</Descriptions.Item>
</>
@@ -217,12 +236,24 @@ export default function UserRewardPanel({ userId, user, statsVariant = 'withdraw
</Descriptions>
<Text type="secondary" style={{ fontSize: 12 }}>
{statsVariant === 'ad'
? '统计随上方时间筛选(现金余额除外,为当前快照);eCPM 均按元展示(原始分/千次 ÷100)。'
: '统计随上方时间筛选(现金余额除外,为当前快照);eCPM 单位分/千次,同金币审计。'}
? '统计随上方时间筛选(现金余额除外,为当前快照);次数仅统计成功发奖记录,信息流按奖励份数统计;eCPM 为预估值。'
: '统计随上方时间筛选(现金余额除外,为当前快照);提现按申请提交时间统计;累计收益为已发金币按当前汇率折算,不代表实际已提现金额;eCPM 为预估值。'}
</Text>
{/* 金币记录 */}
<h4 style={{ margin: '16px 0 8px' }}></h4>
{user?.is_high_risk && (
<div style={{ marginTop: 16 }}>
<Text strong></Text>
<Input.TextArea
readOnly
value={user.high_risk_note || ''}
rows={3}
style={{ marginTop: 8 }}
/>
</div>
)}
{/* 主要金币发放记录 */}
<h4 style={{ margin: '16px 0 8px' }}></h4>
<Table
rowKey={(r) => `${r.source}-${r.created_at}-${r.coin}-${r.ecpm ?? ''}`}
size="small"
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+18 -5
View File
@@ -1,13 +1,26 @@
'use client';
import { useEffect } from 'react';
import { useRouter } from 'next/navigation';
import { getToken } from '@/lib/auth';
export default function Home() {
const router = useRouter();
useEffect(() => {
router.replace(getToken() ? '/dashboard' : '/login');
}, [router]);
return null;
window.location.replace(getToken() ? '/dashboard' : '/login');
}, []);
return (
<main
style={{
minHeight: '100vh',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
background: '#f0f2f5',
color: '#595959',
fontFamily: 'system-ui, sans-serif',
}}
>
</main>
);
}
+81
View File
@@ -0,0 +1,81 @@
'use client';
import { useEffect, useState } from 'react';
import { App, Input, Modal } from 'antd';
import { api, errMsg } from '@/lib/api';
export type RiskUser = {
id: number;
phone: string;
is_high_risk: boolean;
high_risk_note: string | null;
};
type Props = {
user: RiskUser | null;
open: boolean;
onClose: () => void;
onDone: () => void | Promise<void>;
};
export function UserRiskModal({ user, open, onClose, onDone }: Props) {
const { message } = App.useApp();
const [note, setNote] = useState('');
const [saving, setSaving] = useState(false);
useEffect(() => {
if (open) setNote(user?.high_risk_note ?? '');
}, [open, user]);
const save = async () => {
if (!user) return;
const trimmed = note.trim();
if (!trimmed) {
message.warning('请输入标记为高风险的原因');
return;
}
setSaving(true);
try {
await api.post(`/admin/api/users/${user.id}/risk`, {
is_high_risk: true,
note: trimmed,
});
message.success(user.is_high_risk ? '高风险备注已更新' : '已标记为高风险');
await onDone();
onClose();
} catch (error) {
message.error(errMsg(error));
} finally {
setSaving(false);
}
};
return (
<Modal
title="高风险备注"
open={open}
okText="保存"
confirmLoading={saving}
onOk={save}
onCancel={onClose}
destroyOnHidden
>
<Input.TextArea
autoFocus
rows={5}
maxLength={500}
showCount
value={note}
placeholder="请输入标记为高风险的原因"
onChange={(event) => setNote(event.target.value)}
/>
</Modal>
);
}
export async function clearUserRisk(userId: number) {
await api.post(`/admin/api/users/${userId}/risk`, {
is_high_risk: false,
note: null,
});
}
+5 -1
View File
@@ -1,4 +1,8 @@
export type ReviewBadgeKey = '/withdraws' | '/price-reports' | '/feedbacks';
export type ReviewBadgeKey =
| '/invite-withdraws'
| '/withdraws'
| '/price-reports'
| '/feedbacks';
export const REVIEW_BADGE_REFRESH_EVENT = 'review-badge-refresh';
+26 -21
View File
@@ -52,6 +52,8 @@ export interface UserListItem {
status: string;
// 调试链接权限:开了的用户在 App 比价结果页/记录页可复制 price.shaguabijia.com 的 trace 调试链接
debug_trace_enabled: boolean;
is_high_risk: boolean;
high_risk_note: string | null;
// 运营「一键开启新手引导」:true = 该用户下次打开 App 会被强制重走新手引导,走完自动取消
force_onboarding: boolean;
wechat_openid: string | null;
@@ -143,7 +145,6 @@ export interface WithdrawOrder {
amount_cents: number;
// 提现类型:coin_cash(福利页提现,金币兑换现金) / invite_cash(邀请提现,邀请奖励金)
source: string;
user_name: string | null;
status: string; // reviewing / pending / success / failed / rejected
wechat_state: string | null;
transfer_bill_no: string | null;
@@ -157,6 +158,8 @@ export interface WithdrawOrder {
export interface WithdrawListItem extends WithdrawOrder {
phone: string | null;
nickname: string | null;
is_high_risk: boolean;
high_risk_note: string | null;
cumulative_success_cents: number; // 累计成功提现(分)
}
@@ -174,6 +177,8 @@ export interface WithdrawUserSnapshot {
id: number;
phone: string;
nickname: string | null;
is_high_risk: boolean;
high_risk_note: string | null;
status: string;
wechat_nickname: string | null;
wechat_avatar_url: string | null;
@@ -184,14 +189,34 @@ export interface WithdrawUserSnapshot {
withdraw_success_cents: number;
}
export interface InviteeDetail {
user_id: number;
phone: string;
registered_at: string;
invite_success: boolean;
first_compare_store: string | null;
first_compare_products: string | null;
first_order_store: string | null;
first_order_products: string | null;
first_order_amount_cents: number | null;
}
export interface InviteOverview {
invite_total: number;
invite_success_total: number;
items: InviteeDetail[];
}
export interface WithdrawDetail {
order: WithdrawOrder;
user: WithdrawUserSnapshot | null;
cumulative_success_cents: number;
risk_flags: string[];
risk_score: number;
recent_withdraws: WithdrawOrder[];
recent_cash_transactions: CashTxn[];
audit_logs: AuditLog[];
invite_overview: InviteOverview | null;
}
// 提现详情抽屉「用户统计区」:按时间窗口算的提现 + 看广告行为统计。
@@ -318,26 +343,6 @@ export interface WithdrawBulkResult {
items: WithdrawBulkItemResult[];
}
export interface WithdrawLedgerCheck {
ok: boolean;
// 普通现金账(coin_cash)
cash_balance_total_cents: number;
cash_transaction_total_cents: number;
balance_diff_cents: number;
missing_withdraw_txn_count: number;
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 {
ok: boolean;
wxpay_configured: boolean;