fix: complete first version issue remediation

2026-07-11 10:14:37 +08:00
parent 709ac97764
commit 208a6c23f8
73 changed files with 1549 additions and 245 deletions
@@ -131,7 +131,8 @@ function mapTask(task: SmsBatchTask): SmsTask {
  const submittedCount = task.submittedTotal ?? countMessages(messages, submittedStatuses);
  const successCount = task.successTotal ?? countMessages(messages, ['delivered']);
  const failedCount = task.failedTotal ?? countMessages(messages, failedStatuses);
-  const processedCount = submittedCount + (task.unknownTotal ?? 0) + (task.timeoutTotal ?? 0);
+  // 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)
    || task.phoneTotal * (task.template?.billingUnits ?? Math.max(1, Math.ceil([...task.content].length / 67)));

@@ -149,7 +150,7 @@ function mapTask(task: SmsBatchTask): SmsTask {
    scheduledAt: task.scheduledAt,
    submittedCount,
    submittedSuccess: submittedCount,
-    sentCount: Math.max(processedCount, successCount + failedCount),
+    sentCount: Math.min(task.phoneTotal, processedCount),
    successCount,
    failedCount,
    status: normalizeTaskStatus(task.status),
@@ -532,6 +533,8 @@ export function AdminSmsTaskProgressPage() {
          onNext={() => setPage((value) => Math.min(totalPages, value + 1))}
          onPrevious={() => setPage((value) => Math.max(1, value - 1))}
          page={currentPage}
+          totalPages={totalPages}
+          onPageChange={setPage}
          previousDisabled={currentPage <= 1}
          total={filteredTasks.length}
        />