v3数据表更改

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

@@ -1,4 +1,5 @@
 import { Injectable, NotFoundException } from '@nestjs/common';
+import type { DeliveryProvider } from '@prisma/client';
 import { Prisma } from '@prisma/client';
 import { PrismaService } from '../../common/prisma/prisma.module';
 import { serializeBigInt } from '../../common/decorators/current-user.decorator';
@@ -42,7 +43,6 @@ export class AdminRedeemService {
         store: { include: { partner: { select: { id: true, companyName: true } } } },
         coupon: true,
         payout: true,
-        commissions: true,
       },
     });
     if (!record) throw new NotFoundException('核销记录不存在');
@@ -58,7 +58,7 @@ export class AdminDeliveriesService {
     const page = query.page ?? 1;
     const pageSize = query.pageSize ?? 20;
     const where: Prisma.OrderDeliveryWhereInput = {};
-    if (query.provider) where.provider = query.provider;
+    if (query.provider) where.provider = query.provider as DeliveryProvider;
     if (query.trackingNo) where.trackingNo = { contains: query.trackingNo };
     if (query.orderNo) {
       where.order = { orderNo: { contains: query.orderNo } };
@@ -79,6 +79,8 @@ export class AdminDeliveriesService {
               receiverName: true,
               receiverPhone: true,
               deliveryType: true,
+              productName: true,
+              quantity: true,
             },
           },
         },
@@ -95,7 +97,7 @@ export class AdminDeliveriesService {
         order: {
           include: {
             user: { select: { id: true, userNo: true, phone: true } },
-            items: true,
+            imageResource: { select: { url: true } },
           },
         },
       },
@@ -108,7 +110,7 @@ export class AdminDeliveriesService {
     const delivery = await this.prisma.orderDelivery.update({
       where: { id },
       data: {
-        ...(dto.provider !== undefined ? { provider: dto.provider } : {}),
+        ...(dto.provider !== undefined ? { provider: dto.provider as DeliveryProvider } : {}),
         ...(dto.providerOrderNo !== undefined ? { providerOrderNo: dto.providerOrderNo } : {}),
         ...(dto.trackingNo !== undefined ? { trackingNo: dto.trackingNo } : {}),
       },