发布商品，商品图片使用oss服务器地址

server/dukang-api/src/modules/catalog/catalog.service.ts

@@ -1,6 +1,7 @@
-import { Injectable } from '@nestjs/common';
+import { BadRequestException, Injectable } from '@nestjs/common';
 import { PrismaService } from '../../common/prisma/prisma.module';
 import { serializeBigInt } from '../../common/decorators/current-user.decorator';
+import { groupResourcesByProductId, mapProductMedia } from './catalog.mapper';
 
 @Injectable()
 export class CatalogService {
@@ -10,24 +11,50 @@ export class CatalogService {
     const cities = await this.prisma.commonCity.findMany({
       where: { status: 'ACTIVE' },
       include: { partner: { select: { companyName: true } } },
+      orderBy: { name: 'asc' },
     });
     return serializeBigInt(cities);
   }
 
-  async listProducts(aromaType?: string) {
+  async listProducts(aromaType?: string, cityCode?: string) {
+    if (cityCode) {
+      const city = await this.prisma.commonCity.findFirst({
+        where: { code: cityCode, status: 'ACTIVE' },
+      });
+      if (!city) throw new BadRequestException('该城市暂未开城');
+    }
+
     const products = await this.prisma.commonProductItem.findMany({
       where: { status: 'ON_SALE', ...(aromaType ? { aromaType: aromaType as never } : {}) },
       orderBy: { sortOrder: 'asc' },
       include: { coverResource: true },
     });
+
+    const productIds = products.map((p) => p.id);
+    const resources = productIds.length
+      ? await this.prisma.commonResource.findMany({
+          where: {
+            ownerType: 'PRODUCT',
+            ownerId: { in: productIds },
+            status: 'ACTIVE',
+            bizType: { in: ['CAROUSEL', 'DETAIL'] },
+          },
+          orderBy: { sortOrder: 'asc' },
+        })
+      : [];
+    const resourceMap = groupResourcesByProductId(resources);
+
     return serializeBigInt(
-      products.map((p) => ({
-        ...p,
-        benefitAmount: p.benefitAmount ?? p.price,
-        price: Number(p.price),
-        benefitDisplay: Number(p.benefitAmount ?? p.price),
-        mainImageUrl: p.coverResource?.url ?? null,
-      })),
+      products.map((p) => {
+        const media = mapProductMedia(p, resourceMap.get(p.id.toString()) ?? []);
+        return {
+          ...p,
+          benefitAmount: p.benefitAmount ?? p.price,
+          price: Number(p.price),
+          benefitDisplay: Number(p.benefitAmount ?? p.price),
+          ...media,
+        };
+      }),
     );
   }
 
@@ -37,11 +64,23 @@ export class CatalogService {
       include: { coverResource: true },
     });
     if (!product) return null;
+
+    const resources = await this.prisma.commonResource.findMany({
+      where: {
+        ownerType: 'PRODUCT',
+        ownerId: id,
+        status: 'ACTIVE',
+        bizType: { in: ['CAROUSEL', 'DETAIL'] },
+      },
+      orderBy: { sortOrder: 'asc' },
+    });
+
+    const media = mapProductMedia(product, resources);
     return serializeBigInt({
       ...product,
       benefitAmount: product.benefitAmount ?? product.price,
       price: Number(product.price),
-      mainImageUrl: product.coverResource?.url ?? null,
+      ...media,
     });
   }
 }