feat(ad-revenue): 广告数据报表页(替换金币审计页) (#11)

- 新增 /ad-revenue:聚合表 + 派生指标(平均 eCPM/毛利/发奖占比)+ 零依赖 SVG 趋势图
  + 行展开下钻展示明细/发奖复算明细
- 删除旧 /ad-audit 页;侧栏「金币审计」→「广告数据」
- feedbacks 由「加载更多」改 antd 页码分页(usePagedList),内容列 3 行省略可展开
- types 用 AdRevenue* 替换 AdCoinAudit*;providers 统一主题圆角/页面底色

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: OuYingJun1024 <1034284404@qq.com>
Reviewed-on: #11
Co-authored-by: ouzhou <ouzhou@wonderable.ai>
Co-committed-by: ouzhou <ouzhou@wonderable.ai>

src/app/(main)/ad-audit/page.tsx

@@ -1,227 +0,0 @@
-'use client';
-
-import { useCallback, useEffect, useState } from 'react';
-import type { ColumnsType } from 'antd/es/table';
-import {
-  Alert,
-  Button,
-  Card,
-  DatePicker,
-  InputNumber,
-  Select,
-  Space,
-  Table,
-  Tag,
-  Typography,
-  message,
-} from 'antd';
-import dayjs, { type Dayjs } from 'dayjs';
-import { api, errMsg } from '@/lib/api';
-import type { AdCoinAudit, AdCoinAuditRow } from '@/lib/types';
-
-const dt = (v: string) => new Date(v).toLocaleString('zh-CN');
-
-const SCENE_TAG: Record<string, { color: string; label: string }> = {
-  reward_video: { color: 'blue', label: '看视频' },
-  feed: { color: 'purple', label: '信息流' },
-};
-
-const STATUS_TAG: Record<string, string> = {
-  granted: 'green',
-  capped: 'orange',
-  ecpm_missing: 'red',
-};
-
-const fmtFactorRange = (a: number | null, b: number | null) => {
-  if (a == null) return '-';
-  return a === b || b == null ? String(a) : `${a}→${b}`;
-};
-
-const fmtIndexRange = (a: number | null, b: number | null) => {
-  if (a == null) return '-';
-  return a === b ? String(a) : `${a}–${b}`;
-};
-
-export default function AdAuditPage() {
-  const [date, setDate] = useState<Dayjs>(dayjs());
-  const [userId, setUserId] = useState<number | null>(null);
-  const [scene, setScene] = useState<string | undefined>();
-  const [limit, setLimit] = useState<number>(100);
-  const [data, setData] = useState<AdCoinAudit | null>(null);
-  const [loading, setLoading] = useState(false);
-
-  const load = useCallback(async () => {
-    setLoading(true);
-    try {
-      const res = await api.get<AdCoinAudit>('/admin/api/ad-coin-audit', {
-        params: {
-          date: date.format('YYYY-MM-DD'),
-          user_id: userId ?? undefined,
-          scene: scene ?? undefined,
-          limit,
-        },
-      });
-      setData(res.data);
-    } catch (e) {
-      message.error(errMsg(e));
-    } finally {
-      setLoading(false);
-    }
-  }, [date, userId, scene, limit]);
-
-  useEffect(() => {
-    load();
-    // 仅首次自动拉今天;之后由「查询」按钮触发
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  const columns: ColumnsType<AdCoinAuditRow> = [
-    {
-      title: '场景',
-      dataIndex: 'scene',
-      width: 90,
-      render: (s: string) => {
-        const t = SCENE_TAG[s] ?? { color: 'default', label: s };
-        return <Tag color={t.color}>{t.label}</Tag>;
-      },
-    },
-    { title: '时间', dataIndex: 'created_at', render: dt, width: 175 },
-    { title: '用户', dataIndex: 'user_id', width: 70 },
-    {
-      title: '状态',
-      dataIndex: 'status',
-      width: 110,
-      render: (s: string) => <Tag color={STATUS_TAG[s] ?? 'default'}>{s}</Tag>,
-    },
-    { title: 'eCPM', dataIndex: 'ecpm', width: 90, render: (v: string | null) => v ?? '-' },
-    {
-      title: '因子1',
-      dataIndex: 'ecpm_factor',
-      width: 70,
-      render: (v: number | null) => v ?? '-',
-    },
-    { title: '份数', dataIndex: 'units', width: 60 },
-    {
-      title: 'LT累计条数',
-      key: 'lt_index',
-      width: 100,
-      render: (_: unknown, r: AdCoinAuditRow) => fmtIndexRange(r.lt_index_start, r.lt_index_end),
-    },
-    {
-      title: '因子2',
-      key: 'lt_factor',
-      width: 90,
-      render: (_: unknown, r: AdCoinAuditRow) => fmtFactorRange(r.lt_factor_start, r.lt_factor_end),
-    },
-    {
-      title: '应发金币',
-      dataIndex: 'expected_coin',
-      width: 100,
-      render: (v: number) => <b>{v}</b>,
-    },
-    { title: '实发金币', dataIndex: 'actual_coin', width: 100 },
-    {
-      title: '一致',
-      dataIndex: 'matched',
-      width: 70,
-      render: (m: boolean) =>
-        m ? <Tag color="green">✓</Tag> : <Tag color="red">✗ 不符</Tag>,
-    },
-  ];
-
-  return (
-    <div>
-      <h2>看广告金币审计</h2>
-      <Typography.Paragraph type="secondary" style={{ marginBottom: 16 }}>
-        把「看视频赚金币」和「比价信息流广告」的发奖记录,用与正式发奖相同的公式复算一遍,核对实发金币是否按公式计算。纯只读对账。
-      </Typography.Paragraph>
-
-      {data && (
-        <Card size="small" style={{ marginBottom: 16 }}>
-          <Typography.Text strong>金币公式:</Typography.Text>{' '}
-          <Typography.Text code>{data.formula.description}</Typography.Text>
-          <div style={{ marginTop: 8, color: '#666', fontSize: 13 }}>
-            <div>
-              eCPM 口径:{data.formula.ecpm_unit},计算时 ÷100 转元;金币:元 ={' '}
-              {data.formula.coin_per_yuan}:1;信息流每 {data.formula.feed_unit_seconds} 秒折 1 条。两个点位「LT累计条数」各自独立计数。
-            </div>
-            <div style={{ marginTop: 4 }}>
-              因子1(按 eCPM 元判档,阈值单位:元):
-              {data.formula.ecpm_factor_tiers
-                .map(([f, lo, hi]) => `${lo}~${hi ?? '∞'}元→${f}`)
-                .join('  |  ')}
-            </div>
-            <div style={{ marginTop: 4 }}>
-              因子2(LT 累计条数):
-              {data.formula.lt_factor_tiers
-                .map(([f, lo, hi]) => `${lo}${hi != null && hi !== lo ? `~${hi}` : ''}→${f}`)
-                .join('  |  ')}
-            </div>
-          </div>
-        </Card>
-      )}
-
-      <Space style={{ marginBottom: 16 }} wrap>
-        <DatePicker value={date} onChange={(d) => d && setDate(d)} allowClear={false} />
-        <InputNumber
-          placeholder="用户 ID(可空)"
-          value={userId ?? undefined}
-          onChange={(v) => setUserId(v ?? null)}
-          style={{ width: 140 }}
-        />
-        <Select
-          placeholder="场景(全部)"
-          value={scene}
-          onChange={setScene}
-          allowClear
-          style={{ width: 140 }}
-          options={[
-            { value: 'reward_video', label: '看视频' },
-            { value: 'feed', label: '信息流' },
-          ]}
-        />
-        <Select
-          value={limit}
-          onChange={setLimit}
-          style={{ width: 120 }}
-          options={[50, 100, 200, 500].map((n) => ({ value: n, label: `${n} 条` }))}
-        />
-        <Button type="primary" onClick={load} loading={loading}>
-          查询
-        </Button>
-      </Space>
-
-      {data && (
-        <div style={{ marginBottom: 12 }}>
-          {data.mismatch_count > 0 ? (
-            <Alert
-              type="error"
-              message={`共 ${data.total} 条,其中 ${data.mismatch_count} 条复算与实发不一致(✗)——公式可能未生效或发奖有问题`}
-            />
-          ) : (
-            <Alert
-              type="success"
-              message={`共 ${data.total} 条,全部按公式发放(无不一致)`}
-            />
-          )}
-        </div>
-      )}
-
-      <Table
-        rowKey={(r) => `${r.scene}-${r.record_id}`}
-        columns={columns}
-        dataSource={data?.items ?? []}
-        loading={loading}
-        pagination={false}
-        size="small"
-        scroll={{ x: 1100 }}
-        rowClassName={(r) => (r.matched ? '' : 'row-mismatch')}
-      />
-      <style jsx global>{`
-        .row-mismatch > td {
-          background: #fff1f0 !important;
-        }
-      `}</style>
-    </div>
-  );
-}

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

@@ -0,0 +1,746 @@
+'use client';
+
+import { useCallback, useEffect, useState } from 'react';
+import type { ColumnsType } from 'antd/es/table';
+import {
+  Alert,
+  Button,
+  Card,
+  Col,
+  DatePicker,
+  Divider,
+  InputNumber,
+  Modal,
+  Popover,
+  Row,
+  Select,
+  Space,
+  Statistic,
+  Table,
+  Tag,
+  Typography,
+  message,
+} from 'antd';
+import {
+  FallOutlined,
+  InfoCircleOutlined,
+  QuestionCircleOutlined,
+  RiseOutlined,
+} from '@ant-design/icons';
+import dayjs, { type Dayjs } from 'dayjs';
+import { api, errMsg } from '@/lib/api';
+import { formatUtcTime } from '@/lib/format';
+import type {
+  AdRevenueDaily,
+  AdRevenueImpression,
+  AdRevenueRecord,
+  AdRevenueReport,
+  AdRevenueRow,
+} from '@/lib/types';
+
+const { RangePicker } = DatePicker;
+
+// 广告类型标签
+const TYPE_TAG: Record<string, { color: string; label: string }> = {
+  reward_video: { color: 'blue', label: '激励视频' },
+  feed: { color: 'purple', label: '信息流' },
+  draw: { color: 'geekblue', label: 'Draw 信息流' },
+};
+
+// 我们的应用环境标签
+const APP_TAG: Record<string, { color: string; label: string }> = {
+  prod: { color: 'green', label: '傻瓜比价(正式)' },
+  test: { color: 'default', label: '测试应用' },
+};
+
+// 发奖状态 → 颜色 + 中文(含「不发金币的原因」:提前关闭/未满10秒/缺eCPM/次数超限)
+const STATUS_TAG: Record<string, { color: string; label: string }> = {
+  granted: { color: 'green', label: '已发' },
+  capped: { color: 'orange', label: '次数超限' },
+  ecpm_missing: { color: 'red', label: '缺 eCPM' },
+  too_short: { color: 'gold', label: '未满10秒' },
+  closed_early: { color: 'default', label: '提前关闭' },
+};
+
+const fmtFactorRange = (a: number | null, b: number | null) => {
+  if (a == null) return '-';
+  return a === b || b == null ? String(a) : `${a}→${b}`;
+};
+
+const fmtIndexRange = (a: number | null, b: number | null) => {
+  if (a == null) return '-';
+  return a === b ? String(a) : `${a}–${b}`;
+};
+
+// 金币计算公式(写死,展示用)——与后端 app/core/rewards.py 同源,改动以后端常量为准。
+// 单次奖励(元) = (eCPM元 ÷ 1000) × 因子1(eCPM 元档) × 因子2(LT 累计条数);1 元 = 10000 金币,四舍五入取整。
+const COIN_PER_YUAN = 10000;
+// 因子1:按 eCPM(元/千次)判档,对应 AD_ECPM_FACTOR_TABLE
+const ECPM_FACTOR_ROWS = [
+  { key: '4', range: '> 400', factor: 0.6 },
+  { key: '3', range: '201 – 400', factor: 0.4 },
+  { key: '2', range: '101 – 200', factor: 0.3 },
+  { key: '1', range: '0 – 100', factor: 0.1 },
+];
+// 因子2:按该账号累计第几条/份(不按天重置),对应 AD_LT_FACTOR_TABLE
+const LT_FACTOR_ROWS = [
+  { key: '1', lt: '第 1 条', factor: 2.0 },
+  { key: '2', lt: '第 2 条', factor: 1.5 },
+  { key: '3', lt: '第 3 条', factor: 1.3 },
+  { key: '4', lt: '4 – 10 条', factor: 1.1 },
+  { key: '5', lt: '第 11 条及以后', factor: 1.0 },
+];
+
+// 展开行 - 展示明细:每条广告展示一行(时间/eCPM/收益/adn/底层位)
+const IMPRESSION_COLUMNS: ColumnsType<AdRevenueImpression> = [
+  { title: '时间', dataIndex: 'created_at', render: (v: string) => formatUtcTime(v), width: 165 },
+  { title: 'eCPM（分）', dataIndex: 'ecpm', width: 100 },
+  { title: '预估收益(元)', dataIndex: 'revenue_yuan', width: 120, render: (v: number) => v.toFixed(4) },
+  {
+    title: 'adn',
+    dataIndex: 'adn',
+    width: 90,
+    render: (v: string | null) => v ?? '-',
+  },
+  {
+    title: '底层代码位ID',
+    dataIndex: 'slot_id',
+    render: (v: string | null) => v ?? '-',
+  },
+];
+
+// 展开行 - 发奖明细:该组的逐条发奖复算明细(还原原金币审计的 eCPM/因子1/份数/LT/因子2 等列)
+const DETAIL_COLUMNS: ColumnsType<AdRevenueRecord> = [
+  { title: '时间', dataIndex: 'created_at', render: (v: string) => formatUtcTime(v), width: 165 },
+  {
+    title: '状态',
+    dataIndex: 'status',
+    width: 110,
+    render: (s: string) => {
+      const t = STATUS_TAG[s] ?? { color: 'default', label: s };
+      return <Tag color={t.color}>{t.label}</Tag>;
+    },
+  },
+  { title: 'eCPM（分）', dataIndex: 'ecpm', width: 90, render: (v: string | null) => v ?? '-' },
+  { title: '因子1', dataIndex: 'ecpm_factor', width: 70, render: (v: number | null) => v ?? '-' },
+  { title: '份数', dataIndex: 'units', width: 60 },
+  {
+    title: 'LT累计条数',
+    key: 'lt_index',
+    width: 100,
+    render: (_: unknown, r: AdRevenueRecord) => fmtIndexRange(r.lt_index_start, r.lt_index_end),
+  },
+  {
+    title: '因子2',
+    key: 'lt_factor',
+    width: 90,
+    render: (_: unknown, r: AdRevenueRecord) => fmtFactorRange(r.lt_factor_start, r.lt_factor_end),
+  },
+  { title: '应发金币', dataIndex: 'expected_coin', width: 100, render: (v: number) => <b>{v}</b> },
+  { title: '实发金币', dataIndex: 'actual_coin', width: 100 },
+  {
+    title: '一致',
+    dataIndex: 'matched',
+    width: 80,
+    render: (m: boolean) => (m ? <Tag color="green">✓</Tag> : <Tag color="red">✗ 不符</Tag>),
+  },
+];
+
+// 趋势图(纯 SVG,零依赖):柱=展示条数(左轴),线=预估收益元(右轴)。x 轴按传入点序。
+const CHART_BAR = '#69b1ff';
+const CHART_LINE = '#fa8c16';
+
+interface TrendPoint {
+  label: string; // x 轴刻度文案(小时数 / MM-DD)
+  tip: string; // hover 原生 tooltip 全文
+  impressions: number;
+  revenue: number;
+}
+
+// 按小时聚合(0–23),数据源是 items(被 limit 截断时会偏少,调用处给警告)
+function aggregateHourly(rows: AdRevenueRow[]): TrendPoint[] {
+  const byHour = Array.from({ length: 24 }, (_, h) => ({ hour: h, impressions: 0, revenue: 0 }));
+  for (const r of rows) {
+    if (r.hour == null || r.hour < 0 || r.hour > 23) continue;
+    byHour[r.hour].impressions += r.impressions;
+    byHour[r.hour].revenue += r.revenue_yuan;
+  }
+  return byHour.map((b) => ({
+    label: String(b.hour),
+    tip: `${String(b.hour).padStart(2, '0')}:00　展示 ${b.impressions} 条 · 预估收益 ${b.revenue.toFixed(4)} 元`,
+    impressions: b.impressions,
+    revenue: b.revenue,
+  }));
+}
+
+// 按天聚合,数据源是 daily(全量,不受 limit 影响);用 from..to 补齐空缺日为 0,轴连续
+function aggregateDaily(dateFrom: string, dateTo: string, daily: AdRevenueDaily[]): TrendPoint[] {
+  const map = new Map(daily.map((d) => [d.date, d]));
+  const out: TrendPoint[] = [];
+  let cur = dayjs(dateFrom);
+  let guard = 0;
+  while (cur.format('YYYY-MM-DD') <= dateTo && guard < 400) {
+    const ds = cur.format('YYYY-MM-DD');
+    const d = map.get(ds);
+    const impressions = d?.impressions ?? 0;
+    const revenue = d?.revenue_yuan ?? 0;
+    out.push({
+      label: ds.slice(5),
+      tip: `${ds}　展示 ${impressions} 条 · 预估收益 ${revenue.toFixed(4)} 元`,
+      impressions,
+      revenue,
+    });
+    cur = cur.add(1, 'day');
+    guard += 1;
+  }
+  return out;
+}
+
+function TrendChart({ points }: { points: TrendPoint[] }) {
+  const n = points.length;
+  const maxImp = Math.max(1, ...points.map((p) => p.impressions));
+  const maxRev = Math.max(1e-9, ...points.map((p) => p.revenue));
+
+  const W = 960;
+  const H = 280;
+  const padL = 48;
+  const padR = 56;
+  const padT = 16;
+  const padB = 32;
+  const plotW = W - padL - padR;
+  const plotH = H - padT - padB;
+  const step = plotW / Math.max(1, n);
+  const barW = Math.min(28, step * 0.55);
+  const yBase = padT + plotH;
+
+  const barX = (i: number) => padL + i * step + (step - barW) / 2;
+  const cx = (i: number) => padL + i * step + step / 2;
+  const impH = (v: number) => (v / maxImp) * plotH;
+  const revY = (v: number) => yBase - (v / maxRev) * plotH;
+  const linePts = points.map((p, i) => `${cx(i)},${revY(p.revenue)}`).join(' ');
+  const labelEvery = Math.max(1, Math.ceil(n / 12)); // 至多 ~12 个 x 标签,避免拥挤
+
+  return (
+    <svg viewBox={`0 0 ${W} ${H}`} width="100%" style={{ display: 'block' }} role="img" aria-label="趋势图">
+      {[0, 0.25, 0.5, 0.75, 1].map((t) => {
+        const y = yBase - t * plotH;
+        return (
+          <g key={t}>
+            <line x1={padL} y1={y} x2={W - padR} y2={y} stroke="#f0f0f0" />
+            <text x={padL - 8} y={y + 4} textAnchor="end" fontSize={11} fill={CHART_BAR}>
+              {Math.round(maxImp * t)}
+            </text>
+            <text x={W - padR + 8} y={y + 4} textAnchor="start" fontSize={11} fill={CHART_LINE}>
+              {(maxRev * t).toFixed(2)}
+            </text>
+          </g>
+        );
+      })}
+      {points.map((p, i) => (
+        <rect
+          key={i}
+          x={barX(i)}
+          y={yBase - impH(p.impressions)}
+          width={barW}
+          height={impH(p.impressions)}
+          fill={CHART_BAR}
+          rx={2}
+        >
+          <title>{p.tip}</title>
+        </rect>
+      ))}
+      <polyline points={linePts} fill="none" stroke={CHART_LINE} strokeWidth={2} />
+      {points.map((p, i) => (
+        <circle key={i} cx={cx(i)} cy={revY(p.revenue)} r={2.5} fill={CHART_LINE}>
+          <title>{p.tip}</title>
+        </circle>
+      ))}
+      {points.map((p, i) =>
+        i % labelEvery === 0 || i === n - 1 ? (
+          <text key={i} x={cx(i)} y={H - 14} textAnchor="middle" fontSize={11} fill="#999">
+            {p.label}
+          </text>
+        ) : null,
+      )}
+    </svg>
+  );
+}
+
+// 广告数据页:单表 —— 按 用户×类型×应用×代码位 聚合,一行同时给出
+// 展示条数 / 收益 / 应发金币 / 实发金币 / 是否一致(发奖对账下沉到聚合级)。
+export default function AdRevenuePage() {
+  const [range, setRange] = useState<[Dayjs, Dayjs]>([dayjs(), dayjs()]);
+  const [userId, setUserId] = useState<number | null>(null);
+  const [adType, setAdType] = useState<string | undefined>();
+  const [granularity, setGranularity] = useState<'day' | 'hour'>('day');
+  const [limit, setLimit] = useState<number>(500);
+  const [queriedGranularity, setQueriedGranularity] = useState<'day' | 'hour'>('day'); // 本次结果对应的粒度,决定是否显示「小时」列
+  const [queriedMultiDay, setQueriedMultiDay] = useState(false); // 本次结果是否跨多天,决定显示「日期」列 + 按天/按小时图
+  const [data, setData] = useState<AdRevenueReport | null>(null);
+  const [queriedLimit, setQueriedLimit] = useState<number>(500);
+  const [loading, setLoading] = useState(false);
+  const [formulaOpen, setFormulaOpen] = useState(false);
+
+  // 当前选择是否跨多天:跨多天时「按小时」无意义,粒度强制按天
+  const rangeMultiDay = range[0].format('YYYY-MM-DD') !== range[1].format('YYYY-MM-DD');
+
+  const load = useCallback(async () => {
+    const from = range[0].format('YYYY-MM-DD');
+    const to = range[1].format('YYYY-MM-DD');
+    const multiDay = from !== to;
+    const gran = multiDay ? 'day' : granularity; // 跨多天强制按天
+    setLoading(true);
+    try {
+      const res = await api.get<AdRevenueReport>('/admin/api/ad-revenue-report', {
+        params: {
+          date_from: from,
+          date_to: to,
+          user_id: userId ?? undefined,
+          ad_type: adType ?? undefined,
+          granularity: gran,
+          limit,
+        },
+      });
+      setData(res.data);
+      setQueriedLimit(limit);
+      setQueriedGranularity(gran);
+      setQueriedMultiDay(multiDay);
+    } catch (e) {
+      message.error(errMsg(e));
+    } finally {
+      setLoading(false);
+    }
+  }, [range, userId, adType, granularity, limit]);
+
+  useEffect(() => {
+    load();
+    // 仅首次自动拉今天;之后由「查询」按钮触发
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  const columns: ColumnsType<AdRevenueRow> = [
+    ...(queriedMultiDay
+      ? [{ title: '日期', dataIndex: 'report_date', width: 110, fixed: 'left' } as ColumnsType<AdRevenueRow>[number]]
+      : []),
+    { title: '用户', dataIndex: 'user_id', width: 80 },
+    ...(queriedGranularity === 'hour'
+      ? [
+          {
+            title: '小时',
+            dataIndex: 'hour',
+            width: 90,
+            render: (h: number | null) =>
+              h == null ? '-' : `${String(h).padStart(2, '0')}:00`,
+          } as ColumnsType<AdRevenueRow>[number],
+        ]
+      : []),
+    {
+      title: '广告类型',
+      dataIndex: 'ad_type',
+      width: 120,
+      render: (s: string) => {
+        const t = TYPE_TAG[s] ?? { color: 'default', label: s };
+        return <Tag color={t.color}>{t.label}</Tag>;
+      },
+    },
+    {
+      title: '来源应用',
+      dataIndex: 'app_env',
+      width: 150,
+      render: (v: string | null) => {
+        if (!v) return <Typography.Text type="secondary">未知</Typography.Text>;
+        const t = APP_TAG[v] ?? { color: 'default', label: v };
+        return <Tag color={t.color}>{t.label}</Tag>;
+      },
+    },
+    {
+      title: '广告位ID',
+      dataIndex: 'our_code_id',
+      width: 120,
+      render: (v: string | null) =>
+        v ? <Typography.Text code>{v}</Typography.Text> : <Typography.Text type="secondary">-</Typography.Text>,
+    },
+    { title: '展示条数', dataIndex: 'impressions', width: 90, align: 'right' },
+    {
+      title: '预估收益(元)',
+      dataIndex: 'revenue_yuan',
+      width: 120,
+      align: 'right',
+      render: (v: number) => v.toFixed(4),
+    },
+    {
+      title: '应发金币',
+      dataIndex: 'expected_coin',
+      width: 100,
+      align: 'right',
+      render: (v: number) => <b>{v}</b>,
+    },
+    { title: '实发金币', dataIndex: 'actual_coin', width: 100, align: 'right' },
+    {
+      title: '一致',
+      dataIndex: 'matched',
+      width: 80,
+      align: 'center',
+      render: (m: boolean) => (m ? <Tag color="green">✓</Tag> : <Tag color="red">✗ 不符</Tag>),
+    },
+    {
+      title: '底层 ADN',
+      dataIndex: 'adns',
+      render: (v: string[]) =>
+        v.length ? v.map((a) => <Tag key={a}>{a}</Tag>) : <Typography.Text type="secondary">-</Typography.Text>,
+    },
+  ];
+
+  // 派生指标(全部基于全量 total_* 字段,不受 limit 截断影响,准):
+  // 平均 eCPM = 收益÷展示×1000;发奖成本(元)= 实发金币÷汇率;预估毛利 = 收益−发奖成本;
+  // 发奖占收益比 = 发奖成本÷收益;应发实发差额(金币)= 应发−实发(正=少发/负=多发)。
+  const derived = data
+    ? {
+        avgEcpm: data.total_impressions
+          ? (data.total_revenue_yuan / data.total_impressions) * 1000
+          : 0,
+        payoutYuan: data.total_actual_coin / COIN_PER_YUAN,
+        grossProfit: data.total_revenue_yuan - data.total_actual_coin / COIN_PER_YUAN,
+        payoutRatioPct:
+          data.total_revenue_yuan > 0
+            ? (data.total_actual_coin / COIN_PER_YUAN / data.total_revenue_yuan) * 100
+            : null,
+        coinGap: data.total_expected_coin - data.total_actual_coin,
+      }
+    : null;
+
+  return (
+    <div>
+      <Space align="center" style={{ display: 'flex', marginBottom: 16 }}>
+        <h2 style={{ margin: 0 }}>广告数据</h2>
+        <Button
+          type="link"
+          size="small"
+          icon={<QuestionCircleOutlined />}
+          onClick={() => setFormulaOpen(true)}
+        >
+          金币计算规则
+        </Button>
+        <Popover
+          placement="bottomLeft"
+          title="收益口径说明"
+          content={
+            <div style={{ maxWidth: 360, fontSize: 13, lineHeight: 1.7 }}>
+              「预估收益」为客户端在广告展示(onAdShow)时上报 eCPM 折算的预估值(每千次展示 ÷1000
+              累加),<b>只要广告展示就计入、不论是否看完发奖</b>;穿山甲会过滤无效/过短曝光,故预估值可能偏高,
+              <b>实际收益一律以穿山甲后台结算为准</b>。测试应用多为 0。「广告位ID / 来源应用」为本期新增,历史记录留空。
+            </div>
+          }
+        >
+          <Button type="link" size="small" icon={<InfoCircleOutlined />}>
+            收益口径
+          </Button>
+        </Popover>
+      </Space>
+
+      <Card size="small" style={{ marginBottom: 16 }}>
+        <Space wrap size="middle" align="center">
+          <Space size={6}>
+            <Typography.Text type="secondary">日期</Typography.Text>
+            <RangePicker
+              value={range}
+              onChange={(v) => v && v[0] && v[1] && setRange([v[0], v[1]])}
+              allowClear={false}
+              presets={[
+                { label: '今天', value: [dayjs(), dayjs()] },
+                { label: '近 7 天', value: [dayjs().subtract(6, 'day'), dayjs()] },
+                { label: '近 30 天', value: [dayjs().subtract(29, 'day'), dayjs()] },
+              ]}
+            />
+          </Space>
+          <Space size={6}>
+            <Typography.Text type="secondary">用户</Typography.Text>
+            <InputNumber
+              placeholder="可空"
+              value={userId ?? undefined}
+              onChange={(v) => setUserId(v ?? null)}
+              style={{ width: 130 }}
+            />
+          </Space>
+          <Space size={6}>
+            <Typography.Text type="secondary">类型</Typography.Text>
+            <Select
+              placeholder="全部"
+              value={adType}
+              onChange={setAdType}
+              allowClear
+              style={{ width: 150 }}
+              options={[
+                { value: 'reward_video', label: '激励视频' },
+                { value: 'feed', label: '信息流' },
+                { value: 'draw', label: 'Draw 信息流' },
+              ]}
+            />
+          </Space>
+          <Space size={6}>
+            <Typography.Text type="secondary">粒度</Typography.Text>
+            <Select
+              value={rangeMultiDay ? 'day' : granularity}
+              onChange={setGranularity}
+              disabled={rangeMultiDay}
+              style={{ width: 110 }}
+              title={rangeMultiDay ? '跨多天仅支持按天' : undefined}
+              options={[
+                { value: 'day', label: '按天' },
+                { value: 'hour', label: '按小时' },
+              ]}
+            />
+          </Space>
+          <Space size={6}>
+            <Typography.Text type="secondary">条数</Typography.Text>
+            <Select
+              value={limit}
+              onChange={setLimit}
+              style={{ width: 110 }}
+              options={[100, 200, 500, 1000].map((n) => ({ value: n, label: `${n} 组` }))}
+            />
+          </Space>
+          <Button type="primary" onClick={load} loading={loading}>
+            查询
+          </Button>
+        </Space>
+      </Card>
+
+      {data && derived && (
+        <Card size="small" style={{ marginBottom: 16 }}>
+          <Divider orientation="left" plain style={{ marginTop: 0, marginBottom: 16 }}>
+            <Typography.Text type="secondary" style={{ fontSize: 12 }}>
+              广告展示与收益
+            </Typography.Text>
+          </Divider>
+          <Row gutter={[16, 12]}>
+            <Col span={6}>
+              <Statistic title="展示条数合计" value={data.total_impressions} />
+            </Col>
+            <Col span={6}>
+              <Statistic title="平均 eCPM(元/千次)" value={derived.avgEcpm} precision={2} />
+            </Col>
+            <Col span={6}>
+              <Statistic title="预估收益合计(元)" value={data.total_revenue_yuan} precision={4} />
+            </Col>
+            <Col span={6}>
+              <Statistic title="聚合组数" value={data.total} />
+            </Col>
+          </Row>
+          <Divider orientation="left" plain style={{ marginTop: 20, marginBottom: 16 }}>
+            <Typography.Text type="secondary" style={{ fontSize: 12 }}>
+              发奖与对账
+            </Typography.Text>
+          </Divider>
+          <Row gutter={[16, 12]}>
+            <Col span={6}>
+              <Statistic title="应发金币合计" value={data.total_expected_coin} />
+            </Col>
+            <Col span={6}>
+              <Statistic title="实发金币合计" value={data.total_actual_coin} />
+            </Col>
+            <Col span={6}>
+              <Statistic title="发奖成本(元)" value={derived.payoutYuan} precision={4} />
+            </Col>
+            <Col span={6}>
+              <Statistic
+                title="预估毛利(元)"
+                value={derived.grossProfit}
+                precision={4}
+                prefix={derived.grossProfit >= 0 ? <RiseOutlined /> : <FallOutlined />}
+                valueStyle={{ color: derived.grossProfit >= 0 ? '#3f8600' : '#cf1322' }}
+              />
+              <Typography.Text type="secondary" style={{ fontSize: 12 }}>
+                发奖占收益{' '}
+                {derived.payoutRatioPct == null ? '—' : `${derived.payoutRatioPct.toFixed(0)}%`}
+              </Typography.Text>
+            </Col>
+          </Row>
+        </Card>
+      )}
+
+      {data && (
+        <Space direction="vertical" style={{ width: '100%', marginBottom: 12 }}>
+          {data.mismatch_count > 0 ? (
+            <Alert
+              type="error"
+              showIcon
+              message={`共 ${data.total} 组,其中 ${data.mismatch_count} 组应发≠实发(✗);应发−实发 合计 ${
+                derived && derived.coinGap >= 0 ? '+' : ''
+              }${derived?.coinGap ?? 0} 金币(正=少发/负=多发)——公式可能未生效或发奖有问题。定位到具体记录可用后端逐条审计接口。`}
+            />
+          ) : (
+            <Alert type="success" showIcon message={`共 ${data.total} 组,应发与实发全部一致。`} />
+          )}
+          {data.truncated && (
+            <Alert
+              type="warning"
+              showIcon
+              message={`聚合明细已截断到 ${queriedLimit} 组,还有更多未显示——请按用户/类型/日期缩小范围,或调大「组数」。合计数字不受影响。`}
+            />
+          )}
+        </Space>
+      )}
+
+      {data &&
+        (queriedMultiDay
+          ? (data.daily?.length ?? 0) > 0
+          : queriedGranularity === 'hour' && (data.items?.length ?? 0) > 0) && (
+        <Card
+          size="small"
+          title={queriedMultiDay ? '按天趋势' : '按小时趋势'}
+          style={{ marginBottom: 16 }}
+          extra={
+            <Space size={16}>
+              <span style={{ fontSize: 12, color: '#666' }}>
+                <span
+                  style={{
+                    display: 'inline-block',
+                    width: 10,
+                    height: 10,
+                    background: CHART_BAR,
+                    borderRadius: 2,
+                    marginRight: 4,
+                  }}
+                />
+                展示条数
+              </span>
+              <span style={{ fontSize: 12, color: '#666' }}>
+                <span
+                  style={{
+                    display: 'inline-block',
+                    width: 14,
+                    borderTop: `2px solid ${CHART_LINE}`,
+                    marginRight: 4,
+                    verticalAlign: 'middle',
+                  }}
+                />
+                预估收益(元)
+              </span>
+            </Space>
+          }
+        >
+          {/* 按小时图由 items 聚合,会被 limit 截断;按天图用 daily(全量)不受影响,故只在按小时时警告 */}
+          {!queriedMultiDay && data.truncated && (
+            <Alert
+              type="warning"
+              showIcon
+              style={{ marginBottom: 12 }}
+              message={`图表按小时聚合的是已截断到 ${queriedLimit} 组的明细,可能少算——调大「条数」或缩小筛选可还原真实趋势。`}
+            />
+          )}
+          {queriedMultiDay ? (
+            <TrendChart points={aggregateDaily(data.date_from, data.date_to, data.daily)} />
+          ) : (
+            <TrendChart points={aggregateHourly(data.items)} />
+          )}
+        </Card>
+      )}
+
+      <Table
+        rowKey={(r) => `${r.report_date}-${r.user_id}-${r.ad_type}-${r.app_env ?? ''}-${r.our_code_id ?? ''}-${r.hour ?? ''}`}
+        columns={columns}
+        dataSource={data?.items ?? []}
+        loading={loading}
+        pagination={false}
+        size="small"
+        scroll={{ x: 1100 }}
+        rowClassName={(r) => (r.matched ? '' : 'row-mismatch')}
+        expandable={{
+          rowExpandable: (r) =>
+            (r.impression_records?.length ?? 0) > 0 || (r.records?.length ?? 0) > 0,
+          expandedRowRender: (r) => {
+            const imps = r.impression_records ?? [];
+            const recs = r.records ?? [];
+            return (
+              <Space direction="vertical" size="middle" style={{ width: '100%' }}>
+                <div>
+                  <Typography.Text strong>展示明细</Typography.Text>{' '}
+                  <Typography.Text type="secondary">({imps.length} 条)</Typography.Text>
+                  <Table<AdRevenueImpression>
+                    style={{ marginTop: 8 }}
+                    rowKey="id"
+                    columns={IMPRESSION_COLUMNS}
+                    dataSource={imps}
+                    pagination={false}
+                    size="small"
+                    scroll={{ x: 700 }}
+                  />
+                </div>
+                <div>
+                  <Typography.Text strong>发奖明细</Typography.Text>{' '}
+                  <Typography.Text type="secondary">({recs.length} 条)</Typography.Text>
+                  <Table<AdRevenueRecord>
+                    style={{ marginTop: 8 }}
+                    rowKey="record_id"
+                    columns={DETAIL_COLUMNS}
+                    dataSource={recs}
+                    pagination={false}
+                    size="small"
+                    scroll={{ x: 900 }}
+                    rowClassName={(d) => (d.matched ? '' : 'row-mismatch')}
+                    locale={{ emptyText: '该组无发奖记录(只有展示,未发奖)' }}
+                  />
+                </div>
+              </Space>
+            );
+          },
+        }}
+      />
+      <Modal
+        title="金币计算规则"
+        open={formulaOpen}
+        onCancel={() => setFormulaOpen(false)}
+        footer={null}
+        width={680}
+      >
+        <Typography.Paragraph>
+          <b>单次奖励(元)</b> ＝（单次 eCPM<sub>元</sub> ÷ 1000)× <b>因子1</b>(eCPM 档)× <b>因子2</b>(LT 累计条数)
+        </Typography.Paragraph>
+        <Typography.Paragraph type="secondary" style={{ fontSize: 13 }}>
+          · eCPM 取自穿山甲 SDK <Typography.Text code>getEcpm()</Typography.Text> 原值,单位「分/千次展示」,计算时 ÷100 转元;单次收益按「每千次 ÷1000」折到每次。
+          <br />· 金币汇率:<b>1 元 ＝ {COIN_PER_YUAN.toLocaleString()} 金币</b>,最终四舍五入取整。
+          <br />· 因子2「LT 累计条数」按该账号累计第几条计(不按天重置);激励视频每次 1 条,信息流每满 10 秒折 1 条。
+          <br />· 本表与发奖后端同源,本页「应发金币」即按此复算并与「实发金币」对账。
+        </Typography.Paragraph>
+        <Row gutter={16}>
+          <Col span={12}>
+            <Typography.Text strong>因子1 ·按 eCPM(元/千次)判档</Typography.Text>
+            <Table
+              style={{ marginTop: 8 }}
+              size="small"
+              pagination={false}
+              dataSource={ECPM_FACTOR_ROWS}
+              columns={[
+                { title: 'eCPM 范围(元)', dataIndex: 'range' },
+                { title: '因子1', dataIndex: 'factor', width: 80 },
+              ]}
+            />
+          </Col>
+          <Col span={12}>
+            <Typography.Text strong>因子2 ·按账号 LT 累计条数</Typography.Text>
+            <Table
+              style={{ marginTop: 8 }}
+              size="small"
+              pagination={false}
+              dataSource={LT_FACTOR_ROWS}
+              columns={[
+                { title: 'LT 累计条数', dataIndex: 'lt' },
+                { title: '因子2', dataIndex: 'factor', width: 80 },
+              ]}
+            />
+          </Col>
+        </Row>
+        <Typography.Paragraph type="secondary" style={{ fontSize: 13, marginTop: 12, marginBottom: 0 }}>
+          示例:eCPM ＝ 300 元/千次、账号第 1 条 → 0.3 × 0.4 × 2.0 ＝ 0.24 元 ＝ 2,400 金币。
+        </Typography.Paragraph>
+      </Modal>
+
+      <style jsx global>{`
+        .row-mismatch > td {
+          background: #fff1f0 !important;
+        }
+      `}</style>
+    </div>
+  );
+}

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

@@ -4,6 +4,7 @@ import { useEffect, useState } from 'react';
 import type { ColumnsType } from 'antd/es/table';
 import { Button, Form, Input, Modal, Select, Table, Tag, message } from 'antd';
 import { api, errMsg } from '@/lib/api';
+import { formatUtcTime } from '@/lib/format';
 import type { AdminInfo } from '@/lib/types';
 
 const ROLES = [
@@ -11,7 +12,8 @@ const ROLES = [
   { value: 'finance', label: 'finance' },
   { value: 'operator', label: 'operator' },
 ];
-const dt = (v: string | null) => (v ? new Date(v).toLocaleString('zh-CN') : '从未');
+// last_login_at 为 UTC 口径(datetime.now(utc)),按北京显示(勿用 new Date().toLocaleString)
+const dt = (v: string | null) => (v ? formatUtcTime(v, 'YYYY-MM-DD HH:mm:ss') : '从未');
 
 export default function AdminsPage() {
   const [admins, setAdmins] = useState<AdminInfo[]>([]);

src/app/(main)/audit-logs/page.tsx

@@ -3,19 +3,18 @@
 import { useState } from 'react';
 import type { ColumnsType } from 'antd/es/table';
 import { Button, Input, Space, Table, Tag } from 'antd';
-import { useCursorList } from '@/lib/useCursorList';
+import { formatUtcTime } from '@/lib/format';
+import { usePagedList } from '@/lib/usePagedList';
 import type { AuditLog } from '@/lib/types';
 
-const dt = (v: string) => new Date(v).toLocaleString('zh-CN');
+// 审计 created_at 为 UTC 口径(server_default now()),按北京显示(勿用 new Date().toLocaleString)
+const dt = (v: string) => formatUtcTime(v, 'YYYY-MM-DD HH:mm:ss');
 
 export default function AuditLogsPage() {
   const [action, setAction] = useState('');
   const [filters, setFilters] = useState<Record<string, unknown>>({});
-  const { items, nextCursor, loading, loadMore } = useCursorList<AuditLog>(
-    '/admin/api/audit-logs',
-    filters,
-    50,
-  );
+  const { items, total, page, pageSize, loading, onChange: onPageChange } =
+    usePagedList<AuditLog>('/admin/api/audit-logs', filters, 50);
 
   const search = () => setFilters({ action: action || undefined });
 
@@ -59,14 +58,16 @@ export default function AuditLogsPage() {
         columns={columns}
         dataSource={items}
         loading={loading}
-        pagination={false}
+        pagination={{
+          current: page,
+          pageSize,
+          total,
+          showSizeChanger: true,
+          showTotal: (t) => `共 ${t} 条`,
+          onChange: onPageChange,
+        }}
         scroll={{ x: 1000 }}
       />
-      <div style={{ marginTop: 16, textAlign: 'center' }}>
-        <Button onClick={loadMore} disabled={!nextCursor} loading={loading}>
-          {nextCursor ? '加载更多' : '没有更多了'}
-        </Button>
-      </div>
     </div>
   );
 }

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

@@ -19,6 +19,7 @@ import {
   message,
 } from 'antd';
 import { api, errMsg } from '@/lib/api';
+import { formatUtcTime } from '@/lib/format';
 
 interface StatItem {
   metric: string; // help_users / total_compares / total_saved
@@ -601,7 +602,7 @@ export default function HomeStatsConfig() {
                         </span>
                         {it.updated_at && (
                           <span style={{ color: '#bbb' }}>
-                            更新于 {new Date(it.updated_at).toLocaleString('zh-CN')}
+                            更新于 {formatUtcTime(it.updated_at, 'YYYY-MM-DD HH:mm:ss')}
                           </span>
                         )}
                       </Space>

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

@@ -4,10 +4,12 @@ import type { ColumnsType } from 'antd/es/table';
 import { Button, Modal, Popconfirm, Space, Table, message } from 'antd';
 import { api, errMsg } from '@/lib/api';
 import { canDo } from '@/lib/auth';
+import { formatUtcTime } from '@/lib/format';
 import { useCursorList } from '@/lib/useCursorList';
 import type { DeviceOnboardingItem } from '@/lib/types';
 
-const dt = (v: string) => new Date(v).toLocaleString('zh-CN');
+// completed_at 为 UTC 口径(server_default now()),按北京显示(勿用 new Date().toLocaleString)
+const dt = (v: string) => formatUtcTime(v);
 const EMPTY: Record<string, unknown> = {};
 
 export default function DevicesPage() {

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

@@ -1,23 +1,98 @@
 'use client';
 
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
+import type { Key } from 'react';
 import type { ColumnsType } from 'antd/es/table';
-import { Button, Select, Space, Table, Tag, message } from 'antd';
+import type { SorterResult } from 'antd/es/table/interface';
+import {
+  Button,
+  DatePicker,
+  Image,
+  Input,
+  Modal,
+  Select,
+  Space,
+  Table,
+  Tag,
+  Typography,
+  message,
+} from 'antd';
+import type { Dayjs } from 'dayjs';
 import { api, errMsg } from '@/lib/api';
 import { canDo } from '@/lib/auth';
-import { useCursorList } from '@/lib/useCursorList';
+import { formatUtcTime } from '@/lib/format';
+import { usePagedList } from '@/lib/usePagedList';
 import type { Feedback } from '@/lib/types';
 
-const dt = (v: string) => new Date(v).toLocaleString('zh-CN');
+const { Text, Paragraph } = Typography;
+const { RangePicker } = DatePicker;
+
+// 截图是 app-server 的 /media 相对路径,本地由 :8770 提供(NEXT_PUBLIC_MEDIA_BASE);生产同域走 nginx 代理。
+const MEDIA_BASE = process.env.NEXT_PUBLIC_MEDIA_BASE || '';
+const mediaUrl = (p: string) => (p.startsWith('http') ? p : MEDIA_BASE + p);
+
+type SortField = 'id' | 'created_at';
 
 export default function FeedbacksPage() {
+  // 筛选草稿:点「查询」才应用(避免输入即刷新)
   const [status, setStatus] = useState<string | undefined>();
-  const [filters, setFilters] = useState<Record<string, unknown>>({});
-  const { items, nextCursor, loading, loadMore, reload } = useCursorList<Feedback>(
-    '/admin/api/feedbacks',
-    filters,
-  );
+  const [userId, setUserId] = useState('');
+  const [content, setContent] = useState('');
+  const [createdRange, setCreatedRange] = useState<[Dayjs, Dayjs] | null>(null);
+  const [applied, setApplied] = useState<Record<string, unknown>>({});
+  // 排序(服务端):点列头即时生效,与「查询」按钮分开
+  const [sortBy, setSortBy] = useState<SortField>('id');
+  const [sortOrder, setSortOrder] = useState<'asc' | 'desc'>('desc');
+
+  const filters: Record<string, unknown> = { ...applied, sort_by: sortBy, sort_order: sortOrder };
+  const filterKey = JSON.stringify(filters);
+  const { items, total, page, pageSize, loading, onChange: onPageChange, reload } =
+    usePagedList<Feedback>('/admin/api/feedbacks', filters);
+
   const canHandle = canDo(['operator']);
+  const [selectedRowKeys, setSelectedRowKeys] = useState<Key[]>([]);
+
+  // 筛选/排序变化后清空已选(避免选中项跨筛选错位)
+  useEffect(() => {
+    setSelectedRowKeys([]);
+  }, [filterKey]);
+
+  const search = () =>
+    setApplied({
+      status,
+      user_id: userId.trim() ? Number(userId.trim()) : undefined,
+      content: content.trim() || undefined,
+      created_from: createdRange?.[0] ? createdRange[0].startOf('day').toISOString() : undefined,
+      created_to: createdRange?.[1] ? createdRange[1].endOf('day').toISOString() : undefined,
+    });
+
+  const resetFilters = () => {
+    setStatus(undefined);
+    setUserId('');
+    setContent('');
+    setCreatedRange(null);
+    setSortBy('id');
+    setSortOrder('desc');
+    setApplied({});
+  };
+
+  const onTableChange = (
+    _pagination: unknown,
+    _filters: unknown,
+    sorter: SorterResult<Feedback> | SorterResult<Feedback>[],
+  ) => {
+    const s = Array.isArray(sorter) ? sorter[0] : sorter;
+    if (s && s.order && s.field) {
+      setSortBy(s.field as SortField);
+      setSortOrder(s.order === 'ascend' ? 'asc' : 'desc');
+    } else {
+      setSortBy('id');
+      setSortOrder('desc');
+    }
+  };
+
+  const sortOrderOf = (field: SortField) =>
+    sortBy === field ? (sortOrder === 'asc' ? 'ascend' : 'descend') : null;
 
   const handle = async (f: Feedback) => {
     try {
@@ -29,18 +104,90 @@ export default function FeedbacksPage() {
     }
   };
 
+  const selectedNew = items.filter(
+    (f) => selectedRowKeys.includes(f.id) && f.status === 'new',
+  );
+
+  // 批量:循环调现有逐条 /handle 接口(各自已带审计),Promise.allSettled 汇总成败,不新增 bulk 端点
+  const bulkHandle = () => {
+    if (!selectedNew.length) {
+      message.warning('没有可处理的选中项(仅待处理 new 态生效)');
+      return;
+    }
+    Modal.confirm({
+      title: `确认批量标记处理 ${selectedNew.length} 条反馈?`,
+      content: '仅对选中的待处理(new)反馈生效',
+      onOk: async () => {
+        const results = await Promise.allSettled(
+          selectedNew.map((f) => api.post(`/admin/api/feedbacks/${f.id}/handle`)),
+        );
+        const ok = results.filter((r) => r.status === 'fulfilled').length;
+        const fail = results.length - ok;
+        if (fail) message.warning(`批量标记处理完成:成功 ${ok}/${results.length},失败 ${fail}`);
+        else message.success(`批量标记处理完成:${ok} 条`);
+        setSelectedRowKeys([]);
+        reload();
+      },
+    });
+  };
+
   const columns: ColumnsType<Feedback> = [
-    { title: 'ID', dataIndex: 'id', width: 70 },
+    { title: 'ID', dataIndex: 'id', width: 70, sorter: true, sortOrder: sortOrderOf('id') },
     { title: '用户', dataIndex: 'user_id', width: 80 },
-    { title: '内容', dataIndex: 'content' },
-    { title: '联系方式', dataIndex: 'contact', width: 140 },
+    {
+      title: '内容',
+      dataIndex: 'content',
+      width: 360,
+      render: (v: string) =>
+        v ? (
+          <Paragraph
+            style={{ marginBottom: 0, whiteSpace: 'pre-wrap', wordBreak: 'break-word' }}
+            ellipsis={{ rows: 3, expandable: true, symbol: '展开', tooltip: true }}
+          >
+            {v}
+          </Paragraph>
+        ) : (
+          <Text type="secondary">-</Text>
+        ),
+    },
+    {
+      title: '截图',
+      dataIndex: 'images',
+      width: 180,
+      render: (imgs: string[] | null) =>
+        imgs && imgs.length ? (
+          <Image.PreviewGroup>
+            <Space size={4} wrap>
+              {imgs.map((src, i) => (
+                <Image
+                  key={i}
+                  src={mediaUrl(src)}
+                  width={44}
+                  height={44}
+                  style={{ objectFit: 'cover', borderRadius: 4 }}
+                />
+              ))}
+            </Space>
+          </Image.PreviewGroup>
+        ) : (
+          <Text type="secondary">无</Text>
+        ),
+    },
+    { title: '联系方式', dataIndex: 'contact', width: 140, render: (v: string) => v || '-' },
     {
       title: '状态',
       dataIndex: 'status',
       width: 90,
       render: (s: string) => <Tag color={s === 'new' ? 'orange' : 'green'}>{s}</Tag>,
     },
-    { title: '时间', dataIndex: 'created_at', render: dt, width: 180 },
+    {
+      title: '时间',
+      dataIndex: 'created_at',
+      width: 180,
+      sorter: true,
+      sortOrder: sortOrderOf('created_at'),
+      render: (v: string) => formatUtcTime(v),
+    },
     {
       title: '操作',
       key: 'op',
@@ -57,28 +204,82 @@ export default function FeedbacksPage() {
   return (
     <div>
       <h2>反馈工单</h2>
-      <Space style={{ marginBottom: 16 }}>
+      <Space style={{ marginBottom: 16 }} wrap>
         <Select
           placeholder="状态"
           value={status}
-          onChange={(v) => {
-            setStatus(v);
-            setFilters({ status: v });
-          }}
+          onChange={setStatus}
           allowClear
-          style={{ width: 140 }}
+          style={{ width: 120 }}
           options={[
             { value: 'new', label: '待处理' },
             { value: 'handled', label: '已处理' },
           ]}
         />
-      </Space>
-      <Table rowKey="id" columns={columns} dataSource={items} loading={loading} pagination={false} />
-      <div style={{ marginTop: 16, textAlign: 'center' }}>
-        <Button onClick={loadMore} disabled={!nextCursor} loading={loading}>
-          {nextCursor ? '加载更多' : '没有更多了'}
+        <Input
+          placeholder="用户ID"
+          value={userId}
+          onChange={(e) => setUserId(e.target.value.replace(/\D/g, ''))}
+          onPressEnter={search}
+          allowClear
+          style={{ width: 120 }}
+        />
+        <Input
+          placeholder="内容(模糊)"
+          value={content}
+          onChange={(e) => setContent(e.target.value)}
+          onPressEnter={search}
+          allowClear
+          style={{ width: 180 }}
+        />
+        <RangePicker
+          placeholder={['提交起', '提交止']}
+          value={createdRange}
+          onChange={(v) => setCreatedRange(v as [Dayjs, Dayjs] | null)}
+          allowClear
+        />
+        <Button type="primary" onClick={search}>
+          查询
         </Button>
-      </div>
+        <Button onClick={resetFilters}>重置</Button>
+      </Space>
+
+      {canHandle && selectedNew.length > 0 && (
+        <Space style={{ marginBottom: 12, width: '100%' }} wrap>
+          <span style={{ color: '#888' }}>已选 {selectedNew.length} 条待处理</span>
+          <Button type="primary" onClick={bulkHandle}>
+            批量标记处理
+          </Button>
+          <Button type="link" onClick={() => setSelectedRowKeys([])}>
+            清空选择
+          </Button>
+        </Space>
+      )}
+
+      <Table
+        rowKey="id"
+        rowSelection={
+          canHandle
+            ? {
+                selectedRowKeys,
+                onChange: setSelectedRowKeys,
+                getCheckboxProps: (f) => ({ disabled: f.status !== 'new' }),
+              }
+            : undefined
+        }
+        columns={columns}
+        dataSource={items}
+        loading={loading}
+        pagination={{
+          current: page,
+          pageSize,
+          total,
+          showSizeChanger: true,
+          showTotal: (t) => `共 ${t} 条反馈`,
+          onChange: onPageChange,
+        }}
+        onChange={onTableChange}
+      />
     </div>
   );
 }

src/app/(main)/layout.tsx

@@ -3,10 +3,10 @@
 import { useEffect, useState } from 'react';
 import { usePathname, useRouter } from 'next/navigation';
 import {
+  BarChartOutlined,
   DashboardOutlined,
   FileSearchOutlined,
   FlagOutlined,
-  FundProjectionScreenOutlined,
   LogoutOutlined,
   MessageOutlined,
   MobileOutlined,
@@ -28,7 +28,7 @@ const MENU = [
   { key: '/withdraws', icon: <MoneyCollectOutlined />, label: '提现管理' },
   { key: '/price-reports', icon: <FlagOutlined />, label: '上报审核' },
   { key: '/feedbacks', icon: <MessageOutlined />, label: '反馈工单' },
-  { key: '/ad-audit', icon: <FundProjectionScreenOutlined />, label: '金币审计' },
+  { key: '/ad-revenue', icon: <BarChartOutlined />, label: '广告数据' },
   { key: '/config', icon: <SettingOutlined />, label: '系统配置' },
   { key: '/admins', icon: <TeamOutlined />, label: '管理员', superOnly: true },
   { key: '/audit-logs', icon: <FileSearchOutlined />, label: '审计日志' },

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

@@ -20,7 +20,7 @@ import { CheckCircleOutlined, CloseCircleOutlined } from '@ant-design/icons';
 import dayjs from 'dayjs';
 import { api, errMsg } from '@/lib/api';
 import { canDo } from '@/lib/auth';
-import { useCursorList } from '@/lib/useCursorList';
+import { usePagedList } from '@/lib/usePagedList';
 import type { PriceReport, PriceReportSummary } from '@/lib/types';
 
 const { Text } = Typography;
@@ -65,10 +65,8 @@ export default function PriceReportsPage() {
   const filters: Record<string, unknown> = {};
   if (activeStatus !== 'all') filters.status = activeStatus;
 
-  const { items, nextCursor, loading, loadMore, reload } = useCursorList<PriceReport>(
-    '/admin/api/price-reports',
-    filters,
-  );
+  const { items, total, page, pageSize, loading, onChange: onPageChange, reload } =
+    usePagedList<PriceReport>('/admin/api/price-reports', filters);
 
   const canReview = canDo(['operator']);
 
@@ -277,14 +275,16 @@ export default function PriceReportsPage() {
           columns={columns}
           dataSource={items}
           loading={loading}
-          pagination={false}
+          pagination={{
+            current: page,
+            pageSize,
+            total,
+            showSizeChanger: true,
+            showTotal: (t) => `共 ${t} 条`,
+            onChange: onPageChange,
+          }}
           scroll={{ x: 1100 }}
         />
-        <div style={{ marginTop: 16, textAlign: 'center' }}>
-          <Button onClick={loadMore} disabled={!nextCursor} loading={loading}>
-            {nextCursor ? '加载更多' : '没有更多了'}
-          </Button>
-        </div>
       </Card>
 
       <Modal

src/app/(main)/users/[id]/page.tsx

@@ -1,32 +1,94 @@
 'use client';
 
-import { useEffect, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import { useParams } from 'next/navigation';
 import type { ColumnsType } from 'antd/es/table';
-import { Card, Col, Descriptions, Row, Spin, Statistic, Table, Tabs, Tag } from 'antd';
-import { api } from '@/lib/api';
+import {
+  Button,
+  Card,
+  Col,
+  Descriptions,
+  Modal,
+  Result,
+  Row,
+  Space,
+  Spin,
+  Statistic,
+  Table,
+  Tabs,
+  Tag,
+  message,
+} from 'antd';
+import { api, errMsg } from '@/lib/api';
+import { canDo } from '@/lib/auth';
+import { formatUtcTime, formatWallTime, yuan } from '@/lib/format';
 import { useCursorList } from '@/lib/useCursorList';
-import type { CoinTxn, UserOverview, WithdrawOrder } from '@/lib/types';
-
-const yuan = (c: number) => `¥${(c / 100).toFixed(2)}`;
-const dt = (v: string) => new Date(v).toLocaleString('zh-CN');
+import { AdjustCashModal, AdjustCoinModal } from '@/components/AdjustBalanceModals';
+import type { CashTxn, CoinTxn, UserOverview, WithdrawOrder } from '@/lib/types';
 
 export default function UserDetailPage() {
   const params = useParams<{ id: string }>();
   const uid = Number(params.id);
   const [data, setData] = useState<UserOverview | null>(null);
+  const [err, setErr] = useState<string | null>(null);
+  const [coinOpen, setCoinOpen] = useState(false);
+  const [cashOpen, setCashOpen] = useState(false);
 
-  useEffect(() => {
-    api.get<UserOverview>(`/admin/api/users/${uid}`).then((r) => setData(r.data));
+  const loadData = useCallback(() => {
+    setErr(null);
+    api
+      .get<UserOverview>(`/admin/api/users/${uid}`)
+      .then((r) => setData(r.data))
+      .catch((e) => setErr(errMsg(e, '加载用户详情失败')));
   }, [uid]);
 
+  useEffect(() => {
+    loadData();
+  }, [loadData]);
+
   const coins = useCursorList<CoinTxn>('/admin/api/wallet/coin-transactions', { user_id: uid });
+  const cash = useCursorList<CashTxn>('/admin/api/wallet/cash-transactions', { user_id: uid });
   const withdraws = useCursorList<WithdrawOrder>('/admin/api/withdraws', { user_id: uid });
 
+  const canCoins = canDo(['finance']);
+  const canStatus = canDo(['operator']);
+
+  const toggleStatus = () => {
+    if (!data) return;
+    const next = data.user.status === 'active' ? 'disabled' : 'active';
+    Modal.confirm({
+      title: `确认${next === 'disabled' ? '封禁' : '解封'}用户 ${data.user.phone}?`,
+      onOk: async () => {
+        try {
+          await api.post(`/admin/api/users/${uid}/status`, { status: next });
+          message.success('已更新状态');
+          loadData();
+        } catch (e) {
+          message.error(errMsg(e));
+        }
+      },
+    });
+  };
+
+  if (err) {
+    return (
+      <Result
+        status="error"
+        title="加载失败"
+        subTitle={err}
+        extra={
+          <Button type="primary" onClick={loadData}>
+            重试
+          </Button>
+        }
+      />
+    );
+  }
   if (!data) return <Spin style={{ display: 'block', marginTop: 80 }} />;
 
   const coinCols: ColumnsType<CoinTxn> = [
-    { title: '时间', dataIndex: 'created_at', render: dt },
+    // 金币流水为北京 wall-clock 口径,原样显示
+    { title: '时间', dataIndex: 'created_at', render: (v: string) => formatWallTime(v) },
     {
       title: '变动',
       dataIndex: 'amount',
@@ -42,17 +104,58 @@ export default function UserDetailPage() {
     { title: '备注', dataIndex: 'remark', render: (v: string | null) => v || '-' },
   ];
 
+  const cashCols: ColumnsType<CashTxn> = [
+    // 现金流水为北京 wall-clock 口径,原样显示
+    { title: '时间', dataIndex: 'created_at', render: (v: string) => formatWallTime(v) },
+    {
+      title: '变动',
+      dataIndex: 'amount_cents',
+      render: (v: number) => (
+        <span style={{ color: v > 0 ? '#3f8600' : '#cf1322' }}>
+          {v > 0 ? '+' : ''}
+          {yuan(v)}
+        </span>
+      ),
+    },
+    { title: '余额', dataIndex: 'balance_after_cents', render: yuan },
+    { title: '类型', dataIndex: 'biz_type' },
+    { title: '备注', dataIndex: 'remark', render: (v: string | null) => v || '-' },
+  ];
+
   const wdCols: ColumnsType<WithdrawOrder> = [
-    { title: '时间', dataIndex: 'created_at', render: dt },
+    // 提现单为 UTC 口径
+    { title: '时间', dataIndex: 'created_at', render: (v: string) => formatUtcTime(v) },
     { title: '金额', dataIndex: 'amount_cents', render: yuan },
     { title: '状态', dataIndex: 'status', render: (s: string) => <Tag>{s}</Tag> },
     { title: '单号', dataIndex: 'out_bill_no' },
     { title: '失败原因', dataIndex: 'fail_reason', render: (v: string | null) => v || '-' },
   ];
 
+  const loadMoreLink = (list: { loadMore: () => void; nextCursor: number | null }) => (
+    <div style={{ marginTop: 12, textAlign: 'center' }}>
+      <a
+        onClick={list.loadMore}
+        style={{ pointerEvents: list.nextCursor ? 'auto' : 'none', opacity: list.nextCursor ? 1 : 0.4 }}
+      >
+        加载更多
+      </a>
+    </div>
+  );
+
   return (
     <div>
-      <h2>用户详情 #{uid}</h2>
+      <Space style={{ width: '100%', justifyContent: 'space-between', marginBottom: 16 }} wrap>
+        <h2 style={{ margin: 0 }}>用户详情 #{uid}</h2>
+        <Space wrap>
+          {canCoins && <Button onClick={() => setCoinOpen(true)}>调金币</Button>}
+          {canCoins && <Button onClick={() => setCashOpen(true)}>调现金</Button>}
+          {canStatus && data.user.status !== 'deleted' && (
+            <Button danger={data.user.status === 'active'} onClick={toggleStatus}>
+              {data.user.status === 'active' ? '封禁' : '解封'}
+            </Button>
+          )}
+        </Space>
+      </Space>
       <Card style={{ marginBottom: 16 }}>
         <Descriptions column={3}>
           <Descriptions.Item label="手机号">{data.user.phone}</Descriptions.Item>
@@ -64,7 +167,7 @@ export default function UserDetailPage() {
           <Descriptions.Item label="微信绑定">
             {data.user.wechat_openid ? '已绑定' : '未绑定'}
           </Descriptions.Item>
-          <Descriptions.Item label="注册时间">{dt(data.user.created_at)}</Descriptions.Item>
+          <Descriptions.Item label="注册时间">{formatUtcTime(data.user.created_at)}</Descriptions.Item>
         </Descriptions>
       </Card>
 
@@ -115,11 +218,23 @@ export default function UserDetailPage() {
                   loading={coins.loading}
                   pagination={false}
                 />
-                <div style={{ marginTop: 12, textAlign: 'center' }}>
-                  <a onClick={coins.loadMore} style={{ pointerEvents: coins.nextCursor ? 'auto' : 'none', opacity: coins.nextCursor ? 1 : 0.4 }}>
-                    加载更多
-                  </a>
-                </div>
+                {loadMoreLink(coins)}
+              </>
+            ),
+          },
+          {
+            key: 'cash',
+            label: '现金流水',
+            children: (
+              <>
+                <Table
+                  rowKey="id"
+                  columns={cashCols}
+                  dataSource={cash.items}
+                  loading={cash.loading}
+                  pagination={false}
+                />
+                {loadMoreLink(cash)}
               </>
             ),
           },
@@ -138,6 +253,25 @@ export default function UserDetailPage() {
           },
         ]}
       />
+
+      <AdjustCoinModal
+        user={data.user}
+        open={coinOpen}
+        onClose={() => setCoinOpen(false)}
+        onDone={() => {
+          loadData();
+          coins.reload();
+        }}
+      />
+      <AdjustCashModal
+        user={data.user}
+        open={cashOpen}
+        onClose={() => setCashOpen(false)}
+        onDone={() => {
+          loadData();
+          cash.reload();
+        }}
+      />
     </div>
   );
 }

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

@@ -1,92 +1,99 @@
 'use client';
 
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
+import type { Key } from 'react';
 import { useRouter } from 'next/navigation';
 import type { ColumnsType } from 'antd/es/table';
-import {
-  Button,
-  Form,
-  Input,
-  InputNumber,
-  Modal,
-  Select,
-  Space,
-  Table,
-  Tag,
-  message,
-} from 'antd';
+import type { SorterResult } from 'antd/es/table/interface';
+import { Button, DatePicker, Input, Modal, Select, Space, Table, Tag, message } from 'antd';
+import dayjs, { type Dayjs } from 'dayjs';
 import { api, errMsg } from '@/lib/api';
 import { canDo } from '@/lib/auth';
-import { useCursorList } from '@/lib/useCursorList';
-import type { UserListItem, UserOverview } from '@/lib/types';
+import { formatUtcTime } from '@/lib/format';
+import { usePagedList } from '@/lib/usePagedList';
+import { AdjustCashModal, AdjustCoinModal } from '@/components/AdjustBalanceModals';
+import type { UserListItem } from '@/lib/types';
+
+const { RangePicker } = DatePicker;
 
 const STATUS_COLOR: Record<string, string> = { active: 'green', disabled: 'red', deleted: 'default' };
-const yuan = (c: number) => `¥${(c / 100).toFixed(2)}`;
+
+type SortField = 'id' | 'created_at' | 'last_login_at';
 
 export default function UsersPage() {
   const router = useRouter();
+
+  // 筛选草稿:点「查询」才应用(避免输入即刷新);状态/渠道/日期一并随查询提交
   const [phone, setPhone] = useState('');
+  const [nickname, setNickname] = useState('');
   const [status, setStatus] = useState<string | undefined>();
-  const [filters, setFilters] = useState<Record<string, unknown>>({});
-  const { items, nextCursor, loading, loadMore, reload } = useCursorList<UserListItem>(
-    '/admin/api/users',
-    filters,
-  );
+  const [channel, setChannel] = useState<string | undefined>();
+  const [regRange, setRegRange] = useState<[Dayjs, Dayjs] | null>(null);
+  const [loginRange, setLoginRange] = useState<[Dayjs, Dayjs] | null>(null);
+  const [applied, setApplied] = useState<Record<string, unknown>>({});
+  // 排序(服务端):点列头即时生效,与「查询」按钮分开
+  const [sortBy, setSortBy] = useState<SortField>('id');
+  const [sortOrder, setSortOrder] = useState<'asc' | 'desc'>('desc');
+
+  const filters: Record<string, unknown> = { ...applied, sort_by: sortBy, sort_order: sortOrder };
+  const filterKey = JSON.stringify(filters);
+  const { items, total, page, pageSize, loading, onChange: onPageChange, reload } =
+    usePagedList<UserListItem>('/admin/api/users', filters);
 
   const canCoins = canDo(['finance']);
   const canStatus = canDo(['operator']);
 
   const [coinUser, setCoinUser] = useState<UserListItem | null>(null);
-  const [coinForm] = Form.useForm();
   const [cashUser, setCashUser] = useState<UserListItem | null>(null);
-  const [cashForm] = Form.useForm();
-  // 弹窗里展示该用户当前余额:列表行本身不带余额,开弹窗时拉一次 360 概览
-  const [balances, setBalances] = useState<{ coin: number; cashCents: number } | null>(null);
+  const [selectedRowKeys, setSelectedRowKeys] = useState<Key[]>([]);
 
-  const openAdjust = (u: UserListItem, kind: 'coin' | 'cash') => {
-    setBalances(null);
-    if (kind === 'coin') setCoinUser(u);
-    else setCashUser(u);
-    api
-      .get<UserOverview>(`/admin/api/users/${u.id}`)
-      .then((r) => setBalances({ coin: r.data.coin_balance, cashCents: r.data.cash_balance_cents }))
-      .catch(() => {});
+  // 筛选/排序变化后清空已选(避免选中项跨筛选错位)
+  useEffect(() => {
+    setSelectedRowKeys([]);
+  }, [filterKey]);
+
+  const search = () =>
+    setApplied({
+      phone: phone || undefined,
+      nickname: nickname || undefined,
+      status,
+      register_channel: channel || undefined,
+      created_from: regRange?.[0] ? regRange[0].startOf('day').toISOString() : undefined,
+      created_to: regRange?.[1] ? regRange[1].endOf('day').toISOString() : undefined,
+      last_login_from: loginRange?.[0] ? loginRange[0].startOf('day').toISOString() : undefined,
+      last_login_to: loginRange?.[1] ? loginRange[1].endOf('day').toISOString() : undefined,
+    });
+
+  const resetFilters = () => {
+    setPhone('');
+    setNickname('');
+    setStatus(undefined);
+    setChannel(undefined);
+    setRegRange(null);
+    setLoginRange(null);
+    setSortBy('id');
+    setSortOrder('desc');
+    setApplied({});
   };
 
-  const search = () => setFilters({ phone: phone || undefined, status });
-
-  const submitCoins = async () => {
-    const v = await coinForm.validateFields();
-    try {
-      await api.post(`/admin/api/users/${coinUser!.id}/coins`, v);
-      message.success('已调整金币');
-      setCoinUser(null);
-      coinForm.resetFields();
-    } catch (e) {
-      message.error(errMsg(e));
+  const onTableChange = (
+    _pagination: unknown,
+    _filters: unknown,
+    sorter: SorterResult<UserListItem> | SorterResult<UserListItem>[],
+  ) => {
+    const s = Array.isArray(sorter) ? sorter[0] : sorter;
+    if (s && s.order && s.field) {
+      setSortBy(s.field as SortField);
+      setSortOrder(s.order === 'ascend' ? 'asc' : 'desc');
+    } else {
+      // 取消排序 → 回默认(ID 倒序)
+      setSortBy('id');
+      setSortOrder('desc');
     }
   };
 
-  // 发/扣现金:输入元,×100 转分后调后端(主要给无现金用户发钱直接测试提现)
-  const submitCash = async () => {
-    const v = await cashForm.validateFields();
-    const amountCents = Math.round(Number(v.amount_yuan) * 100);
-    if (amountCents === 0) {
-      message.warning('金额不能为 0(且不小于 1 分)');
-      return;
-    }
-    try {
-      await api.post(`/admin/api/users/${cashUser!.id}/cash`, {
-        amount_cents: amountCents,
-        reason: v.reason,
-      });
-      message.success(`已${amountCents > 0 ? '发放' : '扣减'} ¥${(Math.abs(amountCents) / 100).toFixed(2)} 现金`);
-      setCashUser(null);
-      cashForm.resetFields();
-    } catch (e) {
-      message.error(errMsg(e));
-    }
-  };
+  const sortOrderOf = (field: SortField) =>
+    sortBy === field ? (sortOrder === 'asc' ? 'ascend' : 'descend') : null;
 
   const toggleStatus = (u: UserListItem) => {
     const next = u.status === 'active' ? 'disabled' : 'active';
@@ -123,10 +130,72 @@ export default function UsersPage() {
     });
   };
 
+  const selectedUsers = items.filter((u) => selectedRowKeys.includes(u.id));
+  const selectedActive = selectedUsers.filter((u) => u.status === 'active');
+  const selectedDisabled = selectedUsers.filter((u) => u.status === 'disabled');
+
+  // 批量:循环调现有逐用户接口(各自已带审计),Promise.allSettled 汇总成败,不新增 bulk 端点
+  const runBulk = async (
+    targets: UserListItem[],
+    label: string,
+    call: (u: UserListItem) => Promise<unknown>,
+  ) => {
+    const results = await Promise.allSettled(targets.map(call));
+    const ok = results.filter((r) => r.status === 'fulfilled').length;
+    const fail = results.length - ok;
+    if (fail) message.warning(`${label}完成:成功 ${ok}/${results.length},失败 ${fail}`);
+    else message.success(`${label}完成:${ok} 个`);
+    setSelectedRowKeys([]);
+    reload();
+  };
+
+  const bulkStatus = (target: 'disabled' | 'active') => {
+    const targets = target === 'disabled' ? selectedActive : selectedDisabled;
+    const label = target === 'disabled' ? '批量封禁' : '批量解封';
+    if (!targets.length) {
+      message.warning(`没有可${target === 'disabled' ? '封禁(active)' : '解封(disabled)'}的选中用户`);
+      return;
+    }
+    Modal.confirm({
+      title: `确认${label} ${targets.length} 个用户?`,
+      content: target === 'disabled' ? '仅对选中的 active 用户生效' : '仅对选中的 disabled 用户生效',
+      okButtonProps: { danger: target === 'disabled' },
+      onOk: () =>
+        runBulk(targets, label, (u) =>
+          api.post(`/admin/api/users/${u.id}/status`, { status: target }),
+        ),
+    });
+  };
+
+  const bulkDebugTrace = (enabled: boolean) => {
+    // 只对「非 deleted 且当前态不同」的选中用户操作,避免无谓请求
+    const targets = selectedUsers.filter(
+      (u) => u.status !== 'deleted' && u.debug_trace_enabled !== enabled,
+    );
+    const label = enabled ? '批量开调试链接' : '批量关调试链接';
+    if (!targets.length) {
+      message.warning('没有需要变更的选中用户');
+      return;
+    }
+    Modal.confirm({
+      title: `确认${label} ${targets.length} 个用户?`,
+      onOk: () =>
+        runBulk(targets, label, (u) =>
+          api.post(`/admin/api/users/${u.id}/debug-trace`, { enabled }),
+        ),
+    });
+  };
+
   const columns: ColumnsType<UserListItem> = [
-    { title: 'ID', dataIndex: 'id', width: 70 },
-    { title: '手机号', dataIndex: 'phone' },
-    { title: '昵称', dataIndex: 'nickname', render: (v: string | null) => v || '-' },
+    { title: 'ID', dataIndex: 'id', width: 80, sorter: true, sortOrder: sortOrderOf('id') },
+    { title: '手机号', dataIndex: 'phone', width: 130 },
+    {
+      title: '昵称',
+      dataIndex: 'nickname',
+      width: 150,
+      ellipsis: true,
+      render: (v: string | null) => v || '-',
+    },
     { title: '渠道', dataIndex: 'register_channel', width: 90 },
     {
       title: '状态',
@@ -137,16 +206,29 @@ export default function UsersPage() {
     {
       title: '注册时间',
       dataIndex: 'created_at',
-      render: (v: string) => new Date(v).toLocaleString('zh-CN'),
+      width: 160,
+      sorter: true,
+      sortOrder: sortOrderOf('created_at'),
+      render: (v: string) => formatUtcTime(v),
+    },
+    {
+      title: '最近登录',
+      dataIndex: 'last_login_at',
+      width: 160,
+      sorter: true,
+      sortOrder: sortOrderOf('last_login_at'),
+      render: (v: string) => formatUtcTime(v),
     },
     {
       title: '操作',
       key: 'op',
+      fixed: 'right',
+      width: 300,
       render: (_: unknown, u: UserListItem) => (
-        <Space>
+        <Space wrap={false} onClick={(e) => e.stopPropagation()}>
           <a onClick={() => router.push(`/users/${u.id}`)}>详情</a>
-          {canCoins && <a onClick={() => openAdjust(u, 'coin')}>调金币</a>}
-          {canCoins && <a onClick={() => openAdjust(u, 'cash')}>调现金</a>}
+          {canCoins && <a onClick={() => setCoinUser(u)}>调金币</a>}
+          {canCoins && <a onClick={() => setCashUser(u)}>调现金</a>}
           {canStatus && u.status !== 'deleted' && (
             <a onClick={() => toggleStatus(u)}>{u.status === 'active' ? '封禁' : '解封'}</a>
           )}
@@ -170,74 +252,105 @@ export default function UsersPage() {
           onChange={(e) => setPhone(e.target.value)}
           onPressEnter={search}
           allowClear
-          style={{ width: 160 }}
+          style={{ width: 150 }}
+        />
+        <Input
+          placeholder="昵称(模糊)"
+          value={nickname}
+          onChange={(e) => setNickname(e.target.value)}
+          onPressEnter={search}
+          allowClear
+          style={{ width: 150 }}
         />
         <Select
           placeholder="状态"
           value={status}
           onChange={setStatus}
           allowClear
-          style={{ width: 120 }}
+          style={{ width: 110 }}
           options={[
             { value: 'active', label: 'active' },
             { value: 'disabled', label: 'disabled' },
             { value: 'deleted', label: 'deleted' },
           ]}
         />
+        <Select
+          placeholder="渠道"
+          value={channel}
+          onChange={setChannel}
+          allowClear
+          style={{ width: 110 }}
+          options={[
+            { value: 'sms', label: 'sms' },
+            { value: 'wechat', label: 'wechat' },
+          ]}
+        />
+        <RangePicker
+          placeholder={['注册起', '注册止']}
+          value={regRange}
+          onChange={(v) => setRegRange(v as [Dayjs, Dayjs] | null)}
+          allowClear
+        />
+        <RangePicker
+          placeholder={['最近登录起', '最近登录止']}
+          value={loginRange}
+          onChange={(v) => setLoginRange(v as [Dayjs, Dayjs] | null)}
+          allowClear
+        />
         <Button type="primary" onClick={search}>
           查询
         </Button>
+        <Button onClick={resetFilters}>重置</Button>
       </Space>
-      <Table rowKey="id" columns={columns} dataSource={items} loading={loading} pagination={false} />
-      <div style={{ marginTop: 16, textAlign: 'center' }}>
-        <Button onClick={loadMore} disabled={!nextCursor} loading={loading}>
-          {nextCursor ? '加载更多' : '没有更多了'}
-        </Button>
-      </div>
 
-      <Modal
-        title={`调整金币 - ${coinUser?.phone ?? ''}`}
-        open={!!coinUser}
-        onOk={submitCoins}
-        onCancel={() => setCoinUser(null)}
-        destroyOnHidden
-      >
-        <p style={{ color: '#888', marginBottom: 12 }}>
-          当前余额:金币 {balances ? balances.coin : '…'} ｜ 现金 {balances ? yuan(balances.cashCents) : '…'}
-        </p>
-        <Form form={coinForm} layout="vertical">
-          <Form.Item name="amount" label="金币变动(正=增加,负=扣减)" rules={[{ required: true }]}>
-            <InputNumber style={{ width: '100%' }} />
-          </Form.Item>
-          <Form.Item name="reason" label="原因(入审计)" rules={[{ required: true }]}>
-            <Input.TextArea rows={2} />
-          </Form.Item>
-        </Form>
-      </Modal>
+      {canStatus && selectedUsers.length > 0 && (
+        <Space style={{ marginBottom: 12, width: '100%' }} wrap>
+          <span style={{ color: '#888' }}>
+            已选 {selectedUsers.length} 个(active {selectedActive.length}、disabled{' '}
+            {selectedDisabled.length})
+          </span>
+          <Button danger disabled={!selectedActive.length} onClick={() => bulkStatus('disabled')}>
+            批量封禁
+          </Button>
+          <Button disabled={!selectedDisabled.length} onClick={() => bulkStatus('active')}>
+            批量解封
+          </Button>
+          <Button onClick={() => bulkDebugTrace(true)}>批量开调试链接</Button>
+          <Button onClick={() => bulkDebugTrace(false)}>批量关调试链接</Button>
+          <Button type="link" onClick={() => setSelectedRowKeys([])}>
+            清空选择
+          </Button>
+        </Space>
+      )}
 
-      <Modal
-        title={`调现金 - ${cashUser?.phone ?? ''}`}
-        open={!!cashUser}
-        onOk={submitCash}
-        onCancel={() => setCashUser(null)}
-        destroyOnHidden
-      >
-        <p style={{ color: '#888', marginBottom: 12 }}>
-          当前余额:金币 {balances ? balances.coin : '…'} ｜ 现金 {balances ? yuan(balances.cashCents) : '…'}
-        </p>
-        <Form form={cashForm} layout="vertical">
-          <Form.Item
-            name="amount_yuan"
-            label="现金变动(元,正=发放,负=扣减;不可扣成负)"
-            rules={[{ required: true }]}
-          >
-            <InputNumber style={{ width: '100%' }} step={0.01} precision={2} addonAfter="元" />
-          </Form.Item>
-          <Form.Item name="reason" label="原因(入审计)" rules={[{ required: true }]}>
-            <Input.TextArea rows={2} />
-          </Form.Item>
-        </Form>
-      </Modal>
+      <Table
+        rowKey="id"
+        rowSelection={
+          canStatus
+            ? {
+                selectedRowKeys,
+                onChange: setSelectedRowKeys,
+                getCheckboxProps: (u) => ({ disabled: u.status === 'deleted' }),
+              }
+            : undefined
+        }
+        columns={columns}
+        dataSource={items}
+        loading={loading}
+        pagination={{
+          current: page,
+          pageSize,
+          total,
+          showSizeChanger: true,
+          showTotal: (t) => `共 ${t} 个用户`,
+          onChange: onPageChange,
+        }}
+        scroll={{ x: 1160 }}
+        onChange={onTableChange}
+      />
+
+      <AdjustCoinModal user={coinUser} open={!!coinUser} onClose={() => setCoinUser(null)} />
+      <AdjustCashModal user={cashUser} open={!!cashUser} onClose={() => setCashUser(null)} />
     </div>
   );
 }

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

@@ -36,11 +36,10 @@ import {
   SyncOutlined,
 } from '@ant-design/icons';
 import dayjs, { type Dayjs } from 'dayjs';
-import relativeTime from 'dayjs/plugin/relativeTime';
-import 'dayjs/locale/zh-cn';
 import { api, errMsg } from '@/lib/api';
 import { canDo } from '@/lib/auth';
-import { useCursorList } from '@/lib/useCursorList';
+import { formatUtcTime, formatWallTime, utcDayjs, utcFromNow, yuan } from '@/lib/format';
+import { usePagedList } from '@/lib/usePagedList';
 import type {
   AuditLog,
   CashTxn,
@@ -52,19 +51,12 @@ import type {
   WxpayHealthCheck,
 } from '@/lib/types';
 
-dayjs.extend(relativeTime);
-dayjs.locale('zh-cn');
-
 const { Text } = Typography;
 const { RangePicker } = DatePicker;
 
-const yuan = (c: number) => `¥${(c / 100).toFixed(2)}`;
-const apiTime = (v: string) => {
-  const hasTimezone = /(?:Z|[+-]\d{2}:?\d{2})$/i.test(v);
-  return dayjs(hasTimezone ? v : `${v}Z`);
-};
-const dt = (v: string) => apiTime(v).format('YYYY-MM-DD HH:mm');
-const ago = (v: string) => apiTime(v).fromNow();
+// 提现单 / 审计 / 用户均为 UTC 口径(server_default=func.now());现金流水为北京 wall-clock。
+const dt = (v: string) => formatUtcTime(v);
+const ago = (v: string) => utcFromNow(v);
 
 const STATUS_COLOR: Record<string, string> = {
   reviewing: 'gold',
@@ -161,7 +153,7 @@ function riskTags(detail: WithdrawDetail | null) {
   const tags: string[] = [];
   if (!detail.order.user_name) tags.push('缺少提现实名');
   if (detail.user?.status && detail.user.status !== 'active') tags.push(`账号状态:${detail.user.status}`);
-  if (detail.user && dayjs().diff(apiTime(detail.user.created_at), 'hour') < 24) tags.push('新注册用户');
+  if (detail.user && dayjs().diff(utcDayjs(detail.user.created_at), 'hour') < 24) tags.push('新注册用户');
   if ((detail.user?.withdraw_total || 0) >= 3) tags.push('多次提现用户');
   if (detail.recent_withdraws.some((o) => o.status === 'rejected' || o.status === 'failed')) {
     tags.push('历史异常单');
@@ -181,6 +173,7 @@ export default function WithdrawsPage() {
   const [summary, setSummary] = useState<WithdrawSummary | null>(null);
   const [health, setHealth] = useState<WxpayHealthCheck | null>(null);
   const [ledger, setLedger] = useState<WithdrawLedgerCheck | null>(null);
+  const [ledgerLoading, setLedgerLoading] = useState(false);
   const [drawerOpen, setDrawerOpen] = useState(false);
   const [detail, setDetail] = useState<WithdrawDetail | null>(null);
   const [detailLoading, setDetailLoading] = useState(false);
@@ -188,7 +181,6 @@ export default function WithdrawsPage() {
   const [bulkRejecting, setBulkRejecting] = useState<WithdrawOrder[]>([]);
   const [rejectReason, setRejectReason] = useState('');
   const [selectedRowKeys, setSelectedRowKeys] = useState<Key[]>([]);
-  const [pageSize, setPageSize] = useState(20);
   const [searchDraft, setSearchDraft] = useState('');
   const [keyword, setKeyword] = useState('');
   const [dateRange, setDateRange] = useState<[Dayjs, Dayjs] | null>(null);
@@ -209,11 +201,8 @@ export default function WithdrawsPage() {
   filters.sort_by = sortBy;
   filters.sort_order = sortOrder;
   const filterKey = JSON.stringify(filters);
-  const { items, nextCursor, loading, loadMore, reload } = useCursorList<WithdrawOrder>(
-    '/admin/api/withdraws',
-    filters,
-    pageSize,
-  );
+  const { items, total, page, pageSize, loading, onChange: onPageChange, reload } =
+    usePagedList<WithdrawOrder>('/admin/api/withdraws', filters, 20);
   const canManage = canDo(['finance']);
   const selectedOrders = items.filter((item) => selectedRowKeys.includes(item.id));
   const selectedReviewing = selectedOrders.filter((item) => item.status === 'reviewing');
@@ -255,19 +244,28 @@ export default function WithdrawsPage() {
     }
   }, []);
 
-  const loadChecks = useCallback(async () => {
+  const loadHealth = useCallback(async () => {
     try {
-      const [{ data: healthData }, { data: ledgerData }] = await Promise.all([
-        api.get<WxpayHealthCheck>('/admin/api/withdraws/health-check'),
-        api.get<WithdrawLedgerCheck>('/admin/api/withdraws/ledger-check'),
-      ]);
-      setHealth(healthData);
-      setLedger(ledgerData);
+      const { data } = await api.get<WxpayHealthCheck>('/admin/api/withdraws/health-check');
+      setHealth(data);
     } catch (e) {
       message.error(errMsg(e));
     }
   }, []);
 
+  // 账本校验是全表对账、相对重,故只在进页时拉一次 + 提供手动按钮,不随每次写操作重算。
+  const loadLedger = useCallback(async () => {
+    setLedgerLoading(true);
+    try {
+      const { data } = await api.get<WithdrawLedgerCheck>('/admin/api/withdraws/ledger-check');
+      setLedger(data);
+    } catch (e) {
+      message.error(errMsg(e));
+    } finally {
+      setLedgerLoading(false);
+    }
+  }, []);
+
   const loadDetail = useCallback(async (outBillNo: string) => {
     setDetailLoading(true);
     try {
@@ -282,17 +280,19 @@ export default function WithdrawsPage() {
 
   useEffect(() => {
     void loadSummary();
-    void loadChecks();
-  }, [loadChecks, loadSummary]);
+    void loadHealth();
+    void loadLedger();
+  }, [loadHealth, loadLedger, loadSummary]);
 
   useEffect(() => {
     setSelectedRowKeys([]);
-  }, [filterKey, pageSize]);
+  }, [filterKey, page, pageSize]);
 
   const refreshAfterChange = async (outBillNo?: string) => {
     setSelectedRowKeys([]);
     reload();
-    await Promise.all([loadSummary(), loadChecks()]);
+    // 账本校验偏重,写操作后不重算(只刷 summary + health);需要时点账本 Alert 上的「重新校验」。
+    await Promise.all([loadSummary(), loadHealth()]);
     if (outBillNo && drawerOpen && detail?.order.out_bill_no === outBillNo) {
       await loadDetail(outBillNo);
     }
@@ -595,7 +595,8 @@ export default function WithdrawsPage() {
     },
     { title: '余额', dataIndex: 'balance_after_cents', width: 100, render: yuan },
     { title: '备注', dataIndex: 'remark', render: (v: string | null) => v || '-' },
-    { title: '时间', dataIndex: 'created_at', width: 150, render: dt },
+    // 现金流水是北京 wall-clock 口径,原样显示,不能当 UTC 再 +8
+    { title: '时间', dataIndex: 'created_at', width: 150, render: (v: string) => formatWallTime(v) },
   ];
 
   const recentWithdrawColumns: ColumnsType<WithdrawOrder> = [
@@ -686,6 +687,16 @@ export default function WithdrawsPage() {
                   ? `账户余额合计 ${yuan(ledger.cash_balance_total_cents)}，现金流水净额 ${yuan(ledger.cash_transaction_total_cents)}`
                   : ledgerIssues.join('；')
               }
+              action={
+                <Button
+                  size="small"
+                  icon={<ReloadOutlined />}
+                  loading={ledgerLoading}
+                  onClick={() => void loadLedger()}
+                >
+                  重新校验
+                </Button>
+              }
             />
           )}
         </Space>
@@ -872,31 +883,6 @@ export default function WithdrawsPage() {
             </Space>
           </Space>
         )}
-        <Space
-          wrap
-          style={{
-            width: '100%',
-            justifyContent: 'space-between',
-            marginBottom: 12,
-          }}
-        >
-          <Text type="secondary">
-            当前已加载 {items.length} 条{nextCursor ? '，还有更多' : '，已到最后一页'}
-          </Text>
-          <Space>
-            <Text type="secondary">每次加载</Text>
-            <Select
-              value={pageSize}
-              style={{ width: 96 }}
-              onChange={(value: number) => setPageSize(value)}
-              options={[
-                { value: 20, label: '20 条' },
-                { value: 50, label: '50 条' },
-                { value: 100, label: '100 条' },
-              ]}
-            />
-          </Space>
-        </Space>
         <Table
           rowKey="id"
           rowSelection={
@@ -913,18 +899,21 @@ export default function WithdrawsPage() {
           columns={columns}
           dataSource={items}
           loading={loading}
-          pagination={false}
+          pagination={{
+            current: page,
+            pageSize,
+            total,
+            showSizeChanger: true,
+            pageSizeOptions: [20, 50, 100],
+            showTotal: (t) => `共 ${t} 条`,
+            onChange: onPageChange,
+          }}
           scroll={{ x: 1350 }}
           onRow={(record) => ({
             onClick: () => openDetail(record),
             style: { cursor: 'pointer' },
           })}
         />
-        <div style={{ marginTop: 16, textAlign: 'center' }}>
-          <Button onClick={loadMore} disabled={!nextCursor} loading={loading}>
-            {nextCursor ? `继续加载 ${pageSize} 条` : '没有更多了'}
-          </Button>
-        </div>
       </Card>
 
       <Drawer

src/app/providers.tsx

@@ -12,7 +12,17 @@ export function Providers({ children }: { children: React.ReactNode }) {
   return (
     <AntdRegistry>
       {/* wave 禁用:消除 antd 5 波纹在 Next15 dev 下的 React 版本兼容误报(纯噪音,后台不需要波纹) */}
-      <ConfigProvider locale={zhCN} wave={{ disabled: true }}>
+      {/* 全局主题:统一圆角到 8、页面底色用偏冷的浅灰,让白色卡片更有层次(全站生效) */}
+      <ConfigProvider
+        locale={zhCN}
+        wave={{ disabled: true }}
+        theme={{
+          token: {
+            borderRadius: 8,
+            colorBgLayout: '#f0f2f5',
+          },
+        }}
+      >
         {children}
       </ConfigProvider>
     </AntdRegistry>

src/components/AdjustBalanceModals.tsx

@@ -0,0 +1,201 @@
+'use client';
+
+// 调金币 / 调现金弹窗(受控)。列表页与用户详情页共用,避免两处各写一套。
+// 每个弹窗自带「增减 / 设为指定值」两种模式;打开时拉一次 360 概览展示当前余额。
+import { useEffect, useState } from 'react';
+import { Form, Input, InputNumber, Modal, Segmented, message } from 'antd';
+import { api, errMsg } from '@/lib/api';
+import { yuan } from '@/lib/format';
+import type { UserOverview } from '@/lib/types';
+
+export type AdjustTargetUser = { id: number; phone: string };
+
+interface ModalProps {
+  user: AdjustTargetUser | null;
+  open: boolean;
+  onClose: () => void;
+  onDone?: () => void; // 调整成功后回调(刷新余额/列表)
+}
+
+const balanceLine = (balances: { coin: number; cashCents: number } | null) => (
+  <p style={{ color: '#888', marginBottom: 12 }}>
+    当前余额:金币 {balances ? balances.coin : '…'} ｜ 现金 {balances ? yuan(balances.cashCents) : '…'}
+  </p>
+);
+
+// 弹窗打开时拉一次该用户余额;用户切换/关闭时丢弃过期响应(alive 标记防竞态)。
+function useBalances(userId: number | undefined, open: boolean) {
+  const [balances, setBalances] = useState<{ coin: number; cashCents: number } | null>(null);
+  useEffect(() => {
+    if (!open || userId == null) {
+      setBalances(null);
+      return;
+    }
+    let alive = true;
+    setBalances(null);
+    api
+      .get<UserOverview>(`/admin/api/users/${userId}`)
+      .then((r) => {
+        if (alive) setBalances({ coin: r.data.coin_balance, cashCents: r.data.cash_balance_cents });
+      })
+      .catch(() => {});
+    return () => {
+      alive = false;
+    };
+  }, [userId, open]);
+  return balances;
+}
+
+export function AdjustCoinModal({ user, open, onClose, onDone }: ModalProps) {
+  const [form] = Form.useForm();
+  const [mode, setMode] = useState<'delta' | 'set'>('delta');
+  const balances = useBalances(user?.id, open);
+
+  useEffect(() => {
+    if (open) {
+      setMode('delta');
+      form.resetFields();
+    }
+  }, [open, form]);
+
+  const submit = async () => {
+    if (!user) return;
+    const v = await form.validateFields();
+    try {
+      await api.post(`/admin/api/users/${user.id}/coins`, { mode, ...v });
+      message.success(mode === 'set' ? '已设置金币' : '已调整金币');
+      onClose();
+      onDone?.();
+    } catch (e) {
+      message.error(errMsg(e));
+    }
+  };
+
+  return (
+    <Modal
+      title={`调整金币 - ${user?.phone ?? ''}`}
+      open={open}
+      onOk={submit}
+      onCancel={onClose}
+      destroyOnHidden
+    >
+      {balanceLine(balances)}
+      <Form form={form} layout="vertical">
+        <Form.Item label="操作方式">
+          <Segmented
+            value={mode}
+            onChange={(v) => setMode(v as 'delta' | 'set')}
+            options={[
+              { label: '增减', value: 'delta' },
+              { label: '设为指定值', value: 'set' },
+            ]}
+          />
+        </Form.Item>
+        <Form.Item
+          name="amount"
+          label={mode === 'set' ? '目标金币值(直接设为该值)' : '金币变动(正=增加,负=扣减)'}
+          rules={[
+            { required: true },
+            ...(mode === 'set' ? [{ type: 'number' as const, min: 0, message: '目标值不能为负' }] : []),
+          ]}
+        >
+          <InputNumber style={{ width: '100%' }} min={mode === 'set' ? 0 : undefined} />
+        </Form.Item>
+        <Form.Item name="reason" label="原因(入审计)" rules={[{ required: true }]}>
+          <Input.TextArea rows={2} />
+        </Form.Item>
+      </Form>
+    </Modal>
+  );
+}
+
+export function AdjustCashModal({ user, open, onClose, onDone }: ModalProps) {
+  const [form] = Form.useForm();
+  const [mode, setMode] = useState<'delta' | 'set'>('delta');
+  const balances = useBalances(user?.id, open);
+
+  useEffect(() => {
+    if (open) {
+      setMode('delta');
+      form.resetFields();
+    }
+  }, [open, form]);
+
+  // 输入元,×100 转分后调后端(主要给无现金用户发钱直接测试提现)
+  const submit = async () => {
+    if (!user) return;
+    const v = await form.validateFields();
+    const amountCents = Math.round(Number(v.amount_yuan) * 100);
+    if (mode === 'delta' && amountCents === 0) {
+      message.warning('金额不能为 0(且不小于 1 分)');
+      return;
+    }
+    if (mode === 'set' && amountCents < 0) {
+      message.warning('目标金额不能为负');
+      return;
+    }
+    try {
+      await api.post(`/admin/api/users/${user.id}/cash`, {
+        mode,
+        amount_cents: amountCents,
+        reason: v.reason,
+      });
+      message.success(
+        mode === 'set'
+          ? `已设为 ¥${(amountCents / 100).toFixed(2)} 现金`
+          : `已${amountCents > 0 ? '发放' : '扣减'} ¥${(Math.abs(amountCents) / 100).toFixed(2)} 现金`,
+      );
+      onClose();
+      onDone?.();
+    } catch (e) {
+      message.error(errMsg(e));
+    }
+  };
+
+  return (
+    <Modal
+      title={`调现金 - ${user?.phone ?? ''}`}
+      open={open}
+      onOk={submit}
+      onCancel={onClose}
+      destroyOnHidden
+    >
+      {balanceLine(balances)}
+      <Form form={form} layout="vertical">
+        <Form.Item label="操作方式">
+          <Segmented
+            value={mode}
+            onChange={(v) => setMode(v as 'delta' | 'set')}
+            options={[
+              { label: '增减', value: 'delta' },
+              { label: '设为指定值', value: 'set' },
+            ]}
+          />
+        </Form.Item>
+        <Form.Item
+          name="amount_yuan"
+          label={
+            mode === 'set'
+              ? '目标现金(元,直接设为该值,须≥0)'
+              : '现金变动(元,正=发放,负=扣减;不可扣成负)'
+          }
+          rules={[
+            { required: true },
+            ...(mode === 'set' ? [{ type: 'number' as const, min: 0, message: '目标值不能为负' }] : []),
+          ]}
+        >
+          <InputNumber
+            style={{ width: '100%' }}
+            step={0.01}
+            precision={2}
+            suffix="元"
+            min={mode === 'set' ? 0 : undefined}
+          />
+        </Form.Item>
+        <Form.Item name="reason" label="原因(入审计)" rules={[{ required: true }]}>
+          <Input.TextArea rows={2} />
+        </Form.Item>
+      </Form>
+    </Modal>
+  );
+}

src/lib/format.ts

@@ -0,0 +1,47 @@
+// 全站统一的金额 / 时间格式化。
+//
+// 后端有两种时间口径,序列化后从字符串无法区分,必须按字段语义选对函数:
+//   1. UTC 口径:`server_default=func.now()` 的字段(用户/提现单/审计日志/广告发奖记录)。
+//      入库是 UTC,SQLite 下序列化不带时区、Postgres 下带 +00:00。统一当 UTC 解析后转北京显示。
+//   2. 北京 wall-clock 口径:钱包流水(coin_transaction / cash_transaction)。入库即
+//      `datetime.now(CN_TZ).replace(tzinfo=None)`,字面就是北京时间且无时区,**不能再做时区换算**。
+// 历史上各页面混用 `new Date().toLocaleString`(按本地解析)与 `apiTime`(补 Z 当 UTC),
+// 导致提现详情里现金流水时间快 8 小时。此模块收口,按口径区分。
+import dayjs from 'dayjs';
+import utc from 'dayjs/plugin/utc';
+import timezone from 'dayjs/plugin/timezone';
+import relativeTime from 'dayjs/plugin/relativeTime';
+import 'dayjs/locale/zh-cn';
+
+dayjs.extend(utc);
+dayjs.extend(timezone);
+dayjs.extend(relativeTime);
+dayjs.locale('zh-cn');
+
+const TZ = 'Asia/Shanghai';
+
+/** 金额:分 → ¥元(两位小数)。 */
+export const yuan = (cents: number) => `¥${(cents / 100).toFixed(2)}`;
+
+const hasTz = (v: string) => /(?:Z|[+-]\d{2}:?\d{2})$/i.test(v);
+
+/** 把 UTC 口径字符串解析为带时区的 dayjs(无时区后缀的补 Z 当 UTC)。 */
+export const utcDayjs = (v: string) => dayjs(hasTz(v) ? v : `${v}Z`);
+
+/** UTC 口径时间 → 北京时间显示(用户/提现单/审计/广告发奖记录)。 */
+export function formatUtcTime(v?: string | null, fmt = 'YYYY-MM-DD HH:mm'): string {
+  if (!v) return '-';
+  return utcDayjs(v).tz(TZ).format(fmt);
+}
+
+/** UTC 口径相对时间(如「3 分钟前」)。 */
+export function utcFromNow(v?: string | null): string {
+  if (!v) return '-';
+  return utcDayjs(v).fromNow();
+}
+
+/** 北京 wall-clock 口径时间 → 原样格式化,不做时区换算(钱包金币/现金流水)。 */
+export function formatWallTime(v?: string | null, fmt = 'YYYY-MM-DD HH:mm'): string {
+  if (!v) return '-';
+  return dayjs(v).format(fmt);
+}

src/lib/types.ts

@@ -19,6 +19,7 @@ export interface LoginResponse {
 export interface CursorPage<T> {
   items: T[];
   next_cursor: number | null;
+  total?: number | null; // offset 分页时为符合筛选条件的总条数(页码分页用);加载更多接口可能没有
 }
 
 export interface UserListItem {
@@ -187,39 +188,72 @@ export interface AuditLog {
   created_at: string;
 }
 
-export interface AdCoinAuditRow {
-  scene: string; // reward_video / feed
-  record_id: number;
-  user_id: number;
+// 广告收益报表聚合行下钻的单条展示明细
+export interface AdRevenueImpression {
+  id: number;
   created_at: string;
-  status: string; // granted / capped / ecpm_missing
+  ecpm: string; // 分/千次展示
+  revenue_yuan: number; // 本次展示预估收益(元)
+  adn: string | null;
+  slot_id: string | null; // 底层 mediation rit
+}
+
+// 广告收益报表聚合行下钻的单条发奖复算明细
+export interface AdRevenueRecord {
+  record_id: number;
+  created_at: string;
+  status: string; // granted / capped / ecpm_missing / too_short / closed_early
   ecpm: string | null;
-  ecpm_factor: number | null;
-  units: number;
+  ecpm_factor: number | null; // 因子1
+  units: number; // 份数
   lt_index_start: number | null;
   lt_index_end: number | null;
-  lt_factor_start: number | null;
+  lt_factor_start: number | null; // 因子2
   lt_factor_end: number | null;
   expected_coin: number;
   actual_coin: number;
   matched: boolean;
 }
 
-export interface AdCoinFormula {
-  description: string;
-  coin_per_yuan: number;
-  ecpm_unit: string;
-  feed_unit_seconds: number;
-  ecpm_factor_tiers: [number, number, number | null][];
-  lt_factor_tiers: [number, number, number | null][];
+// 广告收益报表:按日期汇总的一天(按天趋势图用;全量,不受 limit 影响)
+export interface AdRevenueDaily {
+  date: string; // 北京时间 YYYY-MM-DD
+  impressions: number;
+  revenue_yuan: number;
+  expected_coin: number;
+  actual_coin: number;
 }
 
-export interface AdCoinAudit {
-  date: string;
-  formula: AdCoinFormula;
-  total: number;
-  mismatch_count: number;
-  items: AdCoinAuditRow[];
+// 广告收益报表:按 日期 × 用户 × 广告类型 × 应用 × 代码位 聚合
+export interface AdRevenueRow {
+  report_date: string; // 该组所属日期 北京时间 YYYY-MM-DD
+  user_id: number;
+  ad_type: string; // reward_video / feed / draw
+  app_env: string | null; // prod(傻瓜比价) / test(测试);旧数据为空
+  our_code_id: string | null; // 我们配置的代码位 104xxx;旧数据为空
+  hour: number | null; // 北京时间小时 0–23(按小时粒度时有值;按天为 null)
+  impressions: number; // 展示条数(轮播每条各计一次)
+  revenue_yuan: number; // 收益(元),预估口径
+  expected_coin: number; // 应发金币(公式复算,与金币审计同源)
+  actual_coin: number; // 实发金币(实际入账)
+  matched: boolean; // 该组应发==实发
+  adns: string[]; // 底层填充 ADN 子渠道集合
+  impression_records: AdRevenueImpression[]; // 该组逐条展示明细(展开下钻)
+  records: AdRevenueRecord[]; // 该组逐条发奖复算明细(展开下钻)
+}
+
+export interface AdRevenueReport {
+  date_from: string; // 起始日 北京时间 YYYY-MM-DD
+  date_to: string; // 结束日 北京时间 YYYY-MM-DD(闭区间;单日时与 date_from 相同)
+  daily: AdRevenueDaily[]; // 按日期汇总序列(全量,供按天趋势图)
+  total: number; // 聚合组总数(全量,不受 limit 影响)
+  truncated: boolean;
+  total_impressions: number;
+  total_revenue_yuan: number;
+  total_expected_coin: number;
+  total_actual_coin: number;
+  mismatch_count: number; // 应发≠实发的组数
+  items: AdRevenueRow[];
 }
 
 export interface DashboardOverview {

src/lib/usePagedList.ts

@@ -0,0 +1,75 @@
+'use client';
+
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { api } from './api';
+import type { CursorPage } from './types';
+
+/**
+ * 页码分页列表 hook(对接后端 offset 分页 + total)。
+ * 与 useCursorList(「加载更多」)并存:需要页码/跳页/共 N 条的主列表页用本 hook。
+ *
+ * 约定:后端 cursor 即 offset,本 hook 按 (page-1)*pageSize 计算;CursorPage.total 为符合
+ * 筛选条件的总条数(供 antd Table pagination 渲染)。filters 变化自动回第 1 页重载。
+ */
+export function usePagedList<T>(
+  url: string,
+  filters: Record<string, unknown>,
+  initialPageSize = 20,
+) {
+  const [items, setItems] = useState<T[]>([]);
+  const [total, setTotal] = useState(0);
+  const [page, setPage] = useState(1);
+  const [pageSize, setPageSize] = useState(initialPageSize);
+  const [loading, setLoading] = useState(false);
+  const requestSeq = useRef(0);
+
+  const filtersKey = JSON.stringify(filters);
+
+  const load = useCallback(
+    async (p: number, ps: number) => {
+      const seq = requestSeq.current + 1;
+      requestSeq.current = seq;
+      setLoading(true);
+      try {
+        const params = { ...JSON.parse(filtersKey), limit: ps, cursor: (p - 1) * ps };
+        const { data } = await api.get<CursorPage<T>>(url, { params });
+        if (requestSeq.current !== seq) return; // 丢弃过期响应(快速切页/筛选)
+        setItems(data.items);
+        setTotal(data.total ?? 0);
+      } finally {
+        if (requestSeq.current === seq) setLoading(false);
+      }
+    },
+    [url, filtersKey],
+  );
+
+  // 筛选变化:回第 1 页重载
+  useEffect(() => {
+    setPage(1);
+    load(1, pageSize);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [load]);
+
+  // antd Table pagination.onChange(page, pageSize):页变或每页条数变都走这里
+  const onChange = (p: number, ps: number) => {
+    if (ps !== pageSize) {
+      // 每页条数变 → 回第 1 页,避免越界空页
+      setPageSize(ps);
+      setPage(1);
+      load(1, ps);
+    } else {
+      setPage(p);
+      load(p, ps);
+    }
+  };
+
+  return {
+    items,
+    total,
+    page,
+    pageSize,
+    loading,
+    onChange,
+    reload: () => load(page, pageSize), // 写操作后刷新当前页
+  };
+}