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

同步最新主分支，保留邀请提现等新增页面，并继续在聚焦、页面恢复可见及定时轮询时同步低价审核、提现审核与用户反馈数据。

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

@@ -32,24 +32,9 @@ interface Props {
   onClose: () => void;
   userId: number | null;
   phone: string | null; // 报表行已有的手机号:概览拉取失败时兜底展示
-  dateFrom: string | null;
-  dateTo: string | null;
-  appEnv?: 'prod' | 'test';
-  revenueScope: 'business' | 'all';
-  feedScene?: 'comparison' | 'coupon' | 'welfare';
 }
 
-export default function UserAdRevenueDrawer({
-  open,
-  onClose,
-  userId,
-  phone,
-  dateFrom,
-  dateTo,
-  appEnv,
-  revenueScope,
-  feedScene,
-}: Props) {
+export default function UserAdRevenueDrawer({ open, onClose, userId, phone }: Props) {
   // UserRewardPanel 的 user 快照:它只读 phone/nickname/wechat_nickname/created_at,其余按 snapshot 形状补齐。
   const [user, setUser] = useState<WithdrawUserSnapshot | null>(null);
 
@@ -97,19 +82,7 @@ export default function UserAdRevenueDrawer({
     >
       {/* userId 就绪即渲染;UserRewardPanel 内部按 userId 自行拉统计与金币记录,user 基本信息随后补上。
           statsVariant="ad":统计区只显示 6 项看广告统计(累计提现/现金余额/激励视频观看数+eCPM/draw观看数+eCPM) */}
-      {userId != null && (
-        <UserRewardPanel
-          key={`${userId}-${dateFrom}-${dateTo}-${appEnv}-${revenueScope}-${feedScene}`}
-          userId={userId}
-          user={user}
-          statsVariant="ad"
-          initialDateFrom={dateFrom ?? undefined}
-          initialDateTo={dateTo ?? undefined}
-          appEnv={appEnv}
-          revenueScope={revenueScope}
-          feedScene={feedScene}
-        />
-      )}
+      {userId != null && <UserRewardPanel userId={userId} user={user} statsVariant="ad" />}
     </Drawer>
   );
 }

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

@@ -30,7 +30,7 @@ import {
 } from '@ant-design/icons';
 import dayjs, { type Dayjs } from 'dayjs';
 import { api, errMsg } from '@/lib/api';
-import { formatUtcTime, nearestRankPercentile } from '@/lib/format';
+import { formatUtcTime, percentile } from '@/lib/format';
 import type {
   AdRevenueDaily,
   AdRevenueHourly,
@@ -470,27 +470,7 @@ export default function AdRevenueReportPage() {
   const [loading, setLoading] = useState(false);
   const [formulaOpen, setFormulaOpen] = useState(false);
   // 点用户手机号弹出的「用户广告收益详情」半屏抽屉(userId + 手机号;null=关闭)
-  const [userDrawer, setUserDrawer] = useState<{
-    userId: number;
-    phone: string | null;
-    dateFrom: string;
-    dateTo: string;
-    appEnv?: 'prod' | 'test';
-    revenueScope: 'business' | 'all';
-    feedScene?: 'comparison' | 'coupon' | 'welfare';
-  } | null>(null);
-  const [queriedDetailFilters, setQueriedDetailFilters] = useState<{
-    dateFrom: string;
-    dateTo: string;
-    appEnv?: 'prod' | 'test';
-    revenueScope: 'business' | 'all';
-    feedScene?: 'comparison' | 'coupon' | 'welfare';
-  }>({
-    dateFrom: range[0].format('YYYY-MM-DD'),
-    dateTo: range[1].format('YYYY-MM-DD'),
-    appEnv: 'prod',
-    revenueScope: 'business',
-  });
+  const [userDrawer, setUserDrawer] = useState<{ userId: number; phone: string | null } | null>(null);
 
   // 当前选择是否跨多天:跨多天时「按小时」无意义,粒度强制按天
   const rangeMultiDay = range[0].format('YYYY-MM-DD') !== range[1].format('YYYY-MM-DD');
@@ -523,13 +503,6 @@ export default function AdRevenueReportPage() {
           },
         });
         setData(res.data);
-        setQueriedDetailFilters({
-          dateFrom: from,
-          dateTo: to,
-          appEnv: appEnv === 'all' ? undefined : appEnv,
-          revenueScope,
-          feedScene: scene as 'comparison' | 'coupon' | 'welfare' | undefined,
-        });
         setPage(targetPage);
         setQueriedLimit(targetLimit);
         setQueriedGranularity(gran);
@@ -578,7 +551,7 @@ export default function AdRevenueReportPage() {
       width: 150,
       render: (phone: string | null, r: AdRevenueRow) => (
         // 点手机号/用户 → 打开该用户「广告收益详情」半屏抽屉(统计卡 + 金币记录)
-        <a onClick={() => setUserDrawer({ userId: r.user_id, phone, ...queriedDetailFilters })}>
+        <a onClick={() => setUserDrawer({ userId: r.user_id, phone })}>
           {phone ? (
             <span>
               {phone}
@@ -785,9 +758,9 @@ export default function AdRevenueReportPage() {
         .filter((item) => item.feed_scene === sceneName)
         .map((item) => item.sub_count ?? 1);
       return {
-        p5: nearestRankPercentile(counts, 0.05),
-        p50: nearestRankPercentile(counts, 0.5),
-        p95: nearestRankPercentile(counts, 0.95),
+        p5: percentile(counts, 0.05, false),
+        p50: percentile(counts, 0.5, false),
+        p95: percentile(counts, 0.95, false),
       };
     };
     return { coupon: summarize('coupon'), comparison: summarize('comparison') };
@@ -1110,12 +1083,12 @@ export default function AdRevenueReportPage() {
             </Typography.Text>
           </Divider>
           <Row gutter={[16, 12]}>
-            <Col span={4}><Statistic title="单次领券广告数 P5" value={sessionAdCounts.coupon.p5 ?? '-'} precision={0} /></Col>
-            <Col span={4}><Statistic title="单次领券广告数 P50" value={sessionAdCounts.coupon.p50 ?? '-'} precision={0} /></Col>
-            <Col span={4}><Statistic title="单次领券广告数 P95" value={sessionAdCounts.coupon.p95 ?? '-'} precision={0} /></Col>
-            <Col span={4}><Statistic title="单次比价广告数 P5" value={sessionAdCounts.comparison.p5 ?? '-'} precision={0} /></Col>
-            <Col span={4}><Statistic title="单次比价广告数 P50" value={sessionAdCounts.comparison.p50 ?? '-'} precision={0} /></Col>
-            <Col span={4}><Statistic title="单次比价广告数 P95" value={sessionAdCounts.comparison.p95 ?? '-'} precision={0} /></Col>
+            <Col span={4}><Statistic title="单次领券广告数 P5" value={sessionAdCounts.coupon.p5 ?? '-'} precision={1} /></Col>
+            <Col span={4}><Statistic title="单次领券广告数 P50" value={sessionAdCounts.coupon.p50 ?? '-'} precision={1} /></Col>
+            <Col span={4}><Statistic title="单次领券广告数 P95" value={sessionAdCounts.coupon.p95 ?? '-'} precision={1} /></Col>
+            <Col span={4}><Statistic title="单次比价广告数 P5" value={sessionAdCounts.comparison.p5 ?? '-'} precision={1} /></Col>
+            <Col span={4}><Statistic title="单次比价广告数 P50" value={sessionAdCounts.comparison.p50 ?? '-'} precision={1} /></Col>
+            <Col span={4}><Statistic title="单次比价广告数 P95" value={sessionAdCounts.comparison.p95 ?? '-'} precision={1} /></Col>
           </Row>
         </Card>
       )}
@@ -1311,11 +1284,6 @@ export default function AdRevenueReportPage() {
         open={!!userDrawer}
         userId={userDrawer?.userId ?? null}
         phone={userDrawer?.phone ?? null}
-        dateFrom={userDrawer?.dateFrom ?? null}
-        dateTo={userDrawer?.dateTo ?? null}
-        appEnv={userDrawer?.appEnv}
-        revenueScope={userDrawer?.revenueScope ?? 'all'}
-        feedScene={userDrawer?.feedScene}
         onClose={() => setUserDrawer(null)}
       />
     </div>

src/app/(main)/comparison-records/page.tsx

@@ -46,41 +46,6 @@ const fmtTok = (inTok: number | null, outTok: number | null) =>
   inTok == null && outTok == null ? '-' : `${inTok ?? 0}/${outTok ?? 0}`;
 const fmtRate = (value: number | null) => (value == null ? '-' : `${(value * 100).toFixed(1)}%`);
 
-function deviceName(record: ComparisonRecordListItem): string {
-  return record.device_model_name || record.device_model || '-';
-}
-
-function romName(record: ComparisonRecordListItem): string {
-  return [
-    record.rom_vendor,
-    record.rom_name,
-    record.rom_version != null ? String(record.rom_version) : null,
-  ]
-    .filter(Boolean)
-    .join(' ') || '-';
-}
-
-function renderDevice(record: ComparisonRecordListItem): ReactNode {
-  const readableName = deviceName(record);
-  const showRawModel =
-    record.device_model_name
-    && record.device_model
-    && record.device_model_name !== record.device_model;
-  return (
-    <Space direction="vertical" size={0}>
-      <span>{readableName}</span>
-      {showRawModel ? (
-        <Typography.Text type="secondary" style={{ fontSize: 12 }}>
-          {record.device_model}
-        </Typography.Text>
-      ) : null}
-      <Typography.Text type="secondary" style={{ fontSize: 12 }}>
-        {romName(record)}
-      </Typography.Text>
-    </Space>
-  );
-}
-
 // LLM 价格快照只展示 prices 里各模型的单价(元/每百万 token),忽略 mode/_source 等元字段。
 function llmPriceRows(snapshot: Record<string, unknown> | null): string[] {
   const prices = snapshot?.prices;
@@ -333,14 +298,6 @@ export default function ComparisonRecordsPage() {
           <b style={{ color: r.saved_amount_cents > 0 ? '#3f8600' : '#999' }}>{yuan(r.saved_amount_cents)}</b>
         ),
     },
-    {
-      title: '是否下单',
-      dataIndex: 'ordered',
-      width: 84,
-      render: (ordered: boolean) => (
-        <Tag color={ordered ? 'green' : 'default'}>{ordered ? '已下单' : '未下单'}</Tag>
-      ),
-    },
     { title: 'LLM', dataIndex: 'llm_call_count', width: 56, render: (v) => v ?? '-' },
     {
       title: 'TOKEN',
@@ -351,9 +308,9 @@ export default function ComparisonRecordsPage() {
     {
       title: '机型/ROM',
       key: 'device',
-      width: 180,
+      width: 150,
       ellipsis: true,
-      render: (_, r) => renderDevice(r),
+      render: (_, r) => [r.device_model, r.rom_name].filter(Boolean).join(' / ') || '-',
     },
     {
       title: 'traceid',
@@ -542,15 +499,8 @@ export default function ComparisonRecordsPage() {
 
             <Card size="small" title="设备环境">
               <Descriptions size="small" column={2}>
-                <Descriptions.Item label="机型">
-                  {deviceName(detail)}
-                  {detail.device_model_name && detail.device_model_name !== detail.device_model
-                    ? `（${[detail.device_manufacturer, detail.device_model].filter(Boolean).join(' · ')}）`
-                    : detail.device_manufacturer
-                      ? `（${detail.device_manufacturer}）`
-                      : ''}
-                </Descriptions.Item>
-                <Descriptions.Item label="ROM">{romName(detail)}</Descriptions.Item>
+                <Descriptions.Item label="机型">{detail.device_model || '-'}（{detail.device_manufacturer || '-'}）</Descriptions.Item>
+                <Descriptions.Item label="ROM">{[detail.rom_vendor, detail.rom_name, detail.rom_version].filter(Boolean).join(' ') || '-'}</Descriptions.Item>
                 <Descriptions.Item label="Android">{detail.android_version || '-'}（SDK {detail.android_sdk ?? '-'}）</Descriptions.Item>
                 <Descriptions.Item label="App 版本">{detail.app_version || '-'}（{detail.app_version_code ?? '-'}）</Descriptions.Item>
                 <Descriptions.Item label="源 App 版本" span={2}>{detail.source_app_version || '-'}</Descriptions.Item>

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

@@ -710,7 +710,7 @@ export default function DashboardPage() {
         <div>
           <h1>数据大盘</h1>
           <p>
-            数据更新于 {updatedAt ?? '--'} · 北京时间 · 日期窗口按 00:00 自然日切分，自定义日期可选择今日
+            数据更新于 {updatedAt ?? '--'} · 北京时间 · 日期窗口按 00:00 自然日切分，不包含今日
           </p>
         </div>
         <div className="controls">
@@ -734,7 +734,7 @@ export default function DashboardPage() {
             format="YYYY-MM-DD"
             allowClear={false}
             open={datePickerOpen}
-            disabledDate={(date) => date.isAfter(dayjs(), 'day')}
+            disabledDate={(date) => date.isAfter(dayjs().subtract(1, 'day'), 'day')}
             suffixIcon={<CalendarOutlined />}
             onClick={() => setDatePickerOpen(true)}
             onOpenChange={setDatePickerOpen}

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

@@ -44,11 +44,6 @@ interface Props {
   withdrawSource?: 'coin_cash' | 'invite_cash';
   // 统计区字段集:withdraw(默认,提现详情:含提现细分) / ad(广告收益详情:只看看广告观看统计,对齐参考图 6 项)
   statsVariant?: 'withdraw' | 'ad';
-  initialDateFrom?: string;
-  initialDateTo?: string;
-  appEnv?: 'prod' | 'test';
-  revenueScope?: 'business' | 'all';
-  feedScene?: 'comparison' | 'coupon' | 'welfare';
 }
 
 /** 用户看广告/提现详情:基本信息 + 互斥时间筛选 + 统计区(按 statsVariant 取字段集)+ 金币发放记录表。 */
@@ -57,17 +52,9 @@ export default function UserRewardPanel({
   user,
   withdrawSource,
   statsVariant = 'withdraw',
-  initialDateFrom,
-  initialDateTo,
-  appEnv,
-  revenueScope = 'all',
-  feedScene,
 }: Props) {
-  const hasInitialRange = Boolean(initialDateFrom && initialDateTo);
-  const [mode, setMode] = useState<'all' | 'range'>(hasInitialRange ? 'range' : 'all');
-  const [range, setRange] = useState<[Dayjs, Dayjs] | null>(() =>
-    hasInitialRange ? [dayjs(initialDateFrom), dayjs(initialDateTo)] : null,
-  );
+  const [mode, setMode] = useState<'all' | 'range'>('all'); // all=注册至今 / range=自定义区间
+  const [range, setRange] = useState<[Dayjs, Dayjs] | null>(null);
   const [stats, setStats] = useState<UserRewardStats | null>(null);
   const [statsLoading, setStatsLoading] = useState(false);
 
@@ -93,9 +80,6 @@ export default function UserRewardPanel({
         params: {
           ...JSON.parse(paramsKey),
           ...(withdrawSource ? { withdraw_source: withdrawSource } : {}),
-          ...(appEnv ? { app_env: appEnv } : {}),
-          revenue_scope: revenueScope,
-          ...(feedScene ? { feed_scene: feedScene } : {}),
         },
       });
       setStats(data);
@@ -104,7 +88,7 @@ export default function UserRewardPanel({
     } finally {
       setStatsLoading(false);
     }
-  }, [userId, paramsKey, withdrawSource, appEnv, revenueScope, feedScene]);
+  }, [userId, paramsKey, withdrawSource]);
 
   const loadRecords = useCallback(
     async (p: number) => {
@@ -252,7 +236,7 @@ export default function UserRewardPanel({
       </Descriptions>
       <Text type="secondary" style={{ fontSize: 12 }}>
         {statsVariant === 'ad'
-          ? '统计继承广告收益页已查询的日期、环境、业务代码位和场景;次数仅统计成功发奖记录,信息流按奖励份数统计;Draw eCPM 按全部实际展示统计(含未发奖)。'
+          ? '统计随上方时间筛选(现金余额除外,为当前快照);次数仅统计成功发奖记录,信息流按奖励份数统计;eCPM 为预估值。'
           : '统计随上方时间筛选(现金余额除外,为当前快照);提现按申请提交时间统计;累计收益为已发金币按当前汇率折算,不代表实际已提现金额;eCPM 为预估值。'}
       </Text>
 

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;
 }
 
@@ -570,7 +567,6 @@ export function WithdrawReviewPage({ mode = 'other' }: { mode?: WithdrawReviewMo
     },
     {
       title: '失败/拒绝原因',
-      key: 'fail_reason',
       dataIndex: 'fail_reason',
       ellipsis: true,
       render: (v: string | null) => v || <Text type="secondary">-</Text>,
@@ -648,10 +644,6 @@ export function WithdrawReviewPage({ mode = 'other' }: { mode?: WithdrawReviewMo
       },
     },
   ];
-  const visibleColumns =
-    activeStatus === 'pending' || activeStatus === 'success'
-      ? columns.filter((column) => column.key !== 'fail_reason')
-      : columns;
 
   const inviteeColumns: ColumnsType<InviteeDetail> = [
     { title: '手机号', dataIndex: 'phone', width: 130 },
@@ -950,7 +942,7 @@ export function WithdrawReviewPage({ mode = 'other' }: { mode?: WithdrawReviewMo
                 }
               : undefined
           }
-          columns={visibleColumns}
+          columns={columns}
           dataSource={items}
           loading={loading}
           pagination={{
@@ -994,6 +986,12 @@ export function WithdrawReviewPage({ mode = 'other' }: { mode?: WithdrawReviewMo
                 <Descriptions.Item label="金额">
                   <Text strong>{yuan(detail.order.amount_cents)}</Text>
                 </Descriptions.Item>
+                <Descriptions.Item label="提现类型">
+                  {detail.order.source === 'invite_cash' ? '邀请奖励提现' : '福利页提现'}
+                </Descriptions.Item>
+                <Descriptions.Item label="累计成功提现">
+                  {yuan(detail.cumulative_success_cents)}
+                </Descriptions.Item>
                 <Descriptions.Item label="提交时间">
                   {dt(detail.order.created_at)}
                 </Descriptions.Item>

src/lib/format.ts

@@ -37,18 +37,6 @@ export function percentile(values: readonly number[], q: number, round = true):
   return round ? Math.round(result) : result;
 }
 
-/**
- * 离散计数分位数（nearest-rank）。
- * 广告条数等不可拆分的计数不做线性插值，结果始终取自真实样本。
- */
-export function nearestRankPercentile(values: readonly number[], q: number): number | null {
-  if (!values.length) return null;
-  const sorted = [...values].sort((a, b) => a - b);
-  const quantile = Math.min(1, Math.max(0, q));
-  const rank = Math.max(1, Math.ceil(quantile * sorted.length));
-  return sorted[rank - 1];
-}
-
 const hasTz = (v: string) => /(?:Z|[+-]\d{2}:?\d{2})$/i.test(v);
 
 /** 把 UTC 口径字符串解析为带时区的 dayjs(无时区后缀的补 Z 当 UTC)。 */

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;
@@ -233,7 +230,7 @@ export interface UserRewardStats {
   reward_video_avg_ecpm: number; // 平均激励视频 eCPM(分/千次)
   reward_video_cash_cents: number; // 激励视频提现
   feed_count: number; // 累计信息流广告数(份)
-  feed_avg_ecpm: number; // 全部 Draw/feed 实际展示的平均 eCPM(分/千次,含未发奖展示)
+  feed_avg_ecpm: number; // 平均信息流广告 eCPM(分/千次)
   feed_cash_cents: number; // 信息流广告提现
 }
 
@@ -457,7 +454,6 @@ export interface ComparisonRecordListItem {
   source_price_cents: number | null;
   best_price_cents: number | null;
   saved_amount_cents: number | null;
-  ordered: boolean;
   total_ms: number | null;
   step_count: number | null;
   llm_call_count: number | null;
@@ -466,10 +462,8 @@ export interface ComparisonRecordListItem {
   output_tokens: number | null;
   llm_cost_yuan: number | null;   // 后端按「当时价」冻结的实际成本(元);旧记录 null → 「成本」列回退估算
   device_model: string | null;
-  device_model_name: string | null;
   rom_vendor: string | null;
   rom_name: string | null;
-  rom_version: number | null;
   android_version: string | null;
   app_version: string | null;
   ad_revenue_yuan: number; // 本次比价看的信息流广告预估收益(元)
@@ -520,6 +514,7 @@ export interface ComparisonRecordDetail extends ComparisonRecordListItem {
   comparison_results: Record<string, unknown>[];
   skipped_dish_names: string[];
   device_manufacturer: string | null;
+  rom_version: number | null;
   android_sdk: number | null;
   app_version_code: number | null;
   source_app_version: string | null;