fix:提交修复6个问题

server/dukang-api/src/modules/iam/auth.service.ts

@@ -217,8 +217,14 @@ export class AuthService {
       if (existing) throw new BadRequestException('该手机号已绑定门店');
       return;
     }
-    if (scene === SmsScene.PARTNER_LOGIN || scene === SmsScene.PARTNER_STAFF_ADD) {
+    if (scene === SmsScene.PARTNER_LOGIN) {
       await this.assertPartnerAccountByPhone(phone);
+      return;
+    }
+    if (scene === SmsScene.PARTNER_STAFF_ADD) {
+      const existing = await this.prisma.partnerAccount.findUnique({ where: { phone } });
+      if (existing) throw new BadRequestException('该手机号已被使用');
+      return;
     }
   }
 
@@ -602,6 +608,7 @@ export class AuthService {
       name: account.name,
       phone: account.phone,
       isPrimary: account.isPrimary === 1,
+      staffRole: account.staffRole ?? undefined,
       companyName: account.partner.companyName,
     });
   }
@@ -1152,6 +1159,7 @@ export class AuthService {
       name: account.name,
       phone: account.phone,
       isPrimary: account.isPrimary === 1,
+      staffRole: account.staffRole ?? undefined,
       companyName: account.partner.companyName,
     });
   }

server/dukang-api/src/modules/iam/dto/partner-staff.dto.ts

@@ -0,0 +1,36 @@
+import { IsIn, IsNotEmpty, IsOptional, IsString } from 'class-validator';
+import { AccountStatus, PartnerStaffRole } from '@dukang/shared-types';
+
+export class CreatePartnerStaffDto {
+  @IsString()
+  @IsNotEmpty()
+  phone: string;
+
+  @IsString()
+  @IsNotEmpty()
+  name: string;
+
+  @IsString()
+  @IsIn(Object.values(PartnerStaffRole))
+  staffRole: string;
+
+  @IsString()
+  @IsNotEmpty()
+  code: string;
+}
+
+export class UpdatePartnerStaffDto {
+  @IsString()
+  @IsOptional()
+  name?: string;
+
+  @IsString()
+  @IsIn(Object.values(PartnerStaffRole))
+  @IsOptional()
+  staffRole?: string;
+
+  @IsString()
+  @IsIn(Object.values(AccountStatus))
+  @IsOptional()
+  status?: string;
+}

server/dukang-api/src/modules/iam/iam.module.ts

@@ -11,11 +11,14 @@ import {
 } from './auth.controller';
 import { UserAddressController } from './user-address.controller';
 import { UserAddressService } from './user-address.service';
+import { PartnerStaffController } from './partner-staff.controller';
+import { PartnerStaffService } from './partner-staff.service';
 import { AdminAuthController } from './admin-auth.controller';
 import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
 import { PhoneVerifiedGuard } from '../../common/guards/phone-verified.guard';
 import { OptionalJwtAuthGuard } from '../../common/guards/optional-jwt-auth.guard';
 import { HqAuthGuard } from '../../common/guards/hq-auth.guard';
+import { PartnerPrimaryGuard } from '../../common/guards/partner-primary.guard';
 
 @Module({
   imports: [
@@ -30,11 +33,12 @@ import { HqAuthGuard } from '../../common/guards/hq-auth.guard';
     UserAuthController,
     ShopAuthController,
     PartnerAuthController,
+    PartnerStaffController,
     UserProfileController,
     UserAddressController,
     AdminAuthController,
   ],
-  providers: [AuthService, UserAddressService, JwtAuthGuard, PhoneVerifiedGuard, OptionalJwtAuthGuard, HqAuthGuard],
-  exports: [AuthService, UserAddressService, JwtModule, JwtAuthGuard, PhoneVerifiedGuard, OptionalJwtAuthGuard, HqAuthGuard],
+  providers: [AuthService, UserAddressService, PartnerStaffService, JwtAuthGuard, PhoneVerifiedGuard, OptionalJwtAuthGuard, HqAuthGuard, PartnerPrimaryGuard],
+  exports: [AuthService, UserAddressService, PartnerStaffService, JwtModule, JwtAuthGuard, PhoneVerifiedGuard, OptionalJwtAuthGuard, HqAuthGuard, PartnerPrimaryGuard],
 })
 export class IamModule {}

server/dukang-api/src/modules/iam/partner-staff.controller.ts

@@ -0,0 +1,36 @@
+import { Body, Controller, Delete, Get, Param, Post, Put, UseGuards } from '@nestjs/common';
+import { JwtAuthGuard, AuthUser } from '../../common/guards/jwt-auth.guard';
+import { PartnerPrimaryGuard } from '../../common/guards/partner-primary.guard';
+import { CurrentUser } from '../../common/decorators/current-user.decorator';
+import { PartnerStaffService } from './partner-staff.service';
+import { CreatePartnerStaffDto, UpdatePartnerStaffDto } from './dto/partner-staff.dto';
+
+@Controller('partner/staff')
+@UseGuards(JwtAuthGuard, PartnerPrimaryGuard)
+export class PartnerStaffController {
+  constructor(private readonly staffService: PartnerStaffService) {}
+
+  @Get()
+  list(@CurrentUser() user: AuthUser) {
+    return this.staffService.listStaff(user.actorId);
+  }
+
+  @Post()
+  create(@CurrentUser() user: AuthUser, @Body() dto: CreatePartnerStaffDto) {
+    return this.staffService.createStaff(user.actorId, dto);
+  }
+
+  @Put(':id')
+  update(
+    @CurrentUser() user: AuthUser,
+    @Param('id') id: string,
+    @Body() dto: UpdatePartnerStaffDto,
+  ) {
+    return this.staffService.updateStaff(user.actorId, BigInt(id), dto);
+  }
+
+  @Delete(':id')
+  remove(@CurrentUser() user: AuthUser, @Param('id') id: string) {
+    return this.staffService.deleteStaff(user.actorId, BigInt(id));
+  }
+}

server/dukang-api/src/modules/iam/partner-staff.service.ts

@@ -0,0 +1,120 @@
+import {
+  BadRequestException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
+import { PartnerStaffRole, SmsScene } from '@dukang/shared-types';
+import { PrismaService } from '../../common/prisma/prisma.module';
+import { serializeBigInt } from '../../common/decorators/current-user.decorator';
+import { AuthService } from './auth.service';
+import { CreatePartnerStaffDto, UpdatePartnerStaffDto } from './dto/partner-staff.dto';
+
+@Injectable()
+export class PartnerStaffService {
+  constructor(
+    private readonly prisma: PrismaService,
+    private readonly authService: AuthService,
+  ) {}
+
+  async listStaff(parentAccountId: bigint) {
+    const rows = await this.prisma.partnerAccount.findMany({
+      where: { parentAccountId },
+      orderBy: { createdAt: 'desc' },
+    });
+    return rows.map((row) => this.toStaffItem(row));
+  }
+
+  async createStaff(parentAccountId: bigint, dto: CreatePartnerStaffDto) {
+    const parent = await this.prisma.partnerAccount.findUniqueOrThrow({
+      where: { id: parentAccountId },
+    });
+    if (parent.isPrimary !== 1) {
+      throw new BadRequestException('仅主账号可添加子账号');
+    }
+
+    const phone = dto.phone.trim();
+    if (!/^1[3-9]\d{9}$/.test(phone)) {
+      throw new BadRequestException('请输入正确的手机号码');
+    }
+
+    const existing = await this.prisma.partnerAccount.findUnique({ where: { phone } });
+    if (existing) throw new BadRequestException('该手机号已被使用');
+
+    await this.authService.verifySmsCode(phone, dto.code, SmsScene.PARTNER_STAFF_ADD);
+
+    const name = dto.name.trim();
+    if (!name) throw new BadRequestException('请填写真实姓名');
+
+    const account = await this.prisma.partnerAccount.create({
+      data: {
+        partnerId: parent.partnerId,
+        phone,
+        name,
+        staffRole: dto.staffRole as PartnerStaffRole,
+        isPrimary: 0,
+        parentAccountId: parent.id,
+        status: 'DISABLED',
+      },
+    });
+
+    return this.toStaffItem(account);
+  }
+
+  async updateStaff(parentAccountId: bigint, staffId: bigint, dto: UpdatePartnerStaffDto) {
+    const staff = await this.assertStaffOwned(parentAccountId, staffId);
+    const data: Record<string, unknown> = {};
+    if (dto.name !== undefined) {
+      const name = dto.name.trim();
+      if (!name) throw new BadRequestException('请填写真实姓名');
+      data.name = name;
+    }
+    if (dto.staffRole !== undefined) {
+      data.staffRole = dto.staffRole as PartnerStaffRole;
+    }
+    if (dto.status !== undefined) {
+      data.status = dto.status;
+    }
+    const updated = await this.prisma.partnerAccount.update({
+      where: { id: staff.id },
+      data,
+    });
+    return this.toStaffItem(updated);
+  }
+
+  async deleteStaff(parentAccountId: bigint, staffId: bigint) {
+    const staff = await this.assertStaffOwned(parentAccountId, staffId);
+    await this.prisma.partnerAccount.delete({ where: { id: staff.id } });
+    return { ok: true };
+  }
+
+  private async assertStaffOwned(parentAccountId: bigint, staffId: bigint) {
+    const staff = await this.prisma.partnerAccount.findFirst({
+      where: { id: staffId, parentAccountId },
+    });
+    if (!staff) throw new NotFoundException('子账号不存在');
+    return staff;
+  }
+
+  private toStaffItem(row: {
+    id: bigint;
+    name: string;
+    phone: string;
+    staffRole: string | null;
+    status: string;
+    lastLoginAt: Date | null;
+  }) {
+    return serializeBigInt({
+      id: row.id.toString(),
+      name: row.name,
+      phone: this.maskPhone(row.phone),
+      staffRole: row.staffRole ?? PartnerStaffRole.INTERNAL,
+      status: row.status,
+      lastLoginAt: row.lastLoginAt?.toISOString(),
+    });
+  }
+
+  private maskPhone(phone: string): string {
+    if (phone.length !== 11) return phone;
+    return `${phone.slice(0, 3)} **** ${phone.slice(7)}`;
+  }
+}