diff --git a/apps/admin-web/src/pages/BigScreenPage.tsx b/apps/admin-web/src/pages/BigScreenPage.tsx index 3494fe2..d85e78f 100644 --- a/apps/admin-web/src/pages/BigScreenPage.tsx +++ b/apps/admin-web/src/pages/BigScreenPage.tsx @@ -41,11 +41,20 @@ function formatOrderTime(iso: string): string { } } +// function formatAmount(n: number): string { +// return Number(n || 0).toLocaleString('zh-CN', { +// minimumFractionDigits: 0, +// maximumFractionDigits: 0, +// }); +// } + function formatAmount(n: number): string { - return Number(n || 0).toLocaleString('zh-CN', { - minimumFractionDigits: 0, - maximumFractionDigits: 0, - }); + const num = Number(n || 0); + // 先保留两位小数,再分割处理 + const fixed = num.toFixed(2); + const [intStr, decStr] = fixed.split('.'); + const intFormatted = Number(intStr).toLocaleString('zh-CN'); + return decStr === '00' ? intFormatted : `${intFormatted}.${decStr}`; } function amountCssClass(payAmount: number, base: string): string { diff --git a/server/dukang-api/src/modules/ops/admin-orders.service.ts b/server/dukang-api/src/modules/ops/admin-orders.service.ts index 188b242..d440b94 100644 --- a/server/dukang-api/src/modules/ops/admin-orders.service.ts +++ b/server/dukang-api/src/modules/ops/admin-orders.service.ts @@ -32,7 +32,6 @@ export class AdminOrdersService { startOfToday.setHours(0, 0, 0, 0); const orders = await this.prisma.order.findMany({ where: { - payAmount: { gte: 100 }, payStatus: 'PAID', paidAt: { gte: startOfToday }, },