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

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

@@ -1,13 +1,18 @@
 import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common';
 import { Prisma } from '@prisma/client';
+import { resolveMaxPartnerCommissionRate, validatePartnerCommissionRates } from '@dukang/domain';
 import { PrismaService } from '../../common/prisma/prisma.module';
 import { serializeBigInt } from '../../common/decorators/current-user.decorator';
+import { PartnerCityService } from '../city-scope/partner-city.service';
 import type { AdminCitiesQueryDto } from './dto/admin-query.dto';
 import type { CreateCityDto, UpdateCityDto } from './dto/admin-mutate.dto';
 
 @Injectable()
 export class AdminCitiesService {
-  constructor(private readonly prisma: PrismaService) {}
+  constructor(
+    private readonly prisma: PrismaService,
+    private readonly partnerCityService: PartnerCityService,
+  ) {}
 
   async list(query: AdminCitiesQueryDto) {
     const page = query.page ?? 1;
@@ -16,7 +21,9 @@ export class AdminCitiesService {
     if (query.name) where.name = { contains: query.name };
     if (query.code) where.code = { contains: query.code };
     if (query.status) where.status = query.status as Prisma.EnumCityStatusFilter['equals'];
-    if (query.partnerId) where.partnerId = BigInt(query.partnerId);
+    if (query.partnerId) {
+      where.partnerAccounts = { some: { id: BigInt(query.partnerId), isPrimary: 1 } };
+    }
 
     const [items, total] = await Promise.all([
       this.prisma.commonCity.findMany({
@@ -25,8 +32,12 @@ export class AdminCitiesService {
         skip: (page - 1) * pageSize,
         take: pageSize,
         include: {
-          partner: { select: { id: true, companyName: true } },
-          _count: { select: { stores: true, orders: true } },
+          partnerAccounts: {
+            where: { isPrimary: 1 },
+            select: { id: true, companyName: true, scopeType: true, bindingStatus: true },
+            orderBy: { createdAt: 'asc' },
+          },
+          _count: { select: { stores: true, orders: true, partnerAccounts: true, warehouses: true } },
         },
       }),
       this.prisma.commonCity.count({ where }),
@@ -34,8 +45,18 @@ export class AdminCitiesService {
     return serializeBigInt({
       items: items.map((c) => ({
         ...c,
+        partnerBindings: c.partnerAccounts.map((bp) => ({
+          id: bp.id.toString(),
+          partnerAccountId: bp.id.toString(),
+          partnerCompanyName: bp.companyName,
+          scopeType: bp.scopeType,
+          status: bp.bindingStatus,
+        })),
+        partnerAccounts: undefined,
         storeCount: c._count.stores,
         orderCount: c._count.orders,
+        partnerBindingCount: c.partnerAccounts.length,
+        warehouseCount: c._count.warehouses,
         _count: undefined,
       })),
       total,
@@ -48,13 +69,22 @@ export class AdminCitiesService {
     const city = await this.prisma.commonCity.findUnique({
       where: { id },
       include: {
-        partner: true,
-        commissionRule: true,
+        warehouses: {
+          include: { partnerAccount: { select: { id: true, companyName: true } } },
+          orderBy: { createdAt: 'desc' },
+        },
         _count: { select: { stores: true, orders: true } },
       },
     });
     if (!city) throw new NotFoundException('开城城市不存在');
-    return serializeBigInt(city);
+    const cityPartners = await this.partnerCityService.listByCity(id);
+    return serializeBigInt({
+      ...city,
+      cityPartners,
+      storeCount: city._count.stores,
+      orderCount: city._count.orders,
+      _count: undefined,
+    });
   }
 
   async create(dto: CreateCityDto) {
@@ -65,31 +95,48 @@ export class AdminCitiesService {
         code: dto.code,
         name: dto.name,
         province: dto.province,
-        partnerId: dto.partnerId ? BigInt(dto.partnerId) : null,
         status: (dto.status ?? 'PENDING') as 'PENDING' | 'ACTIVE' | 'PAUSED',
-        commissionRule: {
-          create: {
-            orderCommissionRate: 0,
-            redeemCommissionRate: 0.03,
-          },
-        },
       },
     });
     return serializeBigInt(city);
   }
 
   async update(id: bigint, dto: UpdateCityDto) {
+    if (dto.maxPartnerCommissionRate !== undefined) {
+      const maxRate = resolveMaxPartnerCommissionRate(dto.maxPartnerCommissionRate);
+      const partners = await this.prisma.partnerAccount.findMany({
+        where: { cityId: id, isPrimary: 1 },
+        select: {
+          companyName: true,
+          orderCommissionRate: true,
+          redeemCommissionRate: true,
+        },
+      });
+      for (const partner of partners) {
+        const check = validatePartnerCommissionRates(
+          Number(partner.orderCommissionRate ?? 0),
+          Number(partner.redeemCommissionRate ?? 0.03),
+          maxRate,
+        );
+        if (!check.ok) {
+          throw new BadRequestException(
+            `无法保存：合伙人「${partner.companyName ?? '—'}」${check.message}`,
+          );
+        }
+      }
+    }
+
     const city = await this.prisma.commonCity.update({
       where: { id },
       data: {
         ...(dto.name !== undefined ? { name: dto.name } : {}),
         ...(dto.province !== undefined ? { province: dto.province } : {}),
-        ...(dto.partnerId !== undefined
-          ? { partnerId: dto.partnerId ? BigInt(dto.partnerId) : null }
-          : {}),
         ...(dto.status !== undefined ? { status: dto.status as 'PENDING' | 'ACTIVE' | 'PAUSED' } : {}),
         ...(dto.localMinQty !== undefined ? { localMinQty: dto.localMinQty } : {}),
         ...(dto.crossMinQty !== undefined ? { crossMinQty: dto.crossMinQty } : {}),
+        ...(dto.maxPartnerCommissionRate !== undefined
+          ? { maxPartnerCommissionRate: dto.maxPartnerCommissionRate }
+          : {}),
       },
     });
     return serializeBigInt(city);