Merge branch 'main' into codex/coupon-point-score

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

@@ -66,101 +66,21 @@ const APP_TAG: Record<string, { color: string; label: string }> = {
   test: { color: 'default', label: '测试应用' },
 };
 
-const REWARD_STATUS_HINT: Record<string, string> = {
-  granted: '已完成金币发放',
-  capped: '次数超限，未发金币',
-  ecpm_missing: '缺少有效 eCPM，未发金币',
-  too_short: '播放时长未达到发奖条件，未发金币',
-  closed_early: '用户提前关闭广告，未发金币',
-};
-
-const PLAYBACK_STATUS_TAG: Record<string, { color: string; label: string }> = {
-  completed: { color: 'green', label: '已完成' },
-  too_short: { color: 'gold', 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: '提前关闭' },
-  unknown: { color: 'default', label: '未知' },
 };
-
-const ZERO_REVENUE_REWARD_VIDEO_STATUSES = new Set(['closed_early', 'too_short']);
-
-function rewardStatuses(row: AdRevenueRow): string[] {
-  if (row.sub_rewards?.length) return row.sub_rewards.map((reward) => reward.status);
-  return row.status ? [row.status] : [];
-}
-
-function effectiveRevenueYuan(row: AdRevenueRow): number {
-  if (
-    row.ad_type === 'reward_video'
-    && rewardStatuses(row).some((status) => ZERO_REVENUE_REWARD_VIDEO_STATUSES.has(status))
-  ) {
-    return 0;
-  }
-  return row.row_revenue_yuan ?? row.revenue_yuan;
-}
-
-function rewardStatusTag(row: AdRevenueRow) {
-  const statuses = rewardStatuses(row);
-  if (!row.has_reward || statuses.length === 0) {
-    return { color: 'default', label: '无记录', hint: '仅记录到广告展示，没有对应发奖记录。' };
-  }
-
-  const grantedCount = statuses.filter((status) => status === 'granted').length;
-  const reasonSummary = Object.entries(
-    statuses
-      .filter((status) => status !== 'granted')
-      .reduce<Record<string, number>>((counts, status) => {
-        counts[status] = (counts[status] ?? 0) + 1;
-        return counts;
-      }, {}),
-  )
-    .map(([status, count]) => `${REWARD_STATUS_HINT[status] ?? status} ${count} 条`)
-    .join('；');
-
-  if (grantedCount === statuses.length) {
-    return { color: 'green', label: '已发', hint: `已完成金币发放${statuses.length > 1 ? ` ${statuses.length} 条` : ''}。` };
-  }
-  if (grantedCount > 0) {
-    return {
-      color: 'blue',
-      label: '部分已发',
-      hint: `已发 ${grantedCount} 条，未发 ${statuses.length - grantedCount} 条${reasonSummary ? `；${reasonSummary}` : ''}。`,
-    };
-  }
-  return { color: 'default', label: '未发', hint: reasonSummary ? `${reasonSummary}。` : '未发放金币。' };
-}
-
-function playbackStatusTag(row: AdRevenueRow) {
-  const statuses = rewardStatuses(row);
-  if (statuses.length === 0) {
-    return row.has_impression
-      ? { color: 'blue', label: '仅展示', hint: '记录到广告展示，但没有对应的播放结果。' }
-      : { color: 'default', label: '无记录', hint: '没有可用的广告播放记录。' };
-  }
-
-  const playbackCounts = statuses.reduce<Record<string, number>>((counts, status) => {
-    const playbackStatus =
-      status === 'too_short' || status === 'closed_early'
-        ? status
-        : status === 'granted' || status === 'capped' || status === 'ecpm_missing'
-          ? 'completed'
-          : 'unknown';
-    counts[playbackStatus] = (counts[playbackStatus] ?? 0) + 1;
-    return counts;
-  }, {});
-  const entries = Object.entries(playbackCounts);
-  if (entries.length === 1) {
-    const [status, count] = entries[0];
-    const tag = PLAYBACK_STATUS_TAG[status];
-    return {
-      ...tag,
-      hint: `${tag.label}${count > 1 ? ` ${count} 条` : ''}。`,
-    };
-  }
-  const hint = entries
-    .map(([status, count]) => `${PLAYBACK_STATUS_TAG[status].label} ${count} 条`)
-    .join('；');
-  return { color: 'purple', label: '部分完成', hint: `${hint}。` };
-}
+const STATUS_HINT: Record<string, string> = {
+  granted: '已满足当前客户端发奖条件并完成金币发放。',
+  too_short: '旧版 Draw 信息流观看不足 10 秒，不发金币；新版按观看比例发放时会记为已发。',
+  closed_early: '用户在达到发奖条件前主动关闭，不发金币。',
+  capped: '已达到次数上限，不再发金币。',
+  ecpm_missing: '缺少有效 eCPM，无法计算金币。',
+};
 
 const fmtFactorRange = (a: number | null, b: number | null) => {
   if (a == null) return '-';
@@ -558,25 +478,19 @@ export default function AdRevenueReportPage() {
       width: 110,
       align: 'right',
       // 一次比价/领券聚合行用 row_revenue_yuan(该次发奖广告 eCPM 折算之和),其它行用展示侧 revenue_yuan
-      // 激励视频提前关闭/时长不足时防御性显示 0，与后端有效收益口径一致。
-      render: (_v: number, r: AdRevenueRow) => effectiveRevenueYuan(r).toFixed(4),
-    },
-    {
-      title: '发奖状态',
-      key: 'reward_status',
-      width: 100,
-      render: (_: unknown, row: AdRevenueRow) => {
-        const tag = rewardStatusTag(row);
-        return <Tooltip title={tag.hint}><Tag color={tag.color}>{tag.label}</Tag></Tooltip>;
+      render: (v: number, r: AdRevenueRow) => {
+        const rev = r.row_revenue_yuan ?? v;
+        return rev.toFixed(4);
       },
     },
     {
-      title: '广告播放状态',
-      key: 'playback_status',
-      width: 120,
-      render: (_: unknown, row: AdRevenueRow) => {
-        const tag = playbackStatusTag(row);
-        return <Tooltip title={tag.hint}><Tag color={tag.color}>{tag.label}</Tag></Tooltip>;
+      title: '发奖状态',
+      dataIndex: 'status',
+      width: 100,
+      render: (s: string | null) => {
+        if (!s) return <Tooltip title="仅记录广告展示，没有对应发奖事件。"><Tag>仅展示</Tag></Tooltip>;
+        const t = STATUS_TAG[s] ?? { color: 'default', label: s };
+        return <Tooltip title={STATUS_HINT[s]}><Tag color={t.color}>{t.label}</Tag></Tooltip>;
       },
     },
     {
@@ -618,8 +532,7 @@ export default function AdRevenueReportPage() {
     'ecpm_yuan',
     'revenue_yuan',
     'actual_coin',
-    'reward_status',
-    'playback_status',
+    'status',
     'ad_type',
     'app_env',
     'our_code_id',
@@ -705,7 +618,7 @@ export default function AdRevenueReportPage() {
               <br />
               <br />
               「预估收益」为客户端在广告展示(onAdShow)时上报 eCPM 折算的预估值(每千次展示 ÷1000
-              累加);<b>激励视频提前关闭或播放时长不足时按 0 计</b>,其他有效展示按 eCPM 折算。穿山甲仍可能过滤无效曝光,
+              累加),<b>只要广告展示就计入、不论是否看完发奖</b>;穿山甲会过滤无效/过短曝光,故预估值可能偏高,
               <b>实际收益一律以穿山甲后台结算为准</b>。测试应用多为 0。「广告位ID / 来源应用」为本期新增,历史记录留空。
               <br />
               <br />

src/app/(main)/coupon-data/page.tsx

@@ -149,10 +149,6 @@ function PointScorePopover({ row }: { row: CouponDataRow }) {
     return <Typography.Text type="secondary">-</Typography.Text>;
   }
   const score = `${row.point_success_count}/${row.point_total_count}`;
-  const scoreColor =
-    row.point_success_count === row.point_total_count
-      ? STATUS_TAG.completed.color
-      : STATUS_TAG.abandoned.color;
   const loadDetails = async () => {
     if (details !== null || loading) return;
     setLoading(true);
@@ -219,9 +215,7 @@ function PointScorePopover({ row }: { row: CouponDataRow }) {
         </div>
       )}
     >
-      <Button type="link" size="small" style={{ height: 'auto', padding: 0, color: scoreColor }}>
-        {score}
-      </Button>
+      <Button type="link" size="small" style={{ height: 'auto', padding: 0 }}>{score}</Button>
     </Popover>
   );
 }
@@ -602,7 +596,7 @@ export default function CouponDataPage() {
       render: (v: number | null) => fmtSec(v),
     },
     {
-      title: '百分比',
+      title: '点位成功率',
       key: 'point_success_rate',
       width: 110,
       render: (_: unknown, r: CouponDataRow) => <PointScorePopover row={r} />,

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

@@ -499,7 +499,12 @@ export default function DashboardPage() {
   const tokenCostYuan = periodData?.comparison.token_cost_total_yuan ?? null;
   const couponRewardCoinTotal = periodData?.coins.coupon_reward_coin_total;
   const comparisonRewardCoinTotal = periodData?.coins.comparison_reward_coin_total;
-  const regularTaskCoinTotal = periodData?.coins.regular_task_coin_total;
+  const signinCoinTotal = periodData?.coins.signin_coin_total;
+  const signinBoostCoinTotal = periodData?.coins.signin_boost_coin_total;
+  const taskCoinTotal = periodData?.coins.task_coin_total;
+  const regularTaskCoinTotal =
+    periodData?.coins.regular_task_coin_total ??
+    ((signinCoinTotal ?? 0) + (signinBoostCoinTotal ?? 0) + (taskCoinTotal ?? 0));
   const cpsAvailable = data?.cps.available === true;
   const meituanCpsCommissionCents = data?.cps.meituan_commission_cents;
   const jdCpsCommissionCents = data?.cps.jd_commission_cents;
@@ -1072,7 +1077,6 @@ export default function DashboardPage() {
             value={fmtInt(regularTaskCoinTotal)}
             delta={regularTaskCoinRatio.value}
             deltaTone={regularTaskCoinRatio.tone}
-            hint="每日签到、历史签到膨胀、通知/其他任务、上报更低价和反馈采纳的实发金币之和。"
           />
           <StatCard
             title="本期提现金额"

src/app/(main)/layout.tsx

@@ -67,6 +67,8 @@ const NAV_GROUPS: NavGroup[] = [
       { key: '/comparison-records', icon: <ProfileOutlined />, label: '比价记录' },
       { key: '/coupon-data', icon: <GiftOutlined />, label: '领券记录' },
       { key: '/cps', icon: <ShareAltOutlined />, label: 'CPS收益' },
+      { key: '/device-liveness', icon: <HeartOutlined />, label: '设备存活' },
+      { key: '/analytics-health', icon: <LineChartOutlined />, label: '埋点成功率' },
     ],
   },
   {
@@ -90,18 +92,9 @@ const NAV_GROUPS: NavGroup[] = [
       { key: '/users', icon: <UserOutlined />, label: '用户管理' },
     ],
   },
-  {
-    key: 'monitoring-audit',
-    icon: <FileSearchOutlined />,
-    label: '监控审计',
-    children: [
-      { key: '/device-liveness', icon: <HeartOutlined />, label: '设备存活' },
-      { key: '/analytics-health', icon: <LineChartOutlined />, label: '埋点成功率' },
-      { key: '/event-logs', icon: <DatabaseOutlined />, label: '埋点日志' },
-      { key: '/audit-logs', icon: <FileSearchOutlined />, label: '审计日志' },
-    ],
-  },
   { key: '/admins', icon: <TeamOutlined />, label: '权限管理' },
+  { key: '/event-logs', icon: <DatabaseOutlined />, label: '埋点日志' },
+  { key: '/audit-logs', icon: <FileSearchOutlined />, label: '审计日志' },
 ];
 
 // 导航项 key(/dashboard)→ 权限页 key(dashboard),与后端 permissions.py 目录对齐

src/lib/types.ts

@@ -488,7 +488,7 @@ export interface AdRevenueRow {
   has_impression: boolean; // 是否有广告展示(信息流逐条展示=true,纯发奖行=false)
   impressions: number; // 本行展示条数 1/0(供日汇总、趋势图复用)
   ecpm: string | null; // 分/千次;展示行取展示值,纯发奖行取发奖采用值
-  revenue_yuan: number; // 本次有效展示预估收益(元);纯发奖、激励视频提前关闭/时长不足=0
+  revenue_yuan: number; // 本次展示预估收益(元);纯发奖行=0
   row_revenue_yuan?: number | null; // 主表逐行显示用:一次比价/领券聚合行=该次发奖广告 eCPM 折算之和;其它行空(回退 revenue_yuan)
   adn: string | null; // 实际填充 ADN;纯发奖行为空
   slot_id: string | null; // 底层 mediation rit;纯发奖行为空