diff --git a/backend/services/planting-service/src/pre-planting/application/services/pre-planting-reward.service.ts b/backend/services/planting-service/src/pre-planting/application/services/pre-planting-reward.service.ts index 188f71eb..b2c92ba9 100644 --- a/backend/services/planting-service/src/pre-planting/application/services/pre-planting-reward.service.ts +++ b/backend/services/planting-service/src/pre-planting/application/services/pre-planting-reward.service.ts @@ -196,9 +196,9 @@ export class PrePlantingRewardService { ] = await Promise.all([ this.referralClient.getReferralChain(accountSequence), this.authorizationClient.getCommunityDistribution(accountSequence), - this.authorizationClient.getProvinceAreaDistribution(provinceCode, portionCount), + this.authorizationClient.getProvinceAreaDistribution(provinceCode), this.authorizationClient.getProvinceTeamDistribution(accountSequence), - this.authorizationClient.getCityAreaDistribution(cityCode, portionCount), + this.authorizationClient.getCityAreaDistribution(cityCode), this.authorizationClient.getCityTeamDistribution(accountSequence), ]); diff --git a/backend/services/planting-service/src/pre-planting/infrastructure/external/pre-planting-authorization.client.ts b/backend/services/planting-service/src/pre-planting/infrastructure/external/pre-planting-authorization.client.ts index 926aadae..f85c4c2e 100644 --- a/backend/services/planting-service/src/pre-planting/infrastructure/external/pre-planting-authorization.client.ts +++ b/backend/services/planting-service/src/pre-planting/infrastructure/external/pre-planting-authorization.client.ts @@ -65,19 +65,18 @@ export class PrePlantingAuthorizationClient { * 省区域权益分配对象 * * [2026-02-28] 修复: - * 1. 传 treeCount 参数(authorization-service 必需,用于省公司月度考核累计) + * 1. 传 treeCount=0(预种阶段不计入省公司月度考核,等合成1棵树后再累计) * 2. 正确解析 { distributions: [{accountSequence, ...}] } 返回格式(之前错误地期望 { accountSequence }) * 3. fallback 路径添加 padStart(6,'0'),确保生成 7 位标准格式(如 9440000 而非 944) */ async getProvinceAreaDistribution( provinceCode: string, - portionCount: number = 1, ): Promise { try { const response = await firstValueFrom( this.httpService.get<{ distributions: AreaDistributionItem[] }>( `${this.baseUrl}/internal/authorization/province-area-reward-distribution`, - { params: { provinceCode, treeCount: portionCount } }, + { params: { provinceCode, treeCount: 0 } }, ), ); @@ -141,19 +140,18 @@ export class PrePlantingAuthorizationClient { * 市区域权益分配对象 * * [2026-02-28] 修复:与省区域同样的三个问题 - * 1. 传 treeCount 参数 + * 1. 传 treeCount=0(预种阶段不计入市公司月度考核,等合成1棵树后再累计) * 2. 正确解析 { distributions: [...] } 返回格式 * 3. fallback 路径添加 padStart(6,'0'),确保生成 7 位标准格式(如 8440100 而非 84401) */ async getCityAreaDistribution( cityCode: string, - portionCount: number = 1, ): Promise { try { const response = await firstValueFrom( this.httpService.get<{ distributions: AreaDistributionItem[] }>( `${this.baseUrl}/internal/authorization/city-area-reward-distribution`, - { params: { cityCode, treeCount: portionCount } }, + { params: { cityCode, treeCount: 0 } }, ), );