城市合伙人端的修改（后台）

server/dukang-api/src/modules/ops/admin-stores.service.ts

@@ -4,6 +4,7 @@ import { PrismaService } from '../../common/prisma/prisma.module';
 import { serializeBigInt } from '../../common/decorators/current-user.decorator';
 import { mapStoreCompat } from '../../common/compat/v31-compat';
 import type { AdminStoreAccountsQueryDto, AdminStoreMediaQueryDto, AdminStoresQueryDto } from './dto/admin-query.dto';
+import { PartnerCityService } from '../city-scope/partner-city.service';
 import type {
   CreateStoreAccountDto,
   CreateStoreDto,
@@ -16,7 +17,10 @@ import type {
 
 @Injectable()
 export class AdminStoresService {
-  constructor(private readonly prisma: PrismaService) {}
+  constructor(
+    private readonly prisma: PrismaService,
+    private readonly partnerCityService: PartnerCityService,
+  ) {}
 
   async listStores(query: AdminStoresQueryDto) {
     const page = query.page ?? 1;
@@ -25,7 +29,7 @@ export class AdminStoresService {
     if (query.name) where.name = { contains: query.name };
     if (query.status) where.status = query.status as Prisma.EnumStoreStatusFilter['equals'];
     if (query.cityId) where.cityId = BigInt(query.cityId);
-    if (query.partnerId) where.partnerId = BigInt(query.partnerId);
+    if (query.partnerId) where.partnerAccountId = BigInt(query.partnerId);
     if (query.phone) where.phone = { contains: query.phone };
 
     const [items, total] = await Promise.all([
@@ -36,7 +40,7 @@ export class AdminStoresService {
         take: pageSize,
         include: {
           cityRef: { select: { id: true, name: true, code: true } },
-          partner: { select: { id: true, companyName: true } },
+          partnerAccount: { select: { id: true, companyName: true } },
           account: { select: { id: true, phone: true, name: true, status: true } },
           coverResource: { select: { id: true, url: true } },
         },
@@ -56,7 +60,7 @@ export class AdminStoresService {
       where: { id },
       include: {
         cityRef: true,
-        partner: true,
+        partnerAccount: true,
         category: true,
         account: true,
         coverResource: true,
@@ -123,6 +127,7 @@ export class AdminStoresService {
         ...(dto.intro !== undefined ? { intro: dto.intro } : {}),
         ...(dto.address !== undefined ? { address: dto.address } : {}),
         ...(dto.district !== undefined ? { district: dto.district } : {}),
+        ...(dto.settlementRate !== undefined ? { settlementRate: dto.settlementRate } : {}),
       },
     });
 
@@ -162,18 +167,22 @@ export class AdminStoresService {
     });
     if (existingAccount) throw new BadRequestException('该手机号已绑定门店');
 
-    const partner = await this.prisma.partner.findUnique({ where: { id: BigInt(dto.partnerId) } });
-    if (!partner) throw new BadRequestException('开城合伙人不存在');
+    const partnerAccountId = BigInt(dto.partnerAccountId);
+    const partnerAccount = await this.prisma.partnerAccount.findUnique({
+      where: { id: partnerAccountId },
+    });
+    if (!partnerAccount || partnerAccount.isPrimary !== 1) {
+      throw new BadRequestException('开城合伙人不存在');
+    }
     const city = await this.prisma.commonCity.findUnique({ where: { id: BigInt(dto.cityId) } });
     if (!city) throw new BadRequestException('开城城市不存在');
-    if (city.partnerId && city.partnerId !== partner.id) {
-      throw new BadRequestException('开城城市与合伙人不匹配');
-    }
+    await this.partnerCityService.assertPartnerAccountBoundToCity(partnerAccountId, city.id);
 
     const store = await this.prisma.store.create({
       data: {
         cityId: city.id,
-        partnerId: partner.id,
+        partnerAccountId,
+        settlementRate: dto.settlementRate ?? 0.6,
         categoryId: dto.categoryId ? BigInt(dto.categoryId) : null,
         name: dto.name,
         phone: normalizedPhone,
@@ -359,7 +368,7 @@ export class AdminStoresService {
   async detailStoreAccount(id: bigint) {
     const account = await this.prisma.storeAccount.findUnique({
       where: { id },
-      include: { store: { include: { cityRef: true, partner: true } } },
+      include: { store: { include: { cityRef: true, partnerAccount: true } } },
     });
     if (!account) throw new NotFoundException('门店账号不存在');
     return serializeBigInt(account);