From 4e670ad774d99a1c14205fe1faa046e00bc013b3 Mon Sep 17 00:00:00 2001 From: hailin Date: Tue, 23 Dec 2025 21:00:31 -0800 Subject: [PATCH] =?UTF-8?q?fix(wallet):=20=E9=9A=90=E8=97=8F=E4=B8=B4?= =?UTF-8?q?=E6=97=B6=E6=B5=81=E6=B0=B4=E8=AE=B0=E5=BD=95=E5=B9=B6=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E5=85=85=E5=80=BC=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在流水明细查询中排除冻结/解冻等临时记录 - 将"充值 (KAVA)"统一改为"充值" 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 --- .../services/wallet-application.service.ts | 4 ++-- .../repositories/ledger-entry.repository.impl.ts | 15 ++++++++++++++- .../lib/core/services/wallet_service.dart | 4 ++-- .../presentation/pages/ledger_detail_page.dart | 2 +- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/backend/services/wallet-service/src/application/services/wallet-application.service.ts b/backend/services/wallet-service/src/application/services/wallet-application.service.ts index d16634fc..31500dd5 100644 --- a/backend/services/wallet-service/src/application/services/wallet-application.service.ts +++ b/backend/services/wallet-service/src/application/services/wallet-application.service.ts @@ -2115,8 +2115,8 @@ export class WalletApplicationService { */ private getEntryTypeName(entryType: string): string { const nameMap: Record = { - DEPOSIT_KAVA: '充值绿积分', - DEPOSIT_BSC: '充值 (BSC)', + DEPOSIT_KAVA: '充值', + DEPOSIT_BSC: '充值', PLANT_PAYMENT: '认种支付', PLANT_FREEZE: '认种冻结', PLANT_UNFREEZE: '认种解冻', diff --git a/backend/services/wallet-service/src/infrastructure/persistence/repositories/ledger-entry.repository.impl.ts b/backend/services/wallet-service/src/infrastructure/persistence/repositories/ledger-entry.repository.impl.ts index 95ca967e..bcd6f481 100644 --- a/backend/services/wallet-service/src/infrastructure/persistence/repositories/ledger-entry.repository.impl.ts +++ b/backend/services/wallet-service/src/infrastructure/persistence/repositories/ledger-entry.repository.impl.ts @@ -46,14 +46,27 @@ export class LedgerEntryRepositoryImpl implements ILedgerEntryRepository { }); } + // 临时性流水类型，不在流水明细中显示 + private static readonly HIDDEN_ENTRY_TYPES = [ + 'PLANT_FREEZE', // 认种冻结（临时） + 'PLANT_UNFREEZE', // 认种解冻（回滚） + 'FREEZE', // 通用冻结（临时） + 'UNFREEZE', // 通用解冻（回滚） + ]; + async findByUserId( userId: bigint, filters?: LedgerFilters, pagination?: Pagination, ): Promise> { - const where: Record = { userId }; + const where: Record = { + userId, + // 排除临时性流水类型 + entryType: { notIn: LedgerEntryRepositoryImpl.HIDDEN_ENTRY_TYPES }, + }; if (filters?.entryType) { + // 如果用户指定了类型筛选，则使用用户指定的类型 where.entryType = filters.entryType; } if (filters?.assetType) { diff --git a/frontend/mobile-app/lib/core/services/wallet_service.dart b/frontend/mobile-app/lib/core/services/wallet_service.dart index ba174147..f81d7899 100644 --- a/frontend/mobile-app/lib/core/services/wallet_service.dart +++ b/frontend/mobile-app/lib/core/services/wallet_service.dart @@ -780,8 +780,8 @@ class LedgerEntry { /// 获取流水类型中文名 String get entryTypeName { const nameMap = { - 'DEPOSIT_KAVA': '充值 (KAVA)', - 'DEPOSIT_BSC': '充值 (BSC)', + 'DEPOSIT_KAVA': '充值', + 'DEPOSIT_BSC': '充值', 'PLANT_PAYMENT': '认种支付', 'PLANT_FREEZE': '认种冻结', 'PLANT_UNFREEZE': '认种解冻', diff --git a/frontend/mobile-app/lib/features/trading/presentation/pages/ledger_detail_page.dart b/frontend/mobile-app/lib/features/trading/presentation/pages/ledger_detail_page.dart index cfd7d9e8..072f8bab 100644 --- a/frontend/mobile-app/lib/features/trading/presentation/pages/ledger_detail_page.dart +++ b/frontend/mobile-app/lib/features/trading/presentation/pages/ledger_detail_page.dart @@ -41,7 +41,7 @@ class _LedgerDetailPageState extends ConsumerState {'value': 'REWARD_EXPIRED', 'label': '奖励过期'}, {'value': 'WITHDRAWAL', 'label': '提现'}, {'value': 'REWARD_SETTLED', 'label': '结算'}, - {'value': 'DEPOSIT_KAVA', 'label': '充值绿积分'}, + {'value': 'DEPOSIT_KAVA', 'label': '充值'}, ]; @override