feat(ops): show redeem records on benefit coupon detail

Reuse the same coupon redeem trace as order detail (primary/secondary, allocations).

Co-authored-by: Cursor <cursoragent@cursor.com>

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

@@ -5,6 +5,7 @@ import { serializeBigInt } from '../../common/decorators/current-user.decorator'
 import { buildBenefitLedgerEvent, benefitLedgerWhere } from '../../common/event/event.helpers';
 import { mapBenefitLedgerCompat } from '../../common/compat/v31-compat';
 import { BenefitService } from '../benefit/benefit.service';
+import { AdminRedeemService } from './admin-redeem.service';
 import type { AdminBenefitCouponsQueryDto, AdminBenefitLedgersQueryDto } from './dto/admin-query.dto';
 import type { AdminBenefitGrantDto } from './dto/admin-mutate.dto';
 
@@ -13,6 +14,7 @@ export class AdminBenefitService {
   constructor(
     private readonly prisma: PrismaService,
     private readonly benefitService: BenefitService,
+    private readonly adminRedeemService: AdminRedeemService,
   ) {}
 
   async listCoupons(query: AdminBenefitCouponsQueryDto) {
@@ -45,16 +47,23 @@ export class AdminBenefitService {
       include: {
         user: { select: { id: true, userNo: true, phone: true, nickname: true } },
         order: { select: { id: true, orderNo: true, status: true, payAmount: true } },
-        redeemRecords: { orderBy: { createdAt: 'desc' }, take: 10, include: { store: { select: { id: true, name: true } } } },
       },
     });
     if (!coupon) throw new NotFoundException('权益券不存在');
-    const ledgers = await this.prisma.commonEvent.findMany({
-      where: benefitLedgerWhere(undefined, id),
-      orderBy: { createdAt: 'desc' },
-      take: 20,
+    const [ledgers, redeemTrace] = await Promise.all([
+      this.prisma.commonEvent.findMany({
+        where: benefitLedgerWhere(undefined, id),
+        orderBy: { createdAt: 'desc' },
+        take: 20,
+      }),
+      this.adminRedeemService.buildCouponRedeemTrace(coupon),
+    ]);
+    return serializeBigInt({
+      ...coupon,
+      ledgers,
+      redeemSummary: redeemTrace.redeemSummary,
+      redeemRecords: redeemTrace.redeemRecords,
     });
-    return serializeBigInt({ ...coupon, ledgers });
   }
 
   async voidCoupon(id: bigint) {

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

@@ -11,6 +11,7 @@ import type { AdminShipOrderDto, HqLogisticsShipDto } from './dto/admin-mutate.d
 import type { XiaofeixiaCreateShipmentDto } from './dto/admin-courier.dto';
 import { FulfillmentService } from '../fulfillment/fulfillment.service';
 import { FulfillmentProviderService } from '../fulfillment/fulfillment-provider.service';
+import { AdminRedeemService } from './admin-redeem.service';
 
 @Injectable()
 export class AdminOrdersService {
@@ -20,6 +21,7 @@ export class AdminOrdersService {
     private readonly xiaofeixiaService: AdminXiaofeixiaService,
     private readonly fulfillmentService: FulfillmentService,
     private readonly fulfillmentProviderService: FulfillmentProviderService,
+    private readonly adminRedeemService: AdminRedeemService,
   ) {}
 
   async list(query: AdminOrdersQueryDto) {
@@ -106,49 +108,9 @@ export class AdminOrdersService {
     });
 
     const coupon = order.benefitCoupon;
-    if (coupon) {
-      await this.ensureRedeemAllocationsForCoupon(coupon.id);
-    }
-
-    const redeemRows = coupon
-      ? await this.prisma.redeemRecord.findMany({
-          where: {
-            OR: [
-              { couponId: coupon.id },
-              { allocations: { some: { couponId: coupon.id } } },
-            ],
-          },
-          orderBy: { createdAt: 'desc' },
-          include: {
-            store: { select: { id: true, name: true, cityName: true } },
-            allocations: {
-              where: { couponId: coupon.id },
-              select: { amount: true, sortOrder: true },
-            },
-          },
-        })
-      : [];
-
-    const redeemRecords = redeemRows.map((r) => {
-      const couponAmount =
-        r.allocations[0] != null
-          ? Number(r.allocations[0].amount)
-          : r.couponId === coupon!.id
-            ? Number(r.amount)
-            : 0;
-      const isPrimary = r.couponId === coupon!.id;
-      return {
-        id: r.id,
-        redeemNo: r.redeemNo,
-        amount: Number(r.amount),
-        settleAmount: Number(r.settleAmount),
-        couponAmount,
-        role: isPrimary ? 'PRIMARY' : 'SECONDARY',
-        createdAt: r.createdAt,
-        store: r.store,
-      };
-    });
-    const redeemRecordSum = redeemRecords.reduce((sum, r) => sum + r.couponAmount, 0);
+    const redeemTrace = coupon
+      ? await this.adminRedeemService.buildCouponRedeemTrace(coupon)
+      : { redeemSummary: null, redeemRecords: [] };
 
     const { benefitCoupon: _coupon, ...orderRest } = order;
 
@@ -168,18 +130,8 @@ export class AdminOrdersService {
               },
             ]
           : [],
-        redeemSummary: coupon
-          ? {
-              couponNo: coupon.couponNo,
-              totalAmount: Number(coupon.totalAmount),
-              usedAmount: Number(coupon.usedAmount),
-              balance: Number(coupon.balance),
-              status: coupon.status,
-              redeemCount: redeemRecords.length,
-              redeemRecordSum,
-            }
-          : null,
-        redeemRecords,
+        redeemSummary: redeemTrace.redeemSummary,
+        redeemRecords: redeemTrace.redeemRecords,
       }),
     );
   }
@@ -418,148 +370,4 @@ export class AdminOrdersService {
     });
     await tx.order.deleteMany({ where: { id: { in: orderIds } } });
   }
-
-  /**
-   * 补齐历史核销分摊：
-   * 1) 待审核销 pending.allocationsJson → allocation 表
-   * 2) 权益流水 REDEEM（次券）→ 按用户/门店/时间窗匹配核销单
-   * 3) 仅主券、尚无分摊行的核销单 → 写入单行分摊（全额）
-   */
-  private async ensureRedeemAllocationsForCoupon(couponId: bigint) {
-    const coupon = await this.prisma.benefitCoupon.findUnique({
-      where: { id: couponId },
-      select: { id: true, userId: true },
-    });
-    if (!coupon) return;
-
-    const pendings = await this.prisma.redeemPendingRecord.findMany({
-      where: { userId: coupon.userId, redeemRecordId: { not: null } },
-      select: { redeemRecordId: true, allocationsJson: true },
-    });
-
-    for (const pending of pendings) {
-      if (!pending.redeemRecordId) continue;
-      const allocs = this.parseAllocationsJson(pending.allocationsJson);
-      if (!allocs.some((a) => a.couponId === couponId.toString())) continue;
-
-      const existing = await this.prisma.redeemRecordAllocation.count({
-        where: { redeemRecordId: pending.redeemRecordId },
-      });
-      if (existing > 0) continue;
-
-      await this.prisma.redeemRecordAllocation.createMany({
-        data: allocs.map((a, index) => ({
-          redeemRecordId: pending.redeemRecordId!,
-          couponId: BigInt(a.couponId),
-          amount: a.amount,
-          sortOrder: index,
-        })),
-        skipDuplicates: true,
-      });
-    }
-
-    const ledgers = await this.prisma.commonEvent.findMany({
-      where: {
-        eventType: 'BENEFIT_LEDGER',
-        param1: 'REDEEM',
-        param2: couponId.toString(),
-        actorType: 'USER',
-        actorId: coupon.userId,
-        refType: 'STORE',
-      },
-      select: { id: true, refId: true, amount1: true, createdAt: true },
-      orderBy: { createdAt: 'asc' },
-    });
-
-    for (const ledger of ledgers) {
-      if (ledger.refId == null || ledger.amount1 == null) continue;
-      const allocAmount = Math.abs(Number(ledger.amount1));
-      if (!(allocAmount > 0)) continue;
-
-      const already = await this.prisma.redeemRecordAllocation.findFirst({
-        where: {
-          couponId,
-          amount: allocAmount,
-          redeemRecord: {
-            userId: coupon.userId,
-            storeId: ledger.refId,
-            createdAt: {
-              gte: new Date(ledger.createdAt.getTime() - 8000),
-              lte: new Date(ledger.createdAt.getTime() + 8000),
-            },
-          },
-        },
-        select: { id: true },
-      });
-      if (already) continue;
-
-      const candidates = await this.prisma.redeemRecord.findMany({
-        where: {
-          userId: coupon.userId,
-          storeId: ledger.refId,
-          createdAt: {
-            gte: new Date(ledger.createdAt.getTime() - 8000),
-            lte: new Date(ledger.createdAt.getTime() + 8000),
-          },
-          amount: { gte: allocAmount },
-          allocations: { none: { couponId } },
-        },
-        orderBy: { createdAt: 'asc' },
-        take: 5,
-      });
-      if (!candidates.length) continue;
-
-      // 优先挂到主券不是本券的核销单（跨券 FIFO 次券场景）
-      const target =
-        candidates.find((r) => r.couponId !== couponId) ??
-        (candidates.length === 1 ? candidates[0] : null);
-      if (!target) continue;
-
-      await this.prisma.redeemRecordAllocation.create({
-        data: {
-          redeemRecordId: target.id,
-          couponId,
-          amount: allocAmount,
-          sortOrder: target.couponId === couponId ? 0 : 1,
-        },
-      }).catch(() => {
-        /* unique 冲突忽略 */
-      });
-    }
-
-    const primaryWithoutAlloc = await this.prisma.redeemRecord.findMany({
-      where: {
-        couponId,
-        allocations: { none: {} },
-      },
-      select: { id: true, amount: true },
-    });
-    if (primaryWithoutAlloc.length) {
-      await this.prisma.redeemRecordAllocation.createMany({
-        data: primaryWithoutAlloc.map((r) => ({
-          redeemRecordId: r.id,
-          couponId,
-          amount: r.amount,
-          sortOrder: 0,
-        })),
-        skipDuplicates: true,
-      });
-    }
-  }
-
-  private parseAllocationsJson(
-    value: Prisma.JsonValue,
-  ): Array<{ couponId: string; amount: number }> {
-    if (!Array.isArray(value)) return [];
-    return value
-      .map((item) => {
-        if (!item || typeof item !== 'object') return null;
-        const row = item as { couponId?: unknown; amount?: unknown };
-        const id = row.couponId != null ? String(row.couponId) : '';
-        const amount = Number(row.amount);
-        if (!id || !Number.isFinite(amount) || amount <= 0) return null;
-        return { couponId: id, amount };
-      })
-      .filter((item): item is { couponId: string; amount: number } => !!item);
-  }
 }

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

@@ -6,6 +6,28 @@ import { serializeBigInt } from '../../common/decorators/current-user.decorator'
 import type { AdminDeliveriesQueryDto, AdminRedeemRecordsQueryDto } from './dto/admin-query.dto';
 import type { UpdateDeliveryDto } from './dto/admin-mutate.dto';
 
+export type CouponRedeemTrace = {
+  redeemSummary: {
+    couponNo: string;
+    totalAmount: number;
+    usedAmount: number;
+    balance: number;
+    status: string;
+    redeemCount: number;
+    redeemRecordSum: number;
+  };
+  redeemRecords: Array<{
+    id: bigint;
+    redeemNo: string;
+    amount: number;
+    settleAmount: number;
+    couponAmount: number;
+    role: 'PRIMARY' | 'SECONDARY';
+    createdAt: Date;
+    store: { id: bigint; name: string; cityName: string | null } | null;
+  }>;
+};
+
 @Injectable()
 export class AdminRedeemService {
   constructor(private readonly prisma: PrismaService) {}
@@ -90,6 +112,207 @@ export class AdminRedeemService {
       })),
     });
   }
+
+  /** 按权益券聚合核销追溯（含跨券 FIFO 次券） */
+  async buildCouponRedeemTrace(coupon: {
+    id: bigint;
+    couponNo: string;
+    totalAmount: Prisma.Decimal | number;
+    usedAmount: Prisma.Decimal | number;
+    balance: Prisma.Decimal | number;
+    status: string;
+  }): Promise<CouponRedeemTrace> {
+    await this.ensureRedeemAllocationsForCoupon(coupon.id);
+
+    const redeemRows = await this.prisma.redeemRecord.findMany({
+      where: {
+        OR: [
+          { couponId: coupon.id },
+          { allocations: { some: { couponId: coupon.id } } },
+        ],
+      },
+      orderBy: { createdAt: 'desc' },
+      include: {
+        store: { select: { id: true, name: true, cityName: true } },
+        allocations: {
+          where: { couponId: coupon.id },
+          select: { amount: true, sortOrder: true },
+        },
+      },
+    });
+
+    const redeemRecords = redeemRows.map((r) => {
+      const couponAmount =
+        r.allocations[0] != null
+          ? Number(r.allocations[0].amount)
+          : r.couponId === coupon.id
+            ? Number(r.amount)
+            : 0;
+      return {
+        id: r.id,
+        redeemNo: r.redeemNo,
+        amount: Number(r.amount),
+        settleAmount: Number(r.settleAmount),
+        couponAmount,
+        role: (r.couponId === coupon.id ? 'PRIMARY' : 'SECONDARY') as 'PRIMARY' | 'SECONDARY',
+        createdAt: r.createdAt,
+        store: r.store,
+      };
+    });
+    const redeemRecordSum = redeemRecords.reduce((sum, r) => sum + r.couponAmount, 0);
+
+    return {
+      redeemSummary: {
+        couponNo: coupon.couponNo,
+        totalAmount: Number(coupon.totalAmount),
+        usedAmount: Number(coupon.usedAmount),
+        balance: Number(coupon.balance),
+        status: coupon.status,
+        redeemCount: redeemRecords.length,
+        redeemRecordSum,
+      },
+      redeemRecords,
+    };
+  }
+
+  private async ensureRedeemAllocationsForCoupon(couponId: bigint) {
+    const coupon = await this.prisma.benefitCoupon.findUnique({
+      where: { id: couponId },
+      select: { id: true, userId: true },
+    });
+    if (!coupon) return;
+
+    const pendings = await this.prisma.redeemPendingRecord.findMany({
+      where: { userId: coupon.userId, redeemRecordId: { not: null } },
+      select: { redeemRecordId: true, allocationsJson: true },
+    });
+
+    for (const pending of pendings) {
+      if (!pending.redeemRecordId) continue;
+      const allocs = this.parseAllocationsJson(pending.allocationsJson);
+      if (!allocs.some((a) => a.couponId === couponId.toString())) continue;
+
+      const existing = await this.prisma.redeemRecordAllocation.count({
+        where: { redeemRecordId: pending.redeemRecordId },
+      });
+      if (existing > 0) continue;
+
+      await this.prisma.redeemRecordAllocation.createMany({
+        data: allocs.map((a, index) => ({
+          redeemRecordId: pending.redeemRecordId!,
+          couponId: BigInt(a.couponId),
+          amount: a.amount,
+          sortOrder: index,
+        })),
+        skipDuplicates: true,
+      });
+    }
+
+    const ledgers = await this.prisma.commonEvent.findMany({
+      where: {
+        eventType: 'BENEFIT_LEDGER',
+        param1: 'REDEEM',
+        param2: couponId.toString(),
+        actorType: 'USER',
+        actorId: coupon.userId,
+        refType: 'STORE',
+      },
+      select: { id: true, refId: true, amount1: true, createdAt: true },
+      orderBy: { createdAt: 'asc' },
+    });
+
+    for (const ledger of ledgers) {
+      if (ledger.refId == null || ledger.amount1 == null) continue;
+      const allocAmount = Math.abs(Number(ledger.amount1));
+      if (!(allocAmount > 0)) continue;
+
+      const already = await this.prisma.redeemRecordAllocation.findFirst({
+        where: {
+          couponId,
+          amount: allocAmount,
+          redeemRecord: {
+            userId: coupon.userId,
+            storeId: ledger.refId,
+            createdAt: {
+              gte: new Date(ledger.createdAt.getTime() - 8000),
+              lte: new Date(ledger.createdAt.getTime() + 8000),
+            },
+          },
+        },
+        select: { id: true },
+      });
+      if (already) continue;
+
+      const candidates = await this.prisma.redeemRecord.findMany({
+        where: {
+          userId: coupon.userId,
+          storeId: ledger.refId,
+          createdAt: {
+            gte: new Date(ledger.createdAt.getTime() - 8000),
+            lte: new Date(ledger.createdAt.getTime() + 8000),
+          },
+          amount: { gte: allocAmount },
+          allocations: { none: { couponId } },
+        },
+        orderBy: { createdAt: 'asc' },
+        take: 5,
+      });
+      if (!candidates.length) continue;
+
+      const target =
+        candidates.find((r) => r.couponId !== couponId) ??
+        (candidates.length === 1 ? candidates[0] : null);
+      if (!target) continue;
+
+      await this.prisma.redeemRecordAllocation
+        .create({
+          data: {
+            redeemRecordId: target.id,
+            couponId,
+            amount: allocAmount,
+            sortOrder: target.couponId === couponId ? 0 : 1,
+          },
+        })
+        .catch(() => {
+          /* unique 冲突忽略 */
+        });
+    }
+
+    const primaryWithoutAlloc = await this.prisma.redeemRecord.findMany({
+      where: {
+        couponId,
+        allocations: { none: {} },
+      },
+      select: { id: true, amount: true },
+    });
+    if (primaryWithoutAlloc.length) {
+      await this.prisma.redeemRecordAllocation.createMany({
+        data: primaryWithoutAlloc.map((r) => ({
+          redeemRecordId: r.id,
+          couponId,
+          amount: r.amount,
+          sortOrder: 0,
+        })),
+        skipDuplicates: true,
+      });
+    }
+  }
+
+  private parseAllocationsJson(
+    value: Prisma.JsonValue,
+  ): Array<{ couponId: string; amount: number }> {
+    if (!Array.isArray(value)) return [];
+    return value
+      .map((item) => {
+        if (!item || typeof item !== 'object') return null;
+        const row = item as { couponId?: unknown; amount?: unknown };
+        const id = row.couponId != null ? String(row.couponId) : '';
+        const amount = Number(row.amount);
+        if (!id || !Number.isFinite(amount) || amount <= 0) return null;
+        return { couponId: id, amount };
+      })
+      .filter((item): item is { couponId: string; amount: number } => !!item);
+  }
 }
 
 @Injectable()