Compare commits

...

1 Commits

Author SHA1 Message Date
linkeyu 16fc253926 优化:将空计算因子显示为可读状态 2026-07-26 20:19:31 +08:00
+78 -23
View File
@@ -9,7 +9,6 @@ import {
Card, Card,
Col, Col,
DatePicker, DatePicker,
Descriptions,
Divider, Divider,
InputNumber, InputNumber,
Modal, Modal,
@@ -190,7 +189,61 @@ const LT_FACTOR_ROWS = [
{ key: '5', lt: '第 11 条及以后', factor: 1.0 }, { 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 等列) // 展开行(逐条事件展开)- 该条的发奖复算明细(还原金币审计的 eCPM/因子1/份数/LT/因子2 等列)
const DETAIL_COLUMNS: ColumnsType<AdRevenueDetailRow> = [ const DETAIL_COLUMNS: ColumnsType<AdRevenueDetailRow> = [
@@ -208,18 +261,25 @@ const DETAIL_COLUMNS: ColumnsType<AdRevenueDetailRow> = [
render: (v: string | null) => (v == null || Number.isNaN(Number(v)) ? '-' : (Number(v) / 100 / 1000).toFixed(4)), render: (v: string | null) => (v == null || Number.isNaN(Number(v)) ? '-' : (Number(v) / 100 / 1000).toFixed(4)),
}, },
{ title: '实发金币数', dataIndex: 'actual_coin', width: 100 }, { 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', title: '因子2',
key: 'lt_factor', key: 'lt_factor',
width: 90, 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累计条数', title: 'LT累计条数',
key: 'lt_index', key: 'lt_index',
width: 100, 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),
}, },
]; ];
@@ -1126,24 +1186,19 @@ export default function AdRevenueReportPage() {
</div> </div>
) : ( ) : (
<div> <div>
<Typography.Text strong></Typography.Text>{' '} <Typography.Text strong>广</Typography.Text>{' '}
<Typography.Text type="secondary">(,,)</Typography.Text> <Typography.Text type="secondary">
<Descriptions size="small" column={3} bordered style={{ marginTop: 8 }}> ( 1 · 0 / 0)
<Descriptions.Item label="时间">{formatUtcTime(r.created_at)}</Descriptions.Item> </Typography.Text>
<Descriptions.Item label="eCPM(分)">{r.ecpm ?? '-'}</Descriptions.Item> <Table<AdRevenueDetailRow>
<Descriptions.Item label="eCPM(元)"> style={{ marginTop: 8 }}
{r.ecpm != null && !Number.isNaN(Number(r.ecpm)) rowKey="record_id"
? (Number(r.ecpm) / 100).toFixed(2) columns={DETAIL_COLUMNS}
: '-'} dataSource={[impressionOnlyDetail(r)]}
</Descriptions.Item> pagination={false}
<Descriptions.Item label="预估收益(元)"> size="small"
{r.has_impression ? r.revenue_yuan.toFixed(4) : '-'} scroll={{ x: 900 }}
</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>
</div> </div>
), ),
}} }}