feat(ad-revenue): 收益报表大盘展示穿山甲后台收益(预估/收益API/趋势线) (#26)

- 核心指标新增「穿山甲后台收益(T+1)」区:穿山甲预估收益、收益API、客户端预估偏差;
  按天趋势图加一条绿色「穿山甲后台收益」线(数据来自后端 daily[].pangle_*)。
- 仅在全量视图(未按用户/类型/场景筛选)展示;非全量或未同步时显示「-」并提示。
- 收益口径说明补充穿山甲后台收益来源;types.ts 同步新增 total_pangle_revenue_yuan /
  total_pangle_api_revenue_yuan / pangle_revenue_available / daily[].pangle_*。

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

---------

Co-authored-by: zzhyyyyy <2685922758@qq.com>
Reviewed-on: #26
Co-authored-by: zhuzihao <zhuzihao@wonderable.ai>
Co-committed-by: zhuzihao <zhuzihao@wonderable.ai>
This commit was merged in pull request #26.
This commit is contained in:
2026-06-29 09:53:52 +08:00
committed by marco
parent 510ce349f7
commit a1d9923f33
2 changed files with 127 additions and 75 deletions
+118 -6
View File
@@ -139,18 +139,21 @@ const DETAIL_COLUMNS: ColumnsType<AdRevenueRecord> = [
}, },
]; ];
// 趋势图(纯 SVG,零依赖):柱=展示条数(左轴),线=预估收益元(右轴)。x 轴按传入点序。 // 趋势图(纯 SVG,零依赖):柱=展示条数(左轴),线=客户端预估收益元(右轴),
// 绿线=穿山甲后台预估收益元(右轴,仅按天且有数据时出现)。x 轴按传入点序。
const CHART_BAR = '#69b1ff'; const CHART_BAR = '#69b1ff';
const CHART_LINE = '#fa8c16'; const CHART_LINE = '#fa8c16';
const CHART_LINE2 = '#52c41a'; // 穿山甲后台收益线
interface TrendPoint { interface TrendPoint {
label: string; // x 轴刻度文案(小时数 / MM-DD) label: string; // x 轴刻度文案(小时数 / MM-DD)
tip: string; // hover 原生 tooltip 全文 tip: string; // hover 原生 tooltip 全文
impressions: number; impressions: number;
revenue: number; revenue: number;
pangleRevenue: number | null; // 穿山甲后台预估收益(元);无则 null(不画绿线点)
} }
// 按小时聚合(023),数据源是 hourly(后端全量聚合,不受分页影响) // 按小时聚合(023),数据源是 hourly(后端全量聚合,不受分页影响)。穿山甲为天级,小时视图无该线。
function aggregateHourly(rows: AdRevenueHourly[]): TrendPoint[] { function aggregateHourly(rows: AdRevenueHourly[]): TrendPoint[] {
const byHour = Array.from({ length: 24 }, (_, h) => ({ hour: h, impressions: 0, revenue: 0 })); const byHour = Array.from({ length: 24 }, (_, h) => ({ hour: h, impressions: 0, revenue: 0 }));
for (const r of rows) { for (const r of rows) {
@@ -163,10 +166,12 @@ function aggregateHourly(rows: AdRevenueHourly[]): TrendPoint[] {
tip: `${String(b.hour).padStart(2, '0')}:00 展示 ${b.impressions} 条 · 预估收益 ${b.revenue.toFixed(4)}`, tip: `${String(b.hour).padStart(2, '0')}:00 展示 ${b.impressions} 条 · 预估收益 ${b.revenue.toFixed(4)}`,
impressions: b.impressions, impressions: b.impressions,
revenue: b.revenue, revenue: b.revenue,
pangleRevenue: null,
})); }));
} }
// 按天聚合,数据源是 daily(全量,不受 limit 影响);用 from..to 补齐空缺日为 0,轴连续 // 按天聚合,数据源是 daily(全量,不受 limit 影响);用 from..to 补齐空缺日为 0,轴连续
// 穿山甲收益(pangle_revenue_yuan)为 null 时该日不画绿线点(T+1 未出/非全量视图)。
function aggregateDaily(dateFrom: string, dateTo: string, daily: AdRevenueDaily[]): TrendPoint[] { function aggregateDaily(dateFrom: string, dateTo: string, daily: AdRevenueDaily[]): TrendPoint[] {
const map = new Map(daily.map((d) => [d.date, d])); const map = new Map(daily.map((d) => [d.date, d]));
const out: TrendPoint[] = []; const out: TrendPoint[] = [];
@@ -177,11 +182,14 @@ function aggregateDaily(dateFrom: string, dateTo: string, daily: AdRevenueDaily[
const d = map.get(ds); const d = map.get(ds);
const impressions = d?.impressions ?? 0; const impressions = d?.impressions ?? 0;
const revenue = d?.revenue_yuan ?? 0; const revenue = d?.revenue_yuan ?? 0;
const pangleRevenue = d?.pangle_revenue_yuan ?? null;
const pangleTip = pangleRevenue != null ? ` · 穿山甲收益 ${pangleRevenue.toFixed(4)}` : '';
out.push({ out.push({
label: ds.slice(5), label: ds.slice(5),
tip: `${ds} 展示 ${impressions} 条 · 预估收益 ${revenue.toFixed(4)}`, tip: `${ds} 展示 ${impressions} 条 · 预估收益 ${revenue.toFixed(4)}${pangleTip}`,
impressions, impressions,
revenue, revenue,
pangleRevenue,
}); });
cur = cur.add(1, 'day'); cur = cur.add(1, 'day');
guard += 1; guard += 1;
@@ -192,7 +200,11 @@ function aggregateDaily(dateFrom: string, dateTo: string, daily: AdRevenueDaily[
function TrendChart({ points }: { points: TrendPoint[] }) { function TrendChart({ points }: { points: TrendPoint[] }) {
const n = points.length; const n = points.length;
const maxImp = Math.max(1, ...points.map((p) => p.impressions)); const maxImp = Math.max(1, ...points.map((p) => p.impressions));
const maxRev = Math.max(1e-9, ...points.map((p) => p.revenue)); const maxRev = Math.max(
1e-9,
...points.map((p) => p.revenue),
...points.map((p) => p.pangleRevenue ?? 0),
);
const W = 960; const W = 960;
const H = 280; const H = 280;
@@ -248,6 +260,24 @@ function TrendChart({ points }: { points: TrendPoint[] }) {
<title>{p.tip}</title> <title>{p.tip}</title>
</circle> </circle>
))} ))}
{/* 穿山甲后台收益线(绿,仅非 null 的天画;按天且已同步 T+1 数据时出现) */}
{(() => {
const pp = points
.map((p, i) => ({ i, v: p.pangleRevenue, tip: p.tip }))
.filter((x): x is { i: number; v: number; tip: string } => x.v != null);
if (pp.length === 0) return null;
const pangleLine = pp.map((x) => `${cx(x.i)},${revY(x.v)}`).join(' ');
return (
<g>
<polyline points={pangleLine} fill="none" stroke={CHART_LINE2} strokeWidth={2} />
{pp.map((x) => (
<circle key={`p-${x.i}`} cx={cx(x.i)} cy={revY(x.v)} r={2.5} fill={CHART_LINE2}>
<title>{x.tip}</title>
</circle>
))}
</g>
);
})()}
{points.map((p, i) => {points.map((p, i) =>
i % labelEvery === 0 || i === n - 1 ? ( i % labelEvery === 0 || i === n - 1 ? (
<text key={i} x={cx(i)} y={H - 14} textAnchor="middle" fontSize={11} fill="#999"> <text key={i} x={cx(i)} y={H - 14} textAnchor="middle" fontSize={11} fill="#999">
@@ -500,6 +530,11 @@ export default function AdRevenueReportPage() {
广(onAdShow) eCPM ( ÷1000 广(onAdShow) eCPM ( ÷1000
),<b>广</b>;穿/,, ),<b>广</b>;穿/,,
<b>穿</b> 0广ID / , <b>穿</b> 0广ID / ,
<br />
<br />
<b>穿(T+1)</b>穿 GroMore API(,):
<b>穿</b>= revenue<b>API</b>= ADN 穿//,
<b></b>(//);,
</div> </div>
} }
> >
@@ -666,6 +701,69 @@ export default function AdRevenueReportPage() {
</Typography.Text> </Typography.Text>
</Col> </Col>
</Row> </Row>
<Divider orientation="left" plain style={{ marginTop: 20, marginBottom: 16 }}>
<Tooltip title="来自穿山甲 GroMore 数据 API(后台结算口径,T+1 次日出数)。穿山甲不提供分用户/类型/场景维度,故仅在「全量视图」(未按用户/类型/场景筛选)展示;按代码位×应用×日期汇总。revenue=预估收益、收益API=各 ADN 回传更接近结算。">
<Typography.Text type="secondary" style={{ fontSize: 12 }}>
穿(T+1)
<InfoCircleOutlined style={{ marginLeft: 4 }} />
</Typography.Text>
</Tooltip>
</Divider>
{data.pangle_revenue_available ? (
<Row gutter={[16, 12]}>
<Col flex="1 1 0">
<Statistic
title="穿山甲预估收益(元)"
value={data.total_pangle_revenue_yuan ?? 0}
precision={4}
/>
</Col>
<Col flex="1 1 0">
<Statistic
title="穿山甲收益API(元)"
value={data.total_pangle_api_revenue_yuan ?? '-'}
precision={data.total_pangle_api_revenue_yuan == null ? undefined : 4}
/>
{data.total_pangle_api_revenue_yuan == null && (
<Typography.Text type="secondary" style={{ fontSize: 12 }}>
Reporting /
</Typography.Text>
)}
</Col>
<Col flex="1 1 0">
<Statistic
title={
<Tooltip title="客户端预估相对穿山甲预估的高估幅度 =(客户端预估 − 穿山甲预估)÷ 穿山甲预估;客户端按 onAdShow 计、不滤无效曝光,通常偏高">
<span>
<InfoCircleOutlined style={{ marginLeft: 4 }} />
</span>
</Tooltip>
}
value={
data.total_pangle_revenue_yuan && data.total_pangle_revenue_yuan > 0
? ((data.total_revenue_yuan - data.total_pangle_revenue_yuan) /
data.total_pangle_revenue_yuan) *
100
: '-'
}
precision={
data.total_pangle_revenue_yuan && data.total_pangle_revenue_yuan > 0
? 1
: undefined
}
suffix={
data.total_pangle_revenue_yuan && data.total_pangle_revenue_yuan > 0 ? '%' : ''
}
/>
</Col>
</Row>
) : (
<Typography.Text type="secondary" style={{ fontSize: 13 }}>
本视图无穿山甲后台收益:(//)
穿 T+1 , <Typography.Text code>scripts/sync_pangle_revenue</Typography.Text>
</Typography.Text>
)}
<Divider orientation="left" plain style={{ marginTop: 20, marginBottom: 16 }}> <Divider orientation="left" plain style={{ marginTop: 20, marginBottom: 16 }}>
<Typography.Text type="secondary" style={{ fontSize: 12 }}> <Typography.Text type="secondary" style={{ fontSize: 12 }}>
广 广
@@ -743,8 +841,22 @@ export default function AdRevenueReportPage() {
verticalAlign: 'middle', verticalAlign: 'middle',
}} }}
/> />
() ()
</span> </span>
{queriedMultiDay && (
<span style={{ fontSize: 12, color: '#666' }}>
<span
style={{
display: 'inline-block',
width: 14,
borderTop: `2px solid ${CHART_LINE2}`,
marginRight: 4,
verticalAlign: 'middle',
}}
/>
穿()
</span>
)}
</Space> </Space>
} }
> >
+9 -69
View File
@@ -369,7 +369,9 @@ export interface AdRevenueRecord {
export interface AdRevenueDaily { export interface AdRevenueDaily {
date: string; // 北京时间 YYYY-MM-DD date: string; // 北京时间 YYYY-MM-DD
impressions: number; impressions: number;
revenue_yuan: number; revenue_yuan: number; // 客户端预估收益(eCPM 折算)
pangle_revenue_yuan: number | null; // 穿山甲后台预估收益(GroMore revenue);非全量视图/无数据为 null
pangle_api_revenue_yuan: number | null; // 穿山甲收益API(更接近结算);未配/当天/无数据为 null
expected_coin: number; expected_coin: number;
actual_coin: number; actual_coin: number;
} }
@@ -427,17 +429,13 @@ export interface AdRevenueReport {
total: number; // 当前筛选下的分页总条数(全量,不受分页影响) total: number; // 当前筛选下的分页总条数(全量,不受分页影响)
truncated: boolean; // 当前页之后是否还有更多事件(分页后前端不再据此报警) truncated: boolean; // 当前页之后是否还有更多事件(分页后前端不再据此报警)
total_impressions: number; total_impressions: number;
total_revenue_yuan: number; total_revenue_yuan: number; // 客户端预估收益合计(eCPM 折算)
total_pangle_revenue_yuan: number | null; // 穿山甲后台预估收益合计(GroMore revenue);非全量视图/无数据为 null
total_pangle_api_revenue_yuan: number | null; // 穿山甲收益API合计(更接近结算);未配/当天/非全量视图为 null
pangle_revenue_available: boolean; // 本次结果是否带穿山甲后台收益(全量视图且已同步到数据)
total_expected_coin: number; total_expected_coin: number;
total_actual_coin: number; total_actual_coin: number;
mismatch_count: number; // 应发≠实发的发奖条数 mismatch_count: number; // 应发≠实发的发奖条数
by_ad_type?: Record<string, {
ad_type: string;
impressions: number;
revenue_yuan: number;
expected_coin: number;
actual_coin: number;
}>;
items: AdRevenueRow[]; items: AdRevenueRow[];
} }
@@ -450,17 +448,7 @@ export interface DashboardOverview {
new_today: number; new_today: number;
dau: number; dau: number;
}; };
coins: { coins: { granted_total: number };
granted_total: number;
reward_video_coin_total?: number;
reward_video_watch_count?: number;
feed_ad_coin_total?: number;
feed_ad_watch_count?: number;
signin_coin_total?: number;
signin_count?: number;
signin_boost_coin_total?: number;
signin_boost_watch_count?: number;
};
cash: { cash: {
withdraw_success_cents: number; withdraw_success_cents: number;
withdraw_pending_count: number; withdraw_pending_count: number;
@@ -468,56 +456,8 @@ export interface DashboardOverview {
withdraw_failed_count: number; withdraw_failed_count: number;
}; };
comparison: { total: number; success: number; success_rate: number }; comparison: { total: number; success: number; success_rate: number };
period: {
date_from: string;
date_to: string;
users: {
new: number;
active: number;
retained_new_users: number;
retention_rate: number | null;
retention_note: string;
};
comparison: {
total: number;
success: number;
success_rate: number;
ordered: number;
average_duration_ms: number | null;
average_saved_cents: number | null;
};
coins: {
granted_total: number;
reward_video_coin_total: number;
feed_ad_coin_total: number;
signin_coin_total: number;
signin_boost_coin_total: number;
task_coin_total: number;
coupon_reward_coin_total: number;
comparison_reward_coin_total: number;
regular_task_coin_total: number;
};
cash: {
withdraw_success_cents: number;
};
trend: Array<{
date: string;
active_users: number;
new_users: number;
comparisons: number;
}>;
};
feedback: { new: number }; feedback: { new: number };
cps: { cps: { available: boolean; note: string };
available: boolean;
note: string;
meituan_order_count?: number;
meituan_commission_cents?: number;
meituan_hit_count?: number;
meituan_miss_count?: number;
meituan_unknown_rate_count?: number;
meituan_hit_rate?: number | null;
};
} }
export interface PriceReport { export interface PriceReport {