From 8d7f36ddac7d187303bfc58fda92c4ee2c6a7f89 Mon Sep 17 00:00:00 2001
From: linkeyu <linkeyu@wonderable.ai>
Date: Mon, 27 Jul 2026 10:24:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E6=94=B6=E7=9B=8A=E6=98=8E=E7=BB=86=E5=B9=BF=E5=91=8A=E7=BD=91?=
 =?UTF-8?q?=E7=BB=9C=E6=9D=A5=E6=BA=90=20(#81)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## 本次改动

- 展开聚合收益记录时优先展示每条明细自身的 ADN
- 单条发奖明细同样读取明细级来源
- 无唯一来源证据的历史记录明确显示“未上报”

## 验证

TypeScript `--noEmit` 检查通过。

依赖服务端 PR：WonderableAI/shaguabijia-app-server#179。

---------

Co-authored-by: linkeyu <798648091@qq.com>
Reviewed-on: https://gitea.shaguabijia.com/WonderableAI/shaguabijia-admin-web/pulls/81
Co-authored-by: linkeyu <linkeyu@wonderable.ai>
Co-committed-by: linkeyu <linkeyu@wonderable.ai>
---
 src/app/(main)/ad-revenue-report/page.tsx | 22 +++++++++++++++++++---
 src/lib/types.ts                          |  2 ++
 2 files changed, 21 insertions(+), 3 deletions(-)

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<AdRevenueDetailRow> = [
-  { title: '来源广告网络', dataIndex: 'source_adn', width: 110, render: (value: string | null) => value || '-' },
+  {
+    title: '来源广告网络',
+    dataIndex: 'source_adn',
+    width: 110,
+    render: (value: string | null) => value?.trim() || (
+      <Tooltip title="该历史记录没有可唯一确认的 SDK 广告来源，未猜测填充。">
+        <span>未上报</span>
+      </Tooltip>
+    ),
+  },
   {
     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
 }
 
 // 广告收益报表:按日期汇总的一天(按天趋势图用;全量,不受分页影响)