fix: remove truncated management totals

This commit is contained in:
hectorzhao
2026-07-12 10:56:00 +08:00
parent 24cb632a45
commit 390b970032
19 changed files with 107 additions and 80 deletions
+29 -3
View File
@@ -125,6 +125,31 @@ function buildRegionStats(messages: SmsMessageRecord[] | undefined): RegionStat[
return Array.from(stats.values()).sort((a, b) => b.total - a.total);
}
function buildCarrierStatsFromAggregates(stats: SmsBatchTask['messageStats']): CarrierStat[] {
const totals = new Map<string, CarrierStat>();
(stats ?? []).forEach((item) => {
const carrier = item.carrier ?? 'unknown';
const meta = carrierLabels[carrier] ?? { label: carrier || '未识别', tone: 'mobile' as const };
const current = totals.get(carrier) ?? { name: meta.label, total: 0, success: 0, tone: meta.tone };
current.total += item._count._all;
if (item.status === 'delivered') current.success += item._count._all;
totals.set(carrier, current);
});
return Array.from(totals.values());
}
function buildRegionStatsFromAggregates(stats: SmsBatchTask['messageStats']): RegionStat[] {
const totals = new Map<string, RegionStat>();
(stats ?? []).forEach((item) => {
const region = item.province ?? '未识别省份';
const current = totals.get(region) ?? { region, total: 0, success: 0 };
current.total += item._count._all;
if (item.status === 'delivered') current.success += item._count._all;
totals.set(region, current);
});
return Array.from(totals.values()).sort((a, b) => b.total - a.total);
}
function mapTask(task: SmsBatchTask): SmsTask {
const messages = task.messages ?? [];
const submittedStatuses = ['submitted', 'delivered', 'failed', 'unknown', 'timeout', 'submit_failed'];
@@ -134,7 +159,8 @@ function mapTask(task: SmsBatchTask): SmsTask {
const failedCount = task.failedTotal ?? countMessages(messages, failedStatuses);
// submittedTotal already includes unknown and timeout records, so never add them again.
const processedCount = Math.max(submittedCount, successCount + failedCount + (task.unknownTotal ?? 0));
const billingCount = messages.reduce((sum, message) => sum + (message.billingUnits ?? 0), 0)
const billingCount = (task.messageStats ?? []).reduce((sum, item) => sum + (item._sum.billingUnits ?? 0), 0)
|| messages.reduce((sum, message) => sum + (message.billingUnits ?? 0), 0)
|| task.phoneTotal * (task.template?.billingUnits ?? Math.max(1, Math.ceil([...task.content].length / 67)));
return {
@@ -156,8 +182,8 @@ function mapTask(task: SmsBatchTask): SmsTask {
failedCount,
status: normalizeTaskStatus(task.status),
rawStatus: task.status,
carriers: buildCarrierStats(messages),
regions: buildRegionStats(messages),
carriers: task.messageStats ? buildCarrierStatsFromAggregates(task.messageStats) : buildCarrierStats(messages),
regions: task.messageStats ? buildRegionStatsFromAggregates(task.messageStats) : buildRegionStats(messages),
};
}