@pisell/pisellos 2.3.53 → 2.3.55

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

@@ -0,0 +1,123 @@
+import { ProductData } from '../Product/types';
+/**
+ * 商品 holder 配置
+ */
+export interface IHolderConfig {
+    required?: number;
+    resource_id: number;
+    status?: string;
+    [key: string]: any;
+}
+/**
+ * 表单记录
+ */
+export interface IFormRecord {
+    form_id: number;
+    form_record_id: number;
+    main_field: string;
+    customer_cover?: string;
+    created_at?: string;
+    customer_id?: number;
+    [key: string]: any;
+}
+/**
+ * 表单配置/定义
+ */
+export interface IFormInfo {
+    form_id: number;
+    name: string;
+    fields?: Record<string, any>[];
+    [key: string]: any;
+}
+/**
+ * 单个 form_id 下的数据结构
+ */
+export interface IFormItemData {
+    records: IFormRecord[];
+    form: IFormInfo | Record<string, any>;
+}
+/**
+ * form_id 为 key 的 map 结构，如 948: { records: [], form: {} }
+ */
+export type HolderFormMap = Record<string, IFormItemData>;
+/**
+ * Holder 模块 reactive store，仅 holderMap 会触发 changed 事件
+ */
+export interface HolderState {
+    holderMap: HolderFormMap;
+}
+export interface IFetchFormInfoParams {
+    url?: string;
+    query: {
+        form_id: string | number;
+    };
+    useCache?: boolean;
+}
+export interface IFetchFormRecordsParams {
+    url?: string;
+    query: {
+        customer_id?: number;
+        form_id: string | number;
+        shop_id: string | number;
+        num?: number;
+        skip?: number;
+        [key: string]: any;
+    };
+    useCache?: boolean;
+}
+export interface IAddFormRecordParams {
+    url?: string;
+    body: {
+        form_id: number;
+        shop_id: number | string;
+        customer_id?: number;
+        [key: string]: any;
+    };
+}
+/**
+ * UI 层自行调用添加接口后，将返回记录写入 holderMap
+ */
+export interface IAppendFormRecordParams {
+    /** 接口返回的 data，或完整响应 { data: {...} } */
+    record: IFormRecord | Record<string, any>;
+    /** 可选，未传则从 record.form_id 读取 */
+    form_id?: number | string;
+}
+export interface IEnsureFormDataParams {
+    form_id: number | string;
+    shop_id: number | string;
+    customer_id?: number;
+    useCache?: boolean;
+    forceRefresh?: boolean;
+    formInfoUrl?: string;
+    recordsUrl?: string;
+    skip?: number;
+    num?: number;
+}
+export interface IEnsureFormByProductParams {
+    product: ProductData | Record<string, any>;
+    customer_id?: number;
+    shop_id?: number | string;
+    useCache?: boolean;
+}
+export interface IRefreshAllFormRecordsParams {
+    customer_id?: number;
+    useCache?: boolean;
+    recordsUrl?: string;
+    num?: number;
+    skip?: number;
+}
+export interface HolderModuleAPI {
+    getHolderFormMap: () => HolderFormMap;
+    getHolderFormData: (formId: number | string) => IFormItemData | undefined;
+    setFormData: (formId: number | string, data: Partial<IFormItemData>) => void;
+    fetchFormInfo: (params: IFetchFormInfoParams) => Promise<IFormInfo | IFormInfo[]>;
+    fetchRecords: (params: IFetchFormRecordsParams) => Promise<IFormRecord[]>;
+    ensureFormData: (params: IEnsureFormDataParams) => Promise<IFormItemData>;
+    ensureFormByProduct: (params: IEnsureFormByProductParams) => Promise<IFormItemData | null>;
+    addFormRecord: (params: IAddFormRecordParams) => Promise<IFormRecord>;
+    appendFormRecord: (params: IAppendFormRecordParams) => IFormRecord;
+    removeFormRecord: (formId: number | string, formRecordId: number) => void;
+    clearFormData: (formId?: number | string) => void;
+    refreshAllFormRecords: (params?: IRefreshAllFormRecordsParams) => Promise<HolderFormMap>;
+}

package/lib/modules/Holder/types.js

@@ -0,0 +1,17 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/Holder/types.ts
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

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

@@ -0,0 +1,13 @@
+import { ProductData } from '../Product/types';
+import { IFormItemData, IHolderConfig } from './types';
+export declare function getProductHolderConfig(product?: ProductData | Record<string, any> | null): IHolderConfig | null;
+export declare function getFormIdFromHolderConfig(config: IHolderConfig): number;
+export declare function normalizeFormId(formId: number | string): number;
+export declare function createEmptyFormItemData(): {
+    records: any[];
+    form: Record<string, any>;
+};
+export declare function resolveFormMetaFromHolderItem(mapKey: string, item: IFormItemData): {
+    form_id: string | number;
+    shop_id: number | string;
+} | null;

package/lib/modules/Holder/utils.js

@@ -0,0 +1,71 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/Holder/utils.ts
+var utils_exports = {};
+__export(utils_exports, {
+  createEmptyFormItemData: () => createEmptyFormItemData,
+  getFormIdFromHolderConfig: () => getFormIdFromHolderConfig,
+  getProductHolderConfig: () => getProductHolderConfig,
+  normalizeFormId: () => normalizeFormId,
+  resolveFormMetaFromHolderItem: () => resolveFormMetaFromHolderItem
+});
+module.exports = __toCommonJS(utils_exports);
+function getProductHolderConfig(product) {
+  var _a;
+  if (!product)
+    return null;
+  const config = (product == null ? void 0 : product.holder_config) ?? ((_a = product == null ? void 0 : product.origin) == null ? void 0 : _a.holder_config);
+  if ((config == null ? void 0 : config.status) && (config == null ? void 0 : config.status) !== "enable")
+    return null;
+  if (!(config == null ? void 0 : config.resource_id))
+    return null;
+  return config;
+}
+function getFormIdFromHolderConfig(config) {
+  return Number(config == null ? void 0 : config.resource_id);
+}
+function normalizeFormId(formId) {
+  return Number(formId);
+}
+function createEmptyFormItemData() {
+  return {
+    records: [],
+    form: {}
+  };
+}
+function resolveFormMetaFromHolderItem(mapKey, item) {
+  const formInfo = item.form || {};
+  const nestedForm = formInfo.form || {};
+  const form_id = normalizeFormId(
+    nestedForm.id ?? formInfo.form_id ?? formInfo.id ?? mapKey
+  );
+  const shop_id = nestedForm.shop_id ?? formInfo.shop_id;
+  if (shop_id === void 0 || shop_id === null || shop_id === "") {
+    return null;
+  }
+  return { form_id, shop_id };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createEmptyFormItemData,
+  getFormIdFromHolderConfig,
+  getProductHolderConfig,
+  normalizeFormId,
+  resolveFormMetaFromHolderItem
+});

package/lib/modules/OpenData/index.js

@@ -73,7 +73,7 @@ var OpenDataModule = class extends import_BaseModule.BaseModule {
   }
   async fetchOpenData(params) {
     var _a, _b;
-    const getData = (_b = (_a = this.appPlugin).getData) == null ? void 0 : _b.call(_a);
+    const getData = (_b = (_a = this.appPlugin) == null ? void 0 : _a.getData) == null ? void 0 : _b.call(_a);
     const shopId = getData == null ? void 0 : getData("shop_id");
     if (!shopId)
       throw new Error("[OpenDataModule] 无法获取 shop_id");

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

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { OrderModuleAPI, CommitOrderParams, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, CheckoutOrderParams, CancelOrderParams, ChangeBookingStatusParams } from './types';
+import { OrderModuleAPI, CommitOrderParams, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, CancelOrderParams, ChangeBookingStatusParams, CheckoutOrderParams } from './types';
 import { CartItem } from '../Cart/types';
 import { type SubmitPayloadEnhancer } from './utils';
 import type { OrderAmountSnapshot, AddProductBookingInput, AddProductToOrderOptions, OrderIdentitySnapshot, OrderPaymentSource, OrderSnapshot, OrderSyncState, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, SubmitSalesOrderParams, OrderProduct, OrderProductIdentity, OrderSummary, OrderTempOrder, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView, ReplaceTempOrderOptions, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions, RemoveProductsFromOrderOptions } from './types';
@@ -147,6 +147,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     isTempOrderPersistEnabled(): boolean;
     /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化；草稿保存请使用 IndexedDB saveDraft。 */
     persistTempOrder(): void;
+    notifyTempOrderChanged(): void;
     private createDefaultTempOrderInstance;
     private createExternalSaleNumber;
     private ensureExternalSaleNumber;
@@ -486,7 +487,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;
@@ -496,6 +497,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         is_deposit: number;
         relation_products: any[];
         relation_forms: any[];
+        business_code: string | undefined;
     };
     checkBeforeSubmitOrder(params: {
         cartItems: CartItem[];

package/lib/modules/Order/index.js

@@ -328,7 +328,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
   }
   async initialize(core, options) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     this.core = core;
     this.store = options.store;
     if (!this.store.tempOrder) {
@@ -341,19 +341,19 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       this.store.availableWalletIds = [];
     }
     this.request = this.core.getPlugin("request");
-    this.appPlugin = this.core.getPlugin("app");
-    if (!this.appPlugin) {
-      throw new Error("Order 模块需要 app 插件支持");
+    const appPlugin = this.core.getPlugin("app");
+    if (!appPlugin) {
+      console.error("Order 模块需要 app 插件支持");
     }
-    const app = this.appPlugin.getApp();
-    this.logger = app.logger;
+    const app = (_a = appPlugin == null ? void 0 : appPlugin.getApp) == null ? void 0 : _a.call(appPlugin);
+    this.logger = app == null ? void 0 : app.logger;
     this.window = this.core.getPlugin("window");
     const otherParams = options.otherParams || {};
     this.cacheId = otherParams.cacheId;
     this.salesSummaryModuleName = otherParams.salesSummaryModuleName;
-    this.rulesHooksOverride = (_a = otherParams.rules) == null ? void 0 : _a.hooks;
+    this.rulesHooksOverride = (_b = otherParams.rules) == null ? void 0 : _b.hooks;
     this.moduleHooksOverride = options.hooks;
-    this.orderHooks = this.moduleHooksOverride || ((_b = otherParams.order) == null ? void 0 : _b.hooks) || ((_c = otherParams.hooks) == null ? void 0 : _c.order);
+    this.orderHooks = this.moduleHooksOverride || ((_c = otherParams.order) == null ? void 0 : _c.hooks) || ((_d = otherParams.hooks) == null ? void 0 : _d.order);
     this.otherParams = otherParams;
     this.registerDiscountModules(options);
     this.logInfo("OrderModule initialized successfully");
@@ -880,6 +880,16 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化；草稿保存请使用 IndexedDB saveDraft。 */
   persistTempOrder() {
   }
+  notifyTempOrderChanged() {
+    if (!this.store.tempOrder)
+      return;
+    this.store.tempOrder = {
+      ...this.store.tempOrder,
+      products: [...this.store.tempOrder.products],
+      bookings: this.store.tempOrder.bookings ? [...this.store.tempOrder.bookings] : []
+    };
+    this.persistTempOrder();
+  }
   // ─── TempOrder: 创建 & 获取 ───
   createDefaultTempOrderInstance() {
     return (0, import_utils.createDefaultTempOrder)({
@@ -2888,7 +2898,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * await this.appendProductLineToTempOrder(tempOrder, { product_id: 1, num: 1 }, booking);
    */
   async appendProductLineToTempOrder(tempOrder, product, booking, options) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f, _g;
     const linked = booking ? this.createLinkedProductAndBooking({ product, booking }) : null;
     const productToAdd = (linked == null ? void 0 : linked.product) || product;
     const incomingFingerprint = (0, import_utils3.buildProductLineFingerprint)(
@@ -2920,7 +2930,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     );
     const hasIncomingProductNote = this.hasOrderProductLineNote(normalizedIncoming);
     const hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
-    const shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingBookingUid || isWeighingProduct;
+    const isIncomingCustomItem = ((_e = (_d = productToAdd.metadata) == null ? void 0 : _d.origin) == null ? void 0 : _e.isCustomItem) === true || ((_f = productToAdd._origin) == null ? void 0 : _f.isCustomItem) === true;
+    const shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
     const matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex((item) => {
       var _a2;
       if (this.hasGoodPassDiscount(item))
@@ -2981,7 +2992,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       }
     } else {
       const targetProduct = matchedProduct;
-      const targetUid = (_d = targetProduct.metadata) == null ? void 0 : _d.unique_identification_number;
+      const targetUid = (_g = targetProduct.metadata) == null ? void 0 : _g.unique_identification_number;
       const normalizedProduct = (0, import_utils.mergeOrderProductDisplayFields)(
         targetProduct,
         (0, import_utils3.normalizeOrderProduct)({
@@ -3985,7 +3996,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       tempOrder,
       effectivePayments
     );
-    const submitResult = await this.submitTempOrder({
+    const submitParams = {
       payments: effectivePayments,
       paymentStatus,
       smallTicketDataFlag: params.smallTicketDataFlag,
@@ -3999,7 +4010,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         };
         return nextPayload;
       }
-    });
+    };
+    const submitResult = params.checkoutSyncTaskEnabled === false ? await this.submitTempOrderAsync(submitParams) : await this.submitTempOrder(submitParams);
     return { ...completion, submitResult };
   }
   createOrder(params) {
@@ -4016,11 +4028,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       is_deposit: 0,
       relation_products: [],
       relation_forms: [],
+      business_code: params == null ? void 0 : params.business_code,
       ...(params == null ? void 0 : params.extraData) || {}
     };
     let is_deposit = 0;
     if (params.cartItems.length > 0) {
       params.cartItems.forEach((item) => {
+        var _a2;
         if (!item._origin.duration) {
           const { duration, durationType } = (0, import_utils.generateDuration)(item);
           item._origin.duration = duration;
@@ -4029,6 +4043,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         item._origin.sub_type = (0, import_utils.normalizeBookingSubType)(item._origin);
         const discountList = (0, import_utils.getAllDiscountList)(item);
         item._origin.product.discount_list = discountList;
+        if ((_a2 = params == null ? void 0 : params.extraData) == null ? void 0 : _a2.is_add_holder_info) {
+          (0, import_utils.ensureCartItemOriginHolder)(item, this.window);
+        }
         if ((0, import_utils2.isNormalProduct)(item._origin)) {
           order.relation_products.push(item._origin.product);
           const relationForms = item._origin.relation_forms || [];

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

@@ -414,6 +414,7 @@ export interface CommitOrderParams {
         type: 'virtual' | 'appointment_booking';
         platform?: string;
         extraData?: Record<string, any>;
+        business_code?: string;
     };
 }
 export interface OrderSubmitBooking {
@@ -589,6 +590,12 @@ export interface SyncPaymentsToOrderParams {
     payments: OrderPaymentSource[];
     paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
     submitWhenPaid?: boolean;
+    /**
+     * Whether the checkout should be queued as the local `sync_sales` task.
+     * Defaults to true to preserve the WebPOS retry path. Set to false when
+     * the caller must wait for the cloud checkout response before proceeding.
+     */
+    checkoutSyncTaskEnabled?: boolean;
     smallTicketDataFlag?: number;
     businessCode?: string;
     channel?: string;
@@ -751,6 +758,8 @@ export interface OrderModuleAPI {
     setEnableTempOrderPersist: (enabled: boolean) => void;
     /** 是否允许 saveDraft 写入 IndexedDB 草稿。 */
     isTempOrderPersistEnabled: () => boolean;
+    /** 提交 tempOrder 变更并触发 `{moduleName}:changed` 事件 */
+    notifyTempOrderChanged: () => void;
     submitTempOrder: <T = any>(params?: {
         cacheId?: string;
         platform?: string;

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

@@ -15,6 +15,7 @@ export interface OrderProductsDepositSummary {
     deposit_policy_ids: number[];
     hasDeposit: boolean;
 }
+import type { WindowPlugin } from '../../plugins';
 /**
  * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
  *
@@ -177,6 +178,15 @@ export declare const mergeRelationForms: (relationForms: {
     form_id: number;
     form_record_ids: number[];
 }[];
+export interface CartOrderHolder {
+    customer_id?: number;
+    form_id: number | string;
+    form_record: (number | string)[] | null;
+}
+/**
+ * 为购物车行补齐订单所需的 holder 信息（与 cartAccount 结构保持一致）
+ */
+export declare function ensureCartItemOriginHolder(cartItem: CartItem, window?: WindowPlugin): void;
 export declare const getAllDiscountList: (cartItem: CartItem) => any;
 export { createUuidV4 };
 export declare function isTempOrder(data: any): data is OrderTempOrder;

package/lib/modules/Order/utils.js

@@ -36,8 +36,9 @@ __export(utils_exports, {
   composeLinePrice: () => composeLinePrice,
   createDefaultOrderRulesHooks: () => createDefaultOrderRulesHooks,
   createDefaultTempOrder: () => createDefaultTempOrder,
-  createEmptySummary: () => import_utils2.createEmptySummary,
+  createEmptySummary: () => import_utils3.createEmptySummary,
   createUuidV4: () => import_orderCollectionIdentity.createUuidV4,
+  ensureCartItemOriginHolder: () => ensureCartItemOriginHolder,
   ensureManualProductDiscountList: () => import_manualProductDiscount.ensureManualProductDiscountList,
   ensureProductSku: () => ensureProductSku,
   findManualProductDiscountItem: () => import_manualProductDiscount.findManualProductDiscountItem,
@@ -85,9 +86,10 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_decimal = __toESM(require("decimal.js"));
-var import_utils = require("../../solution/ScanOrder/utils");
-var import_orderCollectionIdentity = require("./utils/orderCollectionIdentity");
+var import_utils = require("../Holder/utils");
 var import_utils2 = require("../../solution/ScanOrder/utils");
+var import_orderCollectionIdentity = require("./utils/orderCollectionIdentity");
+var import_utils3 = require("../../solution/ScanOrder/utils");
 var import_manualProductDiscount = require("./utils/manualProductDiscount");
 function composeLinePrice(params) {
   const { mainPrice, bundle, useOriginalBundle } = params;
@@ -546,7 +548,7 @@ function createDefaultOrderRulesHooks() {
         // 否则同 SKU 不同小料会在 calcDiscount 重组时互相覆盖。
         // 不透明 identity 契约下，normalizeOrderProduct / hydrate 已保证唯一值存在；
         // 留 fingerprint 分支仅作 Rules 单测里直接传裸 product 时的兜底。
-        _id: ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) ? `${product.product_id}_${product.product_variant_id}_${product.metadata.unique_identification_number}` : `${product.product_id}_${product.product_variant_id}_${(0, import_utils.buildProductLineFingerprint)(
+        _id: ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) ? `${product.product_id}_${product.product_variant_id}_${product.metadata.unique_identification_number}` : `${product.product_id}_${product.product_variant_id}_${(0, import_utils2.buildProductLineFingerprint)(
           getProductSkuOptions(product),
           product.product_bundle
         )}`,
@@ -638,6 +640,34 @@ var mergeRelationForms = (relationForms) => {
     }, {})
   ).filter((item) => item.form_record_ids.length > 0);
 };
+function getCustomerIdFromStorage(window) {
+  var _a;
+  try {
+    const customer = JSON.parse(((_a = window == null ? void 0 : window.getLocalStorage) == null ? void 0 : _a.call(window, "customer")) || "{}");
+    const customerId = Number(customer == null ? void 0 : customer.id);
+    return Number.isFinite(customerId) && customerId > 0 ? customerId : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function ensureCartItemOriginHolder(cartItem, window) {
+  var _a;
+  if ((_a = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _a.holder) {
+    return;
+  }
+  const holderConfig = (0, import_utils.getProductHolderConfig)(
+    (cartItem == null ? void 0 : cartItem._productInit) ?? (cartItem == null ? void 0 : cartItem._productOrigin)
+  );
+  const formRecordId = cartItem == null ? void 0 : cartItem.holder_id;
+  if (!(holderConfig == null ? void 0 : holderConfig.resource_id) || formRecordId == null) {
+    return;
+  }
+  cartItem._origin.holder = {
+    customer_id: getCustomerIdFromStorage(window),
+    form_id: holderConfig.resource_id,
+    form_record: [formRecordId]
+  };
+}
 var getAllDiscountList = (cartItem) => {
   var _a, _b, _c, _d;
   let discountList = ((_b = (_a = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _a.product) == null ? void 0 : _b.discount_list) || [];
@@ -1003,7 +1033,7 @@ function buildSubmitPayload(params) {
     // contacts: tempOrder.contacts || [],
     contacts_info: tempOrder.contacts_info && !Array.isArray(tempOrder.contacts_info) ? tempOrder.contacts_info : null,
     // holder: tempOrder.holder || null,
-    summary: summary || tempOrder.summary || (0, import_utils.createEmptySummary)(),
+    summary: summary || tempOrder.summary || (0, import_utils2.createEmptySummary)(),
     metadata: (() => {
       const {
         collect_pax: _collectPax,
@@ -1252,6 +1282,7 @@ function indexOrderProductsByUid(products) {
   createDefaultTempOrder,
   createEmptySummary,
   createUuidV4,
+  ensureCartItemOriginHolder,
   ensureManualProductDiscountList,
   ensureProductSku,
   findManualProductDiscountItem,

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

@@ -193,6 +193,7 @@ export interface ProductData {
         status?: string;
         required?: number | string | boolean;
         resource_id?: number | string | null;
+        [key: string]: any;
     };
     /** 组合商品id，动态附加 */
     product_variant_id?: number;

package/lib/modules/ProductList/index.js

@@ -106,39 +106,56 @@ var ProductList = class extends import_BaseModule.BaseModule {
     } catch (error) {
       console.error(error);
     }
+    const channelMap = {
+      online_store: "online-store",
+      scan_to_order: "online-store",
+      "scan-to-order": "online-store",
+      scan_to_order_2: "mobile_order",
+      scan_to_order_3: "scantoorder3"
+    };
+    const rawApplicationCode = (_b = this.otherParams) == null ? void 0 : _b.channel;
+    const mappedApplicationCode = typeof rawApplicationCode === "string" ? channelMap[rawApplicationCode] || rawApplicationCode : rawApplicationCode;
+    const queryPayload = {
+      open_quotation: 1,
+      open_bundle: 0,
+      exclude_extension_type: [
+        "product_party",
+        "product_event",
+        "product_series_event",
+        "product_package_ticket",
+        "ticket",
+        "event_item"
+      ],
+      with: [
+        "category",
+        "collection",
+        "resourceRelation",
+        "bundleGroup.bundleItem",
+        "optionGroup.optionItem",
+        "variantGroup.variantItem",
+        "dataVariants"
+      ],
+      status,
+      num: 500,
+      skip: 1,
+      customer_id,
+      ...Array.isArray(category_ids) && category_ids.length ? { category_ids } : {},
+      ...Array.isArray(product_ids) && product_ids.length ? { ids: product_ids } : {},
+      ...Array.isArray(collection) && collection.length ? { collection } : {},
+      front_end_cache_id: cacheId,
+      ...Array.isArray(menu_list_ids) && menu_list_ids.length ? { menu_list_ids } : {},
+      with_count,
+      // client_schedule_ids: schedule_ids,
+      schedule_date,
+      application_code: mappedApplicationCode,
+      is_eject: 1,
+      with_schedule,
+      schedule_datetime,
+      extension_type
+    };
     const productsData = await this.request.post(
       `/product/query`,
-      {
-        open_quotation: 1,
-        open_bundle: 0,
-        exclude_extension_type: [
-          "product_party",
-          "product_event",
-          "product_series_event",
-          "product_package_ticket",
-          "ticket",
-          "event_item"
-        ],
-        with: ["category", "collection", "resourceRelation"],
-        status,
-        num: 500,
-        skip: 1,
-        customer_id,
-        category_ids,
-        ids: product_ids,
-        collection,
-        front_end_cache_id: cacheId,
-        menu_list_ids,
-        with_count,
-        // client_schedule_ids: schedule_ids,
-        schedule_date,
-        application_code: (_b = this.otherParams) == null ? void 0 : _b.channel,
-        is_eject: 1,
-        with_schedule,
-        schedule_datetime,
-        extension_type,
-        strategy_context
-      },
+      queryPayload,
       { osServer: true, callback: options == null ? void 0 : options.callback, subscriberId: options == null ? void 0 : options.subscriberId, customToast: () => {
       } }
     );

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

@@ -21,7 +21,7 @@ export declare class QuotationModule extends BaseModule implements Module {
      * Look up the quotation price for a specific product (+ optional variant) at a given datetime.
      * Returns the price as a string (e.g. "300.00"), or null if no quotation applies.
      *
-     * Priority: iterates quotations already sorted by `sort` ascending (lowest = highest priority).
+     * Priority: iterates quotations already sorted by `sort` descending (highest = highest priority).
      * First matching quotation whose schedule covers `datetime` and whose product_data contains
      * the requested productId wins.
      */

package/lib/modules/Quotation/index.js

@@ -52,7 +52,7 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
       { useCache: false, osServer: true }
     );
     const list = ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || (res == null ? void 0 : res.list) || [];
-    list.sort((a, b) => a.sort - b.sort);
+    list.sort((a, b) => b.sort - a.sort);
     this.store.list = list;
   }
   getQuotationList() {
@@ -96,7 +96,7 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
    * Look up the quotation price for a specific product (+ optional variant) at a given datetime.
    * Returns the price as a string (e.g. "300.00"), or null if no quotation applies.
    *
-   * Priority: iterates quotations already sorted by `sort` ascending (lowest = highest priority).
+   * Priority: iterates quotations already sorted by `sort` descending (highest = highest priority).
    * First matching quotation whose schedule covers `datetime` and whose product_data contains
    * the requested productId wins.
    */