feat(ops): add global test whitelist and exclude test accounts from settlement

Unify product/store visibility on HQ whitelist, mark isTest snapshots, and fix SUPER_ADMIN access for the new module.

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

@@ -1,6 +1,10 @@
 import { BadRequestException, Injectable } from '@nestjs/common';
 import { PrismaService } from '../../common/prisma/prisma.module';
 import { serializeBigInt } from '../../common/decorators/current-user.decorator';
+import {
+  TestWhitelistService,
+  normalizeTestPhone,
+} from '../../common/test-whitelist/test-whitelist.service';
 import { groupResourcesByProductId, mapProductMedia } from './catalog.mapper';
 
 export type CatalogViewer = {
@@ -10,13 +14,32 @@ export type CatalogViewer = {
   bypassWhitelist?: boolean;
 };
 
-function normalizePhone(phone: string | null | undefined): string {
-  return (phone || '').replace(/\D/g, '').trim();
-}
-
 @Injectable()
 export class CatalogService {
-  constructor(private readonly prisma: PrismaService) {}
+  constructor(
+    private readonly prisma: PrismaService,
+    private readonly testWhitelist: TestWhitelistService,
+  ) {}
+
+  private async whitelistPhoneSet(): Promise<Set<string>> {
+    const rows = await this.prisma.commonTestWhitelistPhone.findMany({
+      select: { phone: true },
+    });
+    return new Set(rows.map((r) => normalizeTestPhone(r.phone)).filter(Boolean));
+  }
+
+  isVisibleToViewer(
+    product: { visibilityWhitelistEnabled: boolean },
+    viewer?: CatalogViewer,
+    whitelistPhones?: Set<string>,
+  ): boolean {
+    if (viewer?.bypassWhitelist) return true;
+    if (!product.visibilityWhitelistEnabled) return true;
+    const phone = normalizeTestPhone(viewer?.phone);
+    if (!phone) return false;
+    if (whitelistPhones) return whitelistPhones.has(phone);
+    return false;
+  }
 
   async listCities() {
     const cities = await this.prisma.commonCity.findMany({
@@ -58,11 +81,13 @@ export class CatalogService {
       orderBy: { sortOrder: 'asc' },
       include: {
         coverResource: true,
-        visibilityPhones: { select: { phone: true } },
       },
     });
 
-    const visible = products.filter((p) => this.isVisibleToViewer(p, viewer));
+    const whitelistPhones = products.some((p) => p.visibilityWhitelistEnabled)
+      ? await this.whitelistPhoneSet()
+      : new Set<string>();
+    const visible = products.filter((p) => this.isVisibleToViewer(p, viewer, whitelistPhones));
 
     const productIds = visible.map((p) => p.id);
     const resources = productIds.length
@@ -81,7 +106,7 @@ export class CatalogService {
     return serializeBigInt(
       visible.map((p) => {
         const media = mapProductMedia(p, resourceMap.get(p.id.toString()) ?? []);
-        const { visibilityPhones: _phones, visibilityWhitelistEnabled: _wl, ...rest } = p;
+        const { visibilityWhitelistEnabled: _wl, ...rest } = p;
         return {
           ...rest,
           benefitAmount: p.benefitAmount ?? p.price,
@@ -98,11 +123,13 @@ export class CatalogService {
       where: { id },
       include: {
         coverResource: true,
-        visibilityPhones: { select: { phone: true } },
       },
     });
     if (!product) return null;
-    if (!this.isVisibleToViewer(product, viewer)) {
+    const whitelistPhones = product.visibilityWhitelistEnabled
+      ? await this.whitelistPhoneSet()
+      : new Set<string>();
+    if (!this.isVisibleToViewer(product, viewer, whitelistPhones)) {
       return null;
     }
 
@@ -117,7 +144,7 @@ export class CatalogService {
     });
 
     const media = mapProductMedia(product, resources);
-    const { visibilityPhones: _phones, visibilityWhitelistEnabled: _wl, ...rest } = product;
+    const { visibilityWhitelistEnabled: _wl, ...rest } = product;
     return serializeBigInt({
       ...rest,
       benefitAmount: product.benefitAmount ?? product.price,
@@ -126,17 +153,19 @@ export class CatalogService {
     });
   }
 
-  /** 下单前校验：白名单商品仅白名单手机号可买 */
+  /** 下单前校验：白名单商品仅全局测试白名单手机号可买 */
   async assertPurchasable(productId: bigint, viewerPhone?: string | null) {
     const product = await this.prisma.commonProductItem.findUnique({
       where: { id: productId },
-      include: { visibilityPhones: { select: { phone: true } } },
     });
     if (!product || product.status !== 'ON_SALE') {
       throw new BadRequestException('商品不可购买');
     }
-    if (!this.isVisibleToViewer(product, { phone: viewerPhone })) {
-      throw new BadRequestException('该商品暂不对当前账号开放');
+    if (product.visibilityWhitelistEnabled) {
+      const ok = await this.testWhitelist.isPhoneInWhitelist(viewerPhone);
+      if (!ok) {
+        throw new BadRequestException('该商品暂不对当前账号开放');
+      }
     }
     return product;
   }
@@ -148,18 +177,4 @@ export class CatalogService {
     });
     return user?.phone ?? null;
   }
-
-  isVisibleToViewer(
-    product: {
-      visibilityWhitelistEnabled: boolean;
-      visibilityPhones: Array<{ phone: string }>;
-    },
-    viewer?: CatalogViewer,
-  ): boolean {
-    if (viewer?.bypassWhitelist) return true;
-    if (!product.visibilityWhitelistEnabled) return true;
-    const phone = normalizePhone(viewer?.phone);
-    if (!phone) return false;
-    return product.visibilityPhones.some((row) => normalizePhone(row.phone) === phone);
-  }
 }