v3数据表更改

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

@@ -2,6 +2,8 @@ import { BadRequestException, Injectable, NotFoundException } from '@nestjs/comm
 import { Prisma } from '@prisma/client';
 import { PrismaService } from '../../common/prisma/prisma.module';
 import { serializeBigInt } from '../../common/decorators/current-user.decorator';
+import { buildBenefitLedgerEvent, benefitLedgerWhere } from '../../common/event/event.helpers';
+import { mapBenefitLedgerCompat } from '../../common/compat/v31-compat';
 import type { AdminBenefitCouponsQueryDto, AdminBenefitLedgersQueryDto } from './dto/admin-query.dto';
 
 @Injectable()
@@ -38,12 +40,16 @@ export class AdminBenefitService {
       include: {
         user: { select: { id: true, userNo: true, phone: true, nickname: true } },
         order: { select: { id: true, orderNo: true, status: true, payAmount: true } },
-        ledgers: { orderBy: { createdAt: 'desc' }, take: 20 },
         redeemRecords: { orderBy: { createdAt: 'desc' }, take: 10, include: { store: { select: { id: true, name: true } } } },
       },
     });
     if (!coupon) throw new NotFoundException('权益券不存在');
-    return serializeBigInt(coupon);
+    const ledgers = await this.prisma.commonEvent.findMany({
+      where: benefitLedgerWhere(undefined, id),
+      orderBy: { createdAt: 'desc' },
+      take: 20,
+    });
+    return serializeBigInt({ ...coupon, ledgers });
   }
 
   async voidCoupon(id: bigint) {
@@ -57,8 +63,8 @@ export class AdminBenefitService {
         data: { status: 'VOID', balance: 0 },
       });
       if (Number(coupon.balance) > 0) {
-        await tx.benefitLedger.create({
-          data: {
+        await tx.commonEvent.create({
+          data: buildBenefitLedgerEvent({
             userId: coupon.userId,
             couponId: coupon.id,
             type: 'ADJUST',
@@ -66,7 +72,7 @@ export class AdminBenefitService {
             balanceAfter: 0,
             refType: 'ADMIN_VOID',
             remark: 'HQ 手动作废',
-          },
+          }),
         });
       }
       return row;
@@ -77,24 +83,47 @@ export class AdminBenefitService {
   async listLedgers(query: AdminBenefitLedgersQueryDto) {
     const page = query.page ?? 1;
     const pageSize = query.pageSize ?? 20;
-    const where: Prisma.BenefitLedgerWhereInput = {};
-    if (query.userId) where.userId = BigInt(query.userId);
-    if (query.couponId) where.couponId = BigInt(query.couponId);
-    if (query.type) where.type = query.type as Prisma.EnumBenefitLedgerTypeFilter['equals'];
+    const where: Prisma.CommonEventWhereInput = {
+      eventType: 'BENEFIT_LEDGER',
+      ...(query.userId ? { actorType: 'USER', actorId: BigInt(query.userId) } : {}),
+      ...(query.couponId ? { param2: BigInt(query.couponId).toString() } : {}),
+      ...(query.type ? { param1: query.type } : {}),
+    };
 
     const [items, total] = await Promise.all([
-      this.prisma.benefitLedger.findMany({
+      this.prisma.commonEvent.findMany({
         where,
         orderBy: { createdAt: 'desc' },
         skip: (page - 1) * pageSize,
         take: pageSize,
-        include: {
-          user: { select: { id: true, userNo: true } },
-          coupon: { select: { id: true, couponNo: true } },
-        },
       }),
-      this.prisma.benefitLedger.count({ where }),
+      this.prisma.commonEvent.count({ where }),
     ]);
-    return serializeBigInt({ items, total, page, pageSize });
+
+    const userIds = [...new Set(items.map((i) => i.actorId).filter(Boolean))] as bigint[];
+    const couponIds = [...new Set(items.map((i) => i.param2).filter(Boolean))].map((id) => BigInt(id!));
+    const [users, coupons] = await Promise.all([
+      userIds.length
+        ? this.prisma.user.findMany({ where: { id: { in: userIds } }, select: { id: true, userNo: true } })
+        : Promise.resolve([] as { id: bigint; userNo: string | null }[]),
+      couponIds.length
+        ? this.prisma.benefitCoupon.findMany({ where: { id: { in: couponIds } }, select: { id: true, couponNo: true } })
+        : Promise.resolve([] as { id: bigint; couponNo: string }[]),
+    ]);
+    const userMap = new Map(users.map((u) => [u.id.toString(), u] as const));
+    const couponMap = new Map(coupons.map((c) => [c.id.toString(), c] as const));
+
+    return serializeBigInt({
+      items: items.map((e) =>
+        mapBenefitLedgerCompat(
+          e,
+          e.actorId ? userMap.get(e.actorId.toString()) : null,
+          e.param2 ? couponMap.get(e.param2) : null,
+        ),
+      ),
+      total,
+      page,
+      pageSize,
+    });
   }
 }