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

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

@@ -11,8 +11,8 @@ export class CatalogController {
   }
 
   @Get('products')
-  products(@Query('aromaType') aromaType?: string) {
-    return this.catalogService.listProducts(aromaType);
+  products(@Query('aromaType') aromaType?: string, @Query('cityCode') cityCode?: string) {
+    return this.catalogService.listProducts(aromaType, cityCode);
   }
 
   @Get('products/:id')

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

@@ -0,0 +1,62 @@
+import type { CommonProductItem, CommonResource } from '@prisma/client';
+
+export type ProductMediaDto = {
+  mainImageUrl: string | null;
+  carouselUrls: string[];
+  detailImageUrls: string[];
+};
+
+type ProductWithCover = CommonProductItem & {
+  coverResource?: { url: string } | null;
+};
+
+function urlsFromResources(resources: CommonResource[], bizType: 'CAROUSEL' | 'DETAIL') {
+  return resources
+    .filter((r) => r.bizType === bizType && r.url)
+    .sort((a, b) => a.sortOrder - b.sortOrder)
+    .map((r) => r.url);
+}
+
+export function mapProductMedia(
+  product: ProductWithCover,
+  extraResources: CommonResource[] = [],
+): ProductMediaDto {
+  const mainImageUrl = product.coverResource?.url ?? null;
+  const carouselFromDb = urlsFromResources(extraResources, 'CAROUSEL');
+  const detailFromDb = urlsFromResources(extraResources, 'DETAIL');
+
+  const detailFromJson = parseDetailContentImages(product.detailContent);
+
+  const carouselUrls =
+    carouselFromDb.length > 0
+      ? carouselFromDb
+      : mainImageUrl
+        ? [mainImageUrl]
+        : [];
+
+  const detailImageUrls =
+    detailFromDb.length > 0
+      ? detailFromDb
+      : detailFromJson;
+
+  return { mainImageUrl, carouselUrls, detailImageUrls };
+}
+
+function parseDetailContentImages(detailContent: unknown): string[] {
+  if (!detailContent || typeof detailContent !== 'object') return [];
+  const record = detailContent as Record<string, unknown>;
+  const images = record.images ?? record.detailImages ?? record.detailImageUrls;
+  if (!Array.isArray(images)) return [];
+  return images.filter((item): item is string => typeof item === 'string' && item.length > 0);
+}
+
+export function groupResourcesByProductId(resources: CommonResource[]) {
+  const map = new Map<string, CommonResource[]>();
+  for (const resource of resources) {
+    const key = resource.ownerId.toString();
+    const list = map.get(key) ?? [];
+    list.push(resource);
+    map.set(key, list);
+  }
+  return map;
+}

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,
     });
   }
 }