Compare commits

...

10 Commits

Author SHA1 Message Date
linkeyu 7ca55d0dcb 优化:明确提现审核状态与超时订单处理 (#71)
## 改动说明

- 将支付配置阻断问题改为明确、可操作的提示,技术详情默认折叠。
- 为支付配置检测和现金账本校验增加加载状态、精确时间与完成反馈。
- 账本正常时使用紧凑状态展示,异常时才显示醒目提示。
- 将“批量对账”改为“处理超时订单”,在确认弹窗中说明查单、更新状态、撤销和退款行为。
- 移除自动查单关闭提示,避免把非阻断运维状态展示成业务问题。
- 审计记录中的操作名称同步调整为“处理超时订单”。

## 验证

- `npx tsc --noEmit`
- Next.js 本地页面编译通过。
- 实际验证重新检测、重新校验和超时订单确认弹窗,浏览器控制台无错误。

## 后端配套

- WonderableAI/shaguabijia-app-server#170

---------

Co-authored-by: guke <guke@wonderable.ai>
Co-authored-by: linkeyu <798648091@qq.com>
Reviewed-on: #71
Co-authored-by: linkeyu <linkeyu@wonderable.ai>
Co-committed-by: linkeyu <linkeyu@wonderable.ai>
2026-07-24 14:51:26 +08:00
zuochenyong d29dce91fa 后台前端:新增新手引导视频配置 (#69)
配置页增加「新手引导视频」分区(GuideVideoConfig.tsx):上传 MP4、设置
生效次数、开关启停。types.ts 补齐对应类型。nginx 配置放宽该上传接口的
client_max_body_size,否则大视频在网关就被 413 挡下、到不了后端。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: guke <guke@wonderable.ai>
Co-authored-by: 左辰勇 <exinglang@gmail.com>
Reviewed-on: #69
Co-authored-by: zuochenyong <zuochenyong@wonderable.ai>
Co-committed-by: zuochenyong <zuochenyong@wonderable.ai>
2026-07-24 14:47:57 +08:00
linkeyu 2dfdc721b3 后台审核改用后端批量接口 (#67)
依赖 app-server PR #164。

## 改动
- 低价审核、用户反馈仅勾选待审核记录
- 批量操作改为单次请求后端 `/bulk/approve` 或 `/bulk/reject`
- 按后端逐条结果展示成功/失败;失败项保留勾选,方便重试
- 采纳/拒绝所需的统一金币、原因、内部备注和用户回复保持原有校验与二次确认

## 验证
- `npm run build`
- `git diff --check`

---------

Co-authored-by: linkeyu <798648091@qq.com>
Reviewed-on: #67
Co-authored-by: linkeyu <linkeyu@wonderable.ai>
Co-committed-by: linkeyu <linkeyu@wonderable.ai>
2026-07-24 12:04:37 +08:00
linkeyu bce720df9e 修复:更新金币经济分类说明 (#70)
## 修改内容

- “看视频金币”提示增加历史签到膨胀奖励。
- “常规任务金币”提示移除历史签到膨胀奖励。
- 页面数值继续使用后端统一分类结果。

## 本地验证

- Next.js 生产构建通过。
- `git diff --check` 通过。

---------

Co-authored-by: linkeyu <798648091@qq.com>
Reviewed-on: #70
Co-authored-by: linkeyu <linkeyu@wonderable.ai>
Co-committed-by: linkeyu <linkeyu@wonderable.ai>
2026-07-24 11:16:44 +08:00
linkeyu 17ddf7ff1e 修复:明确领券单券成功率展示 (#68)
## 修改内容

- 将含义模糊的“百分比”列改名为“单券成功率”。
- 同时显示成功数量、有效尝试数量和百分比,例如 `7/8(87.5%)`。
- 保留点击数字查看逐张券结果明细的能力。

## 验证结果

- Next.js 生产构建通过。

---------

Co-authored-by: linkeyu <798648091@qq.com>
Reviewed-on: #68
Co-authored-by: linkeyu <linkeyu@wonderable.ai>
Co-committed-by: linkeyu <linkeyu@wonderable.ai>
2026-07-24 11:15:13 +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
linkeyu 1559d4faf0 修复:激励视频未完成时预估收益显示为零 (#64)
## 问题
后台明细需要与后端有效收益口径一致:激励视频提前关闭或播放时长不足时显示 0,不能继续展示原始 eCPM 折算金额。

## 修改
- 对 reward_video + closed_early/too_short 做防御性归零显示
- 更新收益口径说明和类型注释
- 顶部合计、趋势和分类统计使用后端修正后的有效收益

## 关联后端
WonderableAI/shaguabijia-app-server#160

## 验证
- npm ci --legacy-peer-deps
- npm run build:通过(包含 TypeScript 与页面构建检查)

---------

Co-authored-by: linkeyu <798648091@qq.com>
Reviewed-on: #64
Co-authored-by: linkeyu <linkeyu@wonderable.ai>
Co-committed-by: linkeyu <linkeyu@wonderable.ai>
2026-07-22 17:38:47 +08:00
linkeyu 9d32234015 后台前端:新增“监控审计”一级目录 (#63)
## 变更
- 左侧导航新增一级目录“监控审计”。
- 将设备存活、埋点成功率、埋点日志和审计日志统一迁入该目录。
- 从“看板”移除技术监控项,并取消埋点日志、审计日志的独立一级入口。
- 保留现有页面权限过滤逻辑:无可见子项时不会展示该目录。

## 验证
- `npm run build` 通过,Next.js 编译、lint 和 TypeScript 检查均成功。

## 后端配套
- WonderableAI/shaguabijia-app-server#159

---------

Co-authored-by: linkeyu <798648091@qq.com>
Reviewed-on: #63
Co-authored-by: linkeyu <linkeyu@wonderable.ai>
Co-committed-by: linkeyu <linkeyu@wonderable.ai>
2026-07-22 17:22:23 +08:00
linkeyu a2a8451aec 修复:领券记录百分比状态配色 (#61)
## 改动
- 将领券记录表格的「点位成功率」列改名为「百分比」
- 全部点位成功的 x/x 使用与「完成」相同的绿色
- 未全部成功的 x/x 使用与「中途退出」相同的警示色
- 保留点击 x/x 查看点位明细的交互

## 验证
- 提交前已执行 git pull --rebase --autostash origin main
- npm run build

---------

Co-authored-by: linkeyu <798648091@qq.com>
Reviewed-on: #61
Co-authored-by: linkeyu <linkeyu@wonderable.ai>
Co-committed-by: linkeyu <linkeyu@wonderable.ai>
2026-07-22 13:56:22 +08:00
linkeyu 578819a284 fix(admin): 使用后端常规任务金币汇总 (#60)
## 修改

- 大盘“常规任务金币”直接使用后端 `regular_task_coin_total`
- 移除前端自行将签到、签到膨胀和任务金币相加的兜底逻辑
- 补充卡片口径说明:每日签到、历史签到膨胀、通知/其他任务、上报更低价、反馈采纳

## 验证

- `npx tsc --noEmit`:通过
- `npm run build`:通过

配套后端 PR 会将 `regular_task_coin_total` 改为明确白名单聚合。

---------

Co-authored-by: linkeyu <798648091@qq.com>
Reviewed-on: #60
Co-authored-by: linkeyu <linkeyu@wonderable.ai>
Co-committed-by: linkeyu <linkeyu@wonderable.ai>
2026-07-22 13:56:13 +08:00
12 changed files with 768 additions and 62 deletions
+14
View File
@@ -32,6 +32,20 @@ server {
proxy_read_timeout 60s; 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 托管。 # 用户上传媒体(上报截图 / 反馈截图 / 反馈二维码)由 App 后端(:8770)的 /media 托管。
# admin 页面要展示这些图,经此同域反代过去(免跨域 + 免 https 页面引 http 图被拦)。 # admin 页面要展示这些图,经此同域反代过去(免跨域 + 免 https 页面引 http 图被拦)。
# 前提:App 后端与本 admin 同机;若分机,把 127.0.0.1:8770 换成 App 后端可达地址。 # 前提:App 后端与本 admin 同机;若分机,把 127.0.0.1:8770 换成 App 后端可达地址。
+17 -7
View File
@@ -76,16 +76,28 @@ const REWARD_STATUS_HINT: Record<string, string> = {
const PLAYBACK_STATUS_TAG: Record<string, { color: string; label: string }> = { const PLAYBACK_STATUS_TAG: Record<string, { color: string; label: string }> = {
completed: { color: 'green', label: '已完成' }, completed: { color: 'green', label: '已完成' },
too_short: { color: 'gold', label: '未满10秒' }, too_short: { color: 'gold', label: '观看时长不足' },
closed_early: { color: 'default', label: '提前关闭' }, closed_early: { color: 'default', label: '提前关闭' },
unknown: { color: 'default', label: '未知' }, unknown: { color: 'default', label: '未知' },
}; };
const ZERO_REVENUE_REWARD_VIDEO_STATUSES = new Set(['closed_early', 'too_short']);
function rewardStatuses(row: AdRevenueRow): string[] { function rewardStatuses(row: AdRevenueRow): string[] {
if (row.sub_rewards?.length) return row.sub_rewards.map((reward) => reward.status); if (row.sub_rewards?.length) return row.sub_rewards.map((reward) => reward.status);
return row.status ? [row.status] : []; return row.status ? [row.status] : [];
} }
function effectiveRevenueYuan(row: AdRevenueRow): number {
if (
row.ad_type === 'reward_video'
&& rewardStatuses(row).some((status) => ZERO_REVENUE_REWARD_VIDEO_STATUSES.has(status))
) {
return 0;
}
return row.row_revenue_yuan ?? row.revenue_yuan;
}
function rewardStatusTag(row: AdRevenueRow) { function rewardStatusTag(row: AdRevenueRow) {
const statuses = rewardStatuses(row); const statuses = rewardStatuses(row);
if (!row.has_reward || statuses.length === 0) { if (!row.has_reward || statuses.length === 0) {
@@ -147,7 +159,7 @@ function playbackStatusTag(row: AdRevenueRow) {
const hint = entries const hint = entries
.map(([status, count]) => `${PLAYBACK_STATUS_TAG[status].label} ${count}`) .map(([status, count]) => `${PLAYBACK_STATUS_TAG[status].label} ${count}`)
.join(''); .join('');
return { color: 'purple', label: '混合状态', hint: `${hint}` }; return { color: 'purple', label: '部分完成', hint: `${hint}` };
} }
const fmtFactorRange = (a: number | null, b: number | null) => { const fmtFactorRange = (a: number | null, b: number | null) => {
@@ -546,10 +558,8 @@ export default function AdRevenueReportPage() {
width: 110, width: 110,
align: 'right', align: 'right',
// 一次比价/领券聚合行用 row_revenue_yuan(该次发奖广告 eCPM 折算之和),其它行用展示侧 revenue_yuan // 一次比价/领券聚合行用 row_revenue_yuan(该次发奖广告 eCPM 折算之和),其它行用展示侧 revenue_yuan
render: (v: number, r: AdRevenueRow) => { // 激励视频提前关闭/时长不足时防御性显示 0,与后端有效收益口径一致。
const rev = r.row_revenue_yuan ?? v; render: (_v: number, r: AdRevenueRow) => effectiveRevenueYuan(r).toFixed(4),
return rev.toFixed(4);
},
}, },
{ {
title: '发奖状态', title: '发奖状态',
@@ -695,7 +705,7 @@ export default function AdRevenueReportPage() {
<br /> <br />
<br /> <br />
广(onAdShow) eCPM ( ÷1000 广(onAdShow) eCPM ( ÷1000
),<b>广</b>;穿/,, );<b> 0 </b>, eCPM 穿,
<b>穿</b> 0广ID / , <b>穿</b> 0广ID / ,
<br /> <br />
<br /> <br />
+222
View File
@@ -0,0 +1,222 @@
'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,6 +6,7 @@ import { api, errMsg } from '@/lib/api';
import HomeMarqueeSeeds from './HomeMarqueeSeeds'; import HomeMarqueeSeeds from './HomeMarqueeSeeds';
import HomeStatsConfig from './HomeStatsConfig'; import HomeStatsConfig from './HomeStatsConfig';
import FeedbackQrConfig from './FeedbackQrConfig'; import FeedbackQrConfig from './FeedbackQrConfig';
import GuideVideoConfig from './GuideVideoConfig';
interface ConfigItem { interface ConfigItem {
key: string; key: string;
@@ -164,6 +165,7 @@ export default function ConfigPage() {
}, },
{ key: 'welfare', label: '福利页', children: welfareConfig }, { key: 'welfare', label: '福利页', children: welfareConfig },
{ key: 'feedback-qr', label: '反馈二维码', children: <FeedbackQrConfig /> }, { key: 'feedback-qr', label: '反馈二维码', children: <FeedbackQrConfig /> },
{ key: 'guide-video', label: '领券引导视频', children: <GuideVideoConfig /> },
]} ]}
/> />
</div> </div>
+12 -3
View File
@@ -149,6 +149,13 @@ function PointScorePopover({ row }: { row: CouponDataRow }) {
return <Typography.Text type="secondary">-</Typography.Text>; return <Typography.Text type="secondary">-</Typography.Text>;
} }
const score = `${row.point_success_count}/${row.point_total_count}`; 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
: STATUS_TAG.abandoned.color;
const loadDetails = async () => { const loadDetails = async () => {
if (details !== null || loading) return; if (details !== null || loading) return;
setLoading(true); setLoading(true);
@@ -215,7 +222,9 @@ function PointScorePopover({ row }: { row: CouponDataRow }) {
</div> </div>
)} )}
> >
<Button type="link" size="small" style={{ height: 'auto', padding: 0 }}>{score}</Button> <Button type="link" size="small" style={{ height: 'auto', padding: 0, color: scoreColor }}>
{scoreWithRate}
</Button>
</Popover> </Popover>
); );
} }
@@ -596,9 +605,9 @@ export default function CouponDataPage() {
render: (v: number | null) => fmtSec(v), render: (v: number | null) => fmtSec(v),
}, },
{ {
title: '点位成功率', title: '单券成功率',
key: 'point_success_rate', key: 'point_success_rate',
width: 110, width: 150,
render: (_: unknown, r: CouponDataRow) => <PointScorePopover row={r} />, render: (_: unknown, r: CouponDataRow) => <PointScorePopover row={r} />,
}, },
{ {
+3 -7
View File
@@ -499,12 +499,7 @@ export default function DashboardPage() {
const tokenCostYuan = periodData?.comparison.token_cost_total_yuan ?? null; const tokenCostYuan = periodData?.comparison.token_cost_total_yuan ?? null;
const couponRewardCoinTotal = periodData?.coins.coupon_reward_coin_total; const couponRewardCoinTotal = periodData?.coins.coupon_reward_coin_total;
const comparisonRewardCoinTotal = periodData?.coins.comparison_reward_coin_total; const comparisonRewardCoinTotal = periodData?.coins.comparison_reward_coin_total;
const signinCoinTotal = periodData?.coins.signin_coin_total; const regularTaskCoinTotal = periodData?.coins.regular_task_coin_total;
const signinBoostCoinTotal = periodData?.coins.signin_boost_coin_total;
const taskCoinTotal = periodData?.coins.task_coin_total;
const regularTaskCoinTotal =
periodData?.coins.regular_task_coin_total ??
((signinCoinTotal ?? 0) + (signinBoostCoinTotal ?? 0) + (taskCoinTotal ?? 0));
const cpsAvailable = data?.cps.available === true; const cpsAvailable = data?.cps.available === true;
const meituanCpsCommissionCents = data?.cps.meituan_commission_cents; const meituanCpsCommissionCents = data?.cps.meituan_commission_cents;
const jdCpsCommissionCents = data?.cps.jd_commission_cents; const jdCpsCommissionCents = data?.cps.jd_commission_cents;
@@ -1070,13 +1065,14 @@ export default function DashboardPage() {
value={fmtInt(periodData?.coins.reward_video_coin_total)} value={fmtInt(periodData?.coins.reward_video_coin_total)}
delta={rewardVideoCoinRatio.value} delta={rewardVideoCoinRatio.value}
deltaTone={rewardVideoCoinRatio.tone} deltaTone={rewardVideoCoinRatio.tone}
hint="独立统计看视频发放,不再重复计入领券奖励。" hint="普通看视频与历史签到膨胀的实发金币之和,不再重复计入领券奖励或常规任务。"
/> />
<StatCard <StatCard
title="常规任务金币" title="常规任务金币"
value={fmtInt(regularTaskCoinTotal)} value={fmtInt(regularTaskCoinTotal)}
delta={regularTaskCoinRatio.value} delta={regularTaskCoinRatio.value}
deltaTone={regularTaskCoinRatio.tone} deltaTone={regularTaskCoinRatio.tone}
hint="每日签到、通知/其他任务、上报更低价和反馈采纳的实发金币之和。"
/> />
<StatCard <StatCard
title="本期提现金额" title="本期提现金额"
+202 -1
View File
@@ -4,11 +4,15 @@ import { useEffect, useState } from 'react';
import type { ColumnsType } from 'antd/es/table'; import type { ColumnsType } from 'antd/es/table';
import type { SorterResult } from 'antd/es/table/interface'; import type { SorterResult } from 'antd/es/table/interface';
import { import {
App,
Button, Button,
Card, Card,
DatePicker, DatePicker,
Form,
Image, Image,
Input, Input,
InputNumber,
Modal,
Select, Select,
Space, Space,
Statistic, Statistic,
@@ -17,10 +21,12 @@ import {
Typography, Typography,
} from 'antd'; } from 'antd';
import type { Dayjs } from 'dayjs'; import type { Dayjs } from 'dayjs';
import { api } from '@/lib/api'; import { api, errMsg } from '@/lib/api';
import { canDo } from '@/lib/auth'; import { canDo } from '@/lib/auth';
import { formatWallTime } from '@/lib/format'; import { formatWallTime } from '@/lib/format';
import { refreshReviewBadge } from '@/lib/reviewBadge'; 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 { usePagedList } from '@/lib/usePagedList';
import type { Feedback, FeedbackSummary } from '@/lib/types'; import type { Feedback, FeedbackSummary } from '@/lib/types';
import FeedbackHandleDrawer from './FeedbackHandleDrawer'; import FeedbackHandleDrawer from './FeedbackHandleDrawer';
@@ -28,6 +34,7 @@ import UserRecordsDrawer from '@/components/UserRecordsDrawer';
const { Text, Paragraph } = Typography; const { Text, Paragraph } = Typography;
const { RangePicker } = DatePicker; const { RangePicker } = DatePicker;
const REWARD_MAX = 10000;
// 截图是 app-server 的 /media 相对路径,本地由 :8770 提供(NEXT_PUBLIC_MEDIA_BASE);生产同域走 nginx 代理。 // 截图是 app-server 的 /media 相对路径,本地由 :8770 提供(NEXT_PUBLIC_MEDIA_BASE);生产同域走 nginx 代理。
const MEDIA_BASE = process.env.NEXT_PUBLIC_MEDIA_BASE || ''; const MEDIA_BASE = process.env.NEXT_PUBLIC_MEDIA_BASE || '';
@@ -155,6 +162,8 @@ const RECORD_COLUMNS: ColumnsType<Feedback> = [
]; ];
export default function FeedbacksPage() { export default function FeedbacksPage() {
const { message } = App.useApp();
const [bulkForm] = Form.useForm();
// 筛选草稿:点「查询」才应用(避免输入即刷新) // 筛选草稿:点「查询」才应用(避免输入即刷新)
const [status, setStatus] = useState<string | undefined>(); const [status, setStatus] = useState<string | undefined>();
const [source, setSource] = useState<string | undefined>(); const [source, setSource] = useState<string | undefined>();
@@ -171,6 +180,19 @@ export default function FeedbacksPage() {
usePagedList<Feedback>('/admin/api/feedbacks', filters); usePagedList<Feedback>('/admin/api/feedbacks', filters);
const canReview = canDo(['operator']); 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 [summary, setSummary] = useState<FeedbackSummary | null>(null);
const loadSummary = async () => { const loadSummary = async () => {
@@ -236,6 +258,61 @@ export default function FeedbacksPage() {
const sortOrderOf = (field: SortField) => const sortOrderOf = (field: SortField) =>
sortBy === field ? (sortOrder === 'asc' ? 'ascend' : 'descend') : null; 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> = [ const columns: ColumnsType<Feedback> = [
{ {
title: '用户ID', title: '用户ID',
@@ -411,16 +488,58 @@ export default function FeedbacksPage() {
<Button onClick={resetFilters}></Button> <Button onClick={resetFilters}></Button>
</Space> </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 <Table
rowKey="id" rowKey="id"
columns={columns} columns={columns}
dataSource={items} 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} loading={loading}
pagination={{ pagination={{
current: page, current: page,
pageSize, pageSize,
total, total,
showSizeChanger: true, showSizeChanger: true,
pageSizeOptions: [10, 20, 50],
showTotal: (t) => `${t} 条反馈`, showTotal: (t) => `${t} 条反馈`,
onChange: onPageChange, onChange: onPageChange,
}} }}
@@ -428,6 +547,88 @@ export default function FeedbacksPage() {
scroll={{ x: 1720 }} 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 <FeedbackHandleDrawer
feedback={drawerFb} feedback={drawerFb}
open={drawerOpen} open={drawerOpen}
+11 -4
View File
@@ -67,8 +67,6 @@ const NAV_GROUPS: NavGroup[] = [
{ key: '/comparison-records', icon: <ProfileOutlined />, label: '比价记录' }, { key: '/comparison-records', icon: <ProfileOutlined />, label: '比价记录' },
{ key: '/coupon-data', icon: <GiftOutlined />, label: '领券记录' }, { key: '/coupon-data', icon: <GiftOutlined />, label: '领券记录' },
{ key: '/cps', icon: <ShareAltOutlined />, label: 'CPS收益' }, { key: '/cps', icon: <ShareAltOutlined />, label: 'CPS收益' },
{ key: '/device-liveness', icon: <HeartOutlined />, label: '设备存活' },
{ key: '/analytics-health', icon: <LineChartOutlined />, label: '埋点成功率' },
], ],
}, },
{ {
@@ -92,9 +90,18 @@ const NAV_GROUPS: NavGroup[] = [
{ key: '/users', icon: <UserOutlined />, label: '用户管理' }, { 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: '/admins', icon: <TeamOutlined />, label: '权限管理' },
{ key: '/event-logs', icon: <DatabaseOutlined />, label: '埋点日志' },
{ key: '/audit-logs', icon: <FileSearchOutlined />, label: '审计日志' },
]; ];
// 导航项 key(/dashboard)→ 权限页 key(dashboard),与后端 permissions.py 目录对齐 // 导航项 key(/dashboard)→ 权限页 key(dashboard),与后端 permissions.py 目录对齐
+137 -11
View File
@@ -23,6 +23,8 @@ import { api, errMsg } from '@/lib/api';
import { canDo } from '@/lib/auth'; import { canDo } from '@/lib/auth';
import { mediaUrl } from '@/lib/media'; import { mediaUrl } from '@/lib/media';
import { refreshReviewBadge } from '@/lib/reviewBadge'; 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 { usePagedList } from '@/lib/usePagedList';
import type { PriceReport, PriceReportSummary } from '@/lib/types'; import type { PriceReport, PriceReportSummary } from '@/lib/types';
import UserRecordsDrawer from '@/components/UserRecordsDrawer'; import UserRecordsDrawer from '@/components/UserRecordsDrawer';
@@ -132,7 +134,10 @@ export default function PriceReportsPage() {
const [activeStatus, setActiveStatus] = useState('pending'); const [activeStatus, setActiveStatus] = useState('pending');
const [summary, setSummary] = useState<PriceReportSummary | null>(null); const [summary, setSummary] = useState<PriceReportSummary | null>(null);
const [rejecting, setRejecting] = useState<PriceReport | null>(null); const [rejecting, setRejecting] = useState<PriceReport | null>(null);
const [bulkRejecting, setBulkRejecting] = useState<PriceReport[]>([]);
const [rejectReason, setRejectReason] = useState(''); const [rejectReason, setRejectReason] = useState('');
const [rejectSubmitting, setRejectSubmitting] = useState(false);
const [selectedRowKeys, setSelectedRowKeys] = useState<number[]>([]);
// 提交时间列服务端排序(默认按提交时间倒序,最新在前) // 提交时间列服务端排序(默认按提交时间倒序,最新在前)
const [sortBy, setSortBy] = useState<SortField>('created_at'); const [sortBy, setSortBy] = useState<SortField>('created_at');
const [sortOrder, setSortOrder] = useState<'asc' | 'desc'>('desc'); const [sortOrder, setSortOrder] = useState<'asc' | 'desc'>('desc');
@@ -165,6 +170,16 @@ export default function PriceReportsPage() {
}; };
const canReview = canDo(['operator']); 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 () => { const loadSummary = async () => {
try { try {
@@ -183,6 +198,49 @@ export default function PriceReportsPage() {
loadSummary(); 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) => { const approve = (r: PriceReport) => {
modal.confirm({ modal.confirm({
title: '确认通过该上报?', title: '确认通过该上报?',
@@ -214,21 +272,38 @@ export default function PriceReportsPage() {
}; };
const confirmReject = async () => { const confirmReject = async () => {
if (!rejecting) return; const targets = bulkRejecting.length ? bulkRejecting : rejecting ? [rejecting] : [];
if (!targets.length) return;
if (targets.length > BULK_REVIEW_MAX) {
message.warning(`单次最多审核 ${BULK_REVIEW_MAX} 条记录`);
return;
}
const reason = rejectReason.trim(); const reason = rejectReason.trim();
if (!reason) { if (!reason) {
message.warning('请填写拒绝理由'); message.warning('请填写拒绝理由');
return; return;
} }
setRejectSubmitting(true);
try { try {
await api.post(`/admin/api/price-reports/${rejecting.id}/reject`, { reason }); if (bulkRejecting.length) {
refreshReviewBadge('/price-reports'); const { data } = await api.post<BulkReviewResult>(
message.success('已拒绝'); '/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();
}
setRejecting(null); setRejecting(null);
setBulkRejecting([]);
setRejectReason(''); setRejectReason('');
refreshAfterChange();
} catch (e) { } catch (e) {
message.error(errMsg(e)); message.error(errMsg(e));
} finally {
setRejectSubmitting(false);
} }
}; };
@@ -393,10 +468,56 @@ export default function PriceReportsPage() {
onChange={setActiveStatus} onChange={setActiveStatus}
items={STATUS_TABS.map((t) => ({ key: t.key, label: t.label }))} 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 <Table
rowKey="id" rowKey="id"
columns={columns} columns={columns}
dataSource={items} 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} loading={loading}
onChange={onTableChange} onChange={onTableChange}
pagination={{ pagination={{
@@ -404,6 +525,7 @@ export default function PriceReportsPage() {
pageSize, pageSize,
total, total,
showSizeChanger: true, showSizeChanger: true,
pageSizeOptions: [10, 20, 50],
showTotal: (t) => `${t}`, showTotal: (t) => `${t}`,
onChange: onPageChange, onChange: onPageChange,
}} }}
@@ -412,21 +534,25 @@ export default function PriceReportsPage() {
</Card> </Card>
<Modal <Modal
title="拒绝上报" title={bulkRejecting.length ? `批量拒绝 ${bulkRejecting.length} 条低价上报` : '拒绝上报'}
open={!!rejecting} open={!!(rejecting || bulkRejecting.length)}
okText="确认拒绝" okText="确认拒绝"
confirmLoading={rejectSubmitting}
okButtonProps={{ danger: true, icon: <CloseCircleOutlined /> }} okButtonProps={{ danger: true, icon: <CloseCircleOutlined /> }}
onOk={confirmReject} onOk={confirmReject}
onCancel={() => { onCancel={() => {
setRejecting(null); setRejecting(null);
setBulkRejecting([]);
setRejectReason(''); setRejectReason('');
}} }}
> >
{rejecting && ( {(rejecting || bulkRejecting.length > 0) && (
<Space direction="vertical" style={{ width: '100%' }}> <Space direction="vertical" style={{ width: '100%' }}>
<Text> {bulkRejecting.length ? (
#{rejecting.user_id} · {rejecting.store_name || '-'} <Text type="secondary"> {bulkRejecting.length} </Text>
</Text> ) : rejecting ? (
<Text> #{rejecting.user_id} · {rejecting.store_name || '-'}</Text>
) : null}
<Space wrap> <Space wrap>
{REJECT_TEMPLATES.map((tpl) => ( {REJECT_TEMPLATES.map((tpl) => (
<Button size="small" key={tpl} onClick={() => setRejectReason(tpl)}> <Button size="small" key={tpl} onClick={() => setRejectReason(tpl)}>
+102 -28
View File
@@ -142,7 +142,7 @@ function actionLabel(action: string) {
'withdraw.approve': '审核通过', 'withdraw.approve': '审核通过',
'withdraw.reject': '审核拒绝', 'withdraw.reject': '审核拒绝',
'withdraw.refresh': '查单刷新', 'withdraw.refresh': '查单刷新',
'withdraw.reconcile': '批量对账', 'withdraw.reconcile': '处理超时订单',
}; };
return labels[action] || action; return labels[action] || action;
} }
@@ -182,8 +182,11 @@ export default function WithdrawsPage() {
const [activeStatus, setActiveStatus] = useState('reviewing'); const [activeStatus, setActiveStatus] = useState('reviewing');
const [summary, setSummary] = useState<WithdrawSummary | null>(null); const [summary, setSummary] = useState<WithdrawSummary | null>(null);
const [health, setHealth] = useState<WxpayHealthCheck | 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 [ledger, setLedger] = useState<WithdrawLedgerCheck | null>(null);
const [ledgerLoading, setLedgerLoading] = useState(false); const [ledgerLoading, setLedgerLoading] = useState(false);
const [ledgerCheckedAt, setLedgerCheckedAt] = useState<number | null>(null);
const [drawerOpen, setDrawerOpen] = useState(false); const [drawerOpen, setDrawerOpen] = useState(false);
const [detail, setDetail] = useState<WithdrawDetail | null>(null); const [detail, setDetail] = useState<WithdrawDetail | null>(null);
const [detailLoading, setDetailLoading] = useState(false); const [detailLoading, setDetailLoading] = useState(false);
@@ -255,21 +258,36 @@ export default function WithdrawsPage() {
} }
}, []); }, []);
const loadHealth = useCallback(async () => { const loadHealth = useCallback(async (showFeedback = false) => {
setHealthLoading(true);
try { try {
const { data } = await api.get<WxpayHealthCheck>('/admin/api/withdraws/health-check'); const { data } = await api.get<WxpayHealthCheck>('/admin/api/withdraws/health-check');
setHealth(data); setHealth(data);
setHealthCheckedAt(Date.now());
if (showFeedback) {
message.success(data.ok ? '检测完成,微信提现配置正常' : '检测完成,仍有配置项需要处理');
}
} catch (e) { } catch (e) {
message.error(errMsg(e)); message.error(errMsg(e));
} finally {
setHealthLoading(false);
} }
}, []); }, []);
// 账本校验是全表对账、相对重,故只在进页时拉一次 + 提供手动按钮,不随每次写操作重算。 // 账本校验是全表对账、相对重,故只在进页时拉一次 + 提供手动按钮,不随每次写操作重算。
const loadLedger = useCallback(async () => { const loadLedger = useCallback(async (showFeedback = false) => {
setLedgerLoading(true); setLedgerLoading(true);
try { try {
const { data } = await api.get<WithdrawLedgerCheck>('/admin/api/withdraws/ledger-check'); const { data } = await api.get<WithdrawLedgerCheck>('/admin/api/withdraws/ledger-check');
setLedger(data); setLedger(data);
setLedgerCheckedAt(Date.now());
if (showFeedback) {
if (data.ok) {
message.success('校验完成,现金账本正常');
} else {
message.warning('校验完成,发现现金账本异常');
}
}
} catch (e) { } catch (e) {
message.error(errMsg(e)); message.error(errMsg(e));
} finally { } finally {
@@ -465,15 +483,16 @@ export default function WithdrawsPage() {
const reconcile = () => { const reconcile = () => {
modal.confirm({ modal.confirm({
title: '批量对账?', title: '处理超时打款订单?',
content: '扫描超过 15 分钟仍处于打款中的提现单,逐单向微信查实并归一化。', content:
okText: '开始对账', '将检查超过 15 分钟仍处于“打款中”的订单:微信已成功则更新为“已到账”;失败则退款;仍待用户确认的老单将撤销并退款;仍在处理中则保持不变。',
okText: '开始处理',
onOk: async () => { onOk: async () => {
try { try {
const { data } = await api.post<{ checked: number; resolved: number }>( const { data } = await api.post<{ checked: number; resolved: number }>(
'/admin/api/withdraws/reconcile', '/admin/api/withdraws/reconcile',
); );
message.success(`对账完成: 检查 ${data.checked} 单,解决 ${data.resolved}`); message.success(`处理完成:检查 ${data.checked} 单,更新 ${data.resolved}`);
await refreshAfterChange(); await refreshAfterChange();
} catch (e) { } catch (e) {
message.error(errMsg(e)); message.error(errMsg(e));
@@ -652,6 +671,10 @@ export default function WithdrawsPage() {
: '', : '',
].filter(Boolean) ].filter(Boolean)
: []; : [];
const payoutReady = Boolean(
health?.wxpay_configured && health.private_key_loadable && health.public_key_loadable,
);
const hasBlockingPayoutIssue = Boolean(health && !payoutReady);
return ( return (
<div> <div>
@@ -662,41 +685,62 @@ export default function WithdrawsPage() {
</div> </div>
{canManage && ( {canManage && (
<Button danger icon={<ReloadOutlined />} onClick={reconcile}> <Button danger icon={<ReloadOutlined />} onClick={reconcile}>
</Button> </Button>
)} )}
</Space> </Space>
{(health || ledger) && ( {(hasBlockingPayoutIssue || (ledger && !ledger.ok)) && (
<Space direction="vertical" style={{ width: '100%', marginBottom: 16 }}> <Space direction="vertical" style={{ width: '100%', marginBottom: 16 }}>
{health && ( {health && hasBlockingPayoutIssue && (
<Alert <Alert
showIcon showIcon
type={health.ok ? 'success' : 'warning'} type="warning"
message={health.ok ? '微信提现配置正常' : '微信提现配置需检查'} message="当前环境无法执行微信打款"
description={ description={
health.ok <Space direction="vertical" size={6}>
? `自动对账已${health.auto_reconcile_enabled ? '开启' : '关闭'},每 ${health.auto_reconcile_interval_sec}s 扫描 ${health.auto_reconcile_older_than_minutes} 分钟前的打款中订单` <Text></Text>
: health.issues.join('') {healthCheckedAt && (
} <Text type="secondary">
/> {dayjs(healthCheckedAt).format('HH:mm:ss')}
)} </Text>
{ledger && ( )}
<Alert <details>
showIcon <summary style={{ color: '#1677ff', cursor: 'pointer' }}></summary>
type={ledger.ok ? 'success' : 'error'} <ul style={{ margin: '8px 0 0', paddingInlineStart: 20 }}>
message={ledger.ok ? '现金账本校验正常' : '现金账本存在异常'} {health.issues.map((issue) => (
description={ <li key={issue} style={{ marginBottom: 4, overflowWrap: 'anywhere' }}>
ledger.ok {issue}
? `现金 余额 ${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)}` </li>
: ledgerIssues.join('') ))}
</ul>
</details>
</Space>
} }
action={
<Button
size="small"
icon={<ReloadOutlined />}
loading={healthLoading}
onClick={() => void loadHealth(true)}
>
</Button>
}
/>
)}
{ledger && !ledger.ok && (
<Alert
showIcon
type="error"
message="现金账本存在异常"
description={ledgerIssues.join('')}
action={ action={
<Button <Button
size="small" size="small"
icon={<ReloadOutlined />} icon={<ReloadOutlined />}
loading={ledgerLoading} loading={ledgerLoading}
onClick={() => void loadLedger()} onClick={() => void loadLedger(true)}
> >
</Button> </Button>
@@ -706,6 +750,36 @@ export default function WithdrawsPage() {
</Space> </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 }}> <Row gutter={12} style={{ marginBottom: 16 }}>
<Col xs={24} sm={12}> <Col xs={24} sm={12}>
<Card size="small"> <Card size="small">
+33
View File
@@ -0,0 +1,33 @@
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 ? ';…' : ''}`;
}
+13 -1
View File
@@ -317,6 +317,18 @@ export interface FeedbackQrConfig {
updated_at: string | null; 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 { export interface AuditLog {
id: number; id: number;
admin_id: number; admin_id: number;
@@ -488,7 +500,7 @@ export interface AdRevenueRow {
has_impression: boolean; // 是否有广告展示(信息流逐条展示=true,纯发奖行=false) has_impression: boolean; // 是否有广告展示(信息流逐条展示=true,纯发奖行=false)
impressions: number; // 本行展示条数 1/0(供日汇总、趋势图复用) impressions: number; // 本行展示条数 1/0(供日汇总、趋势图复用)
ecpm: string | null; // 分/千次;展示行取展示值,纯发奖行取发奖采用值 ecpm: string | null; // 分/千次;展示行取展示值,纯发奖行取发奖采用值
revenue_yuan: number; // 本次展示预估收益(元);纯发奖=0 revenue_yuan: number; // 本次有效展示预估收益(元);纯发奖、激励视频提前关闭/时长不足=0
row_revenue_yuan?: number | null; // 主表逐行显示用:一次比价/领券聚合行=该次发奖广告 eCPM 折算之和;其它行空(回退 revenue_yuan) row_revenue_yuan?: number | null; // 主表逐行显示用:一次比价/领券聚合行=该次发奖广告 eCPM 折算之和;其它行空(回退 revenue_yuan)
adn: string | null; // 实际填充 ADN;纯发奖行为空 adn: string | null; // 实际填充 ADN;纯发奖行为空
slot_id: string | null; // 底层 mediation rit;纯发奖行为空 slot_id: string | null; // 底层 mediation rit;纯发奖行为空