@pisell/pisellos 2.2.152 → 2.2.154

package/lib/modules/Order/index.js

@@ -76,7 +76,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
   }
   async initialize(core, options) {
-    var _a;
+    var _a, _b, _c;
     this.core = core;
     this.store = options.store;
     if (!this.store.tempOrder) {
@@ -98,6 +98,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.cacheId = otherParams.cacheId;
     this.salesSummaryModuleName = otherParams.salesSummaryModuleName;
     this.rulesHooksOverride = (_a = otherParams.rules) == null ? void 0 : _a.hooks;
+    this.orderHooks = options.hooks || ((_b = otherParams.order) == null ? void 0 : _b.hooks) || ((_c = otherParams.hooks) == null ? void 0 : _c.order);
     this.otherParams = otherParams;
     this.registerDiscountModules(options);
     this.restoreTempOrderFromStorage();
@@ -195,7 +196,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   async scanCode(code, customerId) {
     var _a, _b, _c, _d, _e;
-    const resultDiscountList = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearch(code, customerId)) || [];
+    const resultDiscountList = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearch(code, { customerId })) || [];
     const rulesModule = this.store.rules;
     if (!rulesModule) {
       return {
@@ -996,6 +997,22 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.persistTempOrder();
     return tempOrder.payments;
   }
+  async shouldMergeProductToOrder(params) {
+    var _a;
+    const onBeforeMergeProductToOrder = (_a = this.orderHooks) == null ? void 0 : _a.onBeforeMergeProductToOrder;
+    if (!onBeforeMergeProductToOrder)
+      return true;
+    const result = await onBeforeMergeProductToOrder({
+      ...params,
+      defaultShouldMerge: true
+    });
+    if (typeof result === "boolean")
+      return result;
+    if (result && typeof result === "object" && typeof result.shouldMerge === "boolean") {
+      return result.shouldMerge;
+    }
+    return true;
+  }
   // ─── TempOrder: 商品 CRUD ───
   async addProductToOrder(product, booking) {
     var _a;
@@ -1018,13 +1035,28 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         return false;
       if (item.product_variant_id !== productToAdd.product_variant_id)
         return false;
-      const existedFingerprint = (0, import_utils3.buildProductLineFingerprint)(
+      const existedFingerprint2 = (0, import_utils3.buildProductLineFingerprint)(
         item.product_option_item,
         item.product_bundle
       );
-      return existedFingerprint === incomingFingerprint;
+      return existedFingerprint2 === incomingFingerprint;
     });
-    if (matchedIndex === -1) {
+    const matchedProduct = matchedIndex === -1 ? null : tempOrder.products[matchedIndex];
+    const existedFingerprint = matchedProduct ? (0, import_utils3.buildProductLineFingerprint)(
+      matchedProduct.product_option_item,
+      matchedProduct.product_bundle
+    ) : "";
+    const shouldMerge = matchedProduct ? await this.shouldMergeProductToOrder({
+      incomingProduct: productToAdd,
+      normalizedIncoming,
+      matchedProduct,
+      matchedIndex,
+      incomingFingerprint,
+      existedFingerprint,
+      tempOrder,
+      booking
+    }) : false;
+    if (matchedIndex === -1 || !matchedProduct || !shouldMerge) {
       this.captureProductRuntime(
         tempOrder,
         productToAdd,
@@ -1039,7 +1071,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       }
       tempOrder.products.push(normalizedIncoming);
     } else {
-      const targetProduct = tempOrder.products[matchedIndex];
+      const targetProduct = matchedProduct;
       const targetUid = (_a = targetProduct.metadata) == null ? void 0 : _a.unique_identification_number;
       const normalizedProduct = (0, import_utils3.normalizeOrderProduct)({
         ...productToAdd,
@@ -1592,7 +1624,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   // TODO 获取详情的接口
   async getOrderInfoByRemote(order_id) {
     const res = await this.request.get(`/order/sales/${order_id}`, {
-      with: ["products", "scheduleEvents", "payments", "customer", "summary", "contacts_info"]
+      with: ["products", "bookings", "payments", "customer", "summary", "contacts_info"]
     });
     if (res.code === 200) {
       this.store.lastOrderInfo = res.data;
@@ -1716,7 +1748,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   async getOrderInfo(order_id) {
     const res = await this.request.get(`/order/sales/${order_id}`, {
-      with: ["products", "scheduleEvents"]
+      with: ["products", "bookings"]
     });
     return res;
   }

package/lib/modules/Order/types.d.ts

@@ -186,6 +186,25 @@ export interface UpdateProductInOrderParams {
     product_bundle?: any[];
 }
 export type AddProductBookingInput = Record<string, any>;
+export interface OrderProductMergeDecisionContext {
+    incomingProduct: Partial<OrderProduct> & OrderProductIdentity;
+    normalizedIncoming: OrderProduct;
+    matchedProduct: OrderProduct;
+    matchedIndex: number;
+    incomingFingerprint: string;
+    existedFingerprint: string;
+    tempOrder: OrderTempOrder;
+    booking?: AddProductBookingInput;
+    defaultShouldMerge: boolean;
+}
+export type OrderProductMergeDecisionResult = boolean | {
+    shouldMerge: boolean;
+    reason?: string;
+    [key: string]: any;
+};
+export interface OrderHooksConfig {
+    onBeforeMergeProductToOrder?: (context: OrderProductMergeDecisionContext) => OrderProductMergeDecisionResult | Promise<OrderProductMergeDecisionResult>;
+}
 /**
  * 订单信息
  */

package/lib/modules/Order/utils.js

@@ -250,7 +250,7 @@ function formatSubmitOptionItems(options) {
   return options.map((d) => {
     const option = {
       num: d == null ? void 0 : d.num,
-      option_group_item_id: (d == null ? void 0 : d.option_group_item_id) ?? (d == null ? void 0 : d.product_option_item_id),
+      option_group_item_id: d == null ? void 0 : d.option_group_item_id,
       option_group_id: d == null ? void 0 : d.option_group_id
     };
     const addPrice = (d == null ? void 0 : d.add_price) ?? (d == null ? void 0 : d.price);
@@ -525,7 +525,9 @@ function buildSubmitPayload(params) {
     delivery_type: tempOrder.delivery_type || "nil",
     schedule_date: scheduleDate,
     created_at: tempOrder.created_at || formatDateTime(now),
-    bookings: (tempOrder.bookings || []).map((booking) => normalizeSubmitBooking(booking)),
+    bookings: (tempOrder.bookings || []).filter(
+      (booking) => Number(booking.parent_id ?? 0) !== 0
+    ).map((booking) => normalizeSubmitBooking(booking)),
     payments: tempOrder.payments || [],
     // discount_list: tempOrder.discount_list || [],
     relation_forms: tempOrder.relation_forms || [],

package/lib/modules/Payment/index.d.ts

@@ -25,6 +25,9 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     private dbManager;
     private logger;
     private voucherUpdateLockByOrderUuid;
+    private payMethodMemoryCache;
+    private payMethodListInFlight;
+    private isRefreshingPaymentMethods;
     protected otherParams: any;
     cash: CashPayment;
     eftpos: EftposPayment;
@@ -59,6 +62,7 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
      * 获取支付方式列表
      */
     getPayMethodListAsync(): Promise<PaymentMethod[]>;
+    private loadPayMethodListAsync;
     /**
      * 后台刷新支付方式列表
      */

package/lib/modules/Payment/index.js

@@ -76,6 +76,9 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     this.defaultVersion = "1.0.0";
     // LoggerManager 实例
     this.voucherUpdateLockByOrderUuid = /* @__PURE__ */ new Map();
+    this.payMethodMemoryCache = null;
+    this.payMethodListInFlight = null;
+    this.isRefreshingPaymentMethods = false;
     this.otherParams = {};
     this.cash = new import_cash.CashPaymentImpl(this);
     this.eftpos = new import_eftpos.EftposPaymentImpl(this);
@@ -228,7 +231,20 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
    * 获取支付方式列表
    */
   async getPayMethodListAsync() {
+    var _a;
     this.logInfo("Starting getPayMethodListAsync");
+    if ((_a = this.payMethodMemoryCache) == null ? void 0 : _a.length) {
+      return this.payMethodMemoryCache;
+    }
+    if (this.payMethodListInFlight) {
+      return this.payMethodListInFlight;
+    }
+    this.payMethodListInFlight = this.loadPayMethodListAsync().finally(() => {
+      this.payMethodListInFlight = null;
+    });
+    return this.payMethodListInFlight;
+  }
+  async loadPayMethodListAsync() {
     try {
       let cachedMethods = [];
       try {
@@ -238,12 +254,14 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       }
       const hasCache = cachedMethods.length > 0;
       if (hasCache) {
+        this.payMethodMemoryCache = cachedMethods;
         this.refreshPaymentMethodsInBackground(cachedMethods);
         return cachedMethods;
       }
       const response = await this.request.get("/pay/custom-payment/all");
-      response.data = this.filterPayMethods(response.data);
+      response.data = await this.filterPayMethods(response.data);
       const payMethods = response.data || [];
+      this.payMethodMemoryCache = payMethods;
       try {
         for (const method of payMethods) {
           await this.dbManager.update("pay_method", method);
@@ -269,14 +287,18 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
    * 后台刷新支付方式列表
    */
   async refreshPaymentMethodsInBackground(cachedMethods) {
+    if (this.isRefreshingPaymentMethods)
+      return;
+    this.isRefreshingPaymentMethods = true;
     this.logInfo("Starting refreshPaymentMethodsInBackground", {
       cachedMethodsCount: cachedMethods.length
     });
     try {
       console.log("[PaymentModule] 后台刷新支付方式列表...");
       const response = await this.request.get("/pay/custom-payment/all");
-      response.data = this.filterPayMethods(response.data);
+      response.data = await this.filterPayMethods(response.data);
       const newPayMethods = response.data || [];
+      this.payMethodMemoryCache = newPayMethods;
       const hasChanges = this.hasPaymentMethodsChanged(
         cachedMethods,
         newPayMethods
@@ -310,6 +332,8 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       }
     } catch (error) {
       console.error("[PaymentModule] 后台刷新支付方式失败", error);
+    } finally {
+      this.isRefreshingPaymentMethods = false;
     }
   }
   /**

package/lib/modules/Payment/types.d.ts

@@ -349,6 +349,18 @@ export interface EftposPayment {
 /**
  * 钱包支付接口
  */
+export interface WalletInitializationResult {
+    walletRecommendList: WalletRecommendItem[];
+    userIdentificationCodes: UserIdentificationCodeItem[];
+    transformList: any[];
+    noApplicableVoucher: any[];
+    products: any[];
+}
+export interface WalletStoredInitData {
+    transformList: any[];
+    noApplicableVoucher: any[];
+    products: any[];
+}
 export interface WalletPassPayment {
     /** 生成钱包API默认参数 */
     generateWalletParams: (businessData: WalletInitBusinessData) => WalletDeductionRecommendParams;
@@ -357,21 +369,25 @@ export interface WalletPassPayment {
     /** 清理已存储的钱包参数 */
     clearStoredWalletParams: () => void;
     /** 初始化钱包数据（从业务数据开始，内部生成参数） */
-    initializeWalletDataFromBusinessAsync: (businessData: WalletInitBusinessData) => Promise<{
-        walletRecommendList: WalletRecommendItem[];
-        userIdentificationCodes: UserIdentificationCodeItem[];
-    }>;
+    initializeWalletDataFromBusinessAsync: (businessData: WalletInitBusinessData) => Promise<WalletInitializationResult>;
     /** 初始化钱包数据（先获取推荐列表，再获取用户识别码列表） */
-    initializeWalletDataAsync: (baseParams: WalletDeductionRecommendParams) => Promise<{
-        walletRecommendList: WalletRecommendItem[];
-        userIdentificationCodes: UserIdentificationCodeItem[];
-    }>;
+    initializeWalletDataAsync: (baseParams: WalletDeductionRecommendParams) => Promise<WalletInitializationResult>;
     /** 获取钱包推荐扣款列表（异步获取并缓存） */
     getWalletPassRecommendListAsync: (params: WalletDeductionRecommendParams) => Promise<WalletRecommendItem[]>;
     /** 查询用户识别码列表（异步获取并缓存） */
     getUserIdentificationCodeListAsync: (params: UserIdentificationCodeParams) => Promise<UserIdentificationCodeItem[]>;
     /** 搜索识别码信息 */
-    searchIdentificationCodeAsync: (params: SearchIdentificationCodeParams) => Promise<SearchIdentificationCodeResult>;
+    searchIdentificationCodeAsync: (params: SearchIdentificationCodeParams, config?: {
+        noCache?: boolean;
+    }) => Promise<SearchIdentificationCodeResult>;
+    /** 将推荐钱包列表转换为 prepare_payments */
+    formatWalletPassList2PreparePayments: (list: WalletRecommendItem[]) => {
+        voucher_id: number;
+        amount: number;
+        tag: string;
+        wallet_pass_usage_unit?: unknown;
+        wallet_pass_use_value?: string | number | null;
+    }[];
     /** 获取缓存的搜索结果列表 */
     getSearchResults: () => SearchIdentificationCodeItem[];
     /** 根据识别码查找搜索结果 */
@@ -384,6 +400,10 @@ export interface WalletPassPayment {
     clearWalletRecommendList: () => void;
     /** 清除用户识别码列表 */
     clearUserIdentificationCodes: () => void;
+    /** 获取缓存的钱包初始化数据 */
+    getStoredWalletInitData: () => WalletStoredInitData | null;
+    /** 清除缓存的钱包初始化数据 */
+    clearStoredWalletInitData: () => void;
     /** 清除搜索结果缓存 */
     clearSearchResults: () => void;
     /** 清除所有缓存数据 */

package/lib/modules/SalesSummary/index.d.ts

@@ -5,20 +5,22 @@ export * from './types';
 export declare class SalesSummaryModule extends BaseModule implements Module, SalesSummaryModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
-    private shopStore;
+    private appPlugin;
     private store;
     private request;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     getSurchargeList(): Promise<void>;
+    private getAppData;
+    private getTaxConfig;
     getSummary(params: {
         products: any[];
         isPriceIncludeTax?: number;
         taxRate?: number;
         shopDiscount?: string | number;
     }): Promise<{
-        tax_title: any;
-        tax_rate: any;
+        tax_title: string;
+        tax_rate: number | undefined;
         product_quantity: number;
         product_original_amount: string;
         product_amount: string;
@@ -42,8 +44,8 @@ export declare class SalesSummaryModule extends BaseModule implements Module, Sa
         pay_service_charge_amount: string;
         is_price_include_tax?: number | undefined;
     } | {
-        tax_title: any;
-        tax_rate: any;
+        tax_title: string;
+        tax_rate: number | undefined;
         product_quantity: number;
         product_original_amount: string;
         product_amount: string;

package/lib/modules/SalesSummary/index.js

@@ -27,6 +27,11 @@ var import_BaseModule = require("../BaseModule");
 var import_Schedule = require("../Schedule");
 var import_utils = require("./utils");
 __reExport(SalesSummary_exports, require("./types"), module.exports);
+var salesSummaryDataKeys = {
+  isPriceIncludeTax: "is_price_include_tax",
+  taxRate: "tax_rate",
+  taxTitle: "tax_title"
+};
 var SalesSummaryModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -37,12 +42,12 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
     var _a, _b;
     this.core = core;
     this.store = options.store;
-    this.shopStore = this.core.getPlugin("shopStore");
+    this.appPlugin = this.core.getPlugin("app");
     this.request = this.core.getPlugin("request");
     this.store.surchargeList = ((_a = options.initialState) == null ? void 0 : _a.surchargeList) || [];
     this.store.summary = ((_b = options.initialState) == null ? void 0 : _b.summary) || (0, import_utils.createEmptySalesSummary)();
-    if (!this.shopStore) {
-      throw new Error("SalesSummaryModule 需要 shopStore 插件支持");
+    if (!this.appPlugin) {
+      throw new Error("SalesSummaryModule 需要 app 插件支持");
     }
     if (!this.request) {
       throw new Error("SalesSummaryModule 需要 request 插件支持");
@@ -66,10 +71,25 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
       this.store.surchargeList = [];
     }
   }
+  getAppData(key) {
+    var _a, _b, _c, _d, _e, _f;
+    const getData = (_b = (_a = this.appPlugin).getData) == null ? void 0 : _b.call(_a);
+    if (typeof getData === "function")
+      return getData(key);
+    const app = this.appPlugin.getApp();
+    const coreData = (_f = (_d = (_c = app == null ? void 0 : app.models) == null ? void 0 : _c.getStore) == null ? void 0 : (_e = _d.call(_c)).getDataByModel) == null ? void 0 : _f.call(_e, "core", "core");
+    return coreData == null ? void 0 : coreData[key];
+  }
+  getTaxConfig() {
+    return {
+      isPriceIncludeTax: this.getAppData(salesSummaryDataKeys.isPriceIncludeTax),
+      taxRate: this.getAppData(salesSummaryDataKeys.taxRate),
+      taxTitle: this.getAppData(salesSummaryDataKeys.taxTitle)
+    };
+  }
   async getSummary(params) {
-    var _a, _b;
     const { products = [], isPriceIncludeTax, taxRate, shopDiscount } = params;
-    const shopInfo = ((_b = (_a = this.shopStore.get("core")) == null ? void 0 : _a.core) == null ? void 0 : _b.shop) || {};
+    const taxConfig = this.getTaxConfig();
     const summarySchedule = this.core.getModule(
       `${this.name.split("_")[0]}_schedule`
     );
@@ -83,8 +103,8 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
     }
     const summary = (0, import_utils.calculateSalesSummary)({
       products,
-      isPriceIncludeTax: isPriceIncludeTax ?? (shopInfo == null ? void 0 : shopInfo.is_price_include_tax) ?? 1,
-      taxRate: taxRate ?? (shopInfo == null ? void 0 : shopInfo.tax_rate),
+      isPriceIncludeTax: isPriceIncludeTax ?? taxConfig.isPriceIncludeTax ?? 1,
+      taxRate: taxRate ?? taxConfig.taxRate,
       surchargeList: this.store.surchargeList,
       scheduleById,
       isInScheduleByDate: import_Schedule.ScheduleModule.isInScheduleByDate,
@@ -92,8 +112,8 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
     });
     const summaryWithTaxMeta = {
       ...summary,
-      tax_title: (shopInfo == null ? void 0 : shopInfo.tax_title) || "",
-      tax_rate: taxRate ?? (shopInfo == null ? void 0 : shopInfo.tax_rate)
+      tax_title: taxConfig.taxTitle || "",
+      tax_rate: taxRate ?? taxConfig.taxRate
     };
     this.store.summary = summaryWithTaxMeta;
     return summaryWithTaxMeta;

package/lib/plugins/app.d.ts

@@ -1,8 +1,10 @@
 import { Plugin } from '../types';
 import App from './app-types/app';
+export type AppDataGetter = (key: string) => any;
 /**
  * AppPlugin 接口定义
  */
 export interface AppPlugin extends Plugin {
     getApp: () => App;
+    getData?: () => AppDataGetter;
 }

package/lib/server/index.d.ts

@@ -372,13 +372,10 @@ declare class Server {
      */
     private recomputeAndNotifyBookingQuery;
     /**
-     * 根据餐牌配置过滤商品
-     * @param products 所有商品列表
-     * @param activeMenuList 生效的餐牌列表
-     * @returns 过滤后的商品列表
+     * 根据餐牌配置提取轻量商品范围。
      * @private
      */
-    private filterProductsByMenuConfig;
+    private getProductScopeByMenuConfig;
     /**
      * 记录信息日志
      * @param title 日志标题

package/lib/server/index.js

@@ -2060,16 +2060,16 @@ var Server = class {
     if (product_id != null && Number.isFinite(Number(product_id))) {
       const pid = Number(product_id);
       const tPrice2 = performance.now();
-      const allProductsWithPrice2 = await this.products.getProductsWithPrice(schedule_date, {
+      const allProductsWithPrice = await this.products.getProductsWithPrice(schedule_date, {
         scheduleModule: this.getSchedule()
       }, {
         changedIds: options == null ? void 0 : options.changedIds
       });
       (0, import_product.perfMark)("computeQuery.getProductsWithPrice(single)", performance.now() - tPrice2, {
-        count: allProductsWithPrice2.length,
+        count: allProductsWithPrice.length,
         productId: pid
       });
-      const published = allProductsWithPrice2.filter((p) => ((p == null ? void 0 : p.status) || "published") === "published");
+      const published = allProductsWithPrice.filter((p) => ((p == null ? void 0 : p.status) || "published") === "published");
       const item = published.find((p) => Number(p.id) === pid) ?? null;
       (0, import_product.perfMark)("computeProductQueryResult", performance.now() - tTotal, {
         mode: "single",
@@ -2108,22 +2108,26 @@ var Server = class {
         activeMenu: activeMenuList.length
       });
     }
+    const tFilter = performance.now();
+    const productScope = this.getProductScopeByMenuConfig(activeMenuList);
+    const scopedProductIds = this.products.getProductIdsByScope(productScope);
+    (0, import_product.perfMark)("computeQuery.filterByMenu", performance.now() - tFilter, {
+      scopedProductCount: scopedProductIds.length,
+      activeMenuCount: activeMenuList.length,
+      isAllProducts: !!productScope.isAllProducts
+    });
     const tPrice = performance.now();
-    const allProductsWithPrice = await this.products.getProductsWithPrice(schedule_date, {
+    let filteredProducts = scopedProductIds.length > 0 ? await this.products.getProductsWithPrice(schedule_date, {
       scheduleModule: this.getSchedule(),
       schedule_datetime,
       customer_id
     }, {
-      changedIds: options == null ? void 0 : options.changedIds
-    });
+      changedIds: options == null ? void 0 : options.changedIds,
+      productIds: productScope.isAllProducts ? void 0 : scopedProductIds
+    }) : [];
     (0, import_product.perfMark)("computeQuery.getProductsWithPrice", performance.now() - tPrice, {
-      count: allProductsWithPrice.length
-    });
-    const tFilter = performance.now();
-    let filteredProducts = this.filterProductsByMenuConfig(allProductsWithPrice, activeMenuList);
-    (0, import_product.perfMark)("computeQuery.filterByMenu", performance.now() - tFilter, {
-      before: allProductsWithPrice.length,
-      after: filteredProducts.length
+      count: filteredProducts.length,
+      scopedProductCount: scopedProductIds.length
     });
     const tStatus = performance.now();
     const beforeStatusCount = filteredProducts.length;
@@ -2141,12 +2145,12 @@ var Server = class {
     });
     (0, import_product.perfMark)("computeQuery.sort", performance.now() - tSort, { count: filteredProducts.length });
     (0, import_product.perfMark)("computeProductQueryResult", performance.now() - tTotal, {
-      originalCount: allProductsWithPrice.length,
+      scopedProductCount: scopedProductIds.length,
       filteredCount: filteredProducts.length,
       activeMenuCount: activeMenuList.length
     });
     this.logInfo("computeProductQueryResult 完成", {
-      originalCount: allProductsWithPrice.length,
+      scopedProductCount: scopedProductIds.length,
       filteredCount: filteredProducts.length,
       activeMenuCount: activeMenuList.length
     });
@@ -2249,29 +2253,25 @@ var Server = class {
     }
   }
   /**
-   * 根据餐牌配置过滤商品
-   * @param products 所有商品列表
-   * @param activeMenuList 生效的餐牌列表
-   * @returns 过滤后的商品列表
+   * 根据餐牌配置提取轻量商品范围。
    * @private
    */
-  filterProductsByMenuConfig(products, activeMenuList) {
+  getProductScopeByMenuConfig(activeMenuList) {
     if (!activeMenuList || activeMenuList.length === 0) {
       console.log("[Server] 没有生效的餐牌，返回空数组");
-      this.logInfo("filterProductsByMenuConfig: 没有生效的餐牌，返回空数组", {
-        productCount: products.length,
+      this.logInfo("getProductScopeByMenuConfig: 没有生效的餐牌，返回空数组", {
         activeMenuCount: 0
       });
-      return [];
+      return { productIds: [], collectionIds: [] };
     }
-    let allowedProductIds = /* @__PURE__ */ new Set();
-    let allowedCollectionIds = /* @__PURE__ */ new Set();
+    const allowedProductIds = /* @__PURE__ */ new Set();
+    const allowedCollectionIds = /* @__PURE__ */ new Set();
     let hasProductAll = false;
     for (const menu of activeMenuList) {
       const config = menu.partyroom_package;
       if (!config) {
         console.warn("[Server] 餐牌缺少 partyroom_package 配置:", menu);
-        this.logWarning("filterProductsByMenuConfig: 餐牌缺少 partyroom_package 配置", {
+        this.logWarning("getProductScopeByMenuConfig: 餐牌缺少 partyroom_package 配置", {
           menuId: menu.form_record_id,
           menuName: menu.name
         });
@@ -2279,7 +2279,7 @@ var Server = class {
       }
       if (config.type === "product_all") {
         console.log("[Server] 餐牌允许所有商品:", menu.name);
-        this.logInfo("filterProductsByMenuConfig: 餐牌允许所有商品", {
+        this.logInfo("getProductScopeByMenuConfig: 餐牌允许所有商品", {
           menuId: menu.form_record_id,
           menuName: menu.name,
           configType: config.type
@@ -2291,7 +2291,7 @@ var Server = class {
         const productIds = config.products.map((item) => item.product_id);
         productIds.forEach((id) => id && allowedProductIds.add(id));
         console.log("[Server] 餐牌允许指定商品 (product_ids):", menu.name, productIds);
-        this.logInfo("filterProductsByMenuConfig: 餐牌允许指定商品", {
+        this.logInfo("getProductScopeByMenuConfig: 餐牌允许指定商品", {
           menuId: menu.form_record_id,
           menuName: menu.name,
           configType: config.type,
@@ -2302,7 +2302,7 @@ var Server = class {
         const collectionIds = config.products.map((item) => item.product_collection_id);
         collectionIds.forEach((id) => id && allowedCollectionIds.add(id));
         console.log("[Server] 餐牌允许商品集合 (product_collection):", menu.name, collectionIds);
-        this.logInfo("filterProductsByMenuConfig: 餐牌允许商品集合", {
+        this.logInfo("getProductScopeByMenuConfig: 餐牌允许商品集合", {
           menuId: menu.form_record_id,
           menuName: menu.name,
           configType: config.type,
@@ -2311,48 +2311,28 @@ var Server = class {
       }
     }
     if (hasProductAll) {
-      this.logInfo("filterProductsByMenuConfig: 返回所有商品（product_all）", {
-        productCount: products.length
-      });
-      return products;
+      this.logInfo("getProductScopeByMenuConfig: 返回所有商品 scope（product_all）");
+      return { isAllProducts: true };
     }
     if (allowedProductIds.size === 0 && allowedCollectionIds.size === 0) {
       console.log("[Server] 没有允许的商品和集合");
-      this.logWarning("filterProductsByMenuConfig: 没有允许的商品和集合", {
-        productCount: products.length,
+      this.logWarning("getProductScopeByMenuConfig: 没有允许的商品和集合", {
         activeMenuCount: activeMenuList.length
       });
-      return [];
+      return { productIds: [], collectionIds: [] };
     }
     const allowedProductIdsArray = Array.from(allowedProductIds);
     const allowedCollectionIdsArray = Array.from(allowedCollectionIds);
     console.log("[Server] 允许的商品 IDs:", allowedProductIdsArray);
     console.log("[Server] 允许的集合 IDs:", allowedCollectionIdsArray);
-    this.logInfo("filterProductsByMenuConfig: 收集到的允许规则", {
+    this.logInfo("getProductScopeByMenuConfig: 收集到的允许规则", {
       allowedProductCount: allowedProductIds.size,
       allowedCollectionCount: allowedCollectionIds.size
     });
-    const filteredProducts = products.filter((product) => {
-      if (allowedProductIds.has(product.id)) {
-        return true;
-      }
-      if (allowedCollectionIds.size > 0 && Array.isArray(product.collection)) {
-        const hasMatchingCollection = product.collection.some(
-          (col) => allowedCollectionIds.has(col.id)
-        );
-        if (hasMatchingCollection) {
-          return true;
-        }
-      }
-      return false;
-    });
-    console.log("[Server] 过滤结果: 原始 %d 个，过滤后 %d 个", products.length, filteredProducts.length);
-    this.logInfo("filterProductsByMenuConfig: 过滤完成", {
-      originalCount: products.length,
-      filteredCount: filteredProducts.length,
-      removedCount: products.length - filteredProducts.length
-    });
-    return filteredProducts;
+    return {
+      productIds: allowedProductIdsArray,
+      collectionIds: allowedCollectionIdsArray
+    };
   }
   /**
    * 记录信息日志

package/lib/server/modules/index.d.ts

@@ -3,7 +3,7 @@
  * 包含新增的 Products、Menu、Quotation 和扩展的 Schedule 模块
  */
 export { ProductsModule } from './products';
-export type { ProductsState } from './products/types';
+export type { ProductIdScope, ProductsState } from './products/types';
 export { ProductsHooks } from './products/types';
 export { MenuModule } from './menu';
 export type { MenuState, MenuData } from './menu/types';