@pisell/pisellos 2.3.163 → 2.3.165

package/dist/solution/UnifiedBookingSales/index.js

@@ -2421,7 +2421,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               (_this$store$customer = this.store.customer) === null || _this$store$customer === void 0 || (_this$store$customer$ = _this$store$customer.setSelectedCustomer) === null || _this$store$customer$ === void 0 || _this$store$customer$.call(_this$store$customer, authenticatedCustomer);
               this.setOrderCustomer(authenticatedCustomer);
               _context10.next = 15;
-              return Promise.all([this.refreshDiscountConfigAfterOrderCustomerChange(authenticatedCustomerId), this.waitForOrderCustomerPromotionRefresh()]);
+              return Promise.all([this.refreshDiscountConfigAfterOrderCustomerChange(authenticatedCustomerId), this.waitForOrderCustomerPromotionRefresh(), this.waitForOrderCustomerContactInfo()]);
             case 15:
               return _context10.abrupt("return", true);
             case 16:

package/lib/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.d.ts

@@ -1,8 +1,10 @@
-import type { OrderProduct } from '../../Order/types';
+import type { OrderHolderRelation, OrderProduct } from '../../Order/types';
 export interface BuildNormalProductCacheItemFromOrderLineInput {
     /** tempOrder.products 中的一行（普通商品，无关联 booking） */
     product: OrderProduct;
     /** 商品 catalog / 详情，用于 variant / option / bundle 模板字段 */
     sourceProduct?: Record<string, any> | null;
+    /** 整单关系集合，按商品行 UID 回填。 */
+    holder_relations?: OrderHolderRelation[];
 }
 export declare function buildNormalProductCacheItemFromOrderLine(input: BuildNormalProductCacheItemFromOrderLineInput): Record<string, any>;

package/lib/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js

@@ -4,13 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.buildNormalProductCacheItemFromOrderLine = buildNormalProductCacheItemFromOrderLine;
+var _lodashEs = require("lodash-es");
+var _holderRelations = require("../../Order/holderRelations");
 var _utils = require("../../Order/utils");
 var _entitlementPass = require("../../Discount/entitlementPass");
+var _utils2 = require("../../Holder/utils");
 var _orderLineDisplay = require("./orderLineDisplay");
 /**
  * 从已加车的普通商品 order line 反查 SkuDetailModal edit 所需的 cacheItem。
  *
- * 与 `buildCacheItemFromOrderLine`（预约行 + booking）并列；不含 resource / duration / holder 等预约字段。
+ * 与 `buildCacheItemFromOrderLine`（预约行 + booking）并列；Holder 从订单关系回填，不生成预约字段。
  */
 /**
  * 解析 v2 主商品 source 价（不含 option、不含 bundle），供 SkuDetailModal / transform 使用。
@@ -84,6 +87,15 @@ function buildNormalProductCacheItemFromOrderLine(input) {
   const original = Number(product.original_price ?? selling);
   const uid = product.metadata?.unique_identification_number;
   const originExtend = product.metadata?.origin?._extend;
+  const holderRelations = (0, _lodashEs.cloneDeep)((0, _holderRelations.getProductHolderRelations)(input, product));
+  const formRelations = holderRelations.filter(relation => relation.holder_type === 'form');
+  const holderIds = formRelations.map(relation => relation.holder_id);
+  const holderNames = formRelations.map(relation => relation.metadata?.name).filter(name => typeof name === 'string' && name.length > 0);
+  const holder = formRelations.length > 0 ? {
+    ...(formRelations[0].metadata || {}),
+    form_record: holderIds,
+    name: holderNames.join(',')
+  } : null;
   const shouldPreserveEntitlementPriceOverride = hasEntitlementPassDiscount(product) && (originExtend?.priceOverride !== undefined || product.metadata?.price_override != null);
   const hasPriceOverride = originExtend?.priceOverride !== undefined || shouldPreserveEntitlementPriceOverride;
   const option = (0, _utils.getProductSkuOptions)(product);
@@ -115,6 +127,9 @@ function buildNormalProductCacheItemFromOrderLine(input) {
     skuValue: JSON.parse(JSON.stringify(skuValue)),
     _skuValue: JSON.parse(JSON.stringify(skuValue)),
     isNormalProduct: true,
+    holder_relations: holderRelations,
+    holder,
+    holder_id: holderIds,
     metadata: {
       product_add_schedule_time: product.metadata?.product_add_schedule_time
     },
@@ -134,6 +149,7 @@ function buildNormalProductCacheItemFromOrderLine(input) {
   }
   return {
     ...(sourceProduct || {}),
+    holder_config: (0, _utils2.resolveProductHolderConfig)(sourceProduct) ?? (0, _utils2.resolveProductHolderConfig)(product) ?? undefined,
     id: resolvedId,
     product_id: resolvedId,
     _id: uid,

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

@@ -1,5 +1,7 @@
 import { ProductData } from '../Product/types';
 import { IFormItemData, IHolderConfig } from './types';
+/** 保留显式禁用配置；仅在新配置缺失时兼容商品旧 holder 定义。 */
+export declare function resolveProductHolderConfig(product?: ProductData | Record<string, any> | null): Record<string, any> | null;
 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;

package/lib/modules/Holder/utils.js

@@ -8,9 +8,35 @@ exports.getFormIdFromHolderConfig = getFormIdFromHolderConfig;
 exports.getProductHolderConfig = getProductHolderConfig;
 exports.normalizeFormId = normalizeFormId;
 exports.resolveFormMetaFromHolderItem = resolveFormMetaFromHolderItem;
+exports.resolveProductHolderConfig = resolveProductHolderConfig;
+/** 保留显式禁用配置；仅在新配置缺失时兼容商品旧 holder 定义。 */
+function resolveProductHolderConfig(product) {
+  if (!product || typeof product !== 'object') return null;
+  const source = product;
+  const configSources = [source.holder_config, source.metadata?.holder_config, source.origin?.holder_config, source.metadata?.origin?.holder_config, source._origin?.holder_config, source._extend?.holder_config, source._extend?.product?.holder_config, source._extend?.product?.origin?.holder_config, source._extend?.product?.metadata?.holder_config, source._extend?.product?.metadata?.origin?.holder_config, source._extend?.product?._origin?.holder_config, source._extend?.product?._extend?.holder_config];
+  const config = configSources.find(value => value !== null && typeof value === 'object');
+  if (config) return config;
+
+  // metadata.holder / _extend.holder 是选择结果，不能作为商品配置读取。
+  const legacySources = [source.holder, source.origin?.holder, source.metadata?.origin?.holder, source._origin?.holder, source._extend?.product?.holder, source._extend?.product?.origin?.holder, source._extend?.product?.metadata?.origin?.holder, source._extend?.product?._origin?.holder];
+  const legacy = legacySources.find(value => value && typeof value === 'object' && !Array.isArray(value) && typeof value.type === 'string');
+  if (!legacy) return null;
+  const formId = legacy.custom?.custom_id;
+  if (legacy.type === 'custom' && legacy.custom?.type === 'form' && (typeof formId === 'number' || typeof formId === 'string') && Number.isInteger(Number(formId)) && Number(formId) > 0) {
+    return {
+      status: 'enable',
+      required: 0,
+      resource_id: formId
+    };
+  }
+  return {
+    status: 'disable',
+    required: 0
+  };
+}
 function getProductHolderConfig(product) {
   if (!product) return null;
-  const config = product?.holder_config ?? product?.origin?.holder_config;
+  const config = resolveProductHolderConfig(product);
   if (config?.status && config?.status !== 'enable') return null;
   if (!config?.resource_id) return null;
   return config;

package/lib/modules/OpenData/contactInfo.d.ts

@@ -0,0 +1,20 @@
+import type { OpenDataConfig } from './types';
+export declare const CONTACT_INFO_FIELDS: readonly ["first_name", "last_name", "phone", "email"];
+export type ContactInfoField = typeof CONTACT_INFO_FIELDS[number];
+export interface ContactInfoConfig {
+    enabled: boolean;
+    fields: Record<ContactInfoField, {
+        visible: boolean;
+        required: boolean;
+    }>;
+}
+export declare function resolveContactInfoConfig(data?: OpenDataConfig | null): ContactInfoConfig;
+export declare function getMissingContactInfoFields(config: ContactInfoConfig, value: unknown): ContactInfoField[];
+export declare function isContactRecord(value: unknown): value is Record<string, any>;
+/** Customer relations wrap the contact in value; sales orders store the object itself. */
+export declare function extractCustomerContactInfo(customer: unknown): Record<string, any> | null;
+export declare class ContactInfoRequiredError extends Error {
+    readonly fields: ContactInfoField[];
+    readonly code = "CONTACT_INFO_REQUIRED";
+    constructor(fields: ContactInfoField[]);
+}

package/lib/modules/OpenData/contactInfo.js

@@ -0,0 +1,56 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ContactInfoRequiredError = exports.CONTACT_INFO_FIELDS = void 0;
+exports.extractCustomerContactInfo = extractCustomerContactInfo;
+exports.getMissingContactInfoFields = getMissingContactInfoFields;
+exports.isContactRecord = isContactRecord;
+exports.resolveContactInfoConfig = resolveContactInfoConfig;
+const CONTACT_INFO_FIELDS = exports.CONTACT_INFO_FIELDS = ['first_name', 'last_name', 'phone', 'email'];
+function resolveContactInfoConfig(data) {
+  const enabled = data?.['sale.enable_contact_info'] === true;
+  const fields = CONTACT_INFO_FIELDS.reduce((result, field) => {
+    const visible = data?.[`sale.${field}.visible`] !== false;
+    result[field] = {
+      visible,
+      required: enabled && visible && data?.[`sale.${field}.required`] === true
+    };
+    return result;
+  }, {});
+  return {
+    enabled: enabled && CONTACT_INFO_FIELDS.some(field => fields[field].visible),
+    fields
+  };
+}
+function getMissingContactInfoFields(config, value) {
+  if (!config.enabled) return [];
+  const contact = isContactRecord(value) ? value : {};
+  return CONTACT_INFO_FIELDS.filter(field => {
+    if (!config.fields[field].visible || !config.fields[field].required) return false;
+    const fieldValue = field === 'phone' ? isContactRecord(contact.phone) ? contact.phone.phone : undefined : contact[field];
+    return typeof fieldValue !== 'string' || !fieldValue.trim();
+  });
+}
+function isContactRecord(value) {
+  return !!value && typeof value === 'object' && !Array.isArray(value);
+}
+
+/** Customer relations wrap the contact in value; sales orders store the object itself. */
+function extractCustomerContactInfo(customer) {
+  if (!isContactRecord(customer)) return null;
+  const contact = customer.contacts_info;
+  if (!isContactRecord(contact)) return null;
+  const value = Object.prototype.hasOwnProperty.call(contact, 'value') ? contact.value : contact;
+  return isContactRecord(value) ? value : null;
+}
+class ContactInfoRequiredError extends Error {
+  code = 'CONTACT_INFO_REQUIRED';
+  constructor(fields) {
+    super(`Contact information is required: ${fields.join(', ')}`);
+    this.fields = fields;
+    this.name = 'ContactInfoRequiredError';
+  }
+}
+exports.ContactInfoRequiredError = ContactInfoRequiredError;

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

@@ -3,6 +3,7 @@ import { BaseModule } from '../BaseModule';
 import type { ScheduleModule } from '../Schedule';
 import type { OpenDataConfig, OpenDataFetchParams, OpenDataAvailabilityResult, InvoiceLayoutConfig, InvoiceTemplateSettings } from './types';
 export * from './types';
+export * from './contactInfo';
 export { computeAvailability, getDefaultInvoiceLayoutConfig, getDefaultInvoiceTemplateSettings, normalizeInvoiceLayoutConfig, normalizeInvoiceLayoutFromTemplateSettings, normalizeInvoiceTemplateSettings, normalizeRawInvoiceTemplateSettings, resolveInvoiceReceiptLocales, } from './utils';
 export declare class OpenDataModule extends BaseModule implements Module {
     protected defaultName: string;

package/lib/modules/OpenData/index.js

@@ -77,6 +77,18 @@ Object.keys(_types).forEach(function (key) {
     }
   });
 });
+var _contactInfo = require("./contactInfo");
+Object.keys(_contactInfo).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _contactInfo[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _contactInfo[key];
+    }
+  });
+});
 function isRecord(value) {
   return !!value && typeof value === 'object' && !Array.isArray(value);
 }

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

@@ -69,6 +69,15 @@ export interface OpenDataConfig {
     'reservation.time_slice'?: number | string;
     'sale.allow_item_notes'?: boolean;
     'sale.allow_order_notes'?: boolean;
+    'sale.enable_contact_info'?: boolean;
+    'sale.first_name.visible'?: boolean;
+    'sale.first_name.required'?: boolean;
+    'sale.last_name.visible'?: boolean;
+    'sale.last_name.required'?: boolean;
+    'sale.phone.visible'?: boolean;
+    'sale.phone.required'?: boolean;
+    'sale.email.visible'?: boolean;
+    'sale.email.required'?: boolean;
     /** False submits an order without starting or confirming payment. */
     'sale.require_payment_on_submit'?: boolean | null;
     'sale.enable_item_rules'?: boolean;

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

@@ -0,0 +1,14 @@
+import type { OrderHolderRelation, OrderTempOrder } from './types';
+/** 在原订单上补齐关系身份，让缓存、提交和重试共用同一个 UUID。 */
+export declare function ensureHolderRelationUuids(order: {
+    holder_relations?: OrderHolderRelation[];
+}): void;
+export declare function hasProductBooking(product: Record<string, any>): boolean;
+export declare function getProductHolderRelations(order: {
+    holder_relations?: OrderHolderRelation[];
+}, product: Record<string, any>): OrderHolderRelation[];
+export declare function replaceProductHolderRelations(order: OrderTempOrder, product: Record<string, any>, patch: OrderHolderRelation[] | undefined): void;
+/** 只删除明确被用户删除的行，不从稀疏远端快照推断删除。 */
+export declare function removeProductHolderRelations(order: OrderTempOrder, products: Array<Record<string, any>>): void;
+/** 仅兼容尚无新字段的旧测试草稿；显式 [] 永远不恢复旧 product 数据。 */
+export declare function restoreLegacyHolderRelations(order: Record<string, any>): OrderHolderRelation[] | undefined;

package/lib/modules/Order/holderRelations.js

@@ -0,0 +1,98 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ensureHolderRelationUuids = ensureHolderRelationUuids;
+exports.getProductHolderRelations = getProductHolderRelations;
+exports.hasProductBooking = hasProductBooking;
+exports.removeProductHolderRelations = removeProductHolderRelations;
+exports.replaceProductHolderRelations = replaceProductHolderRelations;
+exports.restoreLegacyHolderRelations = restoreLegacyHolderRelations;
+var _orderCollectionIdentity = require("./utils/orderCollectionIdentity");
+function getHolderRelationUuid(relation) {
+  return typeof relation?.uuid === 'string' && relation.uuid.trim() ? relation.uuid : undefined;
+}
+
+/** 在原订单上补齐关系身份，让缓存、提交和重试共用同一个 UUID。 */
+function ensureHolderRelationUuids(order) {
+  if (!Array.isArray(order.holder_relations)) return;
+  for (const relation of order.holder_relations) {
+    if (relation && typeof relation === 'object' && !getHolderRelationUuid(relation)) {
+      relation.uuid = (0, _orderCollectionIdentity.createUuidV4)();
+    }
+  }
+}
+function hasProductBooking(product) {
+  const bookingIds = [product.booking_id, product.metadata?.booking_id, product.schedule_event_id];
+  return Boolean(product.booking_uid || product.metadata?.booking_uid) || bookingIds.some(id => id !== undefined && id !== null && String(id) !== '' && String(id) !== '0');
+}
+function getProductHolderRelations(order, product) {
+  const uid = product.metadata?.unique_identification_number ?? product.unique_identification_number;
+  if (uid === undefined || uid === null || uid === '') return [];
+  return (order.holder_relations || []).filter(relation => relation.relation_model === 'order_detail' && String(relation.relation_uuid) === String(uid));
+}
+function replaceProductHolderRelations(order, product, patch) {
+  if (patch === undefined || hasProductBooking(product)) return;
+  const uid = product.metadata?.unique_identification_number ?? product.unique_identification_number;
+  if (uid === undefined || uid === null || uid === '') return;
+  const existing = getProductHolderRelations(order, product);
+  const next = new Map();
+  for (const relation of patch) {
+    const key = `${relation.holder_type}:${relation.holder_id}`;
+    const previous = existing.find(item => item.holder_type === relation.holder_type && String(item.holder_id) === String(relation.holder_id));
+    next.set(key, {
+      ...previous,
+      ...relation,
+      uuid: getHolderRelationUuid(previous) || getHolderRelationUuid(relation) || (0, _orderCollectionIdentity.createUuidV4)(),
+      relation_model: 'order_detail',
+      relation_uuid: String(uid),
+      ...(previous?.metadata || relation.metadata ? {
+        metadata: {
+          ...previous?.metadata,
+          ...relation.metadata
+        }
+      } : {})
+    });
+  }
+  order.holder_relations = [...(order.holder_relations || []).filter(relation => relation.relation_model !== 'order_detail' || String(relation.relation_uuid) !== String(uid)), ...next.values()];
+}
+
+/** 只删除明确被用户删除的行，不从稀疏远端快照推断删除。 */
+function removeProductHolderRelations(order, products) {
+  if (!Array.isArray(order.holder_relations)) return;
+  const removedUids = new Set(products.map(product => String(product.metadata?.unique_identification_number ?? product.unique_identification_number ?? '')));
+  order.holder_relations = order.holder_relations.filter(relation => relation.relation_model !== 'order_detail' || !removedUids.has(String(relation.relation_uuid)));
+}
+
+/** 仅兼容尚无新字段的旧测试草稿；显式 [] 永远不恢复旧 product 数据。 */
+function restoreLegacyHolderRelations(order) {
+  if (Object.prototype.hasOwnProperty.call(order, 'holder_relations')) {
+    return Array.isArray(order.holder_relations) ? order.holder_relations : undefined;
+  }
+  const relations = [];
+  const bookingProductUids = new Set((order.bookings || []).map(booking => String(booking.product_uid ?? booking.metadata?.product_uid ?? '')));
+  for (const product of order.products || []) {
+    if (hasProductBooking(product)) continue;
+    const uid = product.metadata?.unique_identification_number ?? product.unique_identification_number;
+    if (uid === undefined || uid === null || uid === '' || bookingProductUids.has(String(uid))) continue;
+    const holder = product.metadata?.holder || {};
+    const rawIds = product.metadata?.holder_id ?? holder.form_record;
+    const ids = (Array.isArray(rawIds) ? rawIds : [rawIds]).filter(id => id !== undefined && id !== null && id !== '' && Number.isInteger(Number(id)) && Number(id) >= 0);
+    for (const id of ids) {
+      const metadata = {
+        ...holder,
+        form_record: [Number(id)]
+      };
+      if (ids.length !== 1) delete metadata.name;
+      relations.push({
+        relation_model: 'order_detail',
+        relation_uuid: String(uid),
+        holder_type: 'form',
+        holder_id: Number(id),
+        metadata
+      });
+    }
+  }
+  return relations.length ? relations : undefined;
+}

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

@@ -595,7 +595,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: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;
@@ -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) {
@@ -1118,7 +1119,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 +1830,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 +1869,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 +1884,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 +1925,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 +1993,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 +2214,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 +3022,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 +3586,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 +3683,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 +3793,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 +3818,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 +4303,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 +4581,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 +4607,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 +4637,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 +5381,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 +5534,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 +5614,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 +5775,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

@@ -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[];