Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 4d163c7676 | |||
| c564e9df12 | |||
| a286f859ee | |||
| 549c9bdfad | |||
| 26b1adb769 |
@@ -32,9 +32,24 @@ 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 }: Props) {
|
||||
export default function UserAdRevenueDrawer({
|
||||
open,
|
||||
onClose,
|
||||
userId,
|
||||
phone,
|
||||
dateFrom,
|
||||
dateTo,
|
||||
appEnv,
|
||||
revenueScope,
|
||||
feedScene,
|
||||
}: Props) {
|
||||
// UserRewardPanel 的 user 快照:它只读 phone/nickname/wechat_nickname/created_at,其余按 snapshot 形状补齐。
|
||||
const [user, setUser] = useState<WithdrawUserSnapshot | null>(null);
|
||||
|
||||
@@ -82,7 +97,19 @@ export default function UserAdRevenueDrawer({ open, onClose, userId, phone }: Pr
|
||||
>
|
||||
{/* userId 就绪即渲染;UserRewardPanel 内部按 userId 自行拉统计与金币记录,user 基本信息随后补上。
|
||||
statsVariant="ad":统计区只显示 6 项看广告统计(累计提现/现金余额/激励视频观看数+eCPM/draw观看数+eCPM) */}
|
||||
{userId != null && <UserRewardPanel userId={userId} user={user} statsVariant="ad" />}
|
||||
{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}
|
||||
/>
|
||||
)}
|
||||
</Drawer>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ import {
|
||||
} from '@ant-design/icons';
|
||||
import dayjs, { type Dayjs } from 'dayjs';
|
||||
import { api, errMsg } from '@/lib/api';
|
||||
import { formatUtcTime, percentile } from '@/lib/format';
|
||||
import { formatUtcTime, nearestRankPercentile } from '@/lib/format';
|
||||
import type {
|
||||
AdRevenueDaily,
|
||||
AdRevenueHourly,
|
||||
@@ -470,7 +470,27 @@ 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 } | null>(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 rangeMultiDay = range[0].format('YYYY-MM-DD') !== range[1].format('YYYY-MM-DD');
|
||||
@@ -503,6 +523,13 @@ 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);
|
||||
@@ -551,7 +578,7 @@ export default function AdRevenueReportPage() {
|
||||
width: 150,
|
||||
render: (phone: string | null, r: AdRevenueRow) => (
|
||||
// 点手机号/用户 → 打开该用户「广告收益详情」半屏抽屉(统计卡 + 金币记录)
|
||||
<a onClick={() => setUserDrawer({ userId: r.user_id, phone })}>
|
||||
<a onClick={() => setUserDrawer({ userId: r.user_id, phone, ...queriedDetailFilters })}>
|
||||
{phone ? (
|
||||
<span>
|
||||
{phone}
|
||||
@@ -758,9 +785,9 @@ export default function AdRevenueReportPage() {
|
||||
.filter((item) => item.feed_scene === sceneName)
|
||||
.map((item) => item.sub_count ?? 1);
|
||||
return {
|
||||
p5: percentile(counts, 0.05, false),
|
||||
p50: percentile(counts, 0.5, false),
|
||||
p95: percentile(counts, 0.95, false),
|
||||
p5: nearestRankPercentile(counts, 0.05),
|
||||
p50: nearestRankPercentile(counts, 0.5),
|
||||
p95: nearestRankPercentile(counts, 0.95),
|
||||
};
|
||||
};
|
||||
return { coupon: summarize('coupon'), comparison: summarize('comparison') };
|
||||
@@ -1083,12 +1110,12 @@ export default function AdRevenueReportPage() {
|
||||
</Typography.Text>
|
||||
</Divider>
|
||||
<Row gutter={[16, 12]}>
|
||||
<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>
|
||||
<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>
|
||||
</Row>
|
||||
</Card>
|
||||
)}
|
||||
@@ -1284,6 +1311,11 @@ 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>
|
||||
|
||||
@@ -1,7 +1,18 @@
|
||||
'use client';
|
||||
|
||||
import { useEffect, useState } from 'react';
|
||||
import { Button, Card, Space, Spin, Switch, Tag, Typography, Upload, message } from 'antd';
|
||||
import {
|
||||
Button,
|
||||
Card,
|
||||
InputNumber,
|
||||
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';
|
||||
@@ -9,55 +20,64 @@ 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';
|
||||
|
||||
/**
|
||||
* 领券等候浮层的「新手引导视频」配置。
|
||||
*
|
||||
* 用户点首页「一键自动领取」→ 出等候浮层,浮层下方那块位置**前 3 次**放这支引导视频
|
||||
* (而不是广告),每次固定发 120 金币;播完若浮层还开着,自动接着放广告(原逻辑)。
|
||||
* 「系统配置 → 领券引导视频」tab 的一个区块。
|
||||
*
|
||||
* 后台只管两件事:**开关** 和 **换片**。次数(3)/ 金币(120)走服务端默认值,产品已拍板不再
|
||||
* 开放配置,所以这里不渲染输入框、PATCH 也不带这两个字段(后端仍保留字段与默认值)。
|
||||
*/
|
||||
export default function GuideVideoConfig() {
|
||||
const META: Record<Scene, { title: string; action: string }> = {
|
||||
coupon: { title: '一键自动领取引导视频', action: '一键自动领取' },
|
||||
comparison: { title: '开始比价引导视频', action: '开始比价' },
|
||||
};
|
||||
|
||||
function SceneConfig({ scene }: { scene: Scene }) {
|
||||
const meta = META[scene];
|
||||
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 = (c: GuideCfg) => {
|
||||
setCfg(c);
|
||||
setEnabled(c.enabled);
|
||||
const sync = (value: GuideCfg) => {
|
||||
setCfg(value);
|
||||
setEnabled(value.enabled);
|
||||
setMaxPlays(value.max_plays);
|
||||
setRewardCoin(value.reward_coin);
|
||||
};
|
||||
|
||||
const load = async () => {
|
||||
setLoading(true);
|
||||
try {
|
||||
const { data } = await api.get<GuideCfg>('/admin/api/guide-video');
|
||||
const { data } = await api.get<GuideCfg>('/admin/api/guide-video', {
|
||||
params: { scene },
|
||||
});
|
||||
sync(data);
|
||||
} catch (e) {
|
||||
message.error(errMsg(e));
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
load();
|
||||
}, []);
|
||||
void load();
|
||||
}, [scene]);
|
||||
|
||||
const save = async () => {
|
||||
setSaving(true);
|
||||
try {
|
||||
const { data } = await api.patch<GuideCfg>('/admin/api/guide-video', { enabled });
|
||||
const { data } = await api.patch<GuideCfg>(
|
||||
'/admin/api/guide-video',
|
||||
{
|
||||
enabled,
|
||||
reward_coin: rewardCoin,
|
||||
...(scene === 'comparison' ? { max_plays: maxPlays } : {}),
|
||||
},
|
||||
{ params: { scene } },
|
||||
);
|
||||
sync(data);
|
||||
message.success('已保存,用户下一次进入领券浮层即生效');
|
||||
message.success(`${meta.title}配置已保存,下次触发即生效`);
|
||||
} catch (e) {
|
||||
message.error(errMsg(e));
|
||||
} finally {
|
||||
@@ -65,11 +85,27 @@ export default function GuideVideoConfig() {
|
||||
}
|
||||
};
|
||||
|
||||
// antd Upload:beforeUpload 里自行 POST(multipart),返回 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,
|
||||
{ params: { scene } },
|
||||
);
|
||||
sync(data);
|
||||
message.success(`${meta.title}已更新`);
|
||||
} catch (e) {
|
||||
message.error(errMsg(e));
|
||||
} finally {
|
||||
setUploading(false);
|
||||
}
|
||||
};
|
||||
|
||||
const beforeUpload = (file: File) => {
|
||||
// 有些系统给 .mp4 的 type 是空串,不能只看 type,再兜一层扩展名。
|
||||
const looksMp4 = file.type === 'video/mp4' || /\.mp4$/i.test(file.name);
|
||||
if (!looksMp4) {
|
||||
if (file.type !== 'video/mp4' && !/\.mp4$/i.test(file.name)) {
|
||||
message.error('仅支持 MP4 视频(H.264 编码)');
|
||||
return Upload.LIST_IGNORE;
|
||||
}
|
||||
@@ -81,27 +117,15 @@ export default function GuideVideoConfig() {
|
||||
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');
|
||||
const { data } = await api.delete<GuideCfg>(
|
||||
'/admin/api/guide-video/video',
|
||||
{ params: { scene } },
|
||||
);
|
||||
sync(data);
|
||||
message.success('已移除引导视频,领券浮层恢复为只放广告');
|
||||
message.success(`已移除${meta.title}`);
|
||||
} catch (e) {
|
||||
message.error(errMsg(e));
|
||||
} finally {
|
||||
@@ -112,111 +136,136 @@ export default function GuideVideoConfig() {
|
||||
return (
|
||||
<Card
|
||||
size="small"
|
||||
title="领券引导视频(App 领券等候浮层,前 3 次替代广告)"
|
||||
title={meta.title}
|
||||
style={{ marginBottom: 16 }}
|
||||
extra={
|
||||
cfg?.updated_at ? (
|
||||
<Text type="secondary" style={{ fontSize: 12 }}>
|
||||
<Text type="secondary">
|
||||
更新于 {new Date(cfg.updated_at).toLocaleString('zh-CN')}
|
||||
</Text>
|
||||
) : null
|
||||
}
|
||||
>
|
||||
<p style={{ color: '#999', marginTop: 0 }}>
|
||||
用户点「一键自动领取」后出现的等候浮层,下方那块广告位<b>前 3 次</b>改放这支引导视频。
|
||||
视频<b>不可快进</b>;播完或中途关闭都算看完,各发一次 <b>120 金币</b>;播完若浮层还开着,会自动接着放广告。
|
||||
次数<b>按账号</b>计(换设备不重置),<b>视频一开播就算用掉一次</b>。
|
||||
次数与金币走固定值、后台不开放调整;这里只管<b>开关</b>和<b>换片</b>,每次改动进审计日志。
|
||||
<p style={{ color: '#777', marginTop: 0 }}>
|
||||
Android 用户点击「{meta.action}」后,前 {cfg?.max_plays ?? 3}{' '}
|
||||
次在等候浮层广告位播放本视频并奖励金币。次数按账号、按功能分别计算;
|
||||
开播即计次,播完或中途关闭均发放当次配置的金币。
|
||||
{scene === 'coupon' &&
|
||||
'领券引导视频的播放次数上限请在「监控审计 → 白名单」中调整。'}
|
||||
</p>
|
||||
{loading || !cfg ? (
|
||||
<Spin style={{ display: 'block', margin: '24px 0' }} />
|
||||
) : (
|
||||
<Space align="start" size={32} wrap>
|
||||
{/* 左:视频预览 */}
|
||||
<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 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>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* 右:编辑控件 */}
|
||||
<Space direction="vertical" size="middle" style={{ minWidth: 360 }}>
|
||||
<Space direction="vertical" size="middle" style={{ minWidth: 390 }}>
|
||||
<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" style={{ fontSize: 12 }}>
|
||||
MP4(H.264),≤100MB
|
||||
</Text>
|
||||
<Text type="secondary">MP4(H.264),≤100MB</Text>
|
||||
</Space>
|
||||
|
||||
<Button type="primary" loading={saving} disabled={!canEdit} onClick={save}>
|
||||
保存开关
|
||||
<Button
|
||||
type="primary"
|
||||
loading={saving}
|
||||
disabled={!canEdit}
|
||||
onClick={save}
|
||||
>
|
||||
保存配置
|
||||
</Button>
|
||||
{!canEdit && <Text type="secondary">仅 operator / super_admin 可修改</Text>}
|
||||
<Text type="secondary">
|
||||
累计播放 {cfg.total_plays} 次,已发币 {cfg.granted_plays} 次
|
||||
</Text>
|
||||
</Space>
|
||||
</Space>
|
||||
)}
|
||||
</Card>
|
||||
);
|
||||
}
|
||||
|
||||
export default function GuideVideoConfig() {
|
||||
return (
|
||||
<>
|
||||
<SceneConfig scene="coupon" />
|
||||
<SceneConfig scene="comparison" />
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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().subtract(1, 'day'), 'day')}
|
||||
disabledDate={(date) => date.isAfter(dayjs(), 'day')}
|
||||
suffixIcon={<CalendarOutlined />}
|
||||
onClick={() => setDatePickerOpen(true)}
|
||||
onOpenChange={setDatePickerOpen}
|
||||
|
||||
@@ -18,6 +18,7 @@ import {
|
||||
ProfileOutlined,
|
||||
SafetyCertificateOutlined,
|
||||
SecurityScanOutlined,
|
||||
StopOutlined,
|
||||
SettingOutlined,
|
||||
ShareAltOutlined,
|
||||
TeamOutlined,
|
||||
@@ -105,6 +106,7 @@ 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: '白名单' },
|
||||
],
|
||||
},
|
||||
];
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -19,6 +19,7 @@ import {
|
||||
CopyOutlined,
|
||||
DownOutlined,
|
||||
EditOutlined,
|
||||
PlusCircleOutlined,
|
||||
ReloadOutlined,
|
||||
RightOutlined,
|
||||
} from '@ant-design/icons';
|
||||
@@ -69,8 +70,8 @@ type IncidentStatus = 'open' | 'blocked';
|
||||
const RULE_LIMITS: Record<RiskKind, { min: number; max: number; help: string }> = {
|
||||
sms: {
|
||||
min: 1,
|
||||
max: 5,
|
||||
help: '统计成功下发;最高5次,与现有每设备每小时发送上限一致。',
|
||||
max: 100000,
|
||||
help: '统计成功下发;告警阈值与短信硬限制分别配置。',
|
||||
},
|
||||
oneclick: {
|
||||
min: 1,
|
||||
@@ -79,8 +80,8 @@ const RULE_LIMITS: Record<RiskKind, { min: number; max: number; help: string }>
|
||||
},
|
||||
compare: {
|
||||
min: 1,
|
||||
max: 100,
|
||||
help: '同一账户按北京时间自然日累计;最高100次,与比价每日上限一致。',
|
||||
max: 100000,
|
||||
help: '同一账户按北京时间自然日累计;告警阈值与比价硬限制分别配置。',
|
||||
},
|
||||
};
|
||||
const utcTime = (value: string | null, withDate = true) =>
|
||||
@@ -597,6 +598,40 @@ 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 = {
|
||||
@@ -604,9 +639,12 @@ export default function RiskMonitorPage() {
|
||||
key: 'actions',
|
||||
align: 'right' as const,
|
||||
fixed: 'right' as const,
|
||||
width: 180,
|
||||
width: 280,
|
||||
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
|
||||
@@ -618,6 +656,24 @@ 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
|
||||
@@ -700,7 +756,16 @@ export default function RiskMonitorPage() {
|
||||
actionColumn,
|
||||
];
|
||||
},
|
||||
[acting, copy, detailLoading, expanded, revokeRestriction, runAction, toggle],
|
||||
[
|
||||
acting,
|
||||
addToWhitelist,
|
||||
copy,
|
||||
detailLoading,
|
||||
expanded,
|
||||
revokeRestriction,
|
||||
runAction,
|
||||
toggle,
|
||||
],
|
||||
);
|
||||
|
||||
const cards = useMemo(() => {
|
||||
|
||||
@@ -44,6 +44,11 @@ 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 取字段集)+ 金币发放记录表。 */
|
||||
@@ -52,9 +57,17 @@ export default function UserRewardPanel({
|
||||
user,
|
||||
withdrawSource,
|
||||
statsVariant = 'withdraw',
|
||||
initialDateFrom,
|
||||
initialDateTo,
|
||||
appEnv,
|
||||
revenueScope = 'all',
|
||||
feedScene,
|
||||
}: Props) {
|
||||
const [mode, setMode] = useState<'all' | 'range'>('all'); // all=注册至今 / range=自定义区间
|
||||
const [range, setRange] = useState<[Dayjs, Dayjs] | null>(null);
|
||||
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 [stats, setStats] = useState<UserRewardStats | null>(null);
|
||||
const [statsLoading, setStatsLoading] = useState(false);
|
||||
|
||||
@@ -80,6 +93,9 @@ 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);
|
||||
@@ -88,7 +104,7 @@ export default function UserRewardPanel({
|
||||
} finally {
|
||||
setStatsLoading(false);
|
||||
}
|
||||
}, [userId, paramsKey, withdrawSource]);
|
||||
}, [userId, paramsKey, withdrawSource, appEnv, revenueScope, feedScene]);
|
||||
|
||||
const loadRecords = useCallback(
|
||||
async (p: number) => {
|
||||
@@ -236,7 +252,7 @@ export default function UserRewardPanel({
|
||||
</Descriptions>
|
||||
<Text type="secondary" style={{ fontSize: 12 }}>
|
||||
{statsVariant === 'ad'
|
||||
? '统计随上方时间筛选(现金余额除外,为当前快照);次数仅统计成功发奖记录,信息流按奖励份数统计;eCPM 为预估值。'
|
||||
? '统计继承广告收益页已查询的日期、环境、业务代码位和场景;次数仅统计成功发奖记录,信息流按奖励份数统计;Draw eCPM 按全部实际展示统计(含未发奖)。'
|
||||
: '统计随上方时间筛选(现金余额除外,为当前快照);提现按申请提交时间统计;累计收益为已发金币按当前汇率折算,不代表实际已提现金额;eCPM 为预估值。'}
|
||||
</Text>
|
||||
|
||||
|
||||
@@ -37,6 +37,18 @@ 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)。 */
|
||||
|
||||
+66
-3
@@ -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; // 平均信息流广告 eCPM(分/千次)
|
||||
feed_avg_ecpm: number; // 全部 Draw/feed 实际展示的平均 eCPM(分/千次,含未发奖展示)
|
||||
feed_cash_cents: number; // 信息流广告提现
|
||||
}
|
||||
|
||||
@@ -414,13 +414,14 @@ export interface FeedbackQrConfig {
|
||||
updated_at: string | null;
|
||||
}
|
||||
|
||||
/** 领券等候浮层的「新手引导视频」配置(前 3 次用它替代广告,每次固定 120 金币)。
|
||||
/** 领券等候浮层的「新手引导视频」配置(前 3 次用它替代广告,默认每次固定 100 金币)。
|
||||
* 后台只开放 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; // 每次固定金币(服务端默认 120,播完 / 中途关闭都发)
|
||||
reward_coin: number; // 每次固定金币(服务端默认 100,播完 / 中途关闭都发)
|
||||
updated_at: string | null;
|
||||
total_plays: number; // 只读统计:全站已播次数(后台不再展示)
|
||||
granted_plays: number; // 只读统计:其中已发币次数(后台不再展示)
|
||||
@@ -894,3 +895,65 @@ 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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user