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

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

@@ -15,12 +15,12 @@ export class AdminPartnerLogsService {
   async list(query: AdminPartnerLogsQueryDto) {
     const page = query.page ?? 1;
     const pageSize = query.pageSize ?? 20;
-    const partnerIds = await this.resolvePartnerIds(query);
-    if (partnerIds && partnerIds.length === 0) {
+    const partnerAccountIds = await this.resolvePartnerAccountIds(query);
+    if (partnerAccountIds && partnerAccountIds.length === 0) {
       return { items: [], total: 0, page, pageSize };
     }
 
-    const where = this.buildWhere(query, partnerIds);
+    const where = this.buildWhere(query, partnerAccountIds);
     const [rows, total] = await Promise.all([
       this.prisma.logPartnerAnalytics.findMany({
         where,
@@ -44,10 +44,10 @@ export class AdminPartnerLogsService {
 
   private buildWhere(
     query: AdminPartnerLogsQueryDto,
-    partnerIds?: bigint[],
+    partnerAccountIds?: bigint[],
   ): Prisma.LogPartnerAnalyticsWhereInput {
     const where: Prisma.LogPartnerAnalyticsWhereInput = {};
-    if (partnerIds) where.partnerId = { in: partnerIds };
+    if (partnerAccountIds) where.partnerAccountId = { in: partnerAccountIds };
     if (query.partnerAccountId) where.partnerAccountId = BigInt(query.partnerAccountId);
     const categoryEvents = query.eventName
       ? [query.eventName]
@@ -64,40 +64,23 @@ export class AdminPartnerLogsService {
     return where;
   }
 
-  private async resolvePartnerIds(query: AdminPartnerLogsQueryDto): Promise<bigint[] | undefined> {
+  private async resolvePartnerAccountIds(
+    query: AdminPartnerLogsQueryDto,
+  ): Promise<bigint[] | undefined> {
+    if (query.partnerAccountId) return [BigInt(query.partnerAccountId)];
     if (query.partnerId) return [BigInt(query.partnerId)];
 
-    const partnerWhere: Prisma.PartnerWhereInput = {};
-    if (query.companyName) partnerWhere.companyName = { contains: query.companyName };
+    const accountWhere: Prisma.PartnerAccountWhereInput = { isPrimary: 1 };
+    if (query.companyName) accountWhere.companyName = { contains: query.companyName };
+    if (query.phone) accountWhere.phone = { contains: query.phone };
 
-    if (query.partnerAccountId || query.phone) {
-      const accountWhere: Prisma.PartnerAccountWhereInput = {};
-      if (query.partnerAccountId) accountWhere.id = BigInt(query.partnerAccountId);
-      if (query.phone) accountWhere.phone = { contains: query.phone };
+    if (query.companyName || query.phone) {
       const accounts = await this.prisma.partnerAccount.findMany({
         where: accountWhere,
-        select: { partnerId: true },
-        take: 100,
-      });
-      if (accounts.length === 0) return [];
-      const ids = [...new Set(accounts.map((a) => a.partnerId))];
-      if (query.companyName) {
-        const partners = await this.prisma.partner.findMany({
-          where: { id: { in: ids }, ...partnerWhere },
-          select: { id: true },
-        });
-        return partners.map((p) => p.id);
-      }
-      return ids;
-    }
-
-    if (query.companyName) {
-      const partners = await this.prisma.partner.findMany({
-        where: partnerWhere,
         select: { id: true },
         take: 100,
       });
-      return partners.map((p) => p.id);
+      return accounts.map((a) => a.id);
     }
 
     return undefined;
@@ -106,8 +89,7 @@ export class AdminPartnerLogsService {
   private async enrichRows(
     rows: Array<{
       id: bigint;
-      partnerAccountId: bigint | null;
-      partnerId: bigint;
+      partnerAccountId: bigint;
       eventName: string;
       clientApp: string | null;
       refType: string | null;
@@ -116,37 +98,25 @@ export class AdminPartnerLogsService {
       createdAt: Date;
     }>,
   ) {
-    const partnerIds = [...new Set(rows.map((r) => r.partnerId))];
-    const accountIds = [...new Set(rows.map((r) => r.partnerAccountId).filter((id): id is bigint => id != null))];
+    const accountIds = [...new Set(rows.map((r) => r.partnerAccountId))];
+    const accounts = accountIds.length
+      ? await this.prisma.partnerAccount.findMany({
+          where: { id: { in: accountIds } },
+          select: { id: true, name: true, phone: true, companyName: true },
+        })
+      : [];
 
-    const [partners, accounts] = await Promise.all([
-      partnerIds.length
-        ? this.prisma.partner.findMany({
-            where: { id: { in: partnerIds } },
-            select: { id: true, companyName: true },
-          })
-        : Promise.resolve([]),
-      accountIds.length
-        ? this.prisma.partnerAccount.findMany({
-            where: { id: { in: accountIds } },
-            select: { id: true, name: true, phone: true },
-          })
-        : Promise.resolve([]),
-    ]);
-
-    const partnerMap = new Map(partners.map((p) => [p.id.toString(), p] as const));
     const accountMap = new Map(accounts.map((a) => [a.id.toString(), a] as const));
 
     return rows.map((row) => {
-      const partner = partnerMap.get(row.partnerId.toString());
-      const account = row.partnerAccountId ? accountMap.get(row.partnerAccountId.toString()) : undefined;
+      const account = accountMap.get(row.partnerAccountId.toString());
       return {
         id: row.id.toString(),
-        partnerId: row.partnerId.toString(),
-        partnerAccountId: row.partnerAccountId?.toString() ?? null,
+        partnerId: row.partnerAccountId.toString(),
+        partnerAccountId: row.partnerAccountId.toString(),
         accountName: account?.name ?? null,
         accountPhone: account?.phone ?? null,
-        companyName: partner?.companyName ?? null,
+        companyName: account?.companyName ?? null,
         category: resolvePartnerLogCategory(row.eventName),
         eventName: row.eventName,
         clientApp: row.clientApp,