diff --git a/src/app/(main)/ad-revenue-report/page.tsx b/src/app/(main)/ad-revenue-report/page.tsx index e43afaf..9d91ea2 100644 --- a/src/app/(main)/ad-revenue-report/page.tsx +++ b/src/app/(main)/ad-revenue-report/page.tsx @@ -139,18 +139,21 @@ const DETAIL_COLUMNS: ColumnsType = [ }, ]; -// 趋势图(纯 SVG,零依赖):柱=展示条数(左轴),线=预估收益元(右轴)。x 轴按传入点序。 +// 趋势图(纯 SVG,零依赖):柱=展示条数(左轴),橙线=客户端预估收益元(右轴), +// 绿线=穿山甲后台预估收益元(右轴,仅按天且有数据时出现)。x 轴按传入点序。 const CHART_BAR = '#69b1ff'; const CHART_LINE = '#fa8c16'; +const CHART_LINE2 = '#52c41a'; // 穿山甲后台收益线 interface TrendPoint { label: string; // x 轴刻度文案(小时数 / MM-DD) tip: string; // hover 原生 tooltip 全文 impressions: number; revenue: number; + pangleRevenue: number | null; // 穿山甲后台预估收益(元);无则 null(不画绿线点) } -// 按小时聚合(0–23),数据源是 hourly(后端全量聚合,不受分页影响) +// 按小时聚合(0–23),数据源是 hourly(后端全量聚合,不受分页影响)。穿山甲为天级,小时视图无该线。 function aggregateHourly(rows: AdRevenueHourly[]): TrendPoint[] { const byHour = Array.from({ length: 24 }, (_, h) => ({ hour: h, impressions: 0, revenue: 0 })); 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)} 元`, impressions: b.impressions, 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[] { const map = new Map(daily.map((d) => [d.date, d])); const out: TrendPoint[] = []; @@ -177,11 +182,14 @@ function aggregateDaily(dateFrom: string, dateTo: string, daily: AdRevenueDaily[ const d = map.get(ds); const impressions = d?.impressions ?? 0; const revenue = d?.revenue_yuan ?? 0; + const pangleRevenue = d?.pangle_revenue_yuan ?? null; + const pangleTip = pangleRevenue != null ? ` · 穿山甲收益 ${pangleRevenue.toFixed(4)} 元` : ''; out.push({ label: ds.slice(5), - tip: `${ds} 展示 ${impressions} 条 · 预估收益 ${revenue.toFixed(4)} 元`, + tip: `${ds} 展示 ${impressions} 条 · 预估收益 ${revenue.toFixed(4)} 元${pangleTip}`, impressions, revenue, + pangleRevenue, }); cur = cur.add(1, 'day'); guard += 1; @@ -192,7 +200,11 @@ function aggregateDaily(dateFrom: string, dateTo: string, daily: AdRevenueDaily[ function TrendChart({ points }: { points: TrendPoint[] }) { const n = points.length; 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 H = 280; @@ -248,6 +260,24 @@ function TrendChart({ points }: { points: TrendPoint[] }) { {p.tip} ))} + {/* 穿山甲后台收益线(绿,仅非 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 ( + + + {pp.map((x) => ( + + {x.tip} + + ))} + + ); + })()} {points.map((p, i) => i % labelEvery === 0 || i === n - 1 ? ( @@ -500,6 +530,11 @@ export default function AdRevenueReportPage() { 「预估收益」为客户端在广告展示(onAdShow)时上报 eCPM 折算的预估值(每千次展示 ÷1000 累加),只要广告展示就计入、不论是否看完发奖;穿山甲会过滤无效/过短曝光,故预估值可能偏高, 实际收益一律以穿山甲后台结算为准。测试应用多为 0。「广告位ID / 来源应用」为本期新增,历史记录留空。 +
+
+ 核心指标里的「穿山甲后台收益(T+1)」来自穿山甲 GroMore 数据 API(后台结算口径,次日出数): + 穿山甲预估收益=接口 revenue、收益API=各 ADN 回传更接近结算。穿山甲不提供分用户/类型/场景维度, + 故仅在全量视图(未按用户/类型/场景筛选)展示;逐条事件行仍是客户端预估,不受其影响。 } > @@ -666,6 +701,69 @@ export default function AdRevenueReportPage() { + + + + 穿山甲后台收益(T+1) + + + + + {data.pangle_revenue_available ? ( + + + + + + + {data.total_pangle_api_revenue_yuan == null && ( + + 未配 Reporting / 当天无 + + )} + + + + + 客户端预估偏差 + + + + } + 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 ? '%' : '' + } + /> + + + ) : ( + + 本视图无穿山甲后台收益:仅「全量视图」(未按用户/类型/场景筛选)且对应日期已同步到数据时展示。 + 穿山甲 T+1 出数,可由 scripts/sync_pangle_revenue 每日拉取入库。 + + )} 分广告类型 @@ -743,8 +841,22 @@ export default function AdRevenueReportPage() { verticalAlign: 'middle', }} /> - 预估收益(元) + 客户端预估收益(元) + {queriedMultiDay && ( + + + 穿山甲后台收益(元) + + )} } > diff --git a/src/lib/types.ts b/src/lib/types.ts index 3a75b98..7de55c7 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -369,7 +369,9 @@ export interface AdRevenueRecord { export interface AdRevenueDaily { date: string; // 北京时间 YYYY-MM-DD 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; actual_coin: number; } @@ -427,17 +429,13 @@ export interface AdRevenueReport { total: number; // 当前筛选下的分页总条数(全量,不受分页影响) truncated: boolean; // 当前页之后是否还有更多事件(分页后前端不再据此报警) 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_actual_coin: number; mismatch_count: number; // 应发≠实发的发奖条数 - by_ad_type?: Record; items: AdRevenueRow[]; } @@ -450,17 +448,7 @@ export interface DashboardOverview { new_today: number; dau: number; }; - coins: { - 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; - }; + coins: { granted_total: number }; cash: { withdraw_success_cents: number; withdraw_pending_count: number; @@ -468,56 +456,8 @@ export interface DashboardOverview { withdraw_failed_count: 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 }; - cps: { - 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; - }; + cps: { available: boolean; note: string }; } export interface PriceReport {