Compare commits

..

1 Commits

Author SHA1 Message Date
linkeyu af0e6eefda fix(admin): show zero revenue for incomplete reward videos 2026-07-22 17:09:21 +08:00
12 changed files with 47 additions and 741 deletions
-14
View File
@@ -32,20 +32,6 @@ server {
proxy_read_timeout 60s;
}
# 新手引导视频上传:视频比图片大一个量级,单独放宽到 100MB(对齐后端
# settings.GUIDE_VIDEO_MAX_BYTES)。不放宽全站上限,避免其它接口被大 body 打。
# 上传大文件耗时长,读超时同步放宽到 300s。
location = /admin/api/guide-video/video {
client_max_body_size 100m;
proxy_pass http://127.0.0.1:8771;
proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_read_timeout 300s;
proxy_send_timeout 300s;
proxy_request_buffering off;
}
# 用户上传媒体(上报截图 / 反馈截图 / 反馈二维码)由 App 后端(:8770)的 /media 托管。
# admin 页面要展示这些图,经此同域反代过去(免跨域 + 免 https 页面引 http 图被拦)。
# 前提:App 后端与本 admin 同机;若分机,把 127.0.0.1:8770 换成 App 后端可达地址。
+2 -2
View File
@@ -76,7 +76,7 @@ const REWARD_STATUS_HINT: Record<string, string> = {
const PLAYBACK_STATUS_TAG: Record<string, { color: string; label: string }> = {
completed: { color: 'green', label: '已完成' },
too_short: { color: 'gold', label: '观看时长不足' },
too_short: { color: 'gold', label: '未满10秒' },
closed_early: { color: 'default', label: '提前关闭' },
unknown: { color: 'default', label: '未知' },
};
@@ -159,7 +159,7 @@ function playbackStatusTag(row: AdRevenueRow) {
const hint = entries
.map(([status, count]) => `${PLAYBACK_STATUS_TAG[status].label} ${count}`)
.join('');
return { color: 'purple', label: '部分完成', hint: `${hint}` };
return { color: 'purple', label: '混合状态', hint: `${hint}` };
}
const fmtFactorRange = (a: number | null, b: number | null) => {
-222
View File
@@ -1,222 +0,0 @@
'use client';
import { useEffect, useState } from 'react';
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';
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;
/**
* 领券等候浮层的「新手引导视频」配置。
*
* 用户点首页「一键自动领取」→ 出等候浮层,浮层下方那块位置**前 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 canEdit = canDo(['operator']);
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');
sync(data);
} finally {
setLoading(false);
}
};
useEffect(() => {
load();
}, []);
const save = async () => {
setSaving(true);
try {
const { data } = await api.patch<GuideCfg>('/admin/api/guide-video', { enabled });
sync(data);
message.success('已保存,用户下一次进入领券浮层即生效');
} catch (e) {
message.error(errMsg(e));
} finally {
setSaving(false);
}
};
// antd Upload:beforeUpload 里自行 POST(multipart),返回 false 阻止其默认上传。
const beforeUpload = (file: File) => {
// 有些系统给 .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;
}
if (file.size > MAX_BYTES) {
message.error('视频不能超过 100MB');
return Upload.LIST_IGNORE;
}
void uploadVideo(file);
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');
sync(data);
message.success('已移除引导视频,领券浮层恢复为只放广告');
} catch (e) {
message.error(errMsg(e));
} finally {
setUploading(false);
}
};
return (
<Card
size="small"
title="领券引导视频(App 领券等候浮层,前 3 次替代广告)"
style={{ marginBottom: 16 }}
extra={
cfg?.updated_at ? (
<Text type="secondary" style={{ fontSize: 12 }}>
{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>
{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>
)}
</div>
{/* 右:编辑控件 */}
<Space direction="vertical" size="middle" style={{ minWidth: 360 }}>
<Space>
<span></span>
<Switch checked={enabled} disabled={!canEdit} onChange={setEnabled} />
{!enabled && <Tag color="orange"></Tag>}
</Space>
<Space wrap>
<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>
)}
<Text type="secondary" style={{ fontSize: 12 }}>
MP4H.264100MB
</Text>
</Space>
<Button type="primary" loading={saving} disabled={!canEdit} onClick={save}>
</Button>
{!canEdit && <Text type="secondary"> operator / super_admin </Text>}
</Space>
</Space>
)}
</Card>
);
}
-2
View File
@@ -6,7 +6,6 @@ import { api, errMsg } from '@/lib/api';
import HomeMarqueeSeeds from './HomeMarqueeSeeds';
import HomeStatsConfig from './HomeStatsConfig';
import FeedbackQrConfig from './FeedbackQrConfig';
import GuideVideoConfig from './GuideVideoConfig';
interface ConfigItem {
key: string;
@@ -165,7 +164,6 @@ export default function ConfigPage() {
},
{ key: 'welfare', label: '福利页', children: welfareConfig },
{ key: 'feedback-qr', label: '反馈二维码', children: <FeedbackQrConfig /> },
{ key: 'guide-video', label: '领券引导视频', children: <GuideVideoConfig /> },
]}
/>
</div>
+3 -6
View File
@@ -149,9 +149,6 @@ function PointScorePopover({ row }: { row: CouponDataRow }) {
return <Typography.Text type="secondary">-</Typography.Text>;
}
const score = `${row.point_success_count}/${row.point_total_count}`;
const scoreWithRate = `${score}${(
row.point_success_count / row.point_total_count * 100
).toFixed(1)}%`;
const scoreColor =
row.point_success_count === row.point_total_count
? STATUS_TAG.completed.color
@@ -223,7 +220,7 @@ function PointScorePopover({ row }: { row: CouponDataRow }) {
)}
>
<Button type="link" size="small" style={{ height: 'auto', padding: 0, color: scoreColor }}>
{scoreWithRate}
{score}
</Button>
</Popover>
);
@@ -605,9 +602,9 @@ export default function CouponDataPage() {
render: (v: number | null) => fmtSec(v),
},
{
title: '单券成功率',
title: '百分比',
key: 'point_success_rate',
width: 150,
width: 110,
render: (_: unknown, r: CouponDataRow) => <PointScorePopover row={r} />,
},
{
+2 -2
View File
@@ -1065,14 +1065,14 @@ export default function DashboardPage() {
value={fmtInt(periodData?.coins.reward_video_coin_total)}
delta={rewardVideoCoinRatio.value}
deltaTone={rewardVideoCoinRatio.tone}
hint="普通看视频与历史签到膨胀的实发金币之和,不再重复计入领券奖励或常规任务。"
hint="独立统计看视频发放,不再重复计入领券奖励。"
/>
<StatCard
title="常规任务金币"
value={fmtInt(regularTaskCoinTotal)}
delta={regularTaskCoinRatio.value}
deltaTone={regularTaskCoinRatio.tone}
hint="每日签到、通知/其他任务、上报更低价和反馈采纳的实发金币之和。"
hint="每日签到、历史签到膨胀、通知/其他任务、上报更低价和反馈采纳的实发金币之和。"
/>
<StatCard
title="本期提现金额"
+1 -202
View File
@@ -4,15 +4,11 @@ import { useEffect, useState } from 'react';
import type { ColumnsType } from 'antd/es/table';
import type { SorterResult } from 'antd/es/table/interface';
import {
App,
Button,
Card,
DatePicker,
Form,
Image,
Input,
InputNumber,
Modal,
Select,
Space,
Statistic,
@@ -21,12 +17,10 @@ import {
Typography,
} from 'antd';
import type { Dayjs } from 'dayjs';
import { api, errMsg } from '@/lib/api';
import { api } from '@/lib/api';
import { canDo } from '@/lib/auth';
import { formatWallTime } from '@/lib/format';
import { refreshReviewBadge } from '@/lib/reviewBadge';
import { BULK_REVIEW_MAX, bulkFailureReasonText, failedReviewIds } from '@/lib/bulkAction';
import type { BulkReviewResult } from '@/lib/bulkAction';
import { usePagedList } from '@/lib/usePagedList';
import type { Feedback, FeedbackSummary } from '@/lib/types';
import FeedbackHandleDrawer from './FeedbackHandleDrawer';
@@ -34,7 +28,6 @@ import UserRecordsDrawer from '@/components/UserRecordsDrawer';
const { Text, Paragraph } = Typography;
const { RangePicker } = DatePicker;
const REWARD_MAX = 10000;
// 截图是 app-server 的 /media 相对路径,本地由 :8770 提供(NEXT_PUBLIC_MEDIA_BASE);生产同域走 nginx 代理。
const MEDIA_BASE = process.env.NEXT_PUBLIC_MEDIA_BASE || '';
@@ -162,8 +155,6 @@ const RECORD_COLUMNS: ColumnsType<Feedback> = [
];
export default function FeedbacksPage() {
const { message } = App.useApp();
const [bulkForm] = Form.useForm();
// 筛选草稿:点「查询」才应用(避免输入即刷新)
const [status, setStatus] = useState<string | undefined>();
const [source, setSource] = useState<string | undefined>();
@@ -180,19 +171,6 @@ export default function FeedbacksPage() {
usePagedList<Feedback>('/admin/api/feedbacks', filters);
const canReview = canDo(['operator']);
const [selectedRowKeys, setSelectedRowKeys] = useState<number[]>([]);
const [bulkAction, setBulkAction] = useState<'approve' | 'reject' | null>(null);
const [bulkSubmitting, setBulkSubmitting] = useState(false);
const selectedFeedbacks = items.filter(
(item) => selectedRowKeys.includes(item.id) && isPending(item.status),
);
useEffect(() => {
const visiblePendingIds = new Set(
items.filter((item) => isPending(item.status)).map((item) => item.id),
);
setSelectedRowKeys((keys) => keys.filter((id) => visiblePendingIds.has(id)));
}, [items]);
const [summary, setSummary] = useState<FeedbackSummary | null>(null);
const loadSummary = async () => {
@@ -258,61 +236,6 @@ export default function FeedbacksPage() {
const sortOrderOf = (field: SortField) =>
sortBy === field ? (sortOrder === 'asc' ? 'ascend' : 'descend') : null;
const openBulkModal = (action: 'approve' | 'reject') => {
if (!selectedFeedbacks.length) return;
if (selectedFeedbacks.length > BULK_REVIEW_MAX) {
message.warning(`单次最多审核 ${BULK_REVIEW_MAX} 条反馈`);
return;
}
bulkForm.resetFields();
setBulkAction(action);
};
const submitBulkReview = async () => {
if (!bulkAction || !selectedFeedbacks.length) return;
const values = await bulkForm.validateFields();
const targets = selectedFeedbacks;
setBulkSubmitting(true);
try {
const { data } = await api.post<BulkReviewResult>(
`/admin/api/feedbacks/bulk/${bulkAction}`,
bulkAction === 'approve'
? {
ids: targets.map((item) => item.id),
reward_coins: values.reward_coins,
note: values.note?.trim() || null,
reply: values.reply?.trim() || null,
}
: {
ids: targets.map((item) => item.id),
reason: values.reason.trim(),
note: values.note?.trim() || null,
reply: values.reply?.trim() || null,
},
);
const failedIds = failedReviewIds(data);
setSelectedRowKeys(failedIds);
setBulkAction(null);
bulkForm.resetFields();
if (failedIds.length) reload();
else onPageChange(1, pageSize);
loadSummary();
refreshReviewBadge('/feedbacks');
const label = bulkAction === 'approve' ? '批量采纳' : '批量拒绝';
if (failedIds.length) {
message.warning(
`${label}完成:成功 ${data.success} 条,失败 ${failedIds.length} 条;失败项已保留勾选${bulkFailureReasonText(data)}`,
);
} else {
message.success(`${label}完成:成功 ${data.success}`);
}
} catch (e) {
message.error(errMsg(e));
} finally {
setBulkSubmitting(false);
}
};
const columns: ColumnsType<Feedback> = [
{
title: '用户ID',
@@ -488,58 +411,16 @@ export default function FeedbacksPage() {
<Button onClick={resetFilters}></Button>
</Space>
{canReview && (
<Space wrap style={{ display: 'flex', marginBottom: 12 }}>
<Text> <Text strong>{selectedFeedbacks.length}</Text> </Text>
<Button
type="primary"
disabled={!selectedFeedbacks.length || selectedFeedbacks.length > BULK_REVIEW_MAX}
onClick={() => openBulkModal('approve')}
>
</Button>
<Button
danger
disabled={!selectedFeedbacks.length || selectedFeedbacks.length > BULK_REVIEW_MAX}
onClick={() => openBulkModal('reject')}
>
</Button>
{!!selectedFeedbacks.length && (
<Button onClick={() => setSelectedRowKeys([])}></Button>
)}
</Space>
)}
<Table
rowKey="id"
columns={columns}
dataSource={items}
rowSelection={
canReview
? {
selectedRowKeys,
onChange: (keys) => {
const ids = keys as number[];
if (ids.length > BULK_REVIEW_MAX) {
message.warning(`单次最多选择 ${BULK_REVIEW_MAX} 条待审核反馈`);
}
setSelectedRowKeys(ids.slice(0, BULK_REVIEW_MAX));
},
getCheckboxProps: (record) => ({
disabled: !isPending(record.status),
name: `选择反馈 #${record.id}`,
}),
}
: undefined
}
loading={loading}
pagination={{
current: page,
pageSize,
total,
showSizeChanger: true,
pageSizeOptions: [10, 20, 50],
showTotal: (t) => `${t} 条反馈`,
onChange: onPageChange,
}}
@@ -547,88 +428,6 @@ export default function FeedbacksPage() {
scroll={{ x: 1720 }}
/>
<Modal
title={
bulkAction === 'approve'
? `批量采纳 ${selectedFeedbacks.length} 条反馈`
: `批量拒绝 ${selectedFeedbacks.length} 条反馈`
}
open={bulkAction != null}
okText={bulkAction === 'approve' ? '批量采纳并发金币' : '确认批量拒绝'}
okButtonProps={{ danger: bulkAction === 'reject' }}
confirmLoading={bulkSubmitting}
onOk={submitBulkReview}
onCancel={() => {
if (bulkSubmitting) return;
setBulkAction(null);
bulkForm.resetFields();
}}
destroyOnHidden
>
<Text type="secondary">
{selectedFeedbacks.length}
</Text>
<Form form={bulkForm} layout="vertical" preserve={false} style={{ marginTop: 16 }}>
{bulkAction === 'approve' ? (
<Form.Item
name="reward_coins"
label={`每条奖励金币(必填,1 ~ ${REWARD_MAX}`}
rules={[
{ required: true, message: '请输入每条反馈的奖励金币' },
{ type: 'number', min: 1, max: REWARD_MAX, message: `请输入 1 ~ ${REWARD_MAX}` },
]}
>
<InputNumber
min={1}
max={REWARD_MAX}
style={{ width: '100%' }}
placeholder="每条反馈发放相同金币"
/>
</Form.Item>
) : (
<Form.Item
name="reason"
label="未采纳原因(必填,用户可见)"
rules={[
{ required: true, whitespace: true, message: '请填写未采纳原因' },
{ max: 256, message: '最多 256 字' },
]}
>
<Input.TextArea
rows={3}
maxLength={256}
showCount
placeholder="同一原因将发送给全部已选用户"
/>
</Form.Item>
)}
<Form.Item
name="note"
label={
bulkAction === 'approve'
? '采纳要点 / 审核备注(选填,内部)'
: '内部备注(选填)'
}
rules={[{ max: 256, message: '最多 256 字' }]}
>
<Input.TextArea rows={2} maxLength={256} showCount />
</Form.Item>
<Form.Item
name="reply"
label="给用户的回复(选填,用户可见)"
rules={[{ max: 256, message: '最多 256 字' }]}
>
<Input.TextArea
rows={2}
maxLength={256}
showCount
placeholder="同一回复将发送给全部已选用户"
/>
</Form.Item>
</Form>
</Modal>
<FeedbackHandleDrawer
feedback={drawerFb}
open={drawerOpen}
+4 -11
View File
@@ -67,6 +67,8 @@ const NAV_GROUPS: NavGroup[] = [
{ key: '/comparison-records', icon: <ProfileOutlined />, label: '比价记录' },
{ key: '/coupon-data', icon: <GiftOutlined />, label: '领券记录' },
{ key: '/cps', icon: <ShareAltOutlined />, label: 'CPS收益' },
{ key: '/device-liveness', icon: <HeartOutlined />, label: '设备存活' },
{ key: '/analytics-health', icon: <LineChartOutlined />, label: '埋点成功率' },
],
},
{
@@ -90,18 +92,9 @@ const NAV_GROUPS: NavGroup[] = [
{ key: '/users', icon: <UserOutlined />, label: '用户管理' },
],
},
{
key: 'monitoring-audit',
icon: <FileSearchOutlined />,
label: '监控审计',
children: [
{ key: '/device-liveness', icon: <HeartOutlined />, label: '设备存活' },
{ key: '/analytics-health', icon: <LineChartOutlined />, label: '埋点成功率' },
{ key: '/event-logs', icon: <DatabaseOutlined />, label: '埋点日志' },
{ key: '/audit-logs', icon: <FileSearchOutlined />, label: '审计日志' },
],
},
{ key: '/admins', icon: <TeamOutlined />, label: '权限管理' },
{ key: '/event-logs', icon: <DatabaseOutlined />, label: '埋点日志' },
{ key: '/audit-logs', icon: <FileSearchOutlined />, label: '审计日志' },
];
// 导航项 key(/dashboard)→ 权限页 key(dashboard),与后端 permissions.py 目录对齐
+11 -137
View File
@@ -23,8 +23,6 @@ import { api, errMsg } from '@/lib/api';
import { canDo } from '@/lib/auth';
import { mediaUrl } from '@/lib/media';
import { refreshReviewBadge } from '@/lib/reviewBadge';
import { BULK_REVIEW_MAX, bulkFailureReasonText, failedReviewIds } from '@/lib/bulkAction';
import type { BulkReviewResult } from '@/lib/bulkAction';
import { usePagedList } from '@/lib/usePagedList';
import type { PriceReport, PriceReportSummary } from '@/lib/types';
import UserRecordsDrawer from '@/components/UserRecordsDrawer';
@@ -134,10 +132,7 @@ export default function PriceReportsPage() {
const [activeStatus, setActiveStatus] = useState('pending');
const [summary, setSummary] = useState<PriceReportSummary | null>(null);
const [rejecting, setRejecting] = useState<PriceReport | null>(null);
const [bulkRejecting, setBulkRejecting] = useState<PriceReport[]>([]);
const [rejectReason, setRejectReason] = useState('');
const [rejectSubmitting, setRejectSubmitting] = useState(false);
const [selectedRowKeys, setSelectedRowKeys] = useState<number[]>([]);
// 提交时间列服务端排序(默认按提交时间倒序,最新在前)
const [sortBy, setSortBy] = useState<SortField>('created_at');
const [sortOrder, setSortOrder] = useState<'asc' | 'desc'>('desc');
@@ -170,16 +165,6 @@ export default function PriceReportsPage() {
};
const canReview = canDo(['operator']);
const selectedReports = items.filter(
(item) => selectedRowKeys.includes(item.id) && item.status === 'pending',
);
useEffect(() => {
const visiblePendingIds = new Set(
items.filter((item) => item.status === 'pending').map((item) => item.id),
);
setSelectedRowKeys((keys) => keys.filter((id) => visiblePendingIds.has(id)));
}, [items]);
const loadSummary = async () => {
try {
@@ -198,49 +183,6 @@ export default function PriceReportsPage() {
loadSummary();
};
const reportBulkResult = (label: string, result: BulkReviewResult) => {
const failedIds = failedReviewIds(result);
setSelectedRowKeys(failedIds);
refreshReviewBadge('/price-reports');
loadSummary();
if (failedIds.length) reload();
else onPageChange(1, pageSize);
if (failedIds.length) {
message.warning(
`${label}完成:成功 ${result.success} 条,失败 ${failedIds.length} 条;失败项已保留勾选${bulkFailureReasonText(result)}`,
);
} else {
message.success(`${label}完成:成功 ${result.success}`);
}
};
const bulkApprove = () => {
const targets = selectedReports;
if (!targets.length) return;
if (targets.length > BULK_REVIEW_MAX) {
message.warning(`单次最多审核 ${BULK_REVIEW_MAX} 条记录`);
return;
}
modal.confirm({
title: `确认批量通过 ${targets.length} 条低价上报?`,
icon: <CheckCircleOutlined style={{ color: '#52c41a' }} />,
content: `通过后将向每位用户发放 1000 金币,共发放 ${targets.length * 1000} 金币。请确认已逐条核实截图。`,
okText: '批量通过并发金币',
onOk: async () => {
try {
const { data } = await api.post<BulkReviewResult>(
'/admin/api/price-reports/bulk/approve',
{ ids: targets.map((item) => item.id) },
);
reportBulkResult('批量通过', data);
} catch (e) {
message.error(errMsg(e));
throw e;
}
},
});
};
const approve = (r: PriceReport) => {
modal.confirm({
title: '确认通过该上报?',
@@ -272,38 +214,21 @@ export default function PriceReportsPage() {
};
const confirmReject = async () => {
const targets = bulkRejecting.length ? bulkRejecting : rejecting ? [rejecting] : [];
if (!targets.length) return;
if (targets.length > BULK_REVIEW_MAX) {
message.warning(`单次最多审核 ${BULK_REVIEW_MAX} 条记录`);
return;
}
if (!rejecting) return;
const reason = rejectReason.trim();
if (!reason) {
message.warning('请填写拒绝理由');
return;
}
setRejectSubmitting(true);
try {
if (bulkRejecting.length) {
const { data } = await api.post<BulkReviewResult>(
'/admin/api/price-reports/bulk/reject',
{ ids: targets.map((item) => item.id), reason },
);
reportBulkResult('批量拒绝', data);
} else {
await api.post(`/admin/api/price-reports/${targets[0].id}/reject`, { reason });
refreshReviewBadge('/price-reports');
message.success('已拒绝');
refreshAfterChange();
}
await api.post(`/admin/api/price-reports/${rejecting.id}/reject`, { reason });
refreshReviewBadge('/price-reports');
message.success('已拒绝');
setRejecting(null);
setBulkRejecting([]);
setRejectReason('');
refreshAfterChange();
} catch (e) {
message.error(errMsg(e));
} finally {
setRejectSubmitting(false);
}
};
@@ -468,56 +393,10 @@ export default function PriceReportsPage() {
onChange={setActiveStatus}
items={STATUS_TABS.map((t) => ({ key: t.key, label: t.label }))}
/>
{canReview && (
<Space wrap style={{ marginBottom: 16 }}>
<Text> <Text strong>{selectedReports.length}</Text> </Text>
<Button
type="primary"
icon={<CheckCircleOutlined />}
disabled={!selectedReports.length || selectedReports.length > BULK_REVIEW_MAX}
onClick={bulkApprove}
>
</Button>
<Button
danger
icon={<CloseCircleOutlined />}
disabled={!selectedReports.length || selectedReports.length > BULK_REVIEW_MAX}
onClick={() => {
setRejecting(null);
setBulkRejecting(selectedReports);
setRejectReason('');
}}
>
</Button>
{!!selectedReports.length && (
<Button onClick={() => setSelectedRowKeys([])}></Button>
)}
</Space>
)}
<Table
rowKey="id"
columns={columns}
dataSource={items}
rowSelection={
canReview
? {
selectedRowKeys,
onChange: (keys) => {
const ids = keys as number[];
if (ids.length > BULK_REVIEW_MAX) {
message.warning(`单次最多选择 ${BULK_REVIEW_MAX} 条待审核记录`);
}
setSelectedRowKeys(ids.slice(0, BULK_REVIEW_MAX));
},
getCheckboxProps: (record) => ({
disabled: record.status !== 'pending',
name: `选择低价上报 #${record.id}`,
}),
}
: undefined
}
loading={loading}
onChange={onTableChange}
pagination={{
@@ -525,7 +404,6 @@ export default function PriceReportsPage() {
pageSize,
total,
showSizeChanger: true,
pageSizeOptions: [10, 20, 50],
showTotal: (t) => `${t}`,
onChange: onPageChange,
}}
@@ -534,25 +412,21 @@ export default function PriceReportsPage() {
</Card>
<Modal
title={bulkRejecting.length ? `批量拒绝 ${bulkRejecting.length} 条低价上报` : '拒绝上报'}
open={!!(rejecting || bulkRejecting.length)}
title="拒绝上报"
open={!!rejecting}
okText="确认拒绝"
confirmLoading={rejectSubmitting}
okButtonProps={{ danger: true, icon: <CloseCircleOutlined /> }}
onOk={confirmReject}
onCancel={() => {
setRejecting(null);
setBulkRejecting([]);
setRejectReason('');
}}
>
{(rejecting || bulkRejecting.length > 0) && (
{rejecting && (
<Space direction="vertical" style={{ width: '100%' }}>
{bulkRejecting.length ? (
<Text type="secondary"> {bulkRejecting.length} </Text>
) : rejecting ? (
<Text> #{rejecting.user_id} · {rejecting.store_name || '-'}</Text>
) : null}
<Text>
#{rejecting.user_id} · {rejecting.store_name || '-'}
</Text>
<Space wrap>
{REJECT_TEMPLATES.map((tpl) => (
<Button size="small" key={tpl} onClick={() => setRejectReason(tpl)}>
+24 -98
View File
@@ -142,7 +142,7 @@ function actionLabel(action: string) {
'withdraw.approve': '审核通过',
'withdraw.reject': '审核拒绝',
'withdraw.refresh': '查单刷新',
'withdraw.reconcile': '处理超时订单',
'withdraw.reconcile': '批量对账',
};
return labels[action] || action;
}
@@ -182,11 +182,8 @@ export default function WithdrawsPage() {
const [activeStatus, setActiveStatus] = useState('reviewing');
const [summary, setSummary] = useState<WithdrawSummary | null>(null);
const [health, setHealth] = useState<WxpayHealthCheck | null>(null);
const [healthLoading, setHealthLoading] = useState(false);
const [healthCheckedAt, setHealthCheckedAt] = useState<number | null>(null);
const [ledger, setLedger] = useState<WithdrawLedgerCheck | null>(null);
const [ledgerLoading, setLedgerLoading] = useState(false);
const [ledgerCheckedAt, setLedgerCheckedAt] = useState<number | null>(null);
const [drawerOpen, setDrawerOpen] = useState(false);
const [detail, setDetail] = useState<WithdrawDetail | null>(null);
const [detailLoading, setDetailLoading] = useState(false);
@@ -258,36 +255,21 @@ export default function WithdrawsPage() {
}
}, []);
const loadHealth = useCallback(async (showFeedback = false) => {
setHealthLoading(true);
const loadHealth = useCallback(async () => {
try {
const { data } = await api.get<WxpayHealthCheck>('/admin/api/withdraws/health-check');
setHealth(data);
setHealthCheckedAt(Date.now());
if (showFeedback) {
message.success(data.ok ? '检测完成,微信提现配置正常' : '检测完成,仍有配置项需要处理');
}
} catch (e) {
message.error(errMsg(e));
} finally {
setHealthLoading(false);
}
}, []);
// 账本校验是全表对账、相对重,故只在进页时拉一次 + 提供手动按钮,不随每次写操作重算。
const loadLedger = useCallback(async (showFeedback = false) => {
const loadLedger = useCallback(async () => {
setLedgerLoading(true);
try {
const { data } = await api.get<WithdrawLedgerCheck>('/admin/api/withdraws/ledger-check');
setLedger(data);
setLedgerCheckedAt(Date.now());
if (showFeedback) {
if (data.ok) {
message.success('校验完成,现金账本正常');
} else {
message.warning('校验完成,发现现金账本异常');
}
}
} catch (e) {
message.error(errMsg(e));
} finally {
@@ -483,16 +465,15 @@ export default function WithdrawsPage() {
const reconcile = () => {
modal.confirm({
title: '处理超时打款订单?',
content:
'将检查超过 15 分钟仍处于“打款中”的订单:微信已成功则更新为“已到账”;失败则退款;仍待用户确认的老单将撤销并退款;仍在处理中则保持不变。',
okText: '开始处理',
title: '批量对账?',
content: '扫描超过 15 分钟仍处于打款中的提现单,逐单向微信查实并归一化。',
okText: '开始对账',
onOk: async () => {
try {
const { data } = await api.post<{ checked: number; resolved: number }>(
'/admin/api/withdraws/reconcile',
);
message.success(`处理完成:检查 ${data.checked} 单,更新 ${data.resolved}`);
message.success(`对账完成: 检查 ${data.checked} 单,解决 ${data.resolved}`);
await refreshAfterChange();
} catch (e) {
message.error(errMsg(e));
@@ -671,10 +652,6 @@ export default function WithdrawsPage() {
: '',
].filter(Boolean)
: [];
const payoutReady = Boolean(
health?.wxpay_configured && health.private_key_loadable && health.public_key_loadable,
);
const hasBlockingPayoutIssue = Boolean(health && !payoutReady);
return (
<div>
@@ -685,62 +662,41 @@ export default function WithdrawsPage() {
</div>
{canManage && (
<Button danger icon={<ReloadOutlined />} onClick={reconcile}>
</Button>
)}
</Space>
{(hasBlockingPayoutIssue || (ledger && !ledger.ok)) && (
{(health || ledger) && (
<Space direction="vertical" style={{ width: '100%', marginBottom: 16 }}>
{health && hasBlockingPayoutIssue && (
{health && (
<Alert
showIcon
type="warning"
message="当前环境无法执行微信打款"
type={health.ok ? 'success' : 'warning'}
message={health.ok ? '微信提现配置正常' : '微信提现配置需检查'}
description={
<Space direction="vertical" size={6}>
<Text></Text>
{healthCheckedAt && (
<Text type="secondary">
{dayjs(healthCheckedAt).format('HH:mm:ss')}
</Text>
)}
<details>
<summary style={{ color: '#1677ff', cursor: 'pointer' }}></summary>
<ul style={{ margin: '8px 0 0', paddingInlineStart: 20 }}>
{health.issues.map((issue) => (
<li key={issue} style={{ marginBottom: 4, overflowWrap: 'anywhere' }}>
{issue}
</li>
))}
</ul>
</details>
</Space>
}
action={
<Button
size="small"
icon={<ReloadOutlined />}
loading={healthLoading}
onClick={() => void loadHealth(true)}
>
</Button>
health.ok
? `自动对账已${health.auto_reconcile_enabled ? '开启' : '关闭'},每 ${health.auto_reconcile_interval_sec}s 扫描 ${health.auto_reconcile_older_than_minutes} 分钟前的打款中订单`
: health.issues.join('')
}
/>
)}
{ledger && !ledger.ok && (
{ledger && (
<Alert
showIcon
type="error"
message="现金账本存在异常"
description={ledgerIssues.join('')}
type={ledger.ok ? 'success' : 'error'}
message={ledger.ok ? '现金账本校验正常' : '现金账本存在异常'}
description={
ledger.ok
? `现金 余额 ${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={
<Button
size="small"
icon={<ReloadOutlined />}
loading={ledgerLoading}
onClick={() => void loadLedger(true)}
onClick={() => void loadLedger()}
>
</Button>
@@ -750,36 +706,6 @@ export default function WithdrawsPage() {
</Space>
)}
{(health || ledger) && (
<Space
size={12}
wrap
style={{ width: '100%', justifyContent: 'flex-end', marginBottom: 12 }}
>
{health && payoutReady && <Tag color="success"></Tag>}
{ledger?.ok && (
<Space size={6}>
<CheckCircleOutlined style={{ color: '#52c41a' }} />
<Text strong></Text>
{ledgerCheckedAt && (
<Text type="secondary">
· {dayjs(ledgerCheckedAt).format('HH:mm:ss')}
</Text>
)}
<Button
type="link"
size="small"
icon={<ReloadOutlined />}
loading={ledgerLoading}
onClick={() => void loadLedger(true)}
>
</Button>
</Space>
)}
</Space>
)}
<Row gutter={12} style={{ marginBottom: 16 }}>
<Col xs={24} sm={12}>
<Card size="small">
-33
View File
@@ -1,33 +0,0 @@
export interface BulkReviewItemResult {
id: number;
ok: boolean;
status: string | null;
error: string | null;
}
export interface BulkReviewResult {
total: number;
success: number;
failed: number;
items: BulkReviewItemResult[];
}
export const BULK_REVIEW_MAX = 50;
export function failedReviewIds(result: BulkReviewResult): number[] {
return result.items.filter((item) => !item.ok).map((item) => item.id);
}
export function bulkFailureReasonText(result: BulkReviewResult): string {
const reasons = Array.from(
new Set(
result.items
.filter((item) => !item.ok)
.map((item) => item.error?.trim())
.filter((reason): reason is string => Boolean(reason)),
),
);
if (!reasons.length) return '';
const visible = reasons.slice(0, 3);
return `;原因:${visible.join('')}${reasons.length > visible.length ? ';…' : ''}`;
}
-12
View File
@@ -317,18 +317,6 @@ export interface FeedbackQrConfig {
updated_at: string | null;
}
/** ( 3 广, 120 )
* enabled + ;, */
export interface GuideVideoConfig {
enabled: boolean;
video_url: string | null; // /media/guide_video/xxx.mp4;null = 未配片(浮层照旧只放广告)
max_plays: number; // 每个账号前 N 次浮层放引导视频(服务端默认 3,后台不开放调整)
reward_coin: number; // 每次固定金币(服务端默认 120,播完 / 中途关闭都发)
updated_at: string | null;
total_plays: number; // 只读统计:全站已播次数(后台不再展示)
granted_plays: number; // 只读统计:其中已发币次数(后台不再展示)
}
export interface AuditLog {
id: number;
admin_id: number;