@pisell/pisellos 2.2.301 → 2.2.303

package/lib/modules/Order/utils.js

@@ -9,6 +9,7 @@ Object.defineProperty(exports, "buildManualProductDiscountItem", {
     return _manualProductDiscount.buildManualProductDiscountItem;
   }
 });
+exports.buildPointCardSnapshotFromWalletPassList = buildPointCardSnapshotFromWalletPassList;
 exports.buildSubmitPayload = buildSubmitPayload;
 exports.calculateOrderProductsDeposit = calculateOrderProductsDeposit;
 exports.clearTempOrderHolderAssignments = clearTempOrderHolderAssignments;
@@ -67,7 +68,9 @@ exports.mergeOrderProductDisplayFields = mergeOrderProductDisplayFields;
 exports.mergeRelationForms = void 0;
 exports.normalizeBookingIsAll = normalizeBookingIsAll;
 exports.normalizeBookingSubType = normalizeBookingSubType;
+exports.normalizeOrderMetaList = normalizeOrderMetaList;
 exports.normalizeOrderProductDiscountList = normalizeOrderProductDiscountList;
+exports.normalizePointCardSnapshotItem = normalizePointCardSnapshotItem;
 exports.normalizeProductSkuOptions = normalizeProductSkuOptions;
 exports.normalizeSubmitBooking = normalizeSubmitBooking;
 exports.normalizeSubmitCollectPaxValue = normalizeSubmitCollectPaxValue;
@@ -126,8 +129,58 @@ var _decimal = _interopRequireDefault(require("decimal.js"));
 var _utils = require("../Holder/utils");
 var _utils2 = require("../../solution/ScanOrder/utils");
 var _orderCollectionIdentity = require("./utils/orderCollectionIdentity");
+var _salesNotes = require("./salesNotes");
 var _manualProductDiscount = require("./utils/manualProductDiscount");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const POINT_CARD_SNAPSHOT_TAG = 'point_card';
+function isPlainObject(value) {
+  return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
+}
+function normalizeSnapshotScalar(value) {
+  if (value === undefined || value === null) return undefined;
+  if (typeof value === 'string') return value.trim() ? value : undefined;
+  if (typeof value === 'number') return Number.isFinite(value) ? value : undefined;
+  return undefined;
+}
+function normalizePointCardSnapshotItem(value) {
+  if (!isPlainObject(value)) return null;
+  const id = normalizeSnapshotScalar(value.id);
+  if (id === undefined) return null;
+  if (String(value.tag || '').trim().toLowerCase() !== POINT_CARD_SNAPSHOT_TAG) {
+    return null;
+  }
+  const snapshot = {
+    id,
+    tag: 'point_card',
+    product_name: String(value.product_name ?? ''),
+    par_value: String(value.par_value ?? ''),
+    used_par_value: String(value.used_par_value ?? '')
+  };
+  const productId = normalizeSnapshotScalar(value.product_id);
+  if (productId !== undefined) {
+    snapshot.product_id = productId;
+  }
+  return snapshot;
+}
+function buildPointCardSnapshotFromWalletPassList(value) {
+  if (!Array.isArray(value)) return [];
+  return value.reduce((result, item) => {
+    const normalized = normalizePointCardSnapshotItem(item);
+    if (normalized) result.push(normalized);
+    return result;
+  }, []);
+}
+function normalizeOrderMetaList(value) {
+  if (value === undefined) return undefined;
+  if (!isPlainObject(value)) return undefined;
+  const normalized = {};
+  if (Object.prototype.hasOwnProperty.call(value, 'point_cards_snapshot')) {
+    normalized.point_cards_snapshot = buildPointCardSnapshotFromWalletPassList(value.point_cards_snapshot);
+  }
+  if (Object.keys(normalized).length > 0) return normalized;
+  return {};
+}
+
 /**
  * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
  *
@@ -863,7 +916,7 @@ function normalizeSubmitProductionCode(value) {
 }
 
 // 后端 checkout 协议字段 option_group_item_id；tempOrder 内部也保持同一字段名。
-function formatSubmitOptionItems(options) {
+function formatSubmitOptionItems(options, formatOptions = {}) {
   if (!Array.isArray(options)) return [];
   return options.map(d => {
     const option = {
@@ -876,7 +929,11 @@ function formatSubmitOptionItems(options) {
     delete option.production_code;
     if (productionCode !== undefined) option.production_code = productionCode;
     const addPrice = d?.add_price ?? d?.price;
-    if (addPrice !== undefined) option.add_price = String(addPrice);
+    if (formatOptions.virtualSettlementMode) {
+      option.add_price = 0;
+    } else if (addPrice !== undefined) {
+      option.add_price = String(addPrice);
+    }
     delete option.price;
     return option;
   });
@@ -893,7 +950,7 @@ function toMoneyString(value) {
 }
 
 // 出站补齐：只输出后端 checkout 协议字段，运行时/详情展示字段不进入 bundle payload。
-function formatSubmitBundleItems(bundle) {
+function formatSubmitBundleItems(bundle, formatOptions = {}) {
   if (!Array.isArray(bundle)) return [];
   return bundle.map(b => {
     const rawBundle = b && typeof b === 'object' ? b : {};
@@ -905,10 +962,10 @@ function formatSubmitBundleItems(bundle) {
 
     // bundle_selling_price 出站存「正净额」：markdown 为 |price| − Σoptions（如 3.70），
     // markup/原价维持原值；与后端口径一致（price 仍为毛价）。
-    const sellingPrice = getBundleSellingMagnitude(rawBundle).toFixed(2);
+    const sellingPrice = formatOptions.virtualSettlementMode ? '0.00' : getBundleSellingMagnitude(rawBundle).toFixed(2);
     // payment 价由整单折扣均摊层产出；缺省（无折扣）时与 selling 净额同义。
-    const paymentPrice = rawBundle.bundle_payment_price !== undefined && rawBundle.bundle_payment_price !== null && rawBundle.bundle_payment_price !== '' ? toMoneyString(rawBundle.bundle_payment_price) : sellingPrice;
-    const priceValue = rawBundle.price ?? rawBundle.custom_price ?? rawBundle.bundle_selling_price;
+    const paymentPrice = formatOptions.virtualSettlementMode ? '0.00' : rawBundle.bundle_payment_price !== undefined && rawBundle.bundle_payment_price !== null && rawBundle.bundle_payment_price !== '' ? toMoneyString(rawBundle.bundle_payment_price) : sellingPrice;
+    const priceValue = formatOptions.virtualSettlementMode ? 0 : rawBundle.price ?? rawBundle.custom_price ?? rawBundle.bundle_selling_price;
     const relationSurchargeIds = Array.isArray(rawBundle.relation_surcharge_ids) ? rawBundle.relation_surcharge_ids : Array.isArray(existedMetadata.relation_surcharge_ids) ? existedMetadata.relation_surcharge_ids : [];
     const surchargeFee = toMoneyString(rawBundle.surcharge_fee ?? existedMetadata.surcharge_fee);
     const productDiscountDifference = toBundleNumber(existedMetadata.product_discount_difference, 0);
@@ -917,7 +974,7 @@ function formatSubmitBundleItems(bundle) {
     const hasSubmitBundleDiscounts = Array.isArray(rawBundle.discount_list) && rawBundle.discount_list.length > 0;
     const productionCode = normalizeSubmitProductionCode(rawBundle.production_code);
     return {
-      is_charge_tax: rawBundle.is_charge_tax ?? 0,
+      is_charge_tax: formatOptions.virtualSettlementMode ? 0 : rawBundle.is_charge_tax ?? 0,
       bundle_variant_id: rawBundle.bundle_variant_id ?? 0,
       ...(productionCode !== undefined ? {
         production_code: productionCode
@@ -931,7 +988,7 @@ function formatSubmitBundleItems(bundle) {
       price_type_ext: rawBundle.price_type_ext ?? rawBundle.custom_price_type_ext ?? '',
       bundle_selling_price: sellingPrice,
       bundle_payment_price: paymentPrice,
-      option: formatSubmitOptionItems(rawBundle.option),
+      option: formatSubmitOptionItems(rawBundle.option, formatOptions),
       bundle_group_id: rawBundle?.bundle_group_id ?? rawBundle?.group_id,
       bundle_id: rawBundle?.bundle_id ?? rawBundle?.id,
       bundle_product_id: rawBundle?.bundle_product_id ?? rawBundle?._bundle_product_id,
@@ -941,9 +998,9 @@ function formatSubmitBundleItems(bundle) {
         ...(hasSubmitBundleDiscounts && bundleMapId !== undefined ? {
           custom_product_bundle_map_id: bundleMapId
         } : {}),
-        surcharge_fee: surchargeFee,
-        relation_surcharge_ids: relationSurchargeIds,
-        product_discount_difference: productDiscountDifference
+        surcharge_fee: formatOptions.virtualSettlementMode ? '0.00' : surchargeFee,
+        relation_surcharge_ids: formatOptions.virtualSettlementMode ? [] : relationSurchargeIds,
+        product_discount_difference: formatOptions.virtualSettlementMode ? '' : productDiscountDifference
       }
     };
   });
@@ -963,9 +1020,9 @@ function formatSubmitBundleItems(bundle) {
  * - `metadata.main_product_selling_price`：含 option、含主商品折扣。
  * - `metadata.price_schema_version`：schema 版本号（当前 = 2），用于跨端协商价格口径。
  *
- * 本函数不再改造价格字段形状，仅做字段/metadata 裁剪。
+ * 法币仅做字段/metadata 裁剪；虚拟币在出站前再次执行零加价与固定单价断言。
  */
-function normalizeSubmitProduct(product) {
+function normalizeSubmitProduct(product, formatOptions = {}) {
   const {
     unique_identification_number: _runtimeUid,
     ...submitProduct
@@ -993,7 +1050,7 @@ function normalizeSubmitProduct(product) {
   if (rawMetadata.unique_identification_number) {
     cleanMetadata.unique_identification_number = rawMetadata.unique_identification_number;
   }
-  const priceMetaKeys = ['main_product_original_price', 'main_product_selling_price', 'main_product_attached_bundle_selling_price', 'main_product_attached_bundle_payment_price', 'average_discount_amount_rate', 'source_product_price', 'main_product_attached_bundle_surcharge_fee', 'main_product_attached_bundle_tax_fee', 'surcharge_rounding_remainder', 'tax_fee_rounding_remainder', 'relation_surcharge_ids', 'discountable_flag', 'parent_unique_identification_number', 'product_add_schedule_time'];
+  const priceMetaKeys = ['main_product_original_price', 'main_product_selling_price', 'main_product_attached_bundle_selling_price', 'main_product_attached_bundle_payment_price', 'average_discount_amount_rate', 'source_product_price', 'main_product_attached_bundle_surcharge_fee', 'main_product_attached_bundle_tax_fee', 'surcharge_rounding_remainder', 'tax_fee_rounding_remainder', 'relation_surcharge_ids', 'discountable_flag', 'price_schema_version', 'parent_unique_identification_number', 'product_add_schedule_time', 'data_variant_ids'];
   for (const key of priceMetaKeys) {
     if (rawMetadata[key] !== undefined) {
       cleanMetadata[key] = rawMetadata[key];
@@ -1009,12 +1066,36 @@ function normalizeSubmitProduct(product) {
   if (rawMetadata.holder_config !== undefined) {
     cleanMetadata.holder_config = rawMetadata.holder_config;
   }
+  const virtualPrice = toMoneyString(rawMetadata.selected_settlement_snapshot?.price ?? submitProduct.selling_price);
+  if (formatOptions.virtualSettlementMode) {
+    Object.assign(cleanMetadata, {
+      source_product_price: virtualPrice,
+      main_product_original_price: virtualPrice,
+      main_product_selling_price: virtualPrice,
+      main_product_attached_bundle_selling_price: virtualPrice,
+      main_product_attached_bundle_payment_price: virtualPrice,
+      main_product_attached_bundle_surcharge_fee: '0.00',
+      main_product_attached_bundle_tax_fee: '0.00',
+      surcharge_rounding_remainder: '0.00',
+      tax_fee_rounding_remainder: '0.00',
+      relation_surcharge_ids: [],
+      average_discount_amount_rate: '1',
+      product_discount_difference: '',
+      discountable_flag: 0,
+      price_schema_version: 2
+    });
+  }
   const productSku = {
     ...(submitProduct.product_sku && typeof submitProduct.product_sku === 'object' ? submitProduct.product_sku : {}),
-    option: formatSubmitOptionItems(submitProduct.product_sku?.option)
+    option: formatSubmitOptionItems(submitProduct.product_sku?.option, formatOptions)
   };
   return {
     ...productRest,
+    ...(formatOptions.virtualSettlementMode ? {
+      selling_price: virtualPrice,
+      original_price: virtualPrice,
+      is_charge_tax: 0
+    } : {}),
     ...(productionCode !== undefined ? {
       production_code: productionCode
     } : {}),
@@ -1026,12 +1107,12 @@ function normalizeSubmitProduct(product) {
     } : {}),
     product_quantity: toBundleNumber(num ?? submitProduct.product_quantity, 1),
     product_sku: productSku,
-    discount_list: collectSubmitProductDiscountList(submitProduct),
-    product_bundle: formatSubmitBundleItems(submitProduct.product_bundle),
+    discount_list: formatOptions.virtualSettlementMode ? [] : collectSubmitProductDiscountList(submitProduct),
+    product_bundle: formatSubmitBundleItems(submitProduct.product_bundle, formatOptions),
     metadata: cleanMetadata,
     // 出站兼容：后端消费 payment_price 字段（行 composite 已减整单折扣均摊）。
     // 由整单折扣均摊层产出；缺省（无折扣）时与 selling_price 同义。
-    payment_price: submitProduct.payment_price ?? submitProduct.selling_price
+    payment_price: formatOptions.virtualSettlementMode ? virtualPrice : submitProduct.payment_price ?? submitProduct.selling_price
   };
 }
 const SUBMIT_BOOKING_METADATA_WHITELIST = ['unique_identification_number', 'collect_pax', 'capacity', 'holder_id', 'resource_select_type', 'holder'];
@@ -1128,6 +1209,7 @@ function createDefaultTempOrder(params) {
     request_unique_idempotency_token: '',
     vouchers: [],
     products: [],
+    notes: [],
     bookings: [],
     payments: [],
     surcharges: [],
@@ -1137,7 +1219,11 @@ function createDefaultTempOrder(params) {
     holder: null,
     metadata: {},
     _extend: {
-      productsByUid: {}
+      productsByUid: {},
+      salesNotesState: {
+        loaded: true,
+        dirty: false
+      }
     }
   };
 }
@@ -1199,6 +1285,7 @@ function buildSubmitPayload(params) {
   } = params;
   const scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
   const bookingUuid = (0, _orderCollectionIdentity.createUuidV4)();
+  const virtualSettlementMode = tempOrder.metadata?.currency_settlement_config?.settlement_type === 'virtual_currency';
   const {
     _extend: _extend,
     relation_id: _relationId,
@@ -1213,14 +1300,18 @@ function buildSubmitPayload(params) {
     start_time: _startTime,
     customer: _customer,
     discount_list: _discountList,
+    order_meta_list: _orderMetaList,
     tax_fee: _rootTaxFee,
     total_amount: _totalAmount,
     total_refund_amount: _totalRefundAmount,
     create_date: _createDate,
     holder_id: _holderId,
+    payment_status: _paymentStatus,
+    notes: _notes,
     ...tempOrderRest
   } = tempOrder;
   const resolvedBusinessCode = businessCode ?? tempOrder.business_code;
+  const normalizedOrderMetaList = normalizeOrderMetaList(tempOrder.order_meta_list);
   const submitType = resolveSubmitOrderType({
     requestedType: type,
     tempOrderType: tempOrder.type,
@@ -1246,7 +1337,9 @@ function buildSubmitPayload(params) {
     sales_channel: tempOrder.sales_channel || 'my_pisel',
     order_sales_channel: channel ?? tempOrder.order_sales_channel ?? 'online_store',
     status: tempOrder.status || 'normal',
-    payment_status: tempOrder.payment_status || 'payment_processing',
+    ...(params.includePaymentStatus !== false ? {
+      payment_status: tempOrder.payment_status || 'payment_processing'
+    } : {}),
     // shipping_status: tempOrder.shipping_status || 'unfulfilled',
     is_price_include_tax: tempOrder.is_price_include_tax ?? 1,
     currency_format: tempOrder.currency_format || 'symbol_first',
@@ -1269,13 +1362,26 @@ function buildSubmitPayload(params) {
       const {
         collect_pax: _collectPax,
         table_occupancy_duration: _tableOccupancyDuration,
+        cart_settlement_key: _cartSettlementKey,
+        cart_settlement_snapshot: _cartSettlementSnapshot,
+        legal_currency_snapshot: _legalCurrencySnapshot,
         ...rest
       } = tempOrder.metadata || {};
       return {
         ...rest
       };
     })(),
-    products: (tempOrder.products || []).map(product => normalizeSubmitProduct(product))
+    ...(tempOrder._extend?.salesNotesState?.dirty ? {
+      notes: (0, _salesNotes.encodeSalesNotes)(tempOrder.notes || [], {
+        allowUnresolvedOrderTarget: true
+      })
+    } : {}),
+    products: (tempOrder.products || []).map(product => normalizeSubmitProduct(product, {
+      virtualSettlementMode
+    })),
+    ...(normalizedOrderMetaList !== undefined ? {
+      order_meta_list: normalizedOrderMetaList
+    } : {})
   };
   if (!enhance) return payload;
   const enhancedPayload = enhance(payload, {

package/lib/modules/Payment/walletpass.js

@@ -650,17 +650,20 @@ class WalletPassPaymentImpl {
         this.paymentModule.logInfo('[WalletPass] 商品列表为空，跳过获取用户识别码列表');
         return [];
       }
-      const platform = this.paymentModule.getPlatform();
-      if (platform === 'pc' || platform === 'h5') {
-        this.userIdentificationCodes = [];
-        this.emitEvent(_types.WalletPassHooks.OnUserIdentificationCodesUpdated, {
-          userIdentificationCodes: []
-        });
-        this.paymentModule.logInfo('[WalletPass] 用户端平台跳过获取用户识别码列表', {
-          platform
-        });
-        return [];
-      }
+
+      // const platform = this.paymentModule.getPlatform();
+      // if (platform === 'pc' || platform === 'h5') {
+      //   this.userIdentificationCodes = [];
+      //   this.emitEvent(WalletPassHooks.OnUserIdentificationCodesUpdated, {
+      //     userIdentificationCodes: [],
+      //   } as OnUserIdentificationCodesUpdatedEventData);
+      //   this.paymentModule.logInfo(
+      //     '[WalletPass] 用户端平台跳过获取用户识别码列表',
+      //     { platform },
+      //   );
+      //   return [];
+      // }
+
       if (typeof newParams.payment_order_id === 'string' && newParams.payment_order_id.startsWith('LOCAL_')) {
         newParams.payment_order_id = undefined;
       }

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

@@ -23,12 +23,25 @@ export interface ProductDataVariant {
     module_data_id: number;
     /** 关联 data_variant_rule.id */
     data_variant_rule_id: number;
+    /** 多货币结算等业务类型 */
+    business_type?: 'multi_currency_settlement' | string;
+    /** 数据状态；多货币结算仅处理 enable 记录 */
+    status?: 'enable' | 'disable' | string;
     /** 命中策略后覆盖到商品上的字段 */
     data: Record<string, any>;
     created_at: string | null;
     updated_at: string | null;
     deleted_at: string | null;
 }
+export interface ProductSettlementOption extends Record<string, any> {
+    settlement_type: 'legal_currency' | 'virtual_currency' | string;
+    currency_product_id?: number;
+    price: string;
+    data_variant_id?: number;
+    data_variant_rule_id: number | string;
+    available: boolean;
+    disabled_reason?: string;
+}
 /**
  * 商品基本信息接口
  */
@@ -61,6 +74,8 @@ export interface ProductData {
     sum_stock: number;
     /** 商品价格 */
     price: string;
+    /** 当前上下文解析出的可选结算货币 */
+    available_settlement_options?: ProductSettlementOption[];
     /** 商品原价 */
     original_price: string;
     /** 商品成本价 */
@@ -239,6 +254,14 @@ export interface ProductData {
     option_group_count: number;
     /** 智能定价变体列表，/product/query with dataVariants 返回 */
     data_variants?: ProductDataVariant[];
+    /**
+     * 商品接口规则计算结果；data_variant_ids 按优先级从高到低排列。
+     * 空数组表示规则已经计算完成但没有命中 Data Variant。
+     */
+    metadata?: {
+        data_variant_ids?: Array<number | string>;
+        [key: string]: any;
+    };
     /** 服务时长 */
     service_times?: any;
 }

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

@@ -1,6 +1,6 @@
 import { Module, PisellCore } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { ProductListLoadProductsParams } from './types';
+import { ProductListLoadProductsParams, ProductListStoreQueryParams } from './types';
 import { ProductData } from '../Product/types';
 export * from './types';
 export declare class ProductList extends BaseModule implements Module {
@@ -52,6 +52,7 @@ export declare class ProductList extends BaseModule implements Module {
     getRawProductPriceSources(ids: number[]): Map<number, ProductData>;
     getProducts(): Promise<ProductData[]>;
     getProduct(id: number): Promise<ProductData | undefined>;
+    queryProducts(params?: ProductListStoreQueryParams): Promise<ProductData[]>;
     getProductByIds(ids: number[]): Promise<ProductData[] | undefined>;
     addProduct(products: ProductData[]): Promise<void>;
     selectProducts(products: ProductData[]): Promise<void>;

package/lib/modules/ProductList/index.js

@@ -25,6 +25,15 @@ Object.keys(_types).forEach(function (key) {
   });
 });
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function normalizeQuerySet(values) {
+  if (!Array.isArray(values) || values.length === 0) return null;
+  const normalized = values.map(value => String(value ?? '').trim()).filter(Boolean);
+  return normalized.length ? new Set(normalized) : null;
+}
+function matchesAny(values, querySet) {
+  if (!querySet) return true;
+  return values.some(value => querySet.has(String(value ?? '').trim()));
+}
 class ProductList extends _BaseModule.BaseModule {
   defaultName = 'productList';
   defaultVersion = '1.0.0';
@@ -281,10 +290,46 @@ class ProductList extends _BaseModule.BaseModule {
     const product = this.store.list.find(product => product.id === id);
     return product ? (0, _lodashEs.cloneDeep)(product) : undefined;
   }
+  async queryProducts(params = {}) {
+    const includeIds = normalizeQuerySet(params.includeIds);
+    const excludeIds = normalizeQuerySet(params.excludeIds);
+    const categoryIds = normalizeQuerySet(params.categoryIds);
+    const collectionIds = normalizeQuerySet(params.collectionIds);
+    const extensionTypes = normalizeQuerySet(params.extensionTypes);
+    const statuses = normalizeQuerySet(params.statuses);
+    const channelApplications = normalizeQuerySet(params.channelApplications);
+    const codeOrBarcode = typeof params.codeOrBarcode === 'string' ? params.codeOrBarcode.trim() : '';
+    const products = (this.store.list || []).filter(product => {
+      const productId = String(product.id ?? '').trim();
+      if (includeIds && !includeIds.has(productId)) return false;
+      if (excludeIds && excludeIds.has(productId)) return false;
+      if (categoryIds) {
+        const productCategoryIds = (product.categories || []).flatMap(category => [category?.id, category?.pivot?.product_category_id]);
+        if (!matchesAny(productCategoryIds, categoryIds)) return false;
+      }
+      if (collectionIds) {
+        const productCollectionIds = (product.collection || []).map(collection => collection?.id);
+        if (!matchesAny(productCollectionIds, collectionIds)) return false;
+      }
+      if (extensionTypes && !extensionTypes.has(String(product.extension_type ?? '').trim())) return false;
+      if (statuses && !statuses.has(String(product.status ?? '').trim())) return false;
+      if (channelApplications) {
+        if (!matchesAny(product.channel_application || [], channelApplications)) return false;
+      }
+      if (codeOrBarcode) {
+        const code = typeof product.code === 'string' ? product.code.trim() : '';
+        const barcode = typeof product.barcode === 'string' ? product.barcode.trim() : '';
+        if (code !== codeOrBarcode && barcode !== codeOrBarcode) return false;
+      }
+      return true;
+    });
+    return (0, _lodashEs.cloneDeep)(products);
+  }
   async getProductByIds(ids) {
     await this.core.effects.emit(`${this.name}:onGetProductByIds`, this.store.list);
-    const products = this.store.list.filter(product => ids.includes(product.id));
-    return products;
+    return this.queryProducts({
+      includeIds: ids
+    });
   }
   async addProduct(products) {
     // list 需要根据 id 去重

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

@@ -15,6 +15,16 @@ export interface ProductListLoadProductsParams {
     /** 智能定价条件上下文，仅影响策略命中，不参与商品集合筛选 */
     strategy_context?: Record<string, any>;
 }
+export interface ProductListStoreQueryParams {
+    includeIds?: Array<number | string>;
+    excludeIds?: Array<number | string>;
+    categoryIds?: Array<number | string>;
+    collectionIds?: Array<number | string>;
+    extensionTypes?: string[];
+    statuses?: ProductData['status'][];
+    channelApplications?: string[];
+    codeOrBarcode?: string;
+}
 export interface ProductListData {
     list: ProductData[];
     selectProducts: ProductData[];

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

@@ -14,6 +14,11 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     setRulesList(rulesList: Rules[]): Promise<void>;
     getRulesList(): Rules[];
     getWalletPassEvaluator(): import("../..").WalletPassEvaluator | undefined;
+    private normalizeHolderRecordIds;
+    /**
+     * 特定 form Holder 卡只授权给绑定同一 Holder Record 的商品行。
+     * required/isNeedHolder 仅控制是否强制选择 Holder，不参与优惠资格。
+     */
     private checkHolderMatch;
     isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, orderTotalAmount, holders, isFormSubject, }: {
         oldDiscountList: Discount[];

package/lib/modules/Rules/index.js

@@ -38,21 +38,30 @@ class RulesModule extends _BaseModule.BaseModule {
   getWalletPassEvaluator() {
     return this.window.getWalletPassEvaluator?.();
   }
+  normalizeHolderRecordIds(value) {
+    const records = Array.isArray(value) ? value : [value];
+    return Array.from(new Set(records.map(record => {
+      if (record && typeof record === 'object') {
+        return record.form_record_id;
+      }
+      return record;
+    }).filter(record => record !== undefined && record !== null && record !== '' && record !== 0 && record !== '0').map(String)));
+  }
 
-  // 商品不需要holder,则不需要判断，直接返回true，商品需要holder但是还没填写，那么暂时不使用带有holder的券，直到填写才去匹配
+  /**
+   * 特定 form Holder 卡只授权给绑定同一 Holder Record 的商品行。
+   * required/isNeedHolder 仅控制是否强制选择 Holder，不参与优惠资格。
+   */
   checkHolderMatch(discount, product, holders) {
     // 非表单类型 holder 视为匹配
     if (discount.holder?.holder_type !== 'form') return true;
-    // 主预约holder, 目前（20251124）默认只考虑单个holder的情况
-    // 旧版 holders[0].form_record_id 新版 holders[0]
-    const orderHolderId = Array.isArray(holders) && holders.length > 0 ? holders[0].form_record_id || holders[0] : undefined;
-    const productHolderId = Array.isArray(product.holder_id) ? product.holder_id[0] : product.holder_id;
-    // 商品不需要选holder，则不对比holder，直接返回true，
-    if (!product.isNeedHolder) return true;
-    // 商品需要holder，但父预约及商品都无holder，返回false
-    if (!orderHolderId && !productHolderId) return false;
-    // 最终直接匹配 holder 是否相同
-    return (productHolderId || orderHolderId) === discount.holder.holder_id;
+    const discountHolderIds = this.normalizeHolderRecordIds(discount.holder.holder_id);
+    if (!discountHolderIds.length) return false;
+    const productHolderIds = this.normalizeHolderRecordIds(product.holder_id);
+    const candidateHolderIds = productHolderIds.length ? productHolderIds : this.normalizeHolderRecordIds(holders);
+    if (!candidateHolderIds.length) return false;
+    const discountHolderIdSet = new Set(discountHolderIds);
+    return candidateHolderIds.some(holderId => discountHolderIdSet.has(holderId));
   }
 
   // 判断discountList 是否可以对当前productList生效
@@ -1119,7 +1128,8 @@ class RulesModule extends _BaseModule.BaseModule {
           processedFlatItemsMap.set(flatItem._id, [{
             ...flatItem,
             discount_list: isManualDiscount ? this.resolveDiscountListForManualOverride(flatItem.bundleItem?.discount_list || []) : this.filterDiscountListByType(flatItem.bundleItem?.discount_list || [], 'promotion'),
-            price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
+            price: flatItem.bundleItem.price,
+            bundle_selling_price: flatItem.bundleItem.bundle_selling_price ?? (isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price),
             processed: true
           }]);
         }

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

@@ -30,6 +30,7 @@ export declare class SalesSummaryModule extends BaseModule implements Module, Sa
         taxRate?: number;
         shopDiscount?: string | number;
         channel?: string;
+        virtualSettlementMode?: boolean;
     }): Promise<{
         tax_title: string;
         tax_rate: number | undefined;

package/lib/modules/SalesSummary/index.js

@@ -126,7 +126,8 @@ class SalesSummaryModule extends _BaseModule.BaseModule {
       isPriceIncludeTax,
       taxRate,
       shopDiscount,
-      channel
+      channel,
+      virtualSettlementMode = false
     } = params;
     const summaryChannel = channel || this.resolveChannel();
     if (summaryChannel !== this.surchargeListChannel) {
@@ -151,7 +152,8 @@ class SalesSummaryModule extends _BaseModule.BaseModule {
       surchargeList: this.store.surchargeList,
       scheduleById,
       isInScheduleByDate: _Schedule.ScheduleModule.isInScheduleByDate,
-      shopDiscount
+      shopDiscount,
+      virtualSettlementMode
     });
     const summaryWithTaxMeta = {
       ...summary,

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

@@ -64,5 +64,6 @@ export interface SalesSummaryModuleAPI {
         taxRate?: number;
         shopDiscount?: string | number;
         channel?: string;
+        virtualSettlementMode?: boolean;
     }): Promise<SalesSummaryData>;
 }

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

@@ -8,4 +8,5 @@ export declare function calculateSalesSummary(params: {
     scheduleById?: Record<string, any>;
     isInScheduleByDate?: any;
     shopDiscount?: string | number;
+    virtualSettlementMode?: boolean;
 }): SalesSummaryData;

package/lib/modules/SalesSummary/utils.js

@@ -837,11 +837,27 @@ function calculateSalesSummary(params) {
     surchargeList,
     scheduleById = {},
     isInScheduleByDate,
-    shopDiscount
+    shopDiscount,
+    virtualSettlementMode = false
   } = params;
   if (!products?.length) return createEmptySalesSummary();
   const summaryProducts = products.filter(product => !isGeneratedVoucherProduct(product));
   if (!summaryProducts.length) return createEmptySalesSummary();
+  if (virtualSettlementMode) {
+    const productQuantity = summaryProducts.reduce((sum, item) => sum + getSafeNum(item.num), 0);
+    const productAmount = summaryProducts.reduce((sum, item) => sum.plus(toDecimal(item.selling_price).times(getSafeNum(item.num))), new _decimal.default(0));
+    const amount = toFixed2(productAmount);
+    return {
+      ...createEmptySalesSummary(),
+      product_quantity: productQuantity,
+      product_original_amount: amount,
+      product_amount: amount,
+      product_expect_amount: amount,
+      expect_amount: amount,
+      total_amount: amount,
+      is_price_include_tax: isPriceIncludeTax
+    };
+  }
   const productQuantity = summaryProducts.reduce((sum, item) => sum + getSafeNum(item.num), 0);
   const productOriginalAmount = summaryProducts.reduce((sum, item) => sum.plus(getUnitOriginalTotal(item).times(getSafeNum(item.num))), new _decimal.default(0));
   const productAmount = summaryProducts.reduce((sum, item) => sum.plus(getUnitPaymentTotal(item).times(getSafeNum(item.num))), new _decimal.default(0));

package/lib/plugins/request.d.ts

@@ -70,6 +70,7 @@ export interface RequestOptions {
     cache?: CacheProps;
     cacheUpdateChange?: (data: any) => void;
     osServer?: boolean;
+    isNocobase?: boolean;
     prefix?: boolean;
     callback?: (res: any) => void;
     subscriberId?: string;
@@ -125,7 +126,7 @@ declare class RequestPluginImpl implements RequestPlugin {
     /**
      * GET 请求
      */
-    get<T = any>(url: string, options?: RequestOptions): Promise<T>;
+    get<T = any>(url: string, dataOrOptions?: any, options?: RequestOptions): Promise<T>;
     /**
      * POST 请求
      */