From 590f59dee9ff220309febb792eb5492383ba667c Mon Sep 17 00:00:00 2001
From: linkeyu <linkeyu@wonderable.ai>
Date: Mon, 27 Jul 2026 11:36:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E7=9C=8B=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E7=BB=9F=E8=AE=A1=E5=8C=85=E5=90=AB=E6=8F=90=E7=8E=B0?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=20(#79)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## 本次改动

- “看视频收益”合并福利视频与提现视频收益
- “看视频条数”合并两类视频展示记录
- “看视频 eCPM”按合并后的总收益和总展示数计算

## 范围

仅修改 `src/app/(main)/ad-revenue-report/page.tsx`；服务端已分别提供两类 `type_stats`，无需改动。

---------

Co-authored-by: guke <guke@wonderable.ai>
Co-authored-by: linkeyu <798648091@qq.com>
Reviewed-on: https://gitea.shaguabijia.com/WonderableAI/shaguabijia-admin-web/pulls/79
Co-authored-by: linkeyu <linkeyu@wonderable.ai>
Co-committed-by: linkeyu <linkeyu@wonderable.ai>
---
 src/app/(main)/ad-revenue-report/page.tsx | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/app/(main)/ad-revenue-report/page.tsx b/src/app/(main)/ad-revenue-report/page.tsx
index 266ad3a..08ccf3f 100644
--- a/src/app/(main)/ad-revenue-report/page.tsx
+++ b/src/app/(main)/ad-revenue-report/page.tsx
@@ -672,9 +672,17 @@ export default function AdRevenueReportPage() {
         : data.date_from
       : `${data.date_from} ~ ${data.date_to}`;
 
-  // 第二行大盘「分广告类型」:draw / 激励视频 各自 收益 / eCPM / 展示条数;eCPM = 收益÷展示×1000。
+  // 第二行大盘「分广告类型」：看视频包含福利视频与提现视频；
+  // eCPM 使用合并后的总收益 ÷ 总展示数 × 1000，避免只读取 reward_video 而漏算提现视频。
   const drawStat = data?.type_stats?.draw;
-  const rvStat = data?.type_stats?.reward_video;
+  const rewardVideoStat = data?.type_stats?.reward_video;
+  const withdrawalVideoStat = data?.type_stats?.withdrawal_video;
+  const videoStat: AdRevenueTypeStat = {
+    impressions:
+      (rewardVideoStat?.impressions ?? 0) + (withdrawalVideoStat?.impressions ?? 0),
+    revenue_yuan:
+      (rewardVideoStat?.revenue_yuan ?? 0) + (withdrawalVideoStat?.revenue_yuan ?? 0),
+  };
   const ecpmOf = (s?: AdRevenueTypeStat) =>
     s && s.impressions > 0 ? (s.revenue_yuan / s.impressions) * 1000 : 0;
 
@@ -996,13 +1004,13 @@ export default function AdRevenueReportPage() {
               <Statistic title="Draw 信息流条数" value={drawStat?.impressions ?? 0} />
             </Col>
             <Col span={4}>
-              <Statistic title="看视频收益(元)" value={rvStat?.revenue_yuan ?? 0} precision={4} />
+              <Statistic title="看视频收益(元)" value={videoStat.revenue_yuan} precision={4} />
             </Col>
             <Col span={4}>
-              <Statistic title="看视频 eCPM(元/千次)" value={ecpmOf(rvStat)} precision={2} />
+              <Statistic title="看视频 eCPM(元/千次)" value={ecpmOf(videoStat)} precision={2} />
             </Col>
             <Col span={4}>
-              <Statistic title="看视频条数" value={rvStat?.impressions ?? 0} />
+              <Statistic title="看视频条数" value={videoStat.impressions} />
             </Col>
           </Row>
           <Divider orientation="left" plain style={{ marginTop: 20, marginBottom: 16 }}>