Compare commits

...

2 Commits

Author SHA1 Message Date
linkeyu 8258ee00b9 feat(admin): support bulk reward reviews 2026-07-23 17:03:52 +08:00
linkeyu ecf8150cfc 修复:优化广告播放状态文案 (#65)
## 修改内容
- 广告播放状态“未满10秒”调整为“观看时长不足”
- 聚合播放状态“混合状态”调整为“部分完成”
- 保持后端状态码、接口结构和判定逻辑不变

## 影响范围
- 仅修改后台广告收益页的前端展示文案

## 验证
- npm run build

---------

Co-authored-by: linkeyu <798648091@qq.com>
Reviewed-on: #65
Co-authored-by: linkeyu <linkeyu@wonderable.ai>
Co-committed-by: linkeyu <linkeyu@wonderable.ai>
2026-07-22 18:21:39 +08:00
4 changed files with 327 additions and 13 deletions
+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: '未满10秒' },
too_short: { color: 'gold', label: '观看时长不足' },
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) => {
+183
View File
@@ -4,11 +4,15 @@ 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,6 +25,7 @@ import { api } from '@/lib/api';
import { canDo } from '@/lib/auth';
import { formatWallTime } from '@/lib/format';
import { refreshReviewBadge } from '@/lib/reviewBadge';
import { runBulkAction } from '@/lib/bulkAction';
import { usePagedList } from '@/lib/usePagedList';
import type { Feedback, FeedbackSummary } from '@/lib/types';
import FeedbackHandleDrawer from './FeedbackHandleDrawer';
@@ -28,6 +33,7 @@ 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 || '';
@@ -155,6 +161,8 @@ 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>();
@@ -171,6 +179,19 @@ 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 () => {
@@ -236,6 +257,51 @@ export default function FeedbacksPage() {
const sortOrderOf = (field: SortField) =>
sortBy === field ? (sortOrder === 'asc' ? 'ascend' : 'descend') : null;
const openBulkModal = (action: 'approve' | 'reject') => {
if (!selectedFeedbacks.length) 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 result = await runBulkAction(targets, (item) =>
bulkAction === 'approve'
? api.post(`/admin/api/feedbacks/${item.id}/approve`, {
reward_coins: values.reward_coins,
note: values.note?.trim() || null,
reply: values.reply?.trim() || null,
})
: api.post(`/admin/api/feedbacks/${item.id}/reject`, {
reason: values.reason.trim(),
note: values.note?.trim() || null,
reply: values.reply?.trim() || null,
}),
);
setSelectedRowKeys(result.failedIds);
setBulkAction(null);
bulkForm.resetFields();
if (result.failedIds.length) reload();
else onPageChange(1, pageSize);
loadSummary();
refreshReviewBadge('/feedbacks');
const label = bulkAction === 'approve' ? '批量采纳' : '批量拒绝';
if (result.failedIds.length) {
message.warning(
`${label}完成:成功 ${result.succeededIds.length} 条,失败 ${result.failedIds.length} 条;失败项已保留勾选`,
);
} else {
message.success(`${label}完成:成功 ${result.succeededIds.length}`);
}
} finally {
setBulkSubmitting(false);
}
};
const columns: ColumnsType<Feedback> = [
{
title: '用户ID',
@@ -411,10 +477,45 @@ 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}
onClick={() => openBulkModal('approve')}
>
</Button>
<Button
danger
disabled={!selectedFeedbacks.length}
onClick={() => openBulkModal('reject')}
>
</Button>
{!!selectedFeedbacks.length && (
<Button onClick={() => setSelectedRowKeys([])}></Button>
)}
</Space>
)}
<Table
rowKey="id"
columns={columns}
dataSource={items}
rowSelection={
canReview
? {
selectedRowKeys,
onChange: (keys) => setSelectedRowKeys(keys as number[]),
getCheckboxProps: (record) => ({
disabled: !isPending(record.status),
name: `选择反馈 #${record.id}`,
}),
}
: undefined
}
loading={loading}
pagination={{
current: page,
@@ -428,6 +529,88 @@ 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}
+111 -11
View File
@@ -23,6 +23,7 @@ import { api, errMsg } from '@/lib/api';
import { canDo } from '@/lib/auth';
import { mediaUrl } from '@/lib/media';
import { refreshReviewBadge } from '@/lib/reviewBadge';
import { runBulkAction } from '@/lib/bulkAction';
import { usePagedList } from '@/lib/usePagedList';
import type { PriceReport, PriceReportSummary } from '@/lib/types';
import UserRecordsDrawer from '@/components/UserRecordsDrawer';
@@ -132,7 +133,10 @@ 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');
@@ -165,6 +169,16 @@ 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 {
@@ -183,6 +197,36 @@ export default function PriceReportsPage() {
loadSummary();
};
const reportBulkResult = (label: string, succeeded: number, failedIds: number[]) => {
setSelectedRowKeys(failedIds);
refreshReviewBadge('/price-reports');
loadSummary();
if (failedIds.length) reload();
else onPageChange(1, pageSize);
if (failedIds.length) {
message.warning(`${label}完成:成功 ${succeeded} 条,失败 ${failedIds.length} 条;失败项已保留勾选`);
} else {
message.success(`${label}完成:成功 ${succeeded}`);
}
};
const bulkApprove = () => {
const targets = selectedReports;
if (!targets.length) return;
modal.confirm({
title: `确认批量通过 ${targets.length} 条低价上报?`,
icon: <CheckCircleOutlined style={{ color: '#52c41a' }} />,
content: `通过后将向每位用户发放 1000 金币,共发放 ${targets.length * 1000} 金币。请确认已逐条核实截图。`,
okText: '批量通过并发金币',
onOk: async () => {
const result = await runBulkAction(targets, (item) =>
api.post(`/admin/api/price-reports/${item.id}/approve`),
);
reportBulkResult('批量通过', result.succeededIds.length, result.failedIds);
},
});
};
const approve = (r: PriceReport) => {
modal.confirm({
title: '确认通过该上报?',
@@ -214,21 +258,33 @@ export default function PriceReportsPage() {
};
const confirmReject = async () => {
if (!rejecting) return;
const targets = bulkRejecting.length ? bulkRejecting : rejecting ? [rejecting] : [];
if (!targets.length) return;
const reason = rejectReason.trim();
if (!reason) {
message.warning('请填写拒绝理由');
return;
}
setRejectSubmitting(true);
try {
await api.post(`/admin/api/price-reports/${rejecting.id}/reject`, { reason });
refreshReviewBadge('/price-reports');
message.success('已拒绝');
if (bulkRejecting.length) {
const result = await runBulkAction(targets, (item) =>
api.post(`/admin/api/price-reports/${item.id}/reject`, { reason }),
);
reportBulkResult('批量拒绝', result.succeededIds.length, result.failedIds);
} else {
await api.post(`/admin/api/price-reports/${targets[0].id}/reject`, { reason });
refreshReviewBadge('/price-reports');
message.success('已拒绝');
refreshAfterChange();
}
setRejecting(null);
setBulkRejecting([]);
setRejectReason('');
refreshAfterChange();
} catch (e) {
message.error(errMsg(e));
} finally {
setRejectSubmitting(false);
}
};
@@ -393,10 +449,50 @@ 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}
onClick={bulkApprove}
>
</Button>
<Button
danger
icon={<CloseCircleOutlined />}
disabled={!selectedReports.length}
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) => setSelectedRowKeys(keys as number[]),
getCheckboxProps: (record) => ({
disabled: record.status !== 'pending',
name: `选择低价上报 #${record.id}`,
}),
}
: undefined
}
loading={loading}
onChange={onTableChange}
pagination={{
@@ -412,21 +508,25 @@ export default function PriceReportsPage() {
</Card>
<Modal
title="拒绝上报"
open={!!rejecting}
title={bulkRejecting.length ? `批量拒绝 ${bulkRejecting.length} 条低价上报` : '拒绝上报'}
open={!!(rejecting || bulkRejecting.length)}
okText="确认拒绝"
confirmLoading={rejectSubmitting}
okButtonProps={{ danger: true, icon: <CloseCircleOutlined /> }}
onOk={confirmReject}
onCancel={() => {
setRejecting(null);
setBulkRejecting([]);
setRejectReason('');
}}
>
{rejecting && (
{(rejecting || bulkRejecting.length > 0) && (
<Space direction="vertical" style={{ width: '100%' }}>
<Text>
#{rejecting.user_id} · {rejecting.store_name || '-'}
</Text>
{bulkRejecting.length ? (
<Text type="secondary"> {bulkRejecting.length} </Text>
) : rejecting ? (
<Text> #{rejecting.user_id} · {rejecting.store_name || '-'}</Text>
) : null}
<Space wrap>
{REJECT_TEMPLATES.map((tpl) => (
<Button size="small" key={tpl} onClick={() => setRejectReason(tpl)}>
+31
View File
@@ -0,0 +1,31 @@
export interface BulkActionResult {
succeededIds: number[];
failedIds: number[];
}
/**
* Run per-record write endpoints with bounded concurrency.
*
* The review endpoints already own transaction, audit and idempotency semantics,
* so the admin UI deliberately keeps using them instead of duplicating that logic.
*/
export async function runBulkAction<T extends { id: number }>(
targets: T[],
action: (target: T) => Promise<unknown>,
concurrency = 5,
): Promise<BulkActionResult> {
const succeededIds: number[] = [];
const failedIds: number[] = [];
for (let index = 0; index < targets.length; index += concurrency) {
const chunk = targets.slice(index, index + concurrency);
const settled = await Promise.allSettled(chunk.map(action));
settled.forEach((result, resultIndex) => {
const id = chunk[resultIndex].id;
if (result.status === 'fulfilled') succeededIds.push(id);
else failedIds.push(id);
});
}
return { succeededIds, failedIds };
}