diff --git a/src/app/(main)/ad-revenue-report/page.tsx b/src/app/(main)/ad-revenue-report/page.tsx index 189f373..a70ebf0 100644 --- a/src/app/(main)/ad-revenue-report/page.tsx +++ b/src/app/(main)/ad-revenue-report/page.tsx @@ -194,7 +194,16 @@ type AdRevenueDetailRow = AdRevenueRecord & { source_adn?: string | null }; // 展开行(逐条事件展开)- 该条的发奖复算明细(还原金币审计的 eCPM/因子1/份数/LT/因子2 等列) const DETAIL_COLUMNS: ColumnsType = [ - { title: '来源广告网络', dataIndex: 'source_adn', width: 110, render: (value: string | null) => value || '-' }, + { + title: '来源广告网络', + dataIndex: 'source_adn', + width: 110, + render: (value: string | null) => value?.trim() || ( + + 未上报 + + ), + }, { title: 'eCPM(元)', dataIndex: 'ecpm', @@ -1102,7 +1111,11 @@ export default function AdRevenueReportPage() { style={{ marginTop: 8 }} rowKey="record_id" columns={DETAIL_COLUMNS} - dataSource={r.sub_rewards.map((detail) => ({ ...detail, source_adn: r.adn }))} + dataSource={r.sub_rewards.map((detail) => ({ + ...detail, + // 一次比价/领券可能由不同 ADN 连续填充,优先显示本条发奖记录的来源。 + source_adn: detail.adn ?? r.adn, + }))} pagination={false} size="small" scroll={{ x: 900 }} @@ -1118,7 +1131,10 @@ export default function AdRevenueReportPage() { style={{ marginTop: 8 }} rowKey="record_id" columns={DETAIL_COLUMNS} - dataSource={[{ ...r.reward_detail, source_adn: r.adn }]} + dataSource={[{ + ...r.reward_detail, + source_adn: r.reward_detail.adn ?? r.adn, + }]} pagination={false} size="small" scroll={{ x: 900 }} diff --git a/src/lib/types.ts b/src/lib/types.ts index 26d8d95..18c2a32 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -542,6 +542,8 @@ export interface AdRevenueRecord { expected_coin: number; actual_coin: number; matched: boolean; + adn: string | null; // 本条发奖对应的实际填充 ADN + slot_id: string | null; // 本条发奖对应的底层 mediation rit } // 广告收益报表:按日期汇总的一天(按天趋势图用;全量,不受分页影响)