@pisell/pisellos 2.2.315 → 2.2.317

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

@@ -673,6 +673,6 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     getOrderInfo(order_id: number): Promise<any>;
     getVouchers(): any[];
 }
-export type { AddProductToOrderOptions, OrderMetaList, PointCardSnapshotItem, VirtualCurrencySnapshotItem, RemoveProductsFromOrderOptions, SalesNote, SalesNoteDraftInput, SalesNoteLocalizedSelection, SalesNoteLocalizedText, SalesNoteRelation, SalesNoteTextInput, SetSalesNoteInput, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, } from './types';
+export type { OrderHolderRelation, AddProductToOrderOptions, OrderMetaList, PointCardSnapshotItem, VirtualCurrencySnapshotItem, RemoveProductsFromOrderOptions, SalesNote, SalesNoteDraftInput, SalesNoteLocalizedSelection, SalesNoteLocalizedText, SalesNoteRelation, SalesNoteTextInput, SetSalesNoteInput, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, } from './types';
 export { isFulfillmentTimingBooking } from './pickupTiming';
 export type { PickupTimingBooking, PickupTimingBookingInput, PickupTimingBookingMetadata, PickupTimingSelectionMode, PickupTimingSource, } from './pickupTiming';

package/lib/modules/Order/index.js

@@ -16,6 +16,7 @@ var _BaseModule = require("../BaseModule");
 var _types = require("./types");
 var _utils = require("./utils");
 var _utils2 = require("../Product/utils");
+var _holderRelations = require("./holderRelations");
 var _weighedProduct = require("./utils/weighedProduct");
 var _pickupTiming = require("./pickupTiming");
 var _dayjs = _interopRequireDefault(require("dayjs"));
@@ -543,7 +544,7 @@ class OrderModule extends _BaseModule.BaseModule {
     this.store.rules = rules;
   }
   createDefaultRulesHooks() {
-    return (0, _utils.createDefaultOrderRulesHooks)(() => this.store.tempOrder?.bookings || []);
+    return (0, _utils.createDefaultOrderRulesHooks)(() => this.store.tempOrder?.bookings || [], () => this.store.tempOrder?.holder_relations);
   }
 
   /**
@@ -857,7 +858,7 @@ class OrderModule extends _BaseModule.BaseModule {
           discount_list: (0, _utils.normalizeOrderProductDiscountList)((0, _manualProductDiscount.syncManualProductDiscountProductNum)(mergedProduct.discount_list, mergedProduct.num))
         };
       }));
-      (0, _discountProductLineIdentity.ensureUniqueProductLineUids)(tempOrder);
+      (0, _discountProductLineIdentity.ensureUniqueProductLineUids)(tempOrder, discountList);
       (0, _discountProductLineIdentity.consolidateDiscountFreeProductLines)(tempOrder);
     }
     if (result?.discountList) {
@@ -968,14 +969,8 @@ class OrderModule extends _BaseModule.BaseModule {
           }
         } else {
           for (const addAction of result.giftActions.toAdd) {
-            // 单选普通赠品可累加；预约赠品必须新增独立 booking，不能只改 num。
-            if (addAction.giftOptions.length === 1) {
-              const sameStrategy = result.products.find(p => p.metadata?._giftInfo?.strategyId === addAction.strategyId);
-              if (sameStrategy && !sameStrategy.booking_uid && !sameStrategy.metadata?.booking_uid) {
-                sameStrategy.num = (Number(sameStrategy.num) || 0) + (addAction.giftCount || 1);
-                continue;
-              }
-            }
+            // 唯一候选也可能有规格/套餐。每次补赠都交给 SDK 判断，不能复用旧赠品的选择。
+
             const giftMutationBaseline = options?.isCurrentOrder ? (0, _lodashEs.cloneDeep)({
               products: tempOrder.products,
               bookings: tempOrder.bookings
@@ -1118,7 +1113,9 @@ class OrderModule extends _BaseModule.BaseModule {
    * sessionStorage 的 cacheId 分桶。写入失败由 BaseModule 静默降级。
    */
   persistTempOrder() {
-    if (!this.sessionStoragePersistEnabled || !this.store.tempOrder) return;
+    if (!this.store.tempOrder) return;
+    (0, _holderRelations.ensureHolderRelationUuids)(this.store.tempOrder);
+    if (!this.sessionStoragePersistEnabled) return;
     this.checkSaveCache({
       cacheId: this.cacheId,
       fatherModule: this.fatherModule,
@@ -1827,7 +1824,10 @@ class OrderModule extends _BaseModule.BaseModule {
         source_product_price: this.normalizeFingerprintMoney(metadata.source_product_price),
         main_product_selling_price: this.normalizeFingerprintMoney(metadata.main_product_selling_price),
         main_product_original_price: this.normalizeFingerprintMoney(metadata.main_product_original_price),
-        product_discount_difference: this.normalizeFingerprintMoney(metadata.product_discount_difference)
+        product_discount_difference: this.normalizeFingerprintMoney(metadata.product_discount_difference),
+        ...(!(0, _holderRelations.hasProductBooking)(product) ? {
+          holder_relations: this.normalizeFingerprintValue((0, _holderRelations.getProductHolderRelations)(this.store.tempOrder || {}, product))
+        } : {})
       },
       product_sku: this.normalizeFingerprintValue({
         code: sku.code ?? '',
@@ -1863,7 +1863,7 @@ class OrderModule extends _BaseModule.BaseModule {
     items.sort((left, right) => JSON.stringify(left).localeCompare(JSON.stringify(right)));
     return JSON.stringify(items);
   }
-  buildProductStructuralFingerprintItem(product) {
+  buildProductStructuralFingerprintItem(product, order = this.store.tempOrder || {}) {
     const sku = product?.product_sku || {};
     const metadata = product?.metadata || {};
     const discountTypes = (product?.discount_list || []).map(discount => discount?.type ?? discount?.tag);
@@ -1878,7 +1878,10 @@ class OrderModule extends _BaseModule.BaseModule {
         unique_identification_number: metadata.unique_identification_number ?? product?.unique_identification_number ?? '',
         price_override: metadata.price_override ?? '',
         is_manual_discount: metadata.is_manual_discount ?? '',
-        product_discount_reason: metadata.product_discount_reason ?? ''
+        product_discount_reason: metadata.product_discount_reason ?? '',
+        ...(!(0, _holderRelations.hasProductBooking)(product) ? {
+          holder_relations: this.normalizeFingerprintValue((0, _holderRelations.getProductHolderRelations)(order, product))
+        } : {})
       },
       product_sku: this.normalizeFingerprintValue({
         code: sku.code ?? '',
@@ -1916,8 +1919,8 @@ class OrderModule extends _BaseModule.BaseModule {
       })))
     };
   }
-  buildOrderProductsStructuralFingerprint(products) {
-    const items = (products || []).map(product => this.buildProductStructuralFingerprintItem(product));
+  buildOrderProductsStructuralFingerprint(products, order = this.store.tempOrder || {}) {
+    const items = (products || []).map(product => this.buildProductStructuralFingerprintItem(product, order));
     items.sort((left, right) => JSON.stringify(left).localeCompare(JSON.stringify(right)));
     return JSON.stringify(items);
   }
@@ -1984,7 +1987,7 @@ class OrderModule extends _BaseModule.BaseModule {
     const manualDepositOverride = this.getManualDepositOverride(tempOrder);
     if (currentFingerprint !== snapshot.productFingerprint) {
       const currentStructuralFingerprint = this.buildOrderProductsStructuralFingerprint(tempOrder.products);
-      const snapshotStructuralFingerprint = this.buildOrderProductsStructuralFingerprint(Array.isArray(snapshot.products) ? snapshot.products : []);
+      const snapshotStructuralFingerprint = this.buildOrderProductsStructuralFingerprint(Array.isArray(snapshot.products) ? snapshot.products : [], snapshot);
       if (currentStructuralFingerprint !== snapshotStructuralFingerprint) return null;
     }
     let summary = {
@@ -2205,9 +2208,16 @@ class OrderModule extends _BaseModule.BaseModule {
     product.metadata = metadata;
     return String(uid);
   }
-  sanitizeOrderProductForTempOrder(product) {
+  sanitizeOrderProductForTempOrder(product, deferHolderCleanup = false) {
     if (product.metadata && typeof product.metadata === 'object') {
       delete product.metadata.origin;
+      if (!deferHolderCleanup && !(0, _holderRelations.hasProductBooking)(product)) {
+        delete product.metadata.holder;
+        delete product.metadata.holder_id;
+      }
+    }
+    if (product._extend?.holder_relations !== undefined) {
+      delete product._extend.holder_relations;
     }
     return product;
   }
@@ -3006,6 +3016,7 @@ class OrderModule extends _BaseModule.BaseModule {
     const nextCustomerId = tempOrder.customer_id ?? null;
     if (String(previousCustomerId ?? '') !== String(nextCustomerId ?? '')) {
       this.clearCustomerWalletState(tempOrder);
+      (0, _holderRelations.removeProductHolderRelations)(tempOrder, tempOrder.products.filter(product => !(0, _holderRelations.hasProductBooking)(product)));
     }
     this.persistTempOrder();
     return {
@@ -3569,10 +3580,13 @@ class OrderModule extends _BaseModule.BaseModule {
     const hasIncomingProductNote = this.hasOrderProductLineNote(normalizedIncoming);
     const hasIncomingManualProductDiscount = isManualProductDiscountProduct(normalizedIncoming);
     const hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
+    const holderRelationsPatch = !hasIncomingBookingUid ? productToAdd._extend?.holder_relations : undefined;
+    const hasIncomingHolder = Array.isArray(holderRelationsPatch) && holderRelationsPatch.length > 0;
     const isIncomingCustomItem = productToAdd.metadata?.origin?.isCustomItem === true || productToAdd._origin?.isCustomItem === true;
-    const shouldForceNewLine = disableMerge || !!booking || hasIncomingGoodPass || isIncomingPersistedEntitlementPass || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
+    const shouldForceNewLine = disableMerge || !!booking || hasIncomingGoodPass || isIncomingPersistedEntitlementPass || hasIncomingBookingUid || hasIncomingHolder || isIncomingCustomItem || isWeighingProduct;
     const matchedIndex = shouldForceNewLine ? -1 : tempOrder.products.findIndex(item => {
       if (this.hasGoodPassDiscount(item)) return false;
+      if ((0, _holderRelations.getProductHolderRelations)(tempOrder, item).length > 0 || (0, _utils.hasAssignedHolderId)(item.metadata?.holder_id)) return false;
       const isRuntimeEntitlementPass = this.isRuntimeEntitlementAppend(item, tempOrder);
       if (isIncomingEntitlementAppend !== isRuntimeEntitlementPass) {
         return false;
@@ -3663,6 +3677,7 @@ class OrderModule extends _BaseModule.BaseModule {
       if (linked) {
         tempOrder.bookings = [...(tempOrder.bookings || []), linked.booking];
       }
+      (0, _holderRelations.replaceProductHolderRelations)(tempOrder, committedProduct, holderRelationsPatch);
       return committedProduct;
     };
     if (!matchedProduct) {
@@ -3772,6 +3787,7 @@ class OrderModule extends _BaseModule.BaseModule {
     }));
     const mutationSnapshot = salesNoteDrafts.length > 0 ? {
       products: (0, _lodashEs.cloneDeep)(tempOrder.products || []),
+      holder_relations: (0, _lodashEs.cloneDeep)(tempOrder.holder_relations),
       bookings: (0, _lodashEs.cloneDeep)(tempOrder.bookings || []),
       notes: (0, _lodashEs.cloneDeep)(tempOrder.notes || []),
       extend: (0, _lodashEs.cloneDeep)(tempOrder._extend || {})
@@ -3796,6 +3812,7 @@ class OrderModule extends _BaseModule.BaseModule {
     const rollbackProductAndNotesMutation = () => {
       if (!mutationSnapshot) return;
       tempOrder.products = mutationSnapshot.products;
+      if (mutationSnapshot.holder_relations === undefined) delete tempOrder.holder_relations;else tempOrder.holder_relations = mutationSnapshot.holder_relations;
       tempOrder.bookings = mutationSnapshot.bookings;
       tempOrder.notes = mutationSnapshot.notes;
       tempOrder._extend = mutationSnapshot.extend;
@@ -4280,6 +4297,7 @@ class OrderModule extends _BaseModule.BaseModule {
       if (uid) reapplyWeighedDiscountProductUids?.push(String(uid));
     }
     tempOrder.products[productIndex] = normalizedProduct;
+    (0, _holderRelations.replaceProductHolderRelations)(tempOrder, normalizedProduct, updates._extend?.holder_relations);
     this.syncTempOrderHolderFromBookings(tempOrder);
     this.captureProductRuntime(tempOrder, updates, tempOrder.products[productIndex], tempOrder.products[productIndex].metadata?.unique_identification_number);
     return tempOrder.products[productIndex].metadata?.unique_identification_number;
@@ -4557,6 +4575,7 @@ class OrderModule extends _BaseModule.BaseModule {
         tempOrder.products = nextProductIndex >= 0 ? [...productsWithoutRemaining.slice(0, nextProductIndex), remainingProduct, ...productsWithoutRemaining.slice(nextProductIndex)] : [...productsWithoutRemaining, remainingProduct];
       }
     }
+    (0, _holderRelations.removeProductHolderRelations)(tempOrder, productsBeforeRemove.filter(product => !tempOrder.products.includes(product)));
     this.removeSalesNotesForMissingProductLines(tempOrder);
     if (isCurrentOrder) {
       await this.finalizeProductOrderMutation(tempOrder, {
@@ -4582,6 +4601,7 @@ class OrderModule extends _BaseModule.BaseModule {
   async clearOrderCartLines() {
     const tempOrder = this.ensureTempOrder();
     this.ensureSalesNotesLoadedForMutation(tempOrder);
+    (0, _holderRelations.removeProductHolderRelations)(tempOrder, tempOrder.products);
     tempOrder.products = [];
     tempOrder.bookings = [];
     (0, _virtualSettlement.releaseTempOrderSettlementState)(tempOrder);
@@ -4611,6 +4631,7 @@ class OrderModule extends _BaseModule.BaseModule {
   async clearOrderForSettlementSwitch() {
     const tempOrder = this.ensureTempOrder();
     this.ensureSalesNotesLoadedForMutation(tempOrder);
+    (0, _holderRelations.removeProductHolderRelations)(tempOrder, tempOrder.products);
     tempOrder.products = [];
     tempOrder.bookings = [];
     this.removeSalesNotesForMissingProductLines(tempOrder);
@@ -5354,6 +5375,7 @@ class OrderModule extends _BaseModule.BaseModule {
       originalSalesSnapshot: {
         summary: (0, _lodashEs.cloneDeep)(this.store.summary),
         products: (0, _lodashEs.cloneDeep)(nextTempOrder.products || []),
+        holder_relations: (0, _lodashEs.cloneDeep)(nextTempOrder.holder_relations),
         bookings: (0, _lodashEs.cloneDeep)(nextTempOrder.bookings || []),
         payments: (0, _lodashEs.cloneDeep)(nextTempOrder.payments || []),
         surcharges: (0, _lodashEs.cloneDeep)(nextTempOrder.surcharges || []),
@@ -5506,6 +5528,9 @@ class OrderModule extends _BaseModule.BaseModule {
     nextTempOrder.metadata = raw.metadata && typeof raw.metadata === 'object' ? {
       ...raw.metadata
     } : {};
+    const holderRelations = (0, _holderRelations.restoreLegacyHolderRelations)(raw);
+    if (holderRelations === undefined) delete nextTempOrder.holder_relations;else nextTempOrder.holder_relations = (0, _lodashEs.cloneDeep)(holderRelations);
+    (0, _holderRelations.ensureHolderRelationUuids)(nextTempOrder);
     nextTempOrder.holder = raw.holder && typeof raw.holder === 'object' ? {
       ...raw.holder
     } : null;
@@ -5583,6 +5608,7 @@ class OrderModule extends _BaseModule.BaseModule {
     }
     tempOrderExtend.productsByUid = productsByUid;
     this.hydrateLinkedBookingIdentity(nextTempOrder);
+    nextTempOrder.products.forEach(product => this.sanitizeOrderProductForTempOrder(product));
     if (options?.ensureIdentity !== false) {
       this.ensureExternalSaleNumber(nextTempOrder);
     }
@@ -5743,7 +5769,7 @@ class OrderModule extends _BaseModule.BaseModule {
     };
     if (result.metadata) delete result.metadata.price_schema_version;
     const restored = (0, _bundleDiscountHydration.restoreHydratedBundleDiscounts)(result, _utils.normalizeOrderProductDiscountList);
-    return this.sanitizeOrderProductForTempOrder(this.normalizeVirtualSettlementProductIfEnabled(restored));
+    return this.sanitizeOrderProductForTempOrder(this.normalizeVirtualSettlementProductIfEnabled(restored), true);
   }
   getLastOrderInfo() {
     return this.store?.lastOrderInfo;

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

@@ -71,8 +71,8 @@ export interface OrderGiftSelectResult {
 /**
  * 赠品解析回调签名（SDK → OS 的返回值）。
  *
- * - 单选项：SDK 内部自动构造商品，不弹窗
- * - 多选项：SDK 弹窗等用户确认后构造
+ * - 唯一且无规格/套餐的候选：SDK 自动构造商品
+ * - 有规格/套餐或多个候选：SDK 弹窗等用户确认后构造
  * - 用户取消：抛错或返回空数组（OS 视为放弃本次添加）
  *
  * 返回数组时沿用旧协议，只写 tempOrder.products；返回对象时可同时写入预约 bookings。
@@ -243,6 +243,11 @@ export interface OrderProduct extends OrderProductIdentity {
     product_cover?: string;
     metadata: Record<string, any>;
     note?: string;
+    /** 仅作按行更新输入；正式数据保存于订单顶层。 */
+    _extend?: {
+        holder_relations?: OrderHolderRelation[];
+        [key: string]: any;
+    };
 }
 export interface OrderSummary {
     product_quantity: number;
@@ -340,6 +345,17 @@ export interface SalesNotesMutationSnapshot {
 }
 export type SalesNoteProtocolRelation = SalesNoteRelation;
 export type SalesNoteProtocol = SalesNote;
+/** 后端关系及 metadata 均为开放对象，未知字段必须往返保留。 */
+export interface OrderHolderRelation {
+    /** 关系自身的 UUID；新选择/旧草稿可缺省，入单与提交时由 OS 补齐。 */
+    uuid?: string;
+    relation_model: string;
+    relation_uuid: string;
+    holder_type: 'form' | 'customer';
+    holder_id: number;
+    metadata?: Record<string, any>;
+    [key: string]: any;
+}
 export interface OrderTempOrder {
     order_id: number | null;
     external_sale_number: string;
@@ -379,6 +395,7 @@ export interface OrderTempOrder {
     created_at: string | undefined;
     request_unique_idempotency_token?: string;
     products: OrderProduct[];
+    holder_relations?: OrderHolderRelation[];
     notes: SalesNote[];
     bookings: any[];
     payments: any[];
@@ -398,7 +415,7 @@ export interface OrderTempOrder {
         [key: string]: any;
     };
 }
-export interface OrderSubmitProduct extends Omit<OrderProduct, 'unique_identification_number' | 'num'> {
+export interface OrderSubmitProduct extends Omit<OrderProduct, 'unique_identification_number' | 'num' | '_extend'> {
     product_quantity: number;
     payment_price: string;
     product_sku: OrderProductSku;
@@ -607,6 +624,7 @@ export interface SubmitSalesOrderParams {
         schedule_date: string;
         created_at?: string | undefined;
         products: OrderSubmitProduct[];
+        holder_relations?: OrderHolderRelation[];
         bookings: OrderSubmitBooking[];
         payments: any[];
         vouchers: any[];

package/lib/modules/Order/types.js

@@ -32,8 +32,8 @@ let OrderHooks = exports.OrderHooks = /*#__PURE__*/function (OrderHooks) {
 /**
  * 赠品解析回调签名（SDK → OS 的返回值）。
  *
- * - 单选项：SDK 内部自动构造商品，不弹窗
- * - 多选项：SDK 弹窗等用户确认后构造
+ * - 唯一且无规格/套餐的候选：SDK 自动构造商品
+ * - 有规格/套餐或多个候选：SDK 弹窗等用户确认后构造
  * - 用户取消：抛错或返回空数组（OS 视为放弃本次添加）
  *
  * 返回数组时沿用旧协议，只写 tempOrder.products；返回对象时可同时写入预约 bookings。
@@ -63,6 +63,7 @@ let OrderHooks = exports.OrderHooks = /*#__PURE__*/function (OrderHooks) {
  * Sales Notes 乐观写入前的可恢复快照。
  * 该对象应视为 opaque token，只用于原样传回 restoreSalesNotesMutationSnapshot。
  */
+/** 后端关系及 metadata 均为开放对象，未知字段必须往返保留。 */
 /**
  * 添加商品行时的顺序控制。
  * 默认追加到 products 尾部；预约数量同步可插入到既有预约组的最新行之后，

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

@@ -31,7 +31,7 @@ export declare const DISCOUNT_SPLIT_ORIGIN_UID_KEY = "discountSplitOriginUid";
  * 没有 UID 的裸商品不会被补写 UID。这是为了兼容 Rules/mock 的历史协议形状；
  * 正常 Order 写路径会在 normalize 阶段提前创建 UID。
  */
-export declare function ensureUniqueProductLineUids(tempOrder: OrderTempOrder): void;
+export declare function ensureUniqueProductLineUids(tempOrder: OrderTempOrder, discounts?: Array<Record<string, any>>): void;
 /**
  * 把券移除后已经恢复原价的同源折扣拆分行重新合并。
  *

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

@@ -9,6 +9,7 @@ exports.ensureUniqueProductLineUids = ensureUniqueProductLineUids;
 var _lodashEs = require("lodash-es");
 var _utils = require("../../../solution/ScanOrder/utils");
 var _orderCollectionIdentity = require("./orderCollectionIdentity");
+var _holderRelations = require("../holderRelations");
 /**
  * 商品券拆行的身份与回并工具。
  *
@@ -72,16 +73,20 @@ function ensureProductsByUid(tempOrder) {
  * 没有 UID 的裸商品不会被补写 UID。这是为了兼容 Rules/mock 的历史协议形状；
  * 正常 Order 写路径会在 normalize 阶段提前创建 UID。
  */
-function ensureUniqueProductLineUids(tempOrder) {
+function ensureUniqueProductLineUids(tempOrder, discounts = []) {
   // usedUids 只描述本次 Rules 返回的商品集合，不能直接依赖 productsByUid：
   // productsByUid 可能还保留已删除行的历史 runtime，历史 UID 不应导致当前行被改号。
   const usedUids = new Set();
   const productsByUid = ensureProductsByUid(tempOrder);
+  const splitGroups = new Map();
   tempOrder.products = (tempOrder.products || []).map(product => {
     const sourceUid = getProductLineUid(product);
     // 单测 mock 或兼容旧 Rules 时可能返回没有 UID 的裸商品。
     // 这里不主动补 UID，避免一个“校验重复”的工具意外改变旧协议对象形状。
     if (!sourceUid) return product;
+    const group = splitGroups.get(sourceUid) || [];
+    group.push(product);
+    splitGroups.set(sourceUid, group);
 
     // 实际场景：可乐 ×5 首次进入 Rules 时只有一行。
     // 使用三张券后 Rules 可能返回「可乐 ×2 + 三条可乐 ×1」，但四条都复制原 UID。
@@ -122,6 +127,50 @@ function ensureUniqueProductLineUids(tempOrder) {
     usedUids.add(splitUid);
     return product;
   });
+
+  // 仅按本次券上的明确 Holder 分配迁移。数组顺序不能代表券对应的人。
+  // 未能明确分配时保留原 UID，不把整组关系复制给每一个拆分行。
+  for (const [sourceUid, products] of splitGroups) {
+    if (products.length < 2) continue;
+    const relations = (0, _holderRelations.getProductHolderRelations)(tempOrder, {
+      metadata: {
+        unique_identification_number: sourceUid
+      }
+    });
+    if (!relations.length || relations.some(relation => relation.holder_type !== 'form')) continue;
+    const assignments = new Map();
+    let remaining = [...relations];
+    let ambiguous = false;
+    for (const product of products) {
+      const holderIds = new Set();
+      for (const item of product.discount_list || []) {
+        const discount = discounts.find(candidate => String(candidate.id) === String(item.discount?.resource_id));
+        if (discount?.holder?.holder_type !== 'form') continue;
+        const value = discount.holder.holder_id;
+        (Array.isArray(value) ? value : [value]).forEach(id => {
+          const recordId = id && typeof id === 'object' ? id.form_record_id : id;
+          if (recordId !== undefined && recordId !== null && recordId !== '') holderIds.add(String(recordId));
+        });
+      }
+      if (!holderIds.size) continue;
+      const assigned = remaining.filter(relation => holderIds.has(String(relation.holder_id)));
+      if (assigned.length !== Number(product.num)) {
+        ambiguous = true;
+        break;
+      }
+      assignments.set(product, assigned);
+      remaining = remaining.filter(relation => !assigned.includes(relation));
+    }
+    const unassigned = products.filter(product => !assignments.has(product));
+    if (ambiguous || unassigned.length > 1) continue;
+    if (unassigned.length === 1) {
+      if (remaining.length !== Number(unassigned[0].num)) continue;
+      assignments.set(unassigned[0], remaining);
+    } else if (remaining.length) continue;
+    for (const [product, assigned] of assignments) {
+      for (const relation of assigned) relation.relation_uuid = String(getProductLineUid(product));
+    }
+  }
 }
 
 /**
@@ -154,7 +203,7 @@ function consolidateDiscountFreeProductLines(tempOrder) {
     // - 手动改价/备注：用户显式表达了不同价格或不同制作要求；
     // - 称重商品：每次称重的净重和金额属于独立交易事实；
     // - 预约/holder/历史订单行：分别关联预约、持有人或后端 order_detail。
-    const hasMergeBoundary = hasDiscount || Boolean(product.metadata?._giftInfo || product._giftInfo) || Boolean(product.metadata?._promotion) || isManualProductDiscountLine(product) || hasProductLineNote(product) || Number(product.product_sku?.open_sold_weight || 0) === 1 || product.metadata?.is_edit_for_runtime === true || bookingId !== undefined && bookingId !== null && bookingId !== 0 && bookingId !== '0' || bookingUid !== undefined && bookingUid !== null && String(bookingUid) !== '' || holderId !== undefined && holderId !== null && String(holderId) !== '' || orderDetailId !== undefined && orderDetailId !== null && orderDetailId !== '';
+    const hasMergeBoundary = hasDiscount || Boolean(product.metadata?._giftInfo || product._giftInfo) || Boolean(product.metadata?._promotion) || isManualProductDiscountLine(product) || hasProductLineNote(product) || Number(product.product_sku?.open_sold_weight || 0) === 1 || product.metadata?.is_edit_for_runtime === true || bookingId !== undefined && bookingId !== null && bookingId !== 0 && bookingId !== '0' || bookingUid !== undefined && bookingUid !== null && String(bookingUid) !== '' || (0, _holderRelations.getProductHolderRelations)(tempOrder, product).length > 0 || holderId !== undefined && holderId !== null && String(holderId) !== '' || orderDetailId !== undefined && orderDetailId !== null && orderDetailId !== '';
     if (hasMergeBoundary) {
       consolidatedProducts.push(product);
       continue;

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

@@ -331,6 +331,11 @@ function applyOrderCollectionUidRemaps(sourceOrder, uidRemaps) {
       }
       // 冲突 UID 仍由第一条持有；赠品父引用缺少可用的持久化行定位时不能全局改写。
       if (remap.scope !== 'linked-owner') {
+        for (const relation of order.holder_relations || []) {
+          if (relation.relation_model === 'order_detail' && String(relation.relation_uuid) === remap.from) {
+            relation.relation_uuid = remap.to;
+          }
+        }
         for (const product of order.products || []) {
           if (String(product?.metadata?.parent_unique_identification_number || '') === remap.from) {
             product.metadata = {

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

@@ -173,7 +173,7 @@ export declare function resolveManualOverrideLineOriginalPrice(params: {
  * // => -4
  */
 export declare function resolveEffectivePerUnitDiscount(product: Record<string, any>): number;
-export declare function createDefaultOrderRulesHooks(getBookings?: () => OrderTempOrder['bookings']): RulesParamsHooks;
+export declare function createDefaultOrderRulesHooks(getBookings?: () => OrderTempOrder['bookings'], getHolderRelations?: () => OrderTempOrder['holder_relations']): RulesParamsHooks;
 /**
  * 通过 session 类商品的开始时间结束时间生成商品的时长
  * @param {CartItem} cartItem
@@ -213,6 +213,7 @@ export declare function normalizeBookingSubType(booking: Record<string, any>): s
 export declare function normalizeSubmitBooking<T extends {
     metadata?: Record<string, any>;
 }>(booking: T): T;
+export declare function resolveTableOccupancyDuration(tempOrder: OrderTempOrder): number;
 /** 提交用人数：有限且为正则向下取整，否则为 1 */
 export declare function normalizeSubmitCollectPaxValue(value: unknown): number;
 /** 从临时订单 metadata 解析合成 booking 的 collect_pax */

package/lib/modules/Order/utils.js

@@ -109,6 +109,7 @@ Object.defineProperty(exports, "resolveSafeProductNum", {
 });
 exports.resolveSubmitCollectPax = resolveSubmitCollectPax;
 exports.resolveSubmitOrderType = resolveSubmitOrderType;
+exports.resolveTableOccupancyDuration = resolveTableOccupancyDuration;
 Object.defineProperty(exports, "shouldBuildManualProductDiscount", {
   enumerable: true,
   get: function () {
@@ -128,6 +129,7 @@ Object.defineProperty(exports, "syncManualProductDiscountProductNum", {
     return _manualProductDiscount.syncManualProductDiscountProductNum;
   }
 });
+var _lodashEs = require("lodash-es");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _customParseFormat = _interopRequireDefault(require("dayjs/plugin/customParseFormat"));
 var _decimal = _interopRequireDefault(require("decimal.js"));
@@ -138,6 +140,7 @@ var _utils2 = require("../../solution/ScanOrder/utils");
 var _orderCollectionIdentity = require("./utils/orderCollectionIdentity");
 var _salesNotes = require("./salesNotes");
 var _pickupTiming = require("./pickupTiming");
+var _holderRelations = require("./holderRelations");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 _dayjs.default.extend(_customParseFormat.default);
 const POINT_CARD_SNAPSHOT_TAG = 'point_card';
@@ -832,7 +835,7 @@ function resolveEffectivePerUnitDiscount(product) {
   if (!Number.isFinite(originalPrice) || !Number.isFinite(finalPrice)) return fromList;
   return fromList + (originalPrice - finalPrice);
 }
-function createDefaultOrderRulesHooks(getBookings) {
+function createDefaultOrderRulesHooks(getBookings, getHolderRelations) {
   const getProductStartDate = product => {
     const productUid = String(product.metadata?.unique_identification_number ?? product.unique_identification_number ?? '');
     const bookingUid = String(product.booking_uid ?? product.metadata?.booking_uid ?? '');
@@ -950,7 +953,9 @@ function createDefaultOrderRulesHooks(getBookings) {
         // 勿写死 false：否则 Rules 不会走 total≠origin_total 的手动价推断，
         // 无券时会把 bundle 价还原成 original_price（手动改价套餐会从 20 回到 30）。
         isManualDiscount: resolveRulesManualDiscountFlag(metadataAny),
-        holder_id: product.metadata?.holder_id,
+        holder_id: (0, _holderRelations.hasProductBooking)(product) || !getHolderRelations ? product.metadata?.holder_id : (0, _holderRelations.getProductHolderRelations)({
+          holder_relations: getHolderRelations()
+        }, product).filter(relation => relation.holder_type === 'form').map(relation => relation.holder_id),
         startDate: getProductStartDate(product),
         main_product_selling_price: metadataAny.main_product_selling_price !== undefined ? new _decimal.default(Number(metadataAny.main_product_selling_price) || 0).minus(optionSellingSum).toDecimalPlaces(2).toString() : undefined,
         inPromotion: metadataAny._promotion?.inPromotion === true,
@@ -1241,6 +1246,7 @@ function normalizeSubmitProduct(product, formatOptions = {}) {
   } = product;
   const {
     num,
+    _extend: _productExtend,
     surcharge_fee: _productSurchargeFee,
     discount_amount: _deprecatedDiscountAmount,
     discount_type: _deprecatedDiscountType,
@@ -1427,6 +1433,7 @@ function createDefaultTempOrder(params) {
     request_unique_idempotency_token: '',
     vouchers: [],
     products: [],
+    holder_relations: [],
     notes: [],
     bookings: [],
     payments: [],
@@ -1502,6 +1509,7 @@ function buildSubmitPayload(params) {
     summary,
     enhance
   } = params;
+  (0, _holderRelations.ensureHolderRelationUuids)(tempOrder);
   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';
@@ -1541,6 +1549,9 @@ function buildSubmitPayload(params) {
   });
   const payload = {
     ...tempOrderRest,
+    ...(tempOrder.holder_relations !== undefined ? {
+      holder_relations: (0, _lodashEs.cloneDeep)(tempOrder.holder_relations)
+    } : {}),
     customer_id: tempOrder.customer_id ?? 1,
     customer_name: tempOrder.customer_name || 'Walk-In',
     country_calling_code: String(tempOrder.country_calling_code ?? ''),
@@ -1733,15 +1744,24 @@ function hasAssignedHolderId(value) {
  * clearTempOrderHolderAssignments(tempOrder);
  */
 function clearTempOrderHolderAssignments(tempOrder) {
-  let changed = false;
+  const previousRelationCount = tempOrder.holder_relations?.length || 0;
+  (0, _holderRelations.removeProductHolderRelations)(tempOrder, (tempOrder.products || []).filter(product => !(0, _holderRelations.hasProductBooking)(product)));
+  let changed = previousRelationCount !== (tempOrder.holder_relations?.length || 0);
   const resetHolderField = (target, key = 'holder_id') => {
     if (!hasAssignedHolderId(target[key])) return;
     target[key] = null;
     changed = true;
   };
+  const clearHolder = target => {
+    resetHolderField(target);
+    if (target.holder !== undefined && target.holder !== null) {
+      target.holder = null;
+      changed = true;
+    }
+  };
   for (const product of tempOrder.products || []) {
     if (product.metadata && typeof product.metadata === 'object') {
-      resetHolderField(product.metadata);
+      clearHolder(product.metadata);
     }
   }
   for (const booking of tempOrder.bookings || []) {
@@ -1759,11 +1779,13 @@ function clearTempOrderHolderAssignments(tempOrder) {
     for (const entry of Object.values(productsByUid)) {
       const origin = entry?.origin;
       if (!origin || typeof origin !== 'object') continue;
+      clearHolder(origin);
       if (origin.metadata && typeof origin.metadata === 'object') {
-        resetHolderField(origin.metadata);
+        clearHolder(origin.metadata);
       }
       if (origin._extend && typeof origin._extend === 'object') {
-        resetHolderField(origin._extend);
+        clearHolder(origin._extend);
+        delete origin._extend.holder_relations;
       }
     }
   }

package/lib/modules/Rules/index.js

@@ -8,6 +8,7 @@ var _BaseModule = require("../BaseModule");
 var _types = require("./types");
 var _utils = require("../../solution/ShopDiscount/utils");
 var _utils2 = require("../Cart/utils");
+var _utils3 = require("../Holder/utils");
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _lodashEs = require("lodash-es");
 var _dayjs = _interopRequireDefault(require("dayjs"));
@@ -59,7 +60,7 @@ class RulesModule extends _BaseModule.BaseModule {
     if (discount.holder?.holder_type !== 'form') return true;
 
     // getProduct 会裁剪商品字段，从原始商品读取配置，套餐子项沿用父商品。
-    const holderConfig = holderSource?.holder_config ?? holderSource?.metadata?.holder_config ?? holderSource?.origin?.holder_config ?? holderSource?.metadata?.origin?.holder_config ?? holderSource?._origin?.holder_config ?? holderSource?._extend?.holder_config ?? holderSource?._extend?.product?.holder_config ?? holderSource?._extend?.product?.metadata?.holder_config;
+    const holderConfig = (0, _utils3.resolveProductHolderConfig)(holderSource);
     const holderStatus = holderConfig?.status;
     const holderEnabled = holderStatus === true || ['enable', '1'].includes(String(holderStatus).trim().toLowerCase());
     if (!holderEnabled || holderConfig?.resource_id === undefined || holderConfig?.resource_id === null || holderConfig?.resource_id === '') {

package/lib/server/index.js

@@ -540,7 +540,7 @@ class Server {
 
     // 监听 ProductsModule 同步完成事件，重新计算并推送查询结果
     this.core.effects.on(_types2.ProductsHooks.onProductsSyncCompleted, payload => {
-      this.recomputeAndNotifyProductQuery({
+      return this.recomputeAndNotifyProductQuery({
         changedIds: payload?.changedIds
       });
     });
@@ -836,6 +836,9 @@ class Server {
         need_sync: 0,
         is_draft_order: 0
       };
+      if (!Array.isArray(fresh.holder_relations) && Array.isArray(checkoutData?.holder_relations)) {
+        syncedOrder.holder_relations = (0, _lodashEs.cloneDeep)(checkoutData.holder_relations);
+      }
       await this.order.upsertOrdersFromRemote([syncedOrder], 'checkoutSync');
       this.logInfo(`${title}: sync_sales 完整订单已同步到本地`, {
         order_id: fresh.order_id,
@@ -5502,6 +5505,9 @@ class Server {
     if (fresh.order_number !== undefined && fresh.order_number !== null) {
       patch.order_number = fresh.order_number;
     }
+    if (Array.isArray(fresh.holder_relations)) {
+      patch.holder_relations = (0, _lodashEs.cloneDeep)(fresh.holder_relations);
+    }
     return patch;
   }
   buildSyncedOrderForPrint(params) {
@@ -6241,7 +6247,7 @@ class Server {
         const result = await this.computeProductQueryResult(subscriber.context, {
           changedIds: options?.changedIds
         });
-        subscriber.callback(result);
+        await subscriber.callback(result);
         this.logInfo('recomputeAndNotifyProductQuery: 已推送', {
           subscriberId
         });

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

@@ -326,6 +326,10 @@ export declare class OrderModule extends BaseModule implements Module {
     private getIdentifiedPendingPayments;
     private shouldProtectLocalOrderFromRemoteSnapshot;
     private getUnmatchedIdentifiedPendingPayments;
+    /** 关系数组是完整快照，不能拼接或按商品子项生成 UID；扩展字段整体保留。 */
+    private applyHolderRelationsSnapshot;
+    /** 全量拉取缺少关系字段时，仍保留同一订单已有的关系快照。 */
+    private preserveOmittedHolderRelations;
     private mergeOrderRecords;
     private summarizeDuplicateOrders;
     private logDuplicateOrders;