From 4dcdfb8a3cbfbd5ef1909a336517def5b17ed012 Mon Sep 17 00:00:00 2001 From: hailin Date: Tue, 6 Jan 2026 21:04:02 -0800 Subject: [PATCH] =?UTF-8?q?fix(wallet/reporting):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=89=8B=E7=BB=AD=E8=B4=B9=E5=BD=92=E9=9B=86=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=20API=20=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8=E5=90=8D?= =?UTF-8?q?=E5=92=8C=E5=93=8D=E5=BA=94=E8=A7=A3=E5=8C=85=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - wallet-service: 修复 getFeeCollectionSummary 中原生 SQL 使用错误表名 - 将 ledger_entries 改为 wallet_ledger_entries（Prisma 映射表名） - reporting-service: 修复 getFeeCollectionSummary/Entries 响应解包 - wallet-service 返回 { success, data, timestamp } 格式需要解包 data 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 --- .../external/wallet-service/wallet-service.client.ts | 12 ++++++++---- .../services/wallet-application.service.ts | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/backend/services/reporting-service/src/infrastructure/external/wallet-service/wallet-service.client.ts b/backend/services/reporting-service/src/infrastructure/external/wallet-service/wallet-service.client.ts index d6e84d5e..e6d39fcc 100644 --- a/backend/services/reporting-service/src/infrastructure/external/wallet-service/wallet-service.client.ts +++ b/backend/services/reporting-service/src/infrastructure/external/wallet-service/wallet-service.client.ts @@ -320,6 +320,7 @@ export class WalletServiceClient { } // [2026-01-06] 新增：获取手续费归集账户汇总统计 + // [2026-01-07] 修复：wallet-service 返回 { success, data, timestamp } 包装格式，需要解包 /** * 获取手续费归集账户汇总统计 * 统计 S0000000006 账户收到的所有提现手续费 @@ -330,10 +331,11 @@ export class WalletServiceClient { this.logger.debug(`[getFeeCollectionSummary] 请求: ${url}`); const response = await firstValueFrom( - this.httpService.get(url), + this.httpService.get<{ success: boolean; data: FeeCollectionSummaryResponse; timestamp: string }>(url), ); - return response.data; + // wallet-service 返回 { success, data, timestamp } 包装格式 + return response.data.data; } catch (error) { this.logger.error(`[getFeeCollectionSummary] 失败: ${error.message}`); return { @@ -347,6 +349,7 @@ export class WalletServiceClient { } } + // [2026-01-07] 修复：wallet-service 返回 { success, data, timestamp } 包装格式，需要解包 /** * 获取手续费归集账户流水明细 */ @@ -369,10 +372,11 @@ export class WalletServiceClient { this.logger.debug(`[getFeeCollectionEntries] 请求: ${url}`); const response = await firstValueFrom( - this.httpService.get(url), + this.httpService.get<{ success: boolean; data: FeeCollectionEntriesResponse; timestamp: string }>(url), ); - return response.data; + // wallet-service 返回 { success, data, timestamp } 包装格式 + return response.data.data; } catch (error) { this.logger.error(`[getFeeCollectionEntries] 失败: ${error.message}`); return { 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 6851cb51..c35cecf5 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 @@ -3398,7 +3398,7 @@ export class WalletApplicationService { COALESCE(payload_json->>'feeType', 'UNKNOWN') as "feeType", SUM(amount) as amount, COUNT(*) as count - FROM ledger_entries + FROM wallet_ledger_entries WHERE account_sequence = ${feeAccountSequence} AND entry_type = 'FEE_COLLECTION' GROUP BY COALESCE(payload_json->>'feeType', 'UNKNOWN') @@ -3415,7 +3415,7 @@ export class WalletApplicationService { TO_CHAR(created_at, 'YYYY-MM') as month, SUM(amount) as amount, COUNT(*) as count - FROM ledger_entries + FROM wallet_ledger_entries WHERE account_sequence = ${feeAccountSequence} AND entry_type = 'FEE_COLLECTION' GROUP BY TO_CHAR(created_at, 'YYYY-MM')