Compare commits

...

3 Commits

Author SHA1 Message Date
linkeyu af0e6eefda fix(admin): show zero revenue for incomplete reward videos 2026-07-22 17:09:21 +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
4 changed files with 26 additions and 14 deletions
+15 -5
View File
@@ -81,11 +81,23 @@ const PLAYBACK_STATUS_TAG: Record<string, { color: string; label: string }> = {
unknown: { color: 'default', label: '未知' },
};
const ZERO_REVENUE_REWARD_VIDEO_STATUSES = new Set(['closed_early', 'too_short']);
function rewardStatuses(row: AdRevenueRow): string[] {
if (row.sub_rewards?.length) return row.sub_rewards.map((reward) => reward.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) {
const statuses = rewardStatuses(row);
if (!row.has_reward || statuses.length === 0) {
@@ -546,10 +558,8 @@ export default function AdRevenueReportPage() {
width: 110,
align: 'right',
// 一次比价/领券聚合行用 row_revenue_yuan(该次发奖广告 eCPM 折算之和),其它行用展示侧 revenue_yuan
render: (v: number, r: AdRevenueRow) => {
const rev = r.row_revenue_yuan ?? v;
return rev.toFixed(4);
},
// 激励视频提前关闭/时长不足时防御性显示 0,与后端有效收益口径一致。
render: (_v: number, r: AdRevenueRow) => effectiveRevenueYuan(r).toFixed(4),
},
{
title: '发奖状态',
@@ -695,7 +705,7 @@ export default function AdRevenueReportPage() {
<br />
<br />
广(onAdShow) eCPM ( ÷1000
),<b>广</b>;穿/,,
);<b> 0 </b>, eCPM 穿,
<b>穿</b> 0广ID / ,
<br />
<br />
+8 -2
View File
@@ -149,6 +149,10 @@ function PointScorePopover({ row }: { row: CouponDataRow }) {
return <Typography.Text type="secondary">-</Typography.Text>;
}
const score = `${row.point_success_count}/${row.point_total_count}`;
const scoreColor =
row.point_success_count === row.point_total_count
? STATUS_TAG.completed.color
: STATUS_TAG.abandoned.color;
const loadDetails = async () => {
if (details !== null || loading) return;
setLoading(true);
@@ -215,7 +219,9 @@ function PointScorePopover({ row }: { row: CouponDataRow }) {
</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 }}>
{score}
</Button>
</Popover>
);
}
@@ -596,7 +602,7 @@ export default function CouponDataPage() {
render: (v: number | null) => fmtSec(v),
},
{
title: '点位成功率',
title: '百分比',
key: 'point_success_rate',
width: 110,
render: (_: unknown, r: CouponDataRow) => <PointScorePopover row={r} />,
+2 -6
View File
@@ -499,12 +499,7 @@ export default function DashboardPage() {
const tokenCostYuan = periodData?.comparison.token_cost_total_yuan ?? null;
const couponRewardCoinTotal = periodData?.coins.coupon_reward_coin_total;
const comparisonRewardCoinTotal = periodData?.coins.comparison_reward_coin_total;
const signinCoinTotal = periodData?.coins.signin_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 regularTaskCoinTotal = periodData?.coins.regular_task_coin_total;
const cpsAvailable = data?.cps.available === true;
const meituanCpsCommissionCents = data?.cps.meituan_commission_cents;
const jdCpsCommissionCents = data?.cps.jd_commission_cents;
@@ -1077,6 +1072,7 @@ export default function DashboardPage() {
value={fmtInt(regularTaskCoinTotal)}
delta={regularTaskCoinRatio.value}
deltaTone={regularTaskCoinRatio.tone}
hint="每日签到、历史签到膨胀、通知/其他任务、上报更低价和反馈采纳的实发金币之和。"
/>
<StatCard
title="本期提现金额"
+1 -1
View File
@@ -488,7 +488,7 @@ export interface AdRevenueRow {
has_impression: boolean; // 是否有广告展示(信息流逐条展示=true,纯发奖行=false)
impressions: number; // 本行展示条数 1/0(供日汇总、趋势图复用)
ecpm: string | null; // 分/千次;展示行取展示值,纯发奖行取发奖采用值
revenue_yuan: number; // 本次展示预估收益(元);纯发奖=0
revenue_yuan: number; // 本次有效展示预估收益(元);纯发奖、激励视频提前关闭/时长不足=0
row_revenue_yuan?: number | null; // 主表逐行显示用:一次比价/领券聚合行=该次发奖广告 eCPM 折算之和;其它行空(回退 revenue_yuan)
adn: string | null; // 实际填充 ADN;纯发奖行为空
slot_id: string | null; // 底层 mediation rit;纯发奖行为空