@pisell/pisellos 2.2.278 → 2.2.280

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 {
@@ -578,6 +579,10 @@ export interface LoadSalesDetailParams {
      * 存在时 loadSalesDetail 会跳过远端 lookup，直接复用 hydrate 后半段逻辑。
      */
     preloadedSalesDetail?: Record<string, any>;
+    /**
+     * sessionStorage 快照复用详情 hydrate 时使用；不带该值时保持既有编辑订单语义。
+     */
+    hydrateSource?: 'sessionStorage';
     forceRemote?: boolean;
     merge?: boolean;
 }
@@ -589,6 +594,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;
@@ -742,8 +753,15 @@ export interface OrderModuleAPI {
     removeProductFromOrder: (identity: OrderProductIdentity, options?: RemoveProductsFromOrderOptions) => Promise<OrderProduct[]>;
     /** 批量删除购物车行，末尾仅触发一次促销重算与 summary 刷新 */
     removeProductsFromOrder: (identities: OrderProductIdentity[], options?: RemoveProductsFromOrderOptions) => Promise<OrderProduct[]>;
-    /** @deprecated no-op；OrderModule 不再负责 tempOrder localStorage 持久化。 */
+    /** 在显式开启时保存当前 tempOrder 的 sessionStorage 会话快照。 */
     persistTempOrder: () => void;
+    /**
+     * 删除当前 cacheId 的 tempOrder 会话快照，并阻止当前模块实例再次写入。
+     * 新模块实例初始化时会按 otherParams 重新启用持久化。
+     */
+    clearSessionStoragePersistedTempOrder: () => void;
+    /** 取出一次待恢复的 sessionStorage tempOrder 快照。 */
+    consumeSessionStorageRestore: () => Record<string, any> | null;
     /**
      * 控制 IndexedDB 草稿（saveDraft）开关；localStorage tempOrder 持久化已废弃。
      * BigSale 弹窗等场景传 false 可跳过 saveDraft。
@@ -751,6 +769,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;
@@ -799,6 +819,7 @@ export interface OrderModuleAPI {
     saveDraft: () => Promise<void>;
     hydrateTempOrderFromRecord: (record: Record<string, any>, options?: {
         recalcOnHydrate?: boolean;
+        source?: 'salesDetail' | 'sessionStorage';
     }) => Promise<OrderTempOrder>;
     syncPaymentsToOrder: <T = any>(params: SyncPaymentsToOrderParams) => Promise<SyncPaymentsToOrderResult<T>>;
     getSalesOrderByLookup: (params: SalesOrderLookupParams) => Promise<any>;

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

@@ -0,0 +1,45 @@
+import type { OrderTempOrder } from '../types';
+/**
+ * 商品券拆行的身份与回并工具。
+ *
+ * 背景：
+ * Rules.calcDiscount 应用 good_pass 时，会把一个数量行拆成若干「用券行」和
+ * 「普通余量行」。Rules 返回的拆分行可能复制同一份
+ * metadata.unique_identification_number，进而造成：
+ * - 按 UID 删除时同时命中多行；
+ * - UI 把不同券行视为同一个商品；
+ * - 后续商品更新无法准确定位目标行。
+ *
+ * 处理原则：
+ * 1. 拆分后每一行必须拥有独立 UID；
+ * 2. 原始拆分来源仅记录在 tempOrder._extend.productsByUid 的运行态索引中，
+ *    不写入商品 metadata，不污染提交协议；
+ * 3. 券被移除后，只回并被本工具确认来自同一折扣拆分源的行；
+ * 4. 预约、赠品、促销、手动折扣、备注、称重、holder 和已落库行均为硬边界。
+ *
+ * 两个导出函数都会原地更新 tempOrder。调用顺序必须是：
+ * ensureUniqueProductLineUids -> consolidateDiscountFreeProductLines。
+ */
+/** productsByUid 运行态记录中用于关联同一次折扣拆分的字段。 */
+export declare const DISCOUNT_SPLIT_ORIGIN_UID_KEY = "discountSplitOriginUid";
+/**
+ * 修复 Rules 折扣拆行复制 UID 的问题，并为拆分行记录共同来源。
+ *
+ * 第一条商品保留原 UID，后续重复行生成新 UUID；对应的 productsByUid.runtime
+ * 会复制原行 runtime（包括 origin），以保证删除、编辑及展示字段回读仍可工作。
+ *
+ * 没有 UID 的裸商品不会被补写 UID。这是为了兼容 Rules/mock 的历史协议形状；
+ * 正常 Order 写路径会在 normalize 阶段提前创建 UID。
+ */
+export declare function ensureUniqueProductLineUids(tempOrder: OrderTempOrder): void;
+/**
+ * 把券移除后已经恢复原价的同源折扣拆分行重新合并。
+ *
+ * 此函数刻意不执行通用的「同 SKU 合并」：没有 discountSplitOriginUid 的普通行
+ * 可能是业务 hook、导入订单或其它流程主动拆开的，不能在折扣重算时擅自合并。
+ *
+ * payment_price、tax_fee、surcharge_fee 属于 summary 计算层的派生值。券行与普通行
+ * 在回并前可能暂时不同，因此它们不参与 mergeKey；原始价格、SKU/option/bundle
+ * 结构以及税务/商品类型配置仍参与比较，防止不同商品语义被误合并。
+ */
+export declare function consolidateDiscountFreeProductLines(tempOrder: OrderTempOrder): void;

package/lib/modules/Order/utils/discountProductLineIdentity.js

@@ -0,0 +1,170 @@
+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/Order/utils/discountProductLineIdentity.ts
+var discountProductLineIdentity_exports = {};
+__export(discountProductLineIdentity_exports, {
+  DISCOUNT_SPLIT_ORIGIN_UID_KEY: () => DISCOUNT_SPLIT_ORIGIN_UID_KEY,
+  consolidateDiscountFreeProductLines: () => consolidateDiscountFreeProductLines,
+  ensureUniqueProductLineUids: () => ensureUniqueProductLineUids
+});
+module.exports = __toCommonJS(discountProductLineIdentity_exports);
+var import_lodash_es = require("lodash-es");
+var import_utils = require("../../../solution/ScanOrder/utils");
+var import_orderCollectionIdentity = require("./orderCollectionIdentity");
+var DISCOUNT_SPLIT_ORIGIN_UID_KEY = "discountSplitOriginUid";
+function getProductLineUid(product) {
+  var _a;
+  if (!product || typeof product !== "object")
+    return null;
+  const uid = ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) ?? product.unique_identification_number;
+  if (uid === void 0 || uid === null || uid === "")
+    return null;
+  return String(uid);
+}
+function getProductSkuOptions(product) {
+  var _a;
+  return Array.isArray((_a = product.product_sku) == null ? void 0 : _a.option) ? product.product_sku.option : [];
+}
+function hasProductLineNote(product) {
+  return typeof product.note === "string" && product.note.trim().length > 0;
+}
+function isManualProductDiscountLine(product) {
+  var _a, _b;
+  return ((_a = product.metadata) == null ? void 0 : _a.is_manual_discount) === true || ((_b = product.metadata) == null ? void 0 : _b.is_manual_discount) === 1 || (product.discount_list || []).some((item) => (item == null ? void 0 : item.type) === "product");
+}
+function ensureProductsByUid(tempOrder) {
+  if (!tempOrder._extend || typeof tempOrder._extend !== "object") {
+    tempOrder._extend = { productsByUid: {} };
+  }
+  if (!tempOrder._extend.productsByUid) {
+    tempOrder._extend.productsByUid = {};
+  }
+  return tempOrder._extend.productsByUid;
+}
+function ensureUniqueProductLineUids(tempOrder) {
+  const usedUids = /* @__PURE__ */ new Set();
+  const productsByUid = ensureProductsByUid(tempOrder);
+  tempOrder.products = (tempOrder.products || []).map((product) => {
+    const sourceUid = getProductLineUid(product);
+    if (!sourceUid)
+      return product;
+    if (!usedUids.has(sourceUid)) {
+      usedUids.add(sourceUid);
+      return product;
+    }
+    let splitUid = (0, import_orderCollectionIdentity.createUuidV4)();
+    while (usedUids.has(splitUid)) {
+      splitUid = (0, import_orderCollectionIdentity.createUuidV4)();
+    }
+    product.metadata = {
+      ...product.metadata || {},
+      unique_identification_number: splitUid
+    };
+    const sourceRuntime = productsByUid[sourceUid] || {};
+    const discountSplitOriginUid = String(
+      sourceRuntime[DISCOUNT_SPLIT_ORIGIN_UID_KEY] || sourceUid
+    );
+    productsByUid[sourceUid] = {
+      ...sourceRuntime,
+      [DISCOUNT_SPLIT_ORIGIN_UID_KEY]: discountSplitOriginUid
+    };
+    productsByUid[splitUid] = {
+      ...(0, import_lodash_es.cloneDeep)(sourceRuntime),
+      [DISCOUNT_SPLIT_ORIGIN_UID_KEY]: discountSplitOriginUid
+    };
+    usedUids.add(splitUid);
+    return product;
+  });
+}
+function consolidateDiscountFreeProductLines(tempOrder) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+  const consolidatedProducts = [];
+  const productIndexByKey = /* @__PURE__ */ new Map();
+  for (const product of tempOrder.products || []) {
+    const productBundle = Array.isArray(product.product_bundle) ? product.product_bundle : [];
+    const hasDiscount = (product.discount_list || []).length > 0 || productBundle.some((bundle) => ((bundle == null ? void 0 : bundle.discount_list) || []).length > 0);
+    const bookingUid = product.booking_uid ?? ((_a = product.metadata) == null ? void 0 : _a.booking_uid);
+    const bookingId = product.booking_id ?? ((_b = product.metadata) == null ? void 0 : _b.booking_id);
+    const orderDetailId = product.order_detail_id ?? product.orderDetailId;
+    const holderId = product.holder_id ?? ((_c = product.metadata) == null ? void 0 : _c.holder_id);
+    const hasMergeBoundary = hasDiscount || Boolean(((_d = product.metadata) == null ? void 0 : _d._giftInfo) || product._giftInfo) || Boolean((_e = product.metadata) == null ? void 0 : _e._promotion) || isManualProductDiscountLine(product) || hasProductLineNote(product) || Number(((_f = product.product_sku) == null ? void 0 : _f.open_sold_weight) || 0) === 1 || ((_g = product.metadata) == null ? void 0 : _g.is_edit_for_runtime) === true || bookingId !== void 0 && bookingId !== null && bookingId !== 0 && bookingId !== "0" || bookingUid !== void 0 && bookingUid !== null && String(bookingUid) !== "" || holderId !== void 0 && holderId !== null && String(holderId) !== "" || orderDetailId !== void 0 && orderDetailId !== null && orderDetailId !== "";
+    if (hasMergeBoundary) {
+      consolidatedProducts.push(product);
+      continue;
+    }
+    const productUid = getProductLineUid(product);
+    const discountSplitOriginUid = productUid ? (_j = (_i = (_h = tempOrder._extend) == null ? void 0 : _h.productsByUid) == null ? void 0 : _i[productUid]) == null ? void 0 : _j[DISCOUNT_SPLIT_ORIGIN_UID_KEY] : void 0;
+    if (!discountSplitOriginUid) {
+      consolidatedProducts.push(product);
+      continue;
+    }
+    const fingerprint = (0, import_utils.buildProductLineFingerprint)(
+      getProductSkuOptions(product),
+      productBundle
+    );
+    const priceSignature = JSON.stringify({
+      selling_price: String(product.selling_price ?? ""),
+      original_price: String(product.original_price ?? ""),
+      custom_price: String(product.custom_price ?? ""),
+      is_charge_tax: Number(product.is_charge_tax ?? 0),
+      gift_card: Number(product.gift_card ?? 0),
+      bundle_edit: Number(product.bundle_edit ?? 0),
+      price_schema_version: ((_k = product.metadata) == null ? void 0 : _k.price_schema_version) ?? "",
+      source_product_price: String(((_l = product.metadata) == null ? void 0 : _l.source_product_price) ?? ""),
+      main_product_selling_price: String(
+        ((_m = product.metadata) == null ? void 0 : _m.main_product_selling_price) ?? ""
+      ),
+      main_product_original_price: String(
+        ((_n = product.metadata) == null ? void 0 : _n.main_product_original_price) ?? ""
+      ),
+      bundle: productBundle.map((bundle) => ({
+        bundle_id: (bundle == null ? void 0 : bundle.bundle_id) ?? (bundle == null ? void 0 : bundle.id) ?? "",
+        product_id: (bundle == null ? void 0 : bundle.bundle_product_id) ?? (bundle == null ? void 0 : bundle._bundle_product_id) ?? (bundle == null ? void 0 : bundle.product_id) ?? "",
+        product_variant_id: (bundle == null ? void 0 : bundle.bundle_variant_id) ?? (bundle == null ? void 0 : bundle.variant_id) ?? (bundle == null ? void 0 : bundle.product_variant_id) ?? 0,
+        price: String((bundle == null ? void 0 : bundle.price) ?? ""),
+        original_price: String((bundle == null ? void 0 : bundle.original_price) ?? ""),
+        bundle_selling_price: String((bundle == null ? void 0 : bundle.bundle_selling_price) ?? "")
+      }))
+    });
+    const mergeKey = [
+      discountSplitOriginUid,
+      product.product_id,
+      product.product_variant_id ?? 0,
+      fingerprint,
+      priceSignature
+    ].join("#");
+    const matchedIndex = productIndexByKey.get(mergeKey);
+    if (matchedIndex === void 0) {
+      productIndexByKey.set(mergeKey, consolidatedProducts.length);
+      consolidatedProducts.push(product);
+      continue;
+    }
+    const matchedProduct = consolidatedProducts[matchedIndex];
+    matchedProduct.num = (0, import_utils.getSafeProductNum)(
+      Number(matchedProduct.num || 0) + Number(product.num || 0)
+    );
+  }
+  tempOrder.products = consolidatedProducts;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DISCOUNT_SPLIT_ORIGIN_UID_KEY,
+  consolidateDiscountFreeProductLines,
+  ensureUniqueProductLineUids
+});

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

@@ -24,6 +24,16 @@ export interface NormalizeOrderCollectionsResult<T> {
     stats: Record<OrderCollectionKind, OrderCollectionIdentityStats>;
     uidRemaps: OrderCollectionUidRemap[];
 }
+export interface ProductLineIdentityRepair {
+    index: number;
+    from: string;
+    to: string;
+}
+export interface RepairDuplicateProductLineIdentitiesResult<T> {
+    products: T[];
+    productsByUid?: Record<string, Record<string, any>>;
+    repairs: ProductLineIdentityRepair[];
+}
 export declare function createUuidV4(): string;
 export declare function isBlankOrderCollectionIdentity(value: unknown): boolean;
 export declare function getOrderCollectionPersistentId(kind: OrderCollectionKind, item: unknown): string | null;
@@ -31,6 +41,11 @@ export declare function getOrderCollectionUid(kind: OrderCollectionKind, item: u
 export declare function buildOrderCollectionFallbackUid(kind: OrderCollectionKind, persistentId: string | number): string;
 export declare function getOrderCollectionReferenceUid(kind: OrderCollectionKind, item: unknown): string | null;
 export declare function setOrderCollectionUid<T>(kind: OrderCollectionKind, item: T, uid: string): T;
+/**
+ * Rules 会把同一商品按商品券拆成多条真实订单行。拆行结果会继承原商品 UID，
+ * 因此必须在通用 collection normalization 之前为后续行派生稳定身份，避免被折叠。
+ */
+export declare function repairDuplicateProductLineIdentities<T extends Record<string, any>>(products: T[] | null | undefined, productsByUid?: Record<string, Record<string, any>> | null): RepairDuplicateProductLineIdentitiesResult<T>;
 /**
  * 持久化行 ID 是服务端事实主键；只有至少一侧尚未持久化时，才允许用 runtime UID 对齐。
  */

package/lib/modules/Order/utils/orderCollectionIdentity.js

@@ -30,6 +30,7 @@ __export(orderCollectionIdentity_exports, {
   mergeOrderCollectionItems: () => mergeOrderCollectionItems,
   normalizeOrderCollection: () => normalizeOrderCollection,
   normalizeOrderCollections: () => normalizeOrderCollections,
+  repairDuplicateProductLineIdentities: () => repairDuplicateProductLineIdentities,
   setOrderCollectionUid: () => setOrderCollectionUid
 });
 module.exports = __toCommonJS(orderCollectionIdentity_exports);
@@ -105,6 +106,74 @@ function setOrderCollectionUid(kind, item, uid) {
   delete record[uidField];
   return record;
 }
+function getGoodPassResourceId(product) {
+  var _a;
+  const goodPass = (product.discount_list || []).find((item) => {
+    var _a2, _b;
+    const type = (item == null ? void 0 : item.type) || (item == null ? void 0 : item.tag) || ((_a2 = item == null ? void 0 : item.discount) == null ? void 0 : _a2.type) || ((_b = item == null ? void 0 : item.discount) == null ? void 0 : _b.tag);
+    return type === "good_pass";
+  });
+  if (!goodPass)
+    return null;
+  const resourceId = ((_a = goodPass.discount) == null ? void 0 : _a.resource_id) ?? goodPass.resource_id ?? goodPass.discount_id ?? goodPass.id;
+  return isBlankOrderCollectionIdentity(resourceId) ? null : String(resourceId);
+}
+function buildSplitProductUid(originalUid, product, duplicateOrdinal) {
+  const encodedOriginalUid = encodeURIComponent(originalUid);
+  const resourceId = getGoodPassResourceId(product);
+  if (resourceId) {
+    return `os-split:product:${encodedOriginalUid}:good-pass:${encodeURIComponent(resourceId)}:${duplicateOrdinal}`;
+  }
+  return `os-split:product:${encodedOriginalUid}:duplicate:${duplicateOrdinal}`;
+}
+function repairDuplicateProductLineIdentities(products, productsByUid) {
+  const repairedProducts = (0, import_lodash_es.cloneDeep)(products || []);
+  const repairedProductsByUid = productsByUid ? (0, import_lodash_es.cloneDeep)(productsByUid) : void 0;
+  const occupiedUids = new Set(
+    repairedProducts.map((product) => getOrderCollectionUid("product", product)).filter((uid) => Boolean(uid))
+  );
+  Object.keys(repairedProductsByUid || {}).forEach((uid) => occupiedUids.add(uid));
+  const occurrences = /* @__PURE__ */ new Map();
+  const repairs = [];
+  repairedProducts.forEach((product, index) => {
+    const originalUid = getOrderCollectionUid("product", product);
+    if (!originalUid)
+      return;
+    const occurrence = (occurrences.get(originalUid) || 0) + 1;
+    occurrences.set(originalUid, occurrence);
+    if (occurrence === 1)
+      return;
+    const duplicateOrdinal = occurrence - 1;
+    const baseCandidate = buildSplitProductUid(
+      originalUid,
+      product,
+      duplicateOrdinal
+    );
+    let nextUid = baseCandidate;
+    let conflictOrdinal = 1;
+    while (occupiedUids.has(nextUid)) {
+      nextUid = `${baseCandidate}:conflict:${conflictOrdinal}`;
+      conflictOrdinal += 1;
+    }
+    const repairedProduct = setOrderCollectionUid("product", product, nextUid);
+    repairedProduct.identity_key = nextUid;
+    repairedProducts[index] = repairedProduct;
+    occupiedUids.add(nextUid);
+    repairs.push({ index, from: originalUid, to: nextUid });
+    const runtimeSource = repairedProductsByUid == null ? void 0 : repairedProductsByUid[originalUid];
+    if (runtimeSource && repairedProductsByUid) {
+      repairedProductsByUid[nextUid] = {
+        ...(0, import_lodash_es.cloneDeep)(runtimeSource),
+        ...runtimeSource.rowKey !== void 0 ? { rowKey: nextUid } : {}
+      };
+    }
+  });
+  return {
+    products: repairedProducts,
+    ...repairedProductsByUid ? { productsByUid: repairedProductsByUid } : {},
+    repairs
+  };
+}
 function isSameOrderCollectionItem(kind, left, right) {
   const leftPersistentId = getOrderCollectionPersistentId(kind, left);
   const rightPersistentId = getOrderCollectionPersistentId(kind, right);
@@ -414,5 +483,6 @@ function normalizeOrderCollections(sourceOrder, options) {
   mergeOrderCollectionItems,
   normalizeOrderCollection,
   normalizeOrderCollections,
+  repairDuplicateProductLineIdentities,
   setOrderCollectionUid
 });

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) || [];
@@ -771,6 +801,8 @@ function normalizeSubmitProduct(product) {
   delete productRest[`product_${"option"}_item`];
   const rawMetadata = submitProduct.metadata || {};
   const bookingUid = rawMetadata.booking_uid;
+  const hasProductBundle = Array.isArray(submitProduct.product_bundle) && submitProduct.product_bundle.length > 0;
+  const bundleEdit = submitProduct.bundle_edit ?? rawMetadata.bundle_edit ?? (hasProductBundle ? 0 : void 0);
   const cleanMetadata = {};
   if (rawMetadata.unique_identification_number) {
     cleanMetadata.unique_identification_number = rawMetadata.unique_identification_number;
@@ -813,6 +845,7 @@ function normalizeSubmitProduct(product) {
   return {
     ...productRest,
     ...bookingUid ? { booking_uid: bookingUid } : {},
+    ...bundleEdit !== void 0 ? { bundle_edit: bundleEdit } : {},
     product_quantity: toBundleNumber(num ?? submitProduct.product_quantity, 1),
     product_sku: productSku,
     discount_list: collectSubmitProductDiscountList(submitProduct),
@@ -1003,7 +1036,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,
@@ -1173,7 +1206,6 @@ function productRequiresFormSubject(tempOrder, product) {
 }
 function resolveIsFormSubject(tempOrder, product) {
   var _a;
-  debugger;
   if (((_a = tempOrder == null ? void 0 : tempOrder.holder) == null ? void 0 : _a.type) === "form")
     return true;
   if (product)
@@ -1252,6 +1284,7 @@ function indexOrderProductsByUid(products) {
   createDefaultTempOrder,
   createEmptySummary,
   createUuidV4,
+  ensureCartItemOriginHolder,
   ensureManualProductDiscountList,
   ensureProductSku,
   findManualProductDiscountItem,

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

@@ -41,6 +41,10 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
      * paymentModule.updateOtherParams({ fatherModule: 'bookingTicket' });
      */
     updateOtherParams(params: Record<string, any>): void;
+    /**
+     * 获取标准化后的宿主平台标识，供支付子能力做平台边界判断。
+     */
+    getPlatform(): string;
     private getPaymentNumberAppData;
     /**
      * 记录信息日志

package/lib/modules/Payment/index.js

@@ -139,6 +139,13 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
   updateOtherParams(params) {
     this.otherParams = params || {};
   }
+  /**
+   * 获取标准化后的宿主平台标识，供支付子能力做平台边界判断。
+   */
+  getPlatform() {
+    var _a;
+    return String(((_a = this.otherParams) == null ? void 0 : _a.platform) || "").trim().toLowerCase();
+  }
   getPaymentNumberAppData(key) {
     var _a, _b, _c, _d, _e, _f, _g;
     const getData = (_b = (_a = this.appPlugin) == null ? void 0 : _a.getData) == null ? void 0 : _b.call(_a);

package/lib/modules/Payment/walletpass.js

@@ -722,6 +722,18 @@ var WalletPassPaymentImpl = class {
         this.paymentModule.logInfo("[WalletPass] 商品列表为空，跳过获取用户识别码列表");
         return [];
       }
+      const platform = this.paymentModule.getPlatform();
+      if (platform === "pc" || platform === "h5") {
+        this.userIdentificationCodes = [];
+        this.emitEvent(import_types.WalletPassHooks.OnUserIdentificationCodesUpdated, {
+          userIdentificationCodes: []
+        });
+        this.paymentModule.logInfo(
+          "[WalletPass] 用户端平台跳过获取用户识别码列表",
+          { platform }
+        );
+        return [];
+      }
       if (typeof newParams.payment_order_id === "string" && newParams.payment_order_id.startsWith("LOCAL_")) {
         newParams.payment_order_id = void 0;
       }

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;