Merge branch 'main' into codex/price-report-badge-refresh

## 本次改动

- Draw 信息流优先展示后端 `draw + 历史 feed` 的加权 SDK eCPM
- 看视频优先展示 `福利视频 + 提现视频` 的加权 SDK eCPM
- 兼容服务端滚动发布：新字段缺失时仍保留旧公式回退

## 验证

TypeScript `--noEmit` 检查通过。

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

---------

Co-authored-by: guke <guke@wonderable.ai>
Co-authored-by: linkeyu <798648091@qq.com>
Reviewed-on: #80
Co-authored-by: linkeyu <linkeyu@wonderable.ai>
Co-committed-by: linkeyu <linkeyu@wonderable.ai>

src/app/(main)/ad-revenue-report/page.tsx

@@ -735,7 +735,7 @@ export default function AdRevenueReportPage() {
       : `${data.date_from} ~ ${data.date_to}`;
 
   // 第二行大盘「分广告类型」：看视频包含福利视频与提现视频；
-  // eCPM 使用合并后的总收益 ÷ 总展示数 × 1000，避免只读取 reward_video 而漏算提现视频。
+  // eCPM 优先使用后端按真实展示加权的经营分类口径；兼容旧后端时才用合并收益÷展示数回退。
   const drawStat = data?.type_stats?.draw;
   const rewardVideoStat = data?.type_stats?.reward_video;
   const withdrawalVideoStat = data?.type_stats?.withdrawal_video;
@@ -745,8 +745,10 @@ export default function AdRevenueReportPage() {
     revenue_yuan:
       (rewardVideoStat?.revenue_yuan ?? 0) + (withdrawalVideoStat?.revenue_yuan ?? 0),
   };
+  const drawEcpmStat = data?.category_stats?.draw ?? drawStat;
+  const videoEcpmStat = data?.category_stats?.video ?? videoStat;
   const ecpmOf = (s?: AdRevenueTypeStat) =>
-    s && s.impressions > 0 ? (s.revenue_yuan / s.impressions) * 1000 : 0;
+    s?.ecpm_yuan ?? (s && s.impressions > 0 ? (s.revenue_yuan / s.impressions) * 1000 : 0);
 
   // 明细直接用后端返回的当前页 items(「场景」已由后端 feed_scene 全局过滤,前端不再二次筛)。
   const items = data?.items ?? [];
@@ -1060,7 +1062,7 @@ export default function AdRevenueReportPage() {
               <Statistic title="Draw 信息流收益(元)" value={drawStat?.revenue_yuan ?? 0} precision={4} />
             </Col>
             <Col span={4}>
-              <Statistic title="Draw 信息流 eCPM(元/千次)" value={ecpmOf(drawStat)} precision={2} />
+              <Statistic title="Draw 信息流 eCPM(元/千次)" value={ecpmOf(drawEcpmStat)} precision={2} />
             </Col>
             <Col span={4}>
               <Statistic title="Draw 信息流条数" value={drawStat?.impressions ?? 0} />
@@ -1069,7 +1071,7 @@ export default function AdRevenueReportPage() {
               <Statistic title="看视频收益(元)" value={videoStat.revenue_yuan} precision={4} />
             </Col>
             <Col span={4}>
-              <Statistic title="看视频 eCPM(元/千次)" value={ecpmOf(videoStat)} precision={2} />
+              <Statistic title="看视频 eCPM(元/千次)" value={ecpmOf(videoEcpmStat)} precision={2} />
             </Col>
             <Col span={4}>
               <Statistic title="看视频条数" value={videoStat.impressions} />

src/app/(main)/feedbacks/page.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { useEffect, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import type { ColumnsType } from 'antd/es/table';
 import type { SorterResult } from 'antd/es/table/interface';
 import {
@@ -35,6 +35,7 @@ import UserRecordsDrawer from '@/components/UserRecordsDrawer';
 const { Text, Paragraph } = Typography;
 const { RangePicker } = DatePicker;
 const REWARD_MAX = 10000;
+const REVIEW_PAGE_POLL_INTERVAL_MS = 60_000;
 
 // 截图是 app-server 的 /media 相对路径,本地由 :8770 提供(NEXT_PUBLIC_MEDIA_BASE);生产同域走 nginx 代理。
 const MEDIA_BASE = process.env.NEXT_PUBLIC_MEDIA_BASE || '';
@@ -196,6 +197,10 @@ export default function FeedbacksPage() {
   const filters: Record<string, unknown> = { ...applied, sort_by: sortBy, sort_order: sortOrder };
   const { items, total, page, pageSize, loading, onChange: onPageChange, reload } =
     usePagedList<Feedback>('/admin/api/feedbacks', filters);
+  const reloadRef = useRef(reload);
+  useEffect(() => {
+    reloadRef.current = reload;
+  }, [reload]);
 
   const canReview = canDo(['operator']);
   const [selectedRowKeys, setSelectedRowKeys] = useState<number[]>([]);
@@ -213,18 +218,40 @@ export default function FeedbacksPage() {
   }, [items]);
 
   const [summary, setSummary] = useState<FeedbackSummary | null>(null);
-  const loadSummary = async () => {
+  const loadSummary = useCallback(async () => {
     try {
       const { data } = await api.get<FeedbackSummary>('/admin/api/feedbacks/summary');
       setSummary(data);
     } catch {
       /* 统计失败不阻塞列表 */
     }
-  };
-  useEffect(() => {
-    loadSummary();
   }, []);
 
+  const refreshPageData = useCallback(() => {
+    void reloadRef.current();
+    void loadSummary();
+  }, [loadSummary]);
+
+  useEffect(() => {
+    void loadSummary();
+
+    const onWindowFocus = () => refreshPageData();
+    const onVisibilityChange = () => {
+      if (document.visibilityState === 'visible') refreshPageData();
+    };
+    const pollTimer = window.setInterval(() => {
+      if (document.visibilityState === 'visible') refreshPageData();
+    }, REVIEW_PAGE_POLL_INTERVAL_MS);
+
+    window.addEventListener('focus', onWindowFocus);
+    document.addEventListener('visibilitychange', onVisibilityChange);
+    return () => {
+      window.clearInterval(pollTimer);
+      window.removeEventListener('focus', onWindowFocus);
+      document.removeEventListener('visibilitychange', onVisibilityChange);
+    };
+  }, [loadSummary, refreshPageData]);
+
   // 审核/查看抽屉(采纳发金币 / 拒绝填原因 + 看该用户历史反馈)
   const [drawerFb, setDrawerFb] = useState<Feedback | null>(null);
   const [drawerOpen, setDrawerOpen] = useState(false);

src/app/(main)/layout.tsx

@@ -37,6 +37,8 @@ import type {
   WithdrawSummary,
 } from '@/lib/types';
 
+const REVIEW_BADGE_POLL_INTERVAL_MS = 60_000;
+
 const { Sider, Header, Content } = Layout;
 
 type NavItem = {
@@ -162,22 +164,39 @@ export default function MainLayout({ children }: { children: React.ReactNode })
     };
 
     const refreshSafely = (key: ReviewBadgeKey) => refresh(key).catch(() => {});
-    void Promise.all([
-      refreshSafely('/withdraws'),
-      refreshSafely('/invite-withdraws'),
-      refreshSafely('/price-reports'),
-      refreshSafely('/feedbacks'),
-    ]);
+    const refreshAll = () => {
+      void Promise.all([
+        refreshSafely('/withdraws'),
+        refreshSafely('/invite-withdraws'),
+        refreshSafely('/price-reports'),
+        refreshSafely('/feedbacks'),
+      ]);
+    };
+
+    refreshAll();
 
     const onReviewCompleted = (event: Event) => {
       const key = (event as CustomEvent<ReviewBadgeKey>).detail;
       if (key) void refreshSafely(key);
     };
-    window.addEventListener(REVIEW_BADGE_REFRESH_EVENT, onReviewCompleted);
-    return () => {
-      window.removeEventListener(REVIEW_BADGE_REFRESH_EVENT, onReviewCompleted);
+    const onWindowFocus = () => refreshAll();
+    const onVisibilityChange = () => {
+      if (document.visibilityState === 'visible') refreshAll();
     };
-  }, [admin]);
+    const pollTimer = window.setInterval(() => {
+      if (document.visibilityState === 'visible') refreshAll();
+    }, REVIEW_BADGE_POLL_INTERVAL_MS);
+
+    window.addEventListener(REVIEW_BADGE_REFRESH_EVENT, onReviewCompleted);
+    window.addEventListener('focus', onWindowFocus);
+    document.addEventListener('visibilitychange', onVisibilityChange);
+    return () => {
+      window.clearInterval(pollTimer);
+      window.removeEventListener(REVIEW_BADGE_REFRESH_EVENT, onReviewCompleted);
+      window.removeEventListener('focus', onWindowFocus);
+      document.removeEventListener('visibilitychange', onVisibilityChange);
+    };
+  }, [admin, pathname]);
 
   if (!admin) return null; // 守卫期间不闪烁内容
 

src/app/(main)/price-reports/page.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { useEffect, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import {
   App,
   Button,
@@ -30,6 +30,7 @@ import type { PriceReport, PriceReportSummary } from '@/lib/types';
 import UserRecordsDrawer from '@/components/UserRecordsDrawer';
 
 const { Text } = Typography;
+const REVIEW_PAGE_POLL_INTERVAL_MS = 60_000;
 
 // 后端 created_at/reviewed_at 存的是北京 wall-clock(naive,同 savings/comparison),
 // 直接本地解析、不加 Z(否则会差 8h)。
@@ -150,6 +151,10 @@ export default function PriceReportsPage() {
 
   const { items, total, page, pageSize, loading, onChange: onPageChange, reload } =
     usePagedList<PriceReport>('/admin/api/price-reports', filters);
+  const reloadRef = useRef(reload);
+  useEffect(() => {
+    reloadRef.current = reload;
+  }, [reload]);
 
   const sortOrderOf = (field: SortField) =>
     sortBy === field ? (sortOrder === 'asc' ? 'ascend' : 'descend') : null;
@@ -181,18 +186,40 @@ export default function PriceReportsPage() {
     setSelectedRowKeys((keys) => keys.filter((id) => visiblePendingIds.has(id)));
   }, [items]);
 
-  const loadSummary = async () => {
+  const loadSummary = useCallback(async () => {
     try {
       const { data } = await api.get<PriceReportSummary>('/admin/api/price-reports/summary');
       setSummary(data);
     } catch {
       /* 统计失败不阻塞列表 */
     }
-  };
-  useEffect(() => {
-    loadSummary();
   }, []);
 
+  const refreshPageData = useCallback(() => {
+    void reloadRef.current();
+    void loadSummary();
+  }, [loadSummary]);
+
+  useEffect(() => {
+    void loadSummary();
+
+    const onWindowFocus = () => refreshPageData();
+    const onVisibilityChange = () => {
+      if (document.visibilityState === 'visible') refreshPageData();
+    };
+    const pollTimer = window.setInterval(() => {
+      if (document.visibilityState === 'visible') refreshPageData();
+    }, REVIEW_PAGE_POLL_INTERVAL_MS);
+
+    window.addEventListener('focus', onWindowFocus);
+    document.addEventListener('visibilitychange', onVisibilityChange);
+    return () => {
+      window.clearInterval(pollTimer);
+      window.removeEventListener('focus', onWindowFocus);
+      document.removeEventListener('visibilitychange', onVisibilityChange);
+    };
+  }, [loadSummary, refreshPageData]);
+
   const refreshAfterChange = () => {
     reload();
     loadSummary();

src/app/(main)/withdraws/WithdrawReviewPage.tsx

@@ -124,10 +124,7 @@ function summaryCount(summary: WithdrawSummary | null, key: string) {
   if (!summary) return undefined;
   if (key === 'reviewing') return summary.reviewing_count;
   if (key === 'pending') return summary.pending_count;
-  if (key === 'success') return summary.success_count;
-  if (key === 'rejected') return summary.rejected_count;
   if (key === 'failed') return summary.failed_count;
-  if (key === 'all') return summary.total_count;
   return undefined;
 }
 

src/lib/types.ts

@@ -167,10 +167,7 @@ export interface WithdrawSummary {
   reviewing_count: number;
   reviewing_amount_cents: number;
   pending_count: number;
-  success_count: number;
-  rejected_count: number;
   failed_count: number;
-  total_count: number;
   today_success_count: number;
   today_success_amount_cents: number;
   today_rejected_count: number;
@@ -581,6 +578,7 @@ export interface AdRevenueHourly {
 export interface AdRevenueTypeStat {
   impressions: number; // 该类型展示条数合计
   revenue_yuan: number; // 该类型预估收益合计(元)
+  ecpm_yuan?: number; // 按真实展示次数加权的 SDK eCPM(元/千次)
 }
 
 // 广告收益报表:一次广告事件(逐条一行)。激励视频展示+发奖按 ad_session_id 合并;信息流展示/发奖各自成行。
@@ -620,6 +618,7 @@ export interface AdRevenueReport {
   daily: AdRevenueDaily[]; // 按日期汇总序列(全量,供按天趋势图)
   hourly: AdRevenueHourly[]; // 按小时汇总序列(全量,供按小时趋势图;按天查询时为空)
   type_stats: Record<string, AdRevenueTypeStat>; // 按广告类型小计;前端取 draw / reward_video
+  category_stats?: Record<string, AdRevenueTypeStat>; // draw=draw+历史feed；video=福利视频+提现视频
   // 按信息流场景小计(comparison/coupon/welfare;全量,不受分页截断)。数据大盘「领券广告/比价广告」卡
   // 优先读它:2026-07-02 后端起 items 不再含信息流逐条展示行(唯一带收益+场景的行),按 items 现算恒 0。
   // 可选(`?.` 探测)以兼容未升级后端,缺失时回退 items 现算。