Compare commits

..

1 Commits

Author SHA1 Message Date
linkeyu 1d28358f07 修复:统一提现审核状态汇总与列表口径 2026-07-27 15:44:03 +08:00
15 changed files with 182 additions and 1600 deletions
@@ -32,24 +32,9 @@ interface Props {
onClose: () => void;
userId: number | null;
phone: string | null; // 报表行已有的手机号:概览拉取失败时兜底展示
dateFrom: string | null;
dateTo: string | null;
appEnv?: 'prod' | 'test';
revenueScope: 'business' | 'all';
feedScene?: 'comparison' | 'coupon' | 'welfare';
}
export default function UserAdRevenueDrawer({
open,
onClose,
userId,
phone,
dateFrom,
dateTo,
appEnv,
revenueScope,
feedScene,
}: Props) {
export default function UserAdRevenueDrawer({ open, onClose, userId, phone }: Props) {
// UserRewardPanel 的 user 快照:它只读 phone/nickname/wechat_nickname/created_at,其余按 snapshot 形状补齐。
const [user, setUser] = useState<WithdrawUserSnapshot | null>(null);
@@ -97,19 +82,7 @@ export default function UserAdRevenueDrawer({
>
{/* userId 就绪即渲染;UserRewardPanel 内部按 userId 自行拉统计与金币记录,user 基本信息随后补上。
statsVariant="ad":统计区只显示 6 项看广告统计(累计提现/现金余额/激励视频观看数+eCPM/draw观看数+eCPM) */}
{userId != null && (
<UserRewardPanel
key={`${userId}-${dateFrom}-${dateTo}-${appEnv}-${revenueScope}-${feedScene}`}
userId={userId}
user={user}
statsVariant="ad"
initialDateFrom={dateFrom ?? undefined}
initialDateTo={dateTo ?? undefined}
appEnv={appEnv}
revenueScope={revenueScope}
feedScene={feedScene}
/>
)}
{userId != null && <UserRewardPanel userId={userId} user={user} statsVariant="ad" />}
</Drawer>
);
}
+16 -50
View File
@@ -30,7 +30,7 @@ import {
} from '@ant-design/icons';
import dayjs, { type Dayjs } from 'dayjs';
import { api, errMsg } from '@/lib/api';
import { formatUtcTime, nearestRankPercentile } from '@/lib/format';
import { formatUtcTime, percentile } from '@/lib/format';
import type {
AdRevenueDaily,
AdRevenueHourly,
@@ -470,27 +470,7 @@ export default function AdRevenueReportPage() {
const [loading, setLoading] = useState(false);
const [formulaOpen, setFormulaOpen] = useState(false);
// 点用户手机号弹出的「用户广告收益详情」半屏抽屉(userId + 手机号;null=关闭)
const [userDrawer, setUserDrawer] = useState<{
userId: number;
phone: string | null;
dateFrom: string;
dateTo: string;
appEnv?: 'prod' | 'test';
revenueScope: 'business' | 'all';
feedScene?: 'comparison' | 'coupon' | 'welfare';
} | null>(null);
const [queriedDetailFilters, setQueriedDetailFilters] = useState<{
dateFrom: string;
dateTo: string;
appEnv?: 'prod' | 'test';
revenueScope: 'business' | 'all';
feedScene?: 'comparison' | 'coupon' | 'welfare';
}>({
dateFrom: range[0].format('YYYY-MM-DD'),
dateTo: range[1].format('YYYY-MM-DD'),
appEnv: 'prod',
revenueScope: 'business',
});
const [userDrawer, setUserDrawer] = useState<{ userId: number; phone: string | null } | null>(null);
// 当前选择是否跨多天:跨多天时「按小时」无意义,粒度强制按天
const rangeMultiDay = range[0].format('YYYY-MM-DD') !== range[1].format('YYYY-MM-DD');
@@ -523,13 +503,6 @@ export default function AdRevenueReportPage() {
},
});
setData(res.data);
setQueriedDetailFilters({
dateFrom: from,
dateTo: to,
appEnv: appEnv === 'all' ? undefined : appEnv,
revenueScope,
feedScene: scene as 'comparison' | 'coupon' | 'welfare' | undefined,
});
setPage(targetPage);
setQueriedLimit(targetLimit);
setQueriedGranularity(gran);
@@ -578,7 +551,7 @@ export default function AdRevenueReportPage() {
width: 150,
render: (phone: string | null, r: AdRevenueRow) => (
// 点手机号/用户 → 打开该用户「广告收益详情」半屏抽屉(统计卡 + 金币记录)
<a onClick={() => setUserDrawer({ userId: r.user_id, phone, ...queriedDetailFilters })}>
<a onClick={() => setUserDrawer({ userId: r.user_id, phone })}>
{phone ? (
<span>
{phone}
@@ -762,7 +735,7 @@ export default function AdRevenueReportPage() {
: `${data.date_from} ~ ${data.date_to}`;
// 第二行大盘「分广告类型」:看视频包含福利视频与提现视频;
// eCPM 优先使用后端按真实展示加权的经营分类口径;兼容旧后端时才用合并收益÷展示数回退
// eCPM 使用合并后的总收益 ÷ 总展示数 × 1000,避免只读取 reward_video 而漏算提现视频
const drawStat = data?.type_stats?.draw;
const rewardVideoStat = data?.type_stats?.reward_video;
const withdrawalVideoStat = data?.type_stats?.withdrawal_video;
@@ -772,10 +745,8 @@ export default function AdRevenueReportPage() {
revenue_yuan:
(rewardVideoStat?.revenue_yuan ?? 0) + (withdrawalVideoStat?.revenue_yuan ?? 0),
};
const drawEcpmStat = data?.category_stats?.draw ?? drawStat;
const videoEcpmStat = data?.category_stats?.video ?? videoStat;
const ecpmOf = (s?: AdRevenueTypeStat) =>
s?.ecpm_yuan ?? (s && s.impressions > 0 ? (s.revenue_yuan / s.impressions) * 1000 : 0);
s && s.impressions > 0 ? (s.revenue_yuan / s.impressions) * 1000 : 0;
// 明细直接用后端返回的当前页 items(「场景」已由后端 feed_scene 全局过滤,前端不再二次筛)。
const items = data?.items ?? [];
@@ -785,9 +756,9 @@ export default function AdRevenueReportPage() {
.filter((item) => item.feed_scene === sceneName)
.map((item) => item.sub_count ?? 1);
return {
p5: nearestRankPercentile(counts, 0.05),
p50: nearestRankPercentile(counts, 0.5),
p95: nearestRankPercentile(counts, 0.95),
p5: percentile(counts, 0.05, false),
p50: percentile(counts, 0.5, false),
p95: percentile(counts, 0.95, false),
};
};
return { coupon: summarize('coupon'), comparison: summarize('comparison') };
@@ -1089,7 +1060,7 @@ export default function AdRevenueReportPage() {
<Statistic title="Draw 信息流收益(元)" value={drawStat?.revenue_yuan ?? 0} precision={4} />
</Col>
<Col span={4}>
<Statistic title="Draw 信息流 eCPM(元/千次)" value={ecpmOf(drawEcpmStat)} precision={2} />
<Statistic title="Draw 信息流 eCPM(元/千次)" value={ecpmOf(drawStat)} precision={2} />
</Col>
<Col span={4}>
<Statistic title="Draw 信息流条数" value={drawStat?.impressions ?? 0} />
@@ -1098,7 +1069,7 @@ export default function AdRevenueReportPage() {
<Statistic title="看视频收益(元)" value={videoStat.revenue_yuan} precision={4} />
</Col>
<Col span={4}>
<Statistic title="看视频 eCPM(元/千次)" value={ecpmOf(videoEcpmStat)} precision={2} />
<Statistic title="看视频 eCPM(元/千次)" value={ecpmOf(videoStat)} precision={2} />
</Col>
<Col span={4}>
<Statistic title="看视频条数" value={videoStat.impressions} />
@@ -1110,12 +1081,12 @@ export default function AdRevenueReportPage() {
</Typography.Text>
</Divider>
<Row gutter={[16, 12]}>
<Col span={4}><Statistic title="单次领券广告数 P5" value={sessionAdCounts.coupon.p5 ?? '-'} precision={0} /></Col>
<Col span={4}><Statistic title="单次领券广告数 P50" value={sessionAdCounts.coupon.p50 ?? '-'} precision={0} /></Col>
<Col span={4}><Statistic title="单次领券广告数 P95" value={sessionAdCounts.coupon.p95 ?? '-'} precision={0} /></Col>
<Col span={4}><Statistic title="单次比价广告数 P5" value={sessionAdCounts.comparison.p5 ?? '-'} precision={0} /></Col>
<Col span={4}><Statistic title="单次比价广告数 P50" value={sessionAdCounts.comparison.p50 ?? '-'} precision={0} /></Col>
<Col span={4}><Statistic title="单次比价广告数 P95" value={sessionAdCounts.comparison.p95 ?? '-'} precision={0} /></Col>
<Col span={4}><Statistic title="单次领券广告数 P5" value={sessionAdCounts.coupon.p5 ?? '-'} precision={1} /></Col>
<Col span={4}><Statistic title="单次领券广告数 P50" value={sessionAdCounts.coupon.p50 ?? '-'} precision={1} /></Col>
<Col span={4}><Statistic title="单次领券广告数 P95" value={sessionAdCounts.coupon.p95 ?? '-'} precision={1} /></Col>
<Col span={4}><Statistic title="单次比价广告数 P5" value={sessionAdCounts.comparison.p5 ?? '-'} precision={1} /></Col>
<Col span={4}><Statistic title="单次比价广告数 P50" value={sessionAdCounts.comparison.p50 ?? '-'} precision={1} /></Col>
<Col span={4}><Statistic title="单次比价广告数 P95" value={sessionAdCounts.comparison.p95 ?? '-'} precision={1} /></Col>
</Row>
</Card>
)}
@@ -1311,11 +1282,6 @@ export default function AdRevenueReportPage() {
open={!!userDrawer}
userId={userDrawer?.userId ?? null}
phone={userDrawer?.phone ?? null}
dateFrom={userDrawer?.dateFrom ?? null}
dateTo={userDrawer?.dateTo ?? null}
appEnv={userDrawer?.appEnv}
revenueScope={userDrawer?.revenueScope ?? 'all'}
feedScene={userDrawer?.feedScene}
onClose={() => setUserDrawer(null)}
/>
</div>
+4 -54
View File
@@ -46,41 +46,6 @@ const fmtTok = (inTok: number | null, outTok: number | null) =>
inTok == null && outTok == null ? '-' : `${inTok ?? 0}/${outTok ?? 0}`;
const fmtRate = (value: number | null) => (value == null ? '-' : `${(value * 100).toFixed(1)}%`);
function deviceName(record: ComparisonRecordListItem): string {
return record.device_model_name || record.device_model || '-';
}
function romName(record: ComparisonRecordListItem): string {
return [
record.rom_vendor,
record.rom_name,
record.rom_version != null ? String(record.rom_version) : null,
]
.filter(Boolean)
.join(' ') || '-';
}
function renderDevice(record: ComparisonRecordListItem): ReactNode {
const readableName = deviceName(record);
const showRawModel =
record.device_model_name
&& record.device_model
&& record.device_model_name !== record.device_model;
return (
<Space direction="vertical" size={0}>
<span>{readableName}</span>
{showRawModel ? (
<Typography.Text type="secondary" style={{ fontSize: 12 }}>
{record.device_model}
</Typography.Text>
) : null}
<Typography.Text type="secondary" style={{ fontSize: 12 }}>
{romName(record)}
</Typography.Text>
</Space>
);
}
// LLM 价格快照只展示 prices 里各模型的单价(元/每百万 token),忽略 mode/_source 等元字段。
function llmPriceRows(snapshot: Record<string, unknown> | null): string[] {
const prices = snapshot?.prices;
@@ -333,14 +298,6 @@ export default function ComparisonRecordsPage() {
<b style={{ color: r.saved_amount_cents > 0 ? '#3f8600' : '#999' }}>{yuan(r.saved_amount_cents)}</b>
),
},
{
title: '是否下单',
dataIndex: 'ordered',
width: 84,
render: (ordered: boolean) => (
<Tag color={ordered ? 'green' : 'default'}>{ordered ? '已下单' : '未下单'}</Tag>
),
},
{ title: 'LLM', dataIndex: 'llm_call_count', width: 56, render: (v) => v ?? '-' },
{
title: 'TOKEN',
@@ -351,9 +308,9 @@ export default function ComparisonRecordsPage() {
{
title: '机型/ROM',
key: 'device',
width: 180,
width: 150,
ellipsis: true,
render: (_, r) => renderDevice(r),
render: (_, r) => [r.device_model, r.rom_name].filter(Boolean).join(' / ') || '-',
},
{
title: 'traceid',
@@ -542,15 +499,8 @@ export default function ComparisonRecordsPage() {
<Card size="small" title="设备环境">
<Descriptions size="small" column={2}>
<Descriptions.Item label="机型">
{deviceName(detail)}
{detail.device_model_name && detail.device_model_name !== detail.device_model
? `${[detail.device_manufacturer, detail.device_model].filter(Boolean).join(' · ')}`
: detail.device_manufacturer
? `${detail.device_manufacturer}`
: ''}
</Descriptions.Item>
<Descriptions.Item label="ROM">{romName(detail)}</Descriptions.Item>
<Descriptions.Item label="机型">{detail.device_model || '-'}{detail.device_manufacturer || '-'}</Descriptions.Item>
<Descriptions.Item label="ROM">{[detail.rom_vendor, detail.rom_name, detail.rom_version].filter(Boolean).join(' ') || '-'}</Descriptions.Item>
<Descriptions.Item label="Android">{detail.android_version || '-'}SDK {detail.android_sdk ?? '-'}</Descriptions.Item>
<Descriptions.Item label="App 版本">{detail.app_version || '-'}{detail.app_version_code ?? '-'}</Descriptions.Item>
<Descriptions.Item label="源 App 版本" span={2}>{detail.source_app_version || '-'}</Descriptions.Item>
+119 -168
View File
@@ -1,18 +1,7 @@
'use client';
import { useEffect, useState } from 'react';
import {
Button,
Card,
InputNumber,
Space,
Spin,
Switch,
Tag,
Typography,
Upload,
message,
} from 'antd';
import { Button, Card, Space, Spin, Switch, Tag, Typography, Upload, message } from 'antd';
import { DeleteOutlined, UploadOutlined } from '@ant-design/icons';
import { api, errMsg } from '@/lib/api';
import { canDo } from '@/lib/auth';
@@ -20,64 +9,55 @@ import { mediaUrl } from '@/lib/media';
import type { GuideVideoConfig as GuideCfg } from '@/lib/types';
const { Text } = Typography;
/** 后端 media.save_guide_video 只认 MP4 魔数;这里先在浏览器挡一道,省得白传 100MB。 */
const MAX_BYTES = 100 * 1024 * 1024;
type Scene = 'coupon' | 'comparison';
const META: Record<Scene, { title: string; action: string }> = {
coupon: { title: '一键自动领取引导视频', action: '一键自动领取' },
comparison: { title: '开始比价引导视频', action: '开始比价' },
};
function SceneConfig({ scene }: { scene: Scene }) {
const meta = META[scene];
/**
* 领券等候浮层的「新手引导视频」配置。
*
* 用户点首页「一键自动领取」→ 出等候浮层,浮层下方那块位置**前 3 次**放这支引导视频
* (而不是广告),每次固定发 120 金币;播完若浮层还开着,自动接着放广告(原逻辑)。
* 「系统配置 → 领券引导视频」tab 的一个区块。
*
* 后台只管两件事:**开关** 和 **换片**。次数(3)/ 金币(120)走服务端默认值,产品已拍板不再
* 开放配置,所以这里不渲染输入框、PATCH 也不带这两个字段(后端仍保留字段与默认值)。
*/
export default function GuideVideoConfig() {
const [cfg, setCfg] = useState<GuideCfg | null>(null);
const [loading, setLoading] = useState(true);
const [saving, setSaving] = useState(false);
const [uploading, setUploading] = useState(false);
// 本地编辑态,保存时一次性 PATCH
const [enabled, setEnabled] = useState(true);
const [maxPlays, setMaxPlays] = useState(3);
const [rewardCoin, setRewardCoin] = useState(100);
const canEdit = canDo(['operator']);
const sync = (value: GuideCfg) => {
setCfg(value);
setEnabled(value.enabled);
setMaxPlays(value.max_plays);
setRewardCoin(value.reward_coin);
const sync = (c: GuideCfg) => {
setCfg(c);
setEnabled(c.enabled);
};
const load = async () => {
setLoading(true);
try {
const { data } = await api.get<GuideCfg>('/admin/api/guide-video', {
params: { scene },
});
const { data } = await api.get<GuideCfg>('/admin/api/guide-video');
sync(data);
} catch (e) {
message.error(errMsg(e));
} finally {
setLoading(false);
}
};
useEffect(() => {
void load();
}, [scene]);
load();
}, []);
const save = async () => {
setSaving(true);
try {
const { data } = await api.patch<GuideCfg>(
'/admin/api/guide-video',
{
enabled,
reward_coin: rewardCoin,
...(scene === 'comparison' ? { max_plays: maxPlays } : {}),
},
{ params: { scene } },
);
const { data } = await api.patch<GuideCfg>('/admin/api/guide-video', { enabled });
sync(data);
message.success(`${meta.title}配置已保存,下次触发即生效`);
message.success('已保存,用户下一次进入领券浮层即生效');
} catch (e) {
message.error(errMsg(e));
} finally {
@@ -85,27 +65,11 @@ function SceneConfig({ scene }: { scene: Scene }) {
}
};
const uploadVideo = async (file: File) => {
const form = new FormData();
form.append('file', file);
setUploading(true);
try {
const { data } = await api.post<GuideCfg>(
'/admin/api/guide-video/video',
form,
{ params: { scene } },
);
sync(data);
message.success(`${meta.title}已更新`);
} catch (e) {
message.error(errMsg(e));
} finally {
setUploading(false);
}
};
// antd Upload:beforeUpload 里自行 POST(multipart),返回 false 阻止其默认上传。
const beforeUpload = (file: File) => {
if (file.type !== 'video/mp4' && !/\.mp4$/i.test(file.name)) {
// 有些系统给 .mp4 的 type 是空串,不能只看 type,再兜一层扩展名。
const looksMp4 = file.type === 'video/mp4' || /\.mp4$/i.test(file.name);
if (!looksMp4) {
message.error('仅支持 MP4 视频(H.264 编码)');
return Upload.LIST_IGNORE;
}
@@ -117,15 +81,27 @@ function SceneConfig({ scene }: { scene: Scene }) {
return false;
};
const uploadVideo = async (file: File) => {
const form = new FormData();
form.append('file', file);
setUploading(true);
try {
const { data } = await api.post<GuideCfg>('/admin/api/guide-video/video', form);
sync(data);
message.success('引导视频已更新,用户下一次进入领券浮层即生效');
} catch (e) {
message.error(errMsg(e));
} finally {
setUploading(false);
}
};
const removeVideo = async () => {
setUploading(true);
try {
const { data } = await api.delete<GuideCfg>(
'/admin/api/guide-video/video',
{ params: { scene } },
);
const { data } = await api.delete<GuideCfg>('/admin/api/guide-video/video');
sync(data);
message.success(`已移除${meta.title}`);
message.success('已移除引导视频,领券浮层恢复为只放广告');
} catch (e) {
message.error(errMsg(e));
} finally {
@@ -136,136 +112,111 @@ function SceneConfig({ scene }: { scene: Scene }) {
return (
<Card
size="small"
title={meta.title}
title="领券引导视频(App 领券等候浮层,前 3 次替代广告)"
style={{ marginBottom: 16 }}
extra={
cfg?.updated_at ? (
<Text type="secondary">
<Text type="secondary" style={{ fontSize: 12 }}>
{new Date(cfg.updated_at).toLocaleString('zh-CN')}
</Text>
) : null
}
>
<p style={{ color: '#777', marginTop: 0 }}>
Android {meta.action} {cfg?.max_plays ?? 3}{' '}
广
{scene === 'coupon' &&
'领券引导视频的播放次数上限请在「监控审计 → 白名单」中调整。'}
<p style={{ color: '#999', marginTop: 0 }}>
广<b> 3 </b>
<b></b> <b>120 </b>广
<b></b><b></b>
<b></b><b></b>
</p>
{loading || !cfg ? (
<Spin style={{ display: 'block', margin: '24px 0' }} />
) : (
<Space align="start" size={32} wrap>
<div style={{ width: 240 }}>
{cfg.video_url ? (
// eslint-disable-next-line jsx-a11y/media-has-caption
<video
src={mediaUrl(cfg.video_url)}
controls
style={{
width: 240,
maxHeight: 420,
borderRadius: 12,
background: '#000',
}}
/>
) : (
<div
style={{
height: 280,
border: '1px dashed #d9d9d9',
borderRadius: 12,
display: 'grid',
placeItems: 'center',
color: '#aaa',
}}
>
{/* 左:视频预览 */}
<div>
<Text type="secondary" style={{ fontSize: 12 }}>
</Text>
<div style={{ marginTop: 8, width: 240 }}>
{cfg.video_url ? (
// eslint-disable-next-line jsx-a11y/media-has-caption
<video
src={mediaUrl(cfg.video_url)}
controls
style={{
width: 240,
maxHeight: 420,
borderRadius: 12,
background: '#000',
border: '1px solid #f0f0f0',
}}
/>
) : (
<div
style={{
width: 240,
height: 320,
borderRadius: 12,
border: '1px dashed #d9d9d9',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
color: '#bbb',
fontSize: 13,
textAlign: 'center',
padding: 16,
}}
>
<br />
广
</div>
)}
</div>
{!enabled && cfg.video_url && (
<div style={{ color: '#fa8c16', fontSize: 12, marginTop: 6 }}>
广
</div>
)}
</div>
<Space direction="vertical" size="middle" style={{ minWidth: 390 }}>
{/* 右:编辑控件 */}
<Space direction="vertical" size="middle" style={{ minWidth: 360 }}>
<Space>
<span></span>
<Switch
checked={enabled}
disabled={!canEdit}
onChange={setEnabled}
/>
<span></span>
<Switch checked={enabled} disabled={!canEdit} onChange={setEnabled} />
{!enabled && <Tag color="orange"></Tag>}
</Space>
{scene === 'comparison' && (
<Space>
<span></span>
<InputNumber
min={0}
max={50}
precision={0}
value={maxPlays}
disabled={!canEdit}
onChange={(value) => setMaxPlays(value ?? 0)}
/>
<Text type="secondary"> N 3</Text>
</Space>
)}
<Space>
<span></span>
<InputNumber
min={0}
max={10000}
precision={0}
value={rewardCoin}
disabled={!canEdit}
onChange={(value) => setRewardCoin(value ?? 0)}
/>
<Text type="secondary"> 100</Text>
</Space>
<Space wrap>
<Upload
accept="video/mp4,.mp4"
showUploadList={false}
beforeUpload={beforeUpload}
disabled={!canEdit}
>
<Button
icon={<UploadOutlined />}
loading={uploading}
disabled={!canEdit}
>
<Upload accept="video/mp4,.mp4" showUploadList={false} beforeUpload={beforeUpload} disabled={!canEdit}>
<Button icon={<UploadOutlined />} loading={uploading} disabled={!canEdit}>
{cfg.video_url ? '更换视频' : '上传视频'}
</Button>
</Upload>
{cfg.video_url && (
<Button icon={<DeleteOutlined />} danger loading={uploading} disabled={!canEdit} onClick={removeVideo}>
<Button
icon={<DeleteOutlined />}
danger
loading={uploading}
disabled={!canEdit}
onClick={removeVideo}
>
</Button>
)}
<Text type="secondary">MP4H.264100MB</Text>
<Text type="secondary" style={{ fontSize: 12 }}>
MP4H.264100MB
</Text>
</Space>
<Button
type="primary"
loading={saving}
disabled={!canEdit}
onClick={save}
>
<Button type="primary" loading={saving} disabled={!canEdit} onClick={save}>
</Button>
<Text type="secondary">
{cfg.total_plays} {cfg.granted_plays}
</Text>
{!canEdit && <Text type="secondary"> operator / super_admin </Text>}
</Space>
</Space>
)}
</Card>
);
}
export default function GuideVideoConfig() {
return (
<>
<SceneConfig scene="coupon" />
<SceneConfig scene="comparison" />
</>
);
}
+1 -1
View File
@@ -165,7 +165,7 @@ export default function ConfigPage() {
},
{ key: 'welfare', label: '福利页', children: welfareConfig },
{ key: 'feedback-qr', label: '反馈二维码', children: <FeedbackQrConfig /> },
{ key: 'guide-video', label: '引导视频奖励', children: <GuideVideoConfig /> },
{ key: 'guide-video', label: '领券引导视频', children: <GuideVideoConfig /> },
]}
/>
</div>
+2 -2
View File
@@ -710,7 +710,7 @@ export default function DashboardPage() {
<div>
<h1></h1>
<p>
{updatedAt ?? '--'} · · 00:00
{updatedAt ?? '--'} · · 00:00
</p>
</div>
<div className="controls">
@@ -734,7 +734,7 @@ export default function DashboardPage() {
format="YYYY-MM-DD"
allowClear={false}
open={datePickerOpen}
disabledDate={(date) => date.isAfter(dayjs(), 'day')}
disabledDate={(date) => date.isAfter(dayjs().subtract(1, 'day'), 'day')}
suffixIcon={<CalendarOutlined />}
onClick={() => setDatePickerOpen(true)}
onOpenChange={setDatePickerOpen}
+5 -32
View File
@@ -1,6 +1,6 @@
'use client';
import { useCallback, useEffect, useRef, useState } from 'react';
import { useEffect, useState } from 'react';
import type { ColumnsType } from 'antd/es/table';
import type { SorterResult } from 'antd/es/table/interface';
import {
@@ -35,7 +35,6 @@ import UserRecordsDrawer from '@/components/UserRecordsDrawer';
const { Text, Paragraph } = Typography;
const { RangePicker } = DatePicker;
const REWARD_MAX = 10000;
const REVIEW_PAGE_POLL_INTERVAL_MS = 60_000;
// 截图是 app-server 的 /media 相对路径,本地由 :8770 提供(NEXT_PUBLIC_MEDIA_BASE);生产同域走 nginx 代理。
const MEDIA_BASE = process.env.NEXT_PUBLIC_MEDIA_BASE || '';
@@ -197,10 +196,6 @@ export default function FeedbacksPage() {
const filters: Record<string, unknown> = { ...applied, sort_by: sortBy, sort_order: sortOrder };
const { items, total, page, pageSize, loading, onChange: onPageChange, reload } =
usePagedList<Feedback>('/admin/api/feedbacks', filters);
const reloadRef = useRef(reload);
useEffect(() => {
reloadRef.current = reload;
}, [reload]);
const canReview = canDo(['operator']);
const [selectedRowKeys, setSelectedRowKeys] = useState<number[]>([]);
@@ -218,39 +213,17 @@ export default function FeedbacksPage() {
}, [items]);
const [summary, setSummary] = useState<FeedbackSummary | null>(null);
const loadSummary = useCallback(async () => {
const loadSummary = async () => {
try {
const { data } = await api.get<FeedbackSummary>('/admin/api/feedbacks/summary');
setSummary(data);
} catch {
/* 统计失败不阻塞列表 */
}
}, []);
const refreshPageData = useCallback(() => {
void reloadRef.current();
void loadSummary();
}, [loadSummary]);
};
useEffect(() => {
void loadSummary();
const onWindowFocus = () => refreshPageData();
const onVisibilityChange = () => {
if (document.visibilityState === 'visible') refreshPageData();
};
const pollTimer = window.setInterval(() => {
if (document.visibilityState === 'visible') refreshPageData();
}, REVIEW_PAGE_POLL_INTERVAL_MS);
window.addEventListener('focus', onWindowFocus);
document.addEventListener('visibilitychange', onVisibilityChange);
return () => {
window.clearInterval(pollTimer);
window.removeEventListener('focus', onWindowFocus);
document.removeEventListener('visibilitychange', onVisibilityChange);
};
}, [loadSummary, refreshPageData]);
loadSummary();
}, []);
// 审核/查看抽屉(采纳发金币 / 拒绝填原因 + 看该用户历史反馈)
const [drawerFb, setDrawerFb] = useState<Feedback | null>(null);
+7 -28
View File
@@ -18,7 +18,6 @@ import {
ProfileOutlined,
SafetyCertificateOutlined,
SecurityScanOutlined,
StopOutlined,
SettingOutlined,
ShareAltOutlined,
TeamOutlined,
@@ -38,8 +37,6 @@ import type {
WithdrawSummary,
} from '@/lib/types';
const REVIEW_BADGE_POLL_INTERVAL_MS = 60_000;
const { Sider, Header, Content } = Layout;
type NavItem = {
@@ -106,7 +103,6 @@ const NAV_GROUPS: NavGroup[] = [
{ key: '/analytics-health', icon: <LineChartOutlined />, label: '埋点成功率' },
{ key: '/event-logs', icon: <DatabaseOutlined />, label: '埋点日志' },
{ key: '/audit-logs', icon: <FileSearchOutlined />, label: '审计日志' },
{ key: '/limit-whitelist', icon: <StopOutlined />, label: '白名单' },
],
},
];
@@ -166,39 +162,22 @@ export default function MainLayout({ children }: { children: React.ReactNode })
};
const refreshSafely = (key: ReviewBadgeKey) => refresh(key).catch(() => {});
const refreshAll = () => {
void Promise.all([
refreshSafely('/withdraws'),
refreshSafely('/invite-withdraws'),
refreshSafely('/price-reports'),
refreshSafely('/feedbacks'),
]);
};
refreshAll();
void Promise.all([
refreshSafely('/withdraws'),
refreshSafely('/invite-withdraws'),
refreshSafely('/price-reports'),
refreshSafely('/feedbacks'),
]);
const onReviewCompleted = (event: Event) => {
const key = (event as CustomEvent<ReviewBadgeKey>).detail;
if (key) void refreshSafely(key);
};
const onWindowFocus = () => refreshAll();
const onVisibilityChange = () => {
if (document.visibilityState === 'visible') refreshAll();
};
const pollTimer = window.setInterval(() => {
if (document.visibilityState === 'visible') refreshAll();
}, REVIEW_BADGE_POLL_INTERVAL_MS);
window.addEventListener(REVIEW_BADGE_REFRESH_EVENT, onReviewCompleted);
window.addEventListener('focus', onWindowFocus);
document.addEventListener('visibilitychange', onVisibilityChange);
return () => {
window.clearInterval(pollTimer);
window.removeEventListener(REVIEW_BADGE_REFRESH_EVENT, onReviewCompleted);
window.removeEventListener('focus', onWindowFocus);
document.removeEventListener('visibilitychange', onVisibilityChange);
};
}, [admin, pathname]);
}, [admin]);
if (!admin) return null; // 守卫期间不闪烁内容
File diff suppressed because it is too large Load Diff
+5 -32
View File
@@ -1,6 +1,6 @@
'use client';
import { useCallback, useEffect, useRef, useState } from 'react';
import { useEffect, useState } from 'react';
import {
App,
Button,
@@ -30,7 +30,6 @@ import type { PriceReport, PriceReportSummary } from '@/lib/types';
import UserRecordsDrawer from '@/components/UserRecordsDrawer';
const { Text } = Typography;
const REVIEW_PAGE_POLL_INTERVAL_MS = 60_000;
// 后端 created_at/reviewed_at 存的是北京 wall-clock(naive,同 savings/comparison),
// 直接本地解析、不加 Z(否则会差 8h)。
@@ -151,10 +150,6 @@ export default function PriceReportsPage() {
const { items, total, page, pageSize, loading, onChange: onPageChange, reload } =
usePagedList<PriceReport>('/admin/api/price-reports', filters);
const reloadRef = useRef(reload);
useEffect(() => {
reloadRef.current = reload;
}, [reload]);
const sortOrderOf = (field: SortField) =>
sortBy === field ? (sortOrder === 'asc' ? 'ascend' : 'descend') : null;
@@ -186,39 +181,17 @@ export default function PriceReportsPage() {
setSelectedRowKeys((keys) => keys.filter((id) => visiblePendingIds.has(id)));
}, [items]);
const loadSummary = useCallback(async () => {
const loadSummary = async () => {
try {
const { data } = await api.get<PriceReportSummary>('/admin/api/price-reports/summary');
setSummary(data);
} catch {
/* 统计失败不阻塞列表 */
}
}, []);
const refreshPageData = useCallback(() => {
void reloadRef.current();
void loadSummary();
}, [loadSummary]);
};
useEffect(() => {
void loadSummary();
const onWindowFocus = () => refreshPageData();
const onVisibilityChange = () => {
if (document.visibilityState === 'visible') refreshPageData();
};
const pollTimer = window.setInterval(() => {
if (document.visibilityState === 'visible') refreshPageData();
}, REVIEW_PAGE_POLL_INTERVAL_MS);
window.addEventListener('focus', onWindowFocus);
document.addEventListener('visibilitychange', onVisibilityChange);
return () => {
window.clearInterval(pollTimer);
window.removeEventListener('focus', onWindowFocus);
document.removeEventListener('visibilitychange', onVisibilityChange);
};
}, [loadSummary, refreshPageData]);
loadSummary();
}, []);
const refreshAfterChange = () => {
reload();
+6 -71
View File
@@ -19,7 +19,6 @@ import {
CopyOutlined,
DownOutlined,
EditOutlined,
PlusCircleOutlined,
ReloadOutlined,
RightOutlined,
} from '@ant-design/icons';
@@ -70,8 +69,8 @@ type IncidentStatus = 'open' | 'blocked';
const RULE_LIMITS: Record<RiskKind, { min: number; max: number; help: string }> = {
sms: {
min: 1,
max: 100000,
help: '统计成功下发;告警阈值与短信硬限制分别配置。',
max: 5,
help: '统计成功下发;最高5次,与现有每设备每小时发送上限一致。',
},
oneclick: {
min: 1,
@@ -80,8 +79,8 @@ const RULE_LIMITS: Record<RiskKind, { min: number; max: number; help: string }>
},
compare: {
min: 1,
max: 100000,
help: '同一账户按北京时间自然日累计;告警阈值与比价硬限制分别配置。',
max: 100,
help: '同一账户按北京时间自然日累计;最高100次,与比价每日上限一致。',
},
};
const utcTime = (value: string | null, withDate = true) =>
@@ -598,40 +597,6 @@ export default function RiskMonitorPage() {
[lists, loadAll, message, modal],
);
const addToWhitelist = useCallback(
(row: RiskIncidentItem) => {
const isCompare = row.kind === 'compare';
const subjectValue = isCompare ? row.phone : row.subject_id;
if (!isCompare && subjectValue?.startsWith('legacy-ip:')) {
void message.error(
'旧客户端未上报真实设备 ID,无法加入设备白名单,请升级客户端后重试',
);
return;
}
if (!subjectValue) {
void message.error(
isCompare
? '该风险记录没有关联手机号,暂时无法加入白名单'
: '该风险记录没有设备 ID,暂时无法加入白名单',
);
return;
}
const ruleCode: Record<RiskKind, string> = {
sms: 'risk.sms.hourly',
oneclick: 'risk.oneclick.daily',
compare: 'risk.compare.daily',
};
const params = new URLSearchParams({
create: '1',
subject_type: isCompare ? 'phone' : 'device',
subject_value: subjectValue,
rule_code: ruleCode[row.kind],
});
window.location.assign(`/limit-whitelist?${params.toString()}`);
},
[message],
);
const columns = useCallback(
(kind: RiskKind): ColumnsType<RiskIncidentItem> => {
const actionColumn = {
@@ -639,12 +604,9 @@ export default function RiskMonitorPage() {
key: 'actions',
align: 'right' as const,
fixed: 'right' as const,
width: 280,
width: 180,
render: (_: unknown, row: RiskIncidentItem) => {
const open = expanded.has(row.incident_id);
const canAddToWhitelist =
row.kind === 'compare' ||
!row.subject_id.startsWith('legacy-ip:');
return (
<span className={styles.actionGroup}>
<Button
@@ -656,24 +618,6 @@ export default function RiskMonitorPage() {
>
{open ? '收起' : '展开'}
</Button>
<Tooltip
title={
canAddToWhitelist
? undefined
: '旧客户端未上报真实设备 ID,无法加入设备白名单'
}
>
<span>
<Button
size="small"
icon={<PlusCircleOutlined />}
disabled={!canAddToWhitelist}
onClick={() => addToWhitelist(row)}
>
</Button>
</span>
</Tooltip>
{row.status === 'open' && (
<>
<Button
@@ -756,16 +700,7 @@ export default function RiskMonitorPage() {
actionColumn,
];
},
[
acting,
addToWhitelist,
copy,
detailLoading,
expanded,
revokeRestriction,
runAction,
toggle,
],
[acting, copy, detailLoading, expanded, revokeRestriction, runAction, toggle],
);
const cards = useMemo(() => {
+4 -20
View File
@@ -44,11 +44,6 @@ interface Props {
withdrawSource?: 'coin_cash' | 'invite_cash';
// 统计区字段集:withdraw(默认,提现详情:含提现细分) / ad(广告收益详情:只看看广告观看统计,对齐参考图 6 项)
statsVariant?: 'withdraw' | 'ad';
initialDateFrom?: string;
initialDateTo?: string;
appEnv?: 'prod' | 'test';
revenueScope?: 'business' | 'all';
feedScene?: 'comparison' | 'coupon' | 'welfare';
}
/** 用户看广告/提现详情:基本信息 + 互斥时间筛选 + 统计区(按 statsVariant 取字段集)+ 金币发放记录表。 */
@@ -57,17 +52,9 @@ export default function UserRewardPanel({
user,
withdrawSource,
statsVariant = 'withdraw',
initialDateFrom,
initialDateTo,
appEnv,
revenueScope = 'all',
feedScene,
}: Props) {
const hasInitialRange = Boolean(initialDateFrom && initialDateTo);
const [mode, setMode] = useState<'all' | 'range'>(hasInitialRange ? 'range' : 'all');
const [range, setRange] = useState<[Dayjs, Dayjs] | null>(() =>
hasInitialRange ? [dayjs(initialDateFrom), dayjs(initialDateTo)] : null,
);
const [mode, setMode] = useState<'all' | 'range'>('all'); // all=注册至今 / range=自定义区间
const [range, setRange] = useState<[Dayjs, Dayjs] | null>(null);
const [stats, setStats] = useState<UserRewardStats | null>(null);
const [statsLoading, setStatsLoading] = useState(false);
@@ -93,9 +80,6 @@ export default function UserRewardPanel({
params: {
...JSON.parse(paramsKey),
...(withdrawSource ? { withdraw_source: withdrawSource } : {}),
...(appEnv ? { app_env: appEnv } : {}),
revenue_scope: revenueScope,
...(feedScene ? { feed_scene: feedScene } : {}),
},
});
setStats(data);
@@ -104,7 +88,7 @@ export default function UserRewardPanel({
} finally {
setStatsLoading(false);
}
}, [userId, paramsKey, withdrawSource, appEnv, revenueScope, feedScene]);
}, [userId, paramsKey, withdrawSource]);
const loadRecords = useCallback(
async (p: number) => {
@@ -252,7 +236,7 @@ export default function UserRewardPanel({
</Descriptions>
<Text type="secondary" style={{ fontSize: 12 }}>
{statsVariant === 'ad'
? '统计继承广告收益页已查询的日期、环境、业务代码位和场景;次数仅统计成功发奖记录,信息流按奖励份数统计;Draw eCPM 按全部实际展示统计(含未发奖)。'
? '统计随上方时间筛选(现金余额除外,为当前快照);次数仅统计成功发奖记录,信息流按奖励份数统计;eCPM 为预估值。'
: '统计随上方时间筛选(现金余额除外,为当前快照);提现按申请提交时间统计;累计收益为已发金币按当前汇率折算,不代表实际已提现金额;eCPM 为预估值。'}
</Text>
@@ -570,7 +570,6 @@ export function WithdrawReviewPage({ mode = 'other' }: { mode?: WithdrawReviewMo
},
{
title: '失败/拒绝原因',
key: 'fail_reason',
dataIndex: 'fail_reason',
ellipsis: true,
render: (v: string | null) => v || <Text type="secondary">-</Text>,
@@ -648,10 +647,6 @@ export function WithdrawReviewPage({ mode = 'other' }: { mode?: WithdrawReviewMo
},
},
];
const visibleColumns =
activeStatus === 'pending' || activeStatus === 'success'
? columns.filter((column) => column.key !== 'fail_reason')
: columns;
const inviteeColumns: ColumnsType<InviteeDetail> = [
{ title: '手机号', dataIndex: 'phone', width: 130 },
@@ -950,7 +945,7 @@ export function WithdrawReviewPage({ mode = 'other' }: { mode?: WithdrawReviewMo
}
: undefined
}
columns={visibleColumns}
columns={columns}
dataSource={items}
loading={loading}
pagination={{
@@ -994,6 +989,12 @@ export function WithdrawReviewPage({ mode = 'other' }: { mode?: WithdrawReviewMo
<Descriptions.Item label="金额">
<Text strong>{yuan(detail.order.amount_cents)}</Text>
</Descriptions.Item>
<Descriptions.Item label="提现类型">
{detail.order.source === 'invite_cash' ? '邀请奖励提现' : '福利页提现'}
</Descriptions.Item>
<Descriptions.Item label="累计成功提现">
{yuan(detail.cumulative_success_cents)}
</Descriptions.Item>
<Descriptions.Item label="提交时间">
{dt(detail.order.created_at)}
</Descriptions.Item>
-12
View File
@@ -37,18 +37,6 @@ export function percentile(values: readonly number[], q: number, round = true):
return round ? Math.round(result) : result;
}
/**
* nearest-rank
* 广线
*/
export function nearestRankPercentile(values: readonly number[], q: number): number | null {
if (!values.length) return null;
const sorted = [...values].sort((a, b) => a - b);
const quantile = Math.min(1, Math.max(0, q));
const rank = Math.max(1, Math.ceil(quantile * sorted.length));
return sorted[rank - 1];
}
const hasTz = (v: string) => /(?:Z|[+-]\d{2}:?\d{2})$/i.test(v);
/** 把 UTC 口径字符串解析为带时区的 dayjs(无时区后缀的补 Z 当 UTC)。 */
+4 -71
View File
@@ -233,7 +233,7 @@ export interface UserRewardStats {
reward_video_avg_ecpm: number; // 平均激励视频 eCPM(分/千次)
reward_video_cash_cents: number; // 激励视频提现
feed_count: number; // 累计信息流广告数(份)
feed_avg_ecpm: number; // 全部 Draw/feed 实际展示的平均 eCPM(分/千次,含未发奖展示)
feed_avg_ecpm: number; // 平均信息流广告 eCPM(分/千次)
feed_cash_cents: number; // 信息流广告提现
}
@@ -414,14 +414,13 @@ export interface FeedbackQrConfig {
updated_at: string | null;
}
/** ( 3 广, 100 )
/** ( 3 广, 120 )
* enabled + ;, */
export interface GuideVideoConfig {
scene: 'coupon' | 'comparison';
enabled: boolean;
video_url: string | null; // /media/guide_video/xxx.mp4;null = 未配片(浮层照旧只放广告)
max_plays: number; // 每个账号前 N 次浮层放引导视频(服务端默认 3,后台不开放调整)
reward_coin: number; // 每次固定金币(服务端默认 100,播完 / 中途关闭都发)
reward_coin: number; // 每次固定金币(服务端默认 120,播完 / 中途关闭都发)
updated_at: string | null;
total_plays: number; // 只读统计:全站已播次数(后台不再展示)
granted_plays: number; // 只读统计:其中已发币次数(后台不再展示)
@@ -458,7 +457,6 @@ export interface ComparisonRecordListItem {
source_price_cents: number | null;
best_price_cents: number | null;
saved_amount_cents: number | null;
ordered: boolean;
total_ms: number | null;
step_count: number | null;
llm_call_count: number | null;
@@ -467,10 +465,8 @@ export interface ComparisonRecordListItem {
output_tokens: number | null;
llm_cost_yuan: number | null; // 后端按「当时价」冻结的实际成本(元);旧记录 null → 「成本」列回退估算
device_model: string | null;
device_model_name: string | null;
rom_vendor: string | null;
rom_name: string | null;
rom_version: number | null;
android_version: string | null;
app_version: string | null;
ad_revenue_yuan: number; // 本次比价看的信息流广告预估收益(元)
@@ -521,6 +517,7 @@ export interface ComparisonRecordDetail extends ComparisonRecordListItem {
comparison_results: Record<string, unknown>[];
skipped_dish_names: string[];
device_manufacturer: string | null;
rom_version: number | null;
android_sdk: number | null;
app_version_code: number | null;
source_app_version: string | null;
@@ -584,7 +581,6 @@ export interface AdRevenueHourly {
export interface AdRevenueTypeStat {
impressions: number; // 该类型展示条数合计
revenue_yuan: number; // 该类型预估收益合计(元)
ecpm_yuan?: number; // 按真实展示次数加权的 SDK eCPM(元/千次)
}
// 广告收益报表:一次广告事件(逐条一行)。激励视频展示+发奖按 ad_session_id 合并;信息流展示/发奖各自成行。
@@ -624,7 +620,6 @@ export interface AdRevenueReport {
daily: AdRevenueDaily[]; // 按日期汇总序列(全量,供按天趋势图)
hourly: AdRevenueHourly[]; // 按小时汇总序列(全量,供按小时趋势图;按天查询时为空)
type_stats: Record<string, AdRevenueTypeStat>; // 按广告类型小计;前端取 draw / reward_video
category_stats?: Record<string, AdRevenueTypeStat>; // draw=draw+历史feedvideo=福利视频+提现视频
// 按信息流场景小计(comparison/coupon/welfare;全量,不受分页截断)。数据大盘「领券广告/比价广告」卡
// 优先读它:2026-07-02 后端起 items 不再含信息流逐条展示行(唯一带收益+场景的行),按 items 现算恒 0。
// 可选(`?.` 探测)以兼容未升级后端,缺失时回退 items 现算。
@@ -895,65 +890,3 @@ export interface HealthTrendPoint extends HealthMetrics {
export interface HealthBreakdownRow extends HealthMetrics {
key: string; // 维度值(event 名 / app_ver / oem);缺失为 "(unknown)"
}
// ===== 统一限制策略 / 白名单 =====
export type LimitSubjectType = 'phone' | 'device';
export type LimitPolicyMode =
| 'inherit'
| 'override'
| 'unlimited'
| 'suppress_alert';
export interface LimitRule {
code: string;
label: string;
group: string;
global_limit: number;
default_limit: number;
window_label: string;
subject_types: LimitSubjectType[];
allowed_modes: LimitPolicyMode[];
min_value: number;
max_value: number;
supports_reset: boolean;
alert_only: boolean;
}
export interface LimitDeviceCandidate {
device_id: string;
source: string;
source_label: string;
user_id: number | null;
username: string | null;
phone: string | null;
nickname: string | null;
device_model: string | null;
last_active_at: string;
}
export interface LimitOverride {
id: number;
subject_type: LimitSubjectType;
subject_value: string;
rule_code: string;
rule_label: string;
rule_group: string;
mode: LimitPolicyMode;
limit_value: number | null;
global_limit: number;
effective_limit: number | null;
enabled: boolean;
starts_at: string | null;
expires_at: string | null;
reset_at: string | null;
reason: string | null;
status: 'active' | 'scheduled' | 'expired' | 'disabled';
created_by_admin_id: number | null;
created_at: string;
updated_at: string;
}
export interface LimitOverrideList {
items: LimitOverride[];
total: number;
}