Compare commits

..

1 Commits

Author SHA1 Message Date
linkeyu 16fc253926 优化:将空计算因子显示为可读状态 2026-07-26 20:19:31 +08:00
+88 -33
View File
@@ -9,7 +9,6 @@ import {
Card,
Col,
DatePicker,
Descriptions,
Divider,
InputNumber,
Modal,
@@ -43,8 +42,6 @@ import type {
import UserAdRevenueDrawer from './UserAdRevenueDrawer';
const { RangePicker } = DatePicker;
const DEFAULT_PAGE_SIZE = 50;
const ALL_FILTER_VALUE = '__all__';
// 广告类型标签
const TYPE_TAG: Record<string, { color: string; label: string }> = {
@@ -192,7 +189,61 @@ 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> = [
@@ -210,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),
},
];
@@ -389,13 +447,13 @@ export default function AdRevenueReportPage() {
const [scene, setScene] = useState<string | undefined>();
const [granularity, setGranularity] = useState<'day' | 'hour'>('day');
const [sortBy, setSortBy] = useState<'time' | 'ecpm'>('time'); // 明细排序:time=时间倒序 / ecpm=eCPM 倒序
const [limit, setLimit] = useState<number>(DEFAULT_PAGE_SIZE);
const [limit, setLimit] = useState<number>(1000); // 默认拉满接口单页上限,供单次流程广告数分位统计
const [page, setPage] = useState<number>(1); // 当前页码(后端分页;1 起)
const [queriedGranularity, setQueriedGranularity] = useState<'day' | 'hour'>('day'); // 本次结果对应的粒度,决定是否显示「小时」列
const [queriedMultiDay, setQueriedMultiDay] = useState(false); // 本次结果是否跨多天,决定显示「日期」列 + 按天/按小时图
const [data, setData] = useState<AdRevenueReport | null>(null);
const [allFlowItems, setAllFlowItems] = useState<AdRevenueRow[]>([]);
const [queriedLimit, setQueriedLimit] = useState<number>(DEFAULT_PAGE_SIZE);
const [queriedLimit, setQueriedLimit] = useState<number>(1000);
const [loading, setLoading] = useState(false);
const [formulaOpen, setFormulaOpen] = useState(false);
// 点用户手机号弹出的「用户广告收益详情」半屏抽屉(userId + 手机号;null=关闭)
@@ -777,11 +835,12 @@ export default function AdRevenueReportPage() {
<Space size={6}>
<Typography.Text type="secondary"></Typography.Text>
<Select
value={adType ?? ALL_FILTER_VALUE}
onChange={(value) => setAdType(value === ALL_FILTER_VALUE ? undefined : value)}
placeholder="全部"
value={adType}
onChange={setAdType}
allowClear
style={{ width: 150 }}
options={[
{ value: ALL_FILTER_VALUE, label: '全部' },
{ value: 'reward_video', label: '看视频' },
{ value: 'draw', label: 'Draw 信息流' },
{ value: 'withdrawal_video', label: '提现看视频' },
@@ -791,11 +850,12 @@ export default function AdRevenueReportPage() {
<Space size={6}>
<Typography.Text type="secondary"></Typography.Text>
<Select
value={scene ?? ALL_FILTER_VALUE}
onChange={(value) => setScene(value === ALL_FILTER_VALUE ? undefined : value)}
placeholder="全部"
value={scene}
onChange={setScene}
allowClear
style={{ width: 130 }}
options={[
{ value: ALL_FILTER_VALUE, label: '全部' },
{ value: 'comparison', label: '比价' },
{ value: 'coupon', label: '领券' },
{ value: 'welfare', label: '福利' },
@@ -1126,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>
),
}}