diff --git a/backend/services/contribution-service/src/application/services/contribution-distribution-publisher.service.ts b/backend/services/contribution-service/src/application/services/contribution-distribution-publisher.service.ts index c093675e..e7d440b2 100644 --- a/backend/services/contribution-service/src/application/services/contribution-distribution-publisher.service.ts +++ b/backend/services/contribution-service/src/application/services/contribution-distribution-publisher.service.ts @@ -121,13 +121,14 @@ export class ContributionDistributionPublisherService { return result.systemContributions.map((sys) => ({ accountType: sys.accountType, amount: sys.amount.value.toString(), - // 直接使用 regionCode,没有就用传入的参数 + // 省份代码:PROVINCE 用自己的 regionCode,CITY 需要传递省份代码用于创建省份 provinceCode: sys.accountType === 'PROVINCE' ? sys.regionCode || provinceCode : sys.accountType === 'CITY' - ? sys.regionCode || cityCode + ? provinceCode // CITY 需要省份代码来创建省份(如果省份不存在) : undefined, + // 城市代码:只有 CITY 类型有 cityCode: sys.accountType === 'CITY' ? sys.regionCode || cityCode : undefined, neverExpires: sys.accountType === 'OPERATION', // 运营账户永不过期 diff --git a/backend/services/mining-wallet-service/src/application/services/contribution-wallet.service.ts b/backend/services/mining-wallet-service/src/application/services/contribution-wallet.service.ts index b99b7db0..aa1818cc 100644 --- a/backend/services/mining-wallet-service/src/application/services/contribution-wallet.service.ts +++ b/backend/services/mining-wallet-service/src/application/services/contribution-wallet.service.ts @@ -396,13 +396,13 @@ export class ContributionWalletService { }); this.logger.log(`Auto-created province system account: ${account.code}`); - // 发布系统账户创建事件到 Outbox + // 发布系统账户创建事件到 Outbox(用于 mining-admin-service 同步) await tx.outboxEvent.create({ data: { aggregateType: 'SystemAccount', aggregateId: account.id, eventType: 'WalletSystemAccountCreated', - topic: 'mining-wallet.system-account.created', + topic: 'cdc.mining-wallet.outbox', key: account.code, payload: { id: account.id, @@ -481,13 +481,13 @@ export class ContributionWalletService { }); this.logger.log(`Auto-created city system account: ${account.code}`); - // 发布系统账户创建事件到 Outbox + // 发布系统账户创建事件到 Outbox(用于 mining-admin-service 同步) await tx.outboxEvent.create({ data: { aggregateType: 'SystemAccount', aggregateId: account.id, eventType: 'WalletSystemAccountCreated', - topic: 'mining-wallet.system-account.created', + topic: 'cdc.mining-wallet.outbox', key: account.code, payload: { id: account.id,