优化：将空计算因子显示为可读状态

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

@@ -9,7 +9,6 @@ import {
   Card,
   Col,
   DatePicker,
-  Descriptions,
   Divider,
   InputNumber,
   Modal,
@@ -190,20 +189,65 @@ const LT_FACTOR_ROWS = [
   { key: '5', lt: '第 11 条及以后', factor: 1.0 },
 ];
 
-type AdRevenueDetailRow = AdRevenueRecord & { source_adn?: string | null };
+type AdRevenueDetailRow = AdRevenueRecord & {
+  source_adn?: string | null;
+  is_impression_only?: boolean;
+};
+
+const FORMULA_EMPTY_STATUS_LABEL: Record<string, string> = {
+  capped: '次数超限',
+  ecpm_missing: 'eCPM 缺失',
+  too_short: '观看时长不足',
+  closed_early: '提前关闭',
+  impression_only: '仅展示',
+};
+
+// 未发奖记录用可读状态代替空值，避免误认为数据丢失；悬停时说明为何没有计算因子。
+function renderFormulaValue(value: string | number, row: AdRevenueDetailRow) {
+  if (value !== '-') return value;
+  const isGrantedButMissing = row.status === 'granted';
+  const reason = isGrantedButMissing
+    ? '该记录标记为已发奖，但计算因子缺失，需要进一步排查'
+    : row.is_impression_only
+      ? '该记录只有广告展示，没有对应发奖记录'
+      : REWARD_STATUS_HINT[row.status] ?? `发奖状态为 ${row.status || '未知'}`;
+  const statusLabel = isGrantedButMissing
+    ? '计算数据缺失'
+    : (FORMULA_EMPTY_STATUS_LABEL[row.status] ?? row.status) || '未进入计算';
+  return (
+    <Tooltip
+      title={isGrantedButMissing
+        ? reason
+        : `${reason}；未进入金币计算，不占用 LT 累计条数，因此不展示因子。`}
+    >
+      <span>{statusLabel}</span>
+    </Tooltip>
+  );
+}
+
+function impressionOnlyDetail(row: AdRevenueRow): AdRevenueDetailRow {
+  return {
+    record_id: 0,
+    created_at: row.created_at,
+    status: 'impression_only',
+    ecpm: row.ecpm,
+    ecpm_factor: null,
+    units: 0,
+    lt_index_start: null,
+    lt_index_end: null,
+    lt_factor_start: null,
+    lt_factor_end: null,
+    expected_coin: 0,
+    actual_coin: 0,
+    matched: true,
+    source_adn: row.adn,
+    is_impression_only: true,
+  };
+}
 
 // 展开行(逐条事件展开)- 该条的发奖复算明细(还原金币审计的 eCPM/因子1/份数/LT/因子2 等列)
 const DETAIL_COLUMNS: ColumnsType<AdRevenueDetailRow> = [
-  {
-    title: '来源广告网络',
-    dataIndex: 'source_adn',
-    width: 110,
-    render: (value: string | null) => value?.trim() || (
-      <Tooltip title="该历史记录没有可唯一确认的 SDK 广告来源，未猜测填充。">
-        <span>未上报</span>
-      </Tooltip>
-    ),
-  },
+  { title: '来源广告网络', dataIndex: 'source_adn', width: 110, render: (value: string | null) => value || '-' },
   {
     title: 'eCPM（元）',
     dataIndex: 'ecpm',
@@ -217,18 +261,25 @@ const DETAIL_COLUMNS: ColumnsType<AdRevenueDetailRow> = [
     render: (v: string | null) => (v == null || Number.isNaN(Number(v)) ? '-' : (Number(v) / 100 / 1000).toFixed(4)),
   },
   { title: '实发金币数', dataIndex: 'actual_coin', width: 100 },
-  { title: '因子1', dataIndex: 'ecpm_factor', width: 70, render: (v: number | null) => v ?? '-' },
+  {
+    title: '因子1',
+    dataIndex: 'ecpm_factor',
+    width: 70,
+    render: (v: number | null, row: AdRevenueDetailRow) => renderFormulaValue(v ?? '-', row),
+  },
   {
     title: '因子2',
     key: 'lt_factor',
     width: 90,
-    render: (_: unknown, r: AdRevenueDetailRow) => fmtFactorRange(r.lt_factor_start, r.lt_factor_end),
+    render: (_: unknown, row: AdRevenueDetailRow) =>
+      renderFormulaValue(fmtFactorRange(row.lt_factor_start, row.lt_factor_end), row),
   },
   {
     title: 'LT累计条数',
     key: 'lt_index',
     width: 100,
-    render: (_: unknown, r: AdRevenueDetailRow) => fmtIndexRange(r.lt_index_start, r.lt_index_end),
+    render: (_: unknown, row: AdRevenueDetailRow) =>
+      renderFormulaValue(fmtIndexRange(row.lt_index_start, row.lt_index_end), row),
   },
 ];
 
@@ -1111,11 +1162,7 @@ export default function AdRevenueReportPage() {
                   style={{ marginTop: 8 }}
                   rowKey="record_id"
                   columns={DETAIL_COLUMNS}
-                  dataSource={r.sub_rewards.map((detail) => ({
-                    ...detail,
-                    // 一次比价/领券可能由不同 ADN 连续填充，优先显示本条发奖记录的来源。
-                    source_adn: detail.adn ?? r.adn,
-                  }))}
+                  dataSource={r.sub_rewards.map((detail) => ({ ...detail, source_adn: r.adn }))}
                   pagination={false}
                   size="small"
                   scroll={{ x: 900 }}
@@ -1131,10 +1178,7 @@ export default function AdRevenueReportPage() {
                   style={{ marginTop: 8 }}
                   rowKey="record_id"
                   columns={DETAIL_COLUMNS}
-                  dataSource={[{
-                    ...r.reward_detail,
-                    source_adn: r.reward_detail.adn ?? r.adn,
-                  }]}
+                  dataSource={[{ ...r.reward_detail, source_adn: r.adn }]}
                   pagination={false}
                   size="small"
                   scroll={{ x: 900 }}
@@ -1142,24 +1186,19 @@ export default function AdRevenueReportPage() {
               </div>
             ) : (
               <div>
-                <Typography.Text strong>展示明细</Typography.Text>{' '}
-                <Typography.Text type="secondary">(纯展示事件,未单独发奖,无金币复算)</Typography.Text>
-                <Descriptions size="small" column={3} bordered style={{ marginTop: 8 }}>
-                  <Descriptions.Item label="时间">{formatUtcTime(r.created_at)}</Descriptions.Item>
-                  <Descriptions.Item label="eCPM（分）">{r.ecpm ?? '-'}</Descriptions.Item>
-                  <Descriptions.Item label="eCPM（元）">
-                    {r.ecpm != null && !Number.isNaN(Number(r.ecpm))
-                      ? (Number(r.ecpm) / 100).toFixed(2)
-                      : '-'}
-                  </Descriptions.Item>
-                  <Descriptions.Item label="预估收益(元)">
-                    {r.has_impression ? r.revenue_yuan.toFixed(4) : '-'}
-                  </Descriptions.Item>
-                  <Descriptions.Item label="底层 ADN">{r.adn ?? '-'}</Descriptions.Item>
-                  <Descriptions.Item label="底层代码位(rit)">{r.slot_id ?? '-'}</Descriptions.Item>
-                  <Descriptions.Item label="我方代码位">{r.our_code_id ?? '-'}</Descriptions.Item>
-                  <Descriptions.Item label="来源应用">{r.app_env ?? '-'}</Descriptions.Item>
-                </Descriptions>
+                <Typography.Text strong>本次广告逐条明细</Typography.Text>{' '}
+                <Typography.Text type="secondary">
+                  (共 1 条 · 应发 0 / 实发 0；仅展示，未单独发奖)
+                </Typography.Text>
+                <Table<AdRevenueDetailRow>
+                  style={{ marginTop: 8 }}
+                  rowKey="record_id"
+                  columns={DETAIL_COLUMNS}
+                  dataSource={[impressionOnlyDetail(r)]}
+                  pagination={false}
+                  size="small"
+                  scroll={{ x: 900 }}
+                />
               </div>
             ),
         }}

src/app/(main)/config/GuideVideoConfig.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { useEffect, useState } from 'react';
-import { Button, Card, InputNumber, Space, Spin, Switch, Tag, Typography, Upload, message } from 'antd';
+import { Button, Card, Space, Spin, Switch, Tag, Typography, Upload, message } from 'antd';
 import { DeleteOutlined, UploadOutlined } from '@ant-design/icons';
 import { api, errMsg } from '@/lib/api';
 import { canDo } from '@/lib/auth';
@@ -9,58 +9,55 @@ import { mediaUrl } from '@/lib/media';
 import type { GuideVideoConfig as GuideCfg } from '@/lib/types';
 
 const { Text } = Typography;
+
+/** 后端 media.save_guide_video 只认 MP4 魔数;这里先在浏览器挡一道,省得白传 100MB。 */
 const MAX_BYTES = 100 * 1024 * 1024;
-type Scene = 'coupon' | 'comparison';
 
-const META: Record<Scene, { title: string; action: string }> = {
-  coupon: { title: '一键自动领取引导视频', action: '一键自动领取' },
-  comparison: { title: '开始比价引导视频', action: '开始比价' },
-};
-
-function SceneConfig({ scene }: { scene: Scene }) {
-  const meta = META[scene];
+/**
+ * 领券等候浮层的「新手引导视频」配置。
+ *
+ * 用户点首页「一键自动领取」→ 出等候浮层,浮层下方那块位置**前 3 次**放这支引导视频
+ * (而不是广告),每次固定发 120 金币;播完若浮层还开着,自动接着放广告(原逻辑)。
+ * 「系统配置 → 领券引导视频」tab 的一个区块。
+ *
+ * 后台只管两件事:**开关** 和 **换片**。次数(3)/ 金币(120)走服务端默认值,产品已拍板不再
+ * 开放配置,所以这里不渲染输入框、PATCH 也不带这两个字段(后端仍保留字段与默认值)。
+ */
+export default function GuideVideoConfig() {
   const [cfg, setCfg] = useState<GuideCfg | null>(null);
   const [loading, setLoading] = useState(true);
   const [saving, setSaving] = useState(false);
   const [uploading, setUploading] = useState(false);
+
+  // 本地编辑态,保存时一次性 PATCH
   const [enabled, setEnabled] = useState(true);
-  const [maxPlays, setMaxPlays] = useState(3);
-  const [rewardCoin, setRewardCoin] = useState(100);
+
   const canEdit = canDo(['operator']);
 
-  const sync = (value: GuideCfg) => {
-    setCfg(value);
-    setEnabled(value.enabled);
-    setMaxPlays(value.max_plays);
-    setRewardCoin(value.reward_coin);
+  const sync = (c: GuideCfg) => {
+    setCfg(c);
+    setEnabled(c.enabled);
   };
 
   const load = async () => {
     setLoading(true);
     try {
-      const { data } = await api.get<GuideCfg>('/admin/api/guide-video', { params: { scene } });
+      const { data } = await api.get<GuideCfg>('/admin/api/guide-video');
       sync(data);
-    } catch (e) {
-      message.error(errMsg(e));
     } finally {
       setLoading(false);
     }
   };
-
   useEffect(() => {
-    void load();
-  }, [scene]);
+    load();
+  }, []);
 
   const save = async () => {
     setSaving(true);
     try {
-      const { data } = await api.patch<GuideCfg>(
-        '/admin/api/guide-video',
-        { enabled, max_plays: maxPlays, reward_coin: rewardCoin },
-        { params: { scene } },
-      );
+      const { data } = await api.patch<GuideCfg>('/admin/api/guide-video', { enabled });
       sync(data);
-      message.success(`${meta.title}配置已保存，下次触发即生效`);
+      message.success('已保存，用户下一次进入领券浮层即生效');
     } catch (e) {
       message.error(errMsg(e));
     } finally {
@@ -68,27 +65,11 @@ function SceneConfig({ scene }: { scene: Scene }) {
     }
   };
 
-  const uploadVideo = async (file: File) => {
-    const form = new FormData();
-    form.append('file', file);
-    setUploading(true);
-    try {
-      const { data } = await api.post<GuideCfg>(
-        '/admin/api/guide-video/video',
-        form,
-        { params: { scene } },
-      );
-      sync(data);
-      message.success(`${meta.title}已更新`);
-    } catch (e) {
-      message.error(errMsg(e));
-    } finally {
-      setUploading(false);
-    }
-  };
-
+  // antd Upload:beforeUpload 里自行 POST(multipart),返回 false 阻止其默认上传。
   const beforeUpload = (file: File) => {
-    if (file.type !== 'video/mp4' && !/\.mp4$/i.test(file.name)) {
+    // 有些系统给 .mp4 的 type 是空串,不能只看 type,再兜一层扩展名。
+    const looksMp4 = file.type === 'video/mp4' || /\.mp4$/i.test(file.name);
+    if (!looksMp4) {
       message.error('仅支持 MP4 视频（H.264 编码）');
       return Upload.LIST_IGNORE;
     }
@@ -100,15 +81,27 @@ function SceneConfig({ scene }: { scene: Scene }) {
     return false;
   };
 
+  const uploadVideo = async (file: File) => {
+    const form = new FormData();
+    form.append('file', file);
+    setUploading(true);
+    try {
+      const { data } = await api.post<GuideCfg>('/admin/api/guide-video/video', form);
+      sync(data);
+      message.success('引导视频已更新，用户下一次进入领券浮层即生效');
+    } catch (e) {
+      message.error(errMsg(e));
+    } finally {
+      setUploading(false);
+    }
+  };
+
   const removeVideo = async () => {
     setUploading(true);
     try {
-      const { data } = await api.delete<GuideCfg>(
-        '/admin/api/guide-video/video',
-        { params: { scene } },
-      );
+      const { data } = await api.delete<GuideCfg>('/admin/api/guide-video/video');
       sync(data);
-      message.success(`已移除${meta.title}`);
+      message.success('已移除引导视频，领券浮层恢复为只放广告');
     } catch (e) {
       message.error(errMsg(e));
     } finally {
@@ -119,48 +112,82 @@ function SceneConfig({ scene }: { scene: Scene }) {
   return (
     <Card
       size="small"
-      title={meta.title}
+      title="领券引导视频（App 领券等候浮层，前 3 次替代广告）"
       style={{ marginBottom: 16 }}
-      extra={cfg?.updated_at ? <Text type="secondary">更新于 {new Date(cfg.updated_at).toLocaleString('zh-CN')}</Text> : null}
+      extra={
+        cfg?.updated_at ? (
+          <Text type="secondary" style={{ fontSize: 12 }}>
+            更新于 {new Date(cfg.updated_at).toLocaleString('zh-CN')}
+          </Text>
+        ) : null
+      }
     >
-      <p style={{ color: '#777', marginTop: 0 }}>
-        Android 用户点击「{meta.action}」后，前若干次在等候浮层广告位播放本视频并奖励金币。
-        次数按账号、按功能分别计算；开播即计次，播完或中途关闭均发放当次配置的金币。
+      <p style={{ color: '#999', marginTop: 0 }}>
+        用户点「一键自动领取」后出现的等候浮层，下方那块广告位<b>前 3 次</b>改放这支引导视频。
+        视频<b>不可快进</b>；播完或中途关闭都算看完，各发一次 <b>120 金币</b>；播完若浮层还开着，会自动接着放广告。
+        次数<b>按账号</b>计（换设备不重置），<b>视频一开播就算用掉一次</b>。
+        次数与金币走固定值、后台不开放调整；这里只管<b>开关</b>和<b>换片</b>，每次改动进审计日志。
       </p>
       {loading || !cfg ? (
         <Spin style={{ display: 'block', margin: '24px 0' }} />
       ) : (
         <Space align="start" size={32} wrap>
-          <div style={{ width: 240 }}>
-            {cfg.video_url ? (
-              // eslint-disable-next-line jsx-a11y/media-has-caption
-              <video
-                src={mediaUrl(cfg.video_url)}
-                controls
-                style={{ width: 240, maxHeight: 420, borderRadius: 12, background: '#000' }}
-              />
-            ) : (
-              <div style={{ height: 280, border: '1px dashed #d9d9d9', borderRadius: 12, display: 'grid', placeItems: 'center', color: '#aaa' }}>
-                未上传视频
+          {/* 左:视频预览 */}
+          <div>
+            <Text type="secondary" style={{ fontSize: 12 }}>
+              当前引导视频
+            </Text>
+            <div style={{ marginTop: 8, width: 240 }}>
+              {cfg.video_url ? (
+                // eslint-disable-next-line jsx-a11y/media-has-caption
+                <video
+                  src={mediaUrl(cfg.video_url)}
+                  controls
+                  style={{
+                    width: 240,
+                    maxHeight: 420,
+                    borderRadius: 12,
+                    background: '#000',
+                    border: '1px solid #f0f0f0',
+                  }}
+                />
+              ) : (
+                <div
+                  style={{
+                    width: 240,
+                    height: 320,
+                    borderRadius: 12,
+                    border: '1px dashed #d9d9d9',
+                    display: 'flex',
+                    alignItems: 'center',
+                    justifyContent: 'center',
+                    color: '#bbb',
+                    fontSize: 13,
+                    textAlign: 'center',
+                    padding: 16,
+                  }}
+                >
+                  未上传视频
+                  <br />
+                  （领券浮层照旧只放广告）
+                </div>
+              )}
+            </div>
+            {!enabled && cfg.video_url && (
+              <div style={{ color: '#fa8c16', fontSize: 12, marginTop: 6 }}>
+                当前为「关闭」：浮层不放引导视频，直接放广告
               </div>
             )}
           </div>
-          <Space direction="vertical" size="middle" style={{ minWidth: 390 }}>
+
+          {/* 右:编辑控件 */}
+          <Space direction="vertical" size="middle" style={{ minWidth: 360 }}>
             <Space>
-              <span>启用：</span>
+              <span>启用引导视频：</span>
               <Switch checked={enabled} disabled={!canEdit} onChange={setEnabled} />
               {!enabled && <Tag color="orange">已关闭</Tag>}
             </Space>
-            <Space>
-              <span>播放次数：</span>
-              <InputNumber min={0} max={50} precision={0} value={maxPlays} disabled={!canEdit} onChange={(v) => setMaxPlays(v ?? 0)} />
-              <Text type="secondary">每个账号前 N 次（默认 3）</Text>
-            </Space>
-            <Space>
-              <span>每次金币：</span>
-              <InputNumber min={0} max={10000} precision={0} value={rewardCoin} disabled={!canEdit} onChange={(v) => setRewardCoin(v ?? 0)} />
-              <Text type="secondary">默认 100</Text>
-            </Space>
+
             <Space wrap>
               <Upload accept="video/mp4,.mp4" showUploadList={false} beforeUpload={beforeUpload} disabled={!canEdit}>
                 <Button icon={<UploadOutlined />} loading={uploading} disabled={!canEdit}>
@@ -168,26 +195,28 @@ function SceneConfig({ scene }: { scene: Scene }) {
                 </Button>
               </Upload>
               {cfg.video_url && (
-                <Button icon={<DeleteOutlined />} danger loading={uploading} disabled={!canEdit} onClick={removeVideo}>
+                <Button
+                  icon={<DeleteOutlined />}
+                  danger
+                  loading={uploading}
+                  disabled={!canEdit}
+                  onClick={removeVideo}
+                >
                   移除视频
                 </Button>
               )}
-              <Text type="secondary">MP4（H.264），≤100MB</Text>
+              <Text type="secondary" style={{ fontSize: 12 }}>
+                MP4（H.264），≤100MB
+              </Text>
             </Space>
-            <Button type="primary" loading={saving} disabled={!canEdit} onClick={save}>保存配置</Button>
-            <Text type="secondary">累计播放 {cfg.total_plays} 次，已发币 {cfg.granted_plays} 次</Text>
+
+            <Button type="primary" loading={saving} disabled={!canEdit} onClick={save}>
+              保存开关
+            </Button>
+            {!canEdit && <Text type="secondary">仅 operator / super_admin 可修改</Text>}
           </Space>
         </Space>
       )}
     </Card>
   );
 }
-
-export default function GuideVideoConfig() {
-  return (
-    <>
-      <SceneConfig scene="coupon" />
-      <SceneConfig scene="comparison" />
-    </>
-  );
-}

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

@@ -165,7 +165,7 @@ export default function ConfigPage() {
           },
           { key: 'welfare', label: '福利页', children: welfareConfig },
           { key: 'feedback-qr', label: '反馈二维码', children: <FeedbackQrConfig /> },
-          { key: 'guide-video', label: '引导视频奖励', children: <GuideVideoConfig /> },
+          { key: 'guide-video', label: '领券引导视频', children: <GuideVideoConfig /> },
         ]}
       />
     </div>

src/lib/types.ts

@@ -406,7 +406,6 @@ export interface FeedbackQrConfig {
 /** 领券等候浮层的「新手引导视频」配置(前 3 次用它替代广告,每次固定 120 金币)。
  *  后台只开放 enabled + 换片;下面几个字段接口仍返回,但页面不展示、也不回传。 */
 export interface GuideVideoConfig {
-  scene: 'coupon' | 'comparison';
   enabled: boolean;
   video_url: string | null; // /media/guide_video/xxx.mp4;null = 未配片(浮层照旧只放广告)
   max_plays: number; // 每个账号前 N 次浮层放引导视频(服务端默认 3,后台不开放调整)
@@ -543,8 +542,6 @@ export interface AdRevenueRecord {
   expected_coin: number;
   actual_coin: number;
   matched: boolean;
-  adn: string | null; // 本条发奖对应的实际填充 ADN
-  slot_id: string | null; // 本条发奖对应的底层 mediation rit
 }
 
 // 广告收益报表:按日期汇总的一天(按天趋势图用;全量,不受分页影响)