diff --git a/frontend/admin-web/src/components/features/system-account-report/SystemAccountsTab.tsx b/frontend/admin-web/src/components/features/system-account-report/SystemAccountsTab.tsx index f966600d..ecb027bf 100644 --- a/frontend/admin-web/src/components/features/system-account-report/SystemAccountsTab.tsx +++ b/frontend/admin-web/src/components/features/system-account-report/SystemAccountsTab.tsx @@ -26,7 +26,7 @@ import type { OfflineSettlementEntriesResponse, OfflineSettlementEntryDTO, } from '@/types'; -import { ENTRY_TYPE_LABELS, ACCOUNT_TYPE_LABELS, FEE_TYPE_LABELS, REWARD_RIGHT_TYPE_LABELS, REWARD_STATUS_LABELS, FEE_COLLECTION_TYPE_LABELS } from '@/types'; +import { ENTRY_TYPE_LABELS, ACCOUNT_TYPE_LABELS, FEE_TYPE_LABELS, REWARD_RIGHT_TYPE_LABELS, REWARD_STATUS_LABELS, FEE_COLLECTION_TYPE_LABELS, getAccountDisplayName, SYSTEM_ACCOUNT_NAMES, PROVINCE_CODE_NAMES } from '@/types'; import styles from './SystemAccountsTab.module.scss'; /** @@ -296,23 +296,23 @@ export default function SystemAccountsTab() { * [2026-01-05] 更新:根据业务需求调整显示名称,USDT改为绿积分 */ function FixedAccountsSection({ data }: { data: SystemAccountReportResponse['fixedAccounts'] }) { + // [2026-01-07] 更新:使用 SYSTEM_ACCOUNT_NAMES 映射获取正式名称 const accounts = [ - { key: 'costAccount', label: '总部储备', sequence: 'S0000000001', data: data.costAccount }, - { key: 'operationAccount', label: '运营账户1', sequence: 'S0000000002', data: data.operationAccount }, - { key: 'hqCommunity', label: '运营账户2', sequence: 'S0000000003', data: data.hqCommunity }, - { key: 'rwadPoolPending', label: '积分股池', sequence: 'S0000000004', data: data.rwadPoolPending }, - { key: 'platformFee', label: '平台手续费', sequence: 'S0000000005', data: data.platformFee }, + { key: 'costAccount', sequence: 'S0000000001', data: data.costAccount }, + { key: 'operationAccount', sequence: 'S0000000002', data: data.operationAccount }, + { key: 'hqCommunity', sequence: 'S0000000003', data: data.hqCommunity }, + { key: 'rwadPoolPending', sequence: 'S0000000004', data: data.rwadPoolPending }, + { key: 'platformFee', sequence: 'S0000000005', data: data.platformFee }, ]; return (
| 区域代码 | -区域名称 | +区域 | 余额 (绿积分) | 累计收入 (绿积分) | 状态 | @@ -384,8 +383,8 @@ function RegionAccountsSection({ data, type }: { data: RegionAccountsSummary; ty|||||
|---|---|---|---|---|---|---|---|---|---|---|
| {account.regionCode || '-'} | -{account.regionName || '-'} | + {/* [2026-01-07] 更新:合并显示区域名称和编码 */} +{account.regionName ? `${account.regionName} (${account.regionCode})` : account.regionCode || '-'} | {formatAmount(account.usdtBalance)} | {formatAmount(account.totalReceived)} | @@ -519,7 +518,8 @@ function OfflineSettlementSection({ data }: { data: SystemAccountReportResponse[ | |||||
| {entry.accountSequence} | + {/* [2026-01-07] 更新:使用 getAccountDisplayName 显示账户名称和编码 */} +{getAccountDisplayName(entry.accountSequence)} | {formatAmount(entry.amount)} | {entry.memo || '-'} | {new Date(entry.createdAt).toLocaleString('zh-CN')} | @@ -704,14 +704,15 @@ function LedgerSection({ {/* 固定系统账户分类账 */} + {/* [2026-01-07] 更新:使用 getAccountDisplayName 显示账户名称和编码 */} {data.fixedAccountsLedger && data.fixedAccountsLedger.length > 0 && (||||||
| {new Date(entry.createdAt).toLocaleString('zh-CN')} | -{entry.accountSequence} | + {/* [2026-01-07] 更新:使用 getAccountDisplayName 显示账户名称和编码 */} +{getAccountDisplayName(entry.accountSequence)} | {entry.sourceOrderId} | {formatAmount(entry.usdtAmount)} |
diff --git a/frontend/admin-web/src/types/system-account.types.ts b/frontend/admin-web/src/types/system-account.types.ts
index 2d8de42b..f1ead3a1 100644
--- a/frontend/admin-web/src/types/system-account.types.ts
+++ b/frontend/admin-web/src/types/system-account.types.ts
@@ -380,3 +380,122 @@ export const FEE_COLLECTION_TYPE_LABELS: Record |