fix(authorization): 修复 grantCityCompany 业务验证逻辑

- 添加市区域/省区域互斥检查:同一用户不能同时拥有两种身份
- 添加用户市区域唯一性检查:一个用户只能有一个市区域角色
- 添加城市全局唯一性检查:同一城市只允许一个市区域角色
- 移除错误的 validateAuthorizationRequest 调用(该方法只适用于团队角色)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
hailin 2025-12-14 00:11:13 -08:00
parent 10ce981111
commit 298ce52fc7
1 changed files with 32 additions and 13 deletions

View File

@ -304,27 +304,46 @@ export class AuthorizationApplicationService {
/**
*
*
*
*
* -
* -
*/
async grantCityCompany(command: GrantCityCompanyCommand): Promise<void> {
const userId = UserId.create(command.userId, command.accountSequence)
const adminId = AdminUserId.create(command.adminId, command.adminAccountSequence)
const regionCode = RegionCode.create(command.cityCode)
// 1. 验证团队内唯一性(同一推荐链上不能有重复的相同城市授权)
const validation = await this.validatorService.validateAuthorizationRequest(
userId,
RoleType.CITY_COMPANY,
regionCode,
this.referralRepository,
this.authorizationRepository,
// 1. 检查用户是否已有省区域授权(市区域和省区域互斥)
const existingProvinceCompany = await this.authorizationRepository.findByAccountSequenceAndRoleType(
command.accountSequence,
RoleType.PROVINCE_COMPANY,
)
if (!validation.isValid) {
throw new ApplicationError(validation.errorMessage!)
if (existingProvinceCompany && existingProvinceCompany.status !== AuthorizationStatus.REVOKED) {
throw new ApplicationError(
`用户 ${command.accountSequence} 已拥有省区域角色「${existingProvinceCompany.regionName}」,不能同时拥有市区域角色`,
)
}
// 2. 创建授权
// 2. 检查用户是否已有市区域授权(一个用户只能有一个市区域)
const existingCityCompany = await this.authorizationRepository.findByAccountSequenceAndRoleType(
command.accountSequence,
RoleType.CITY_COMPANY,
)
if (existingCityCompany && existingCityCompany.status !== AuthorizationStatus.REVOKED) {
throw new ApplicationError(
`用户 ${command.accountSequence} 已拥有市区域角色「${existingCityCompany.regionName}」,不能重复授权`,
)
}
// 3. 检查该城市是否已有市区域授权(同一城市全局唯一)
const existingCityRegion = await this.authorizationRepository.findCityCompanyByRegion(command.cityCode)
if (existingCityRegion && existingCityRegion.status !== AuthorizationStatus.REVOKED) {
throw new ApplicationError(
`城市「${command.cityName}」已有市区域角色授权给用户 ${existingCityRegion.userId.accountSequence},不能重复授权`,
)
}
// 4. 创建授权
const authorization = AuthorizationRole.createCityCompany({
userId,
cityCode: command.cityCode,