@pisell/pisellos 0.10.59 → 0.10.61

package/dist/utils/platform.js

@@ -1,4 +1,5 @@
 var CUSTOMER_USER_PLATFORMS = new Set(['pc', 'h5']);
+var SELF_SERVICE_PLATFORMS = new Set(['kiosk', 'vending']);
 
 /**
  * Normalize the runtime platform passed through solution/module otherParams.
@@ -12,4 +13,9 @@ export function normalizeRuntimePlatform(platform) {
  */
 export function isCustomerUserPlatform(platform) {
   return CUSTOMER_USER_PLATFORMS.has(normalizeRuntimePlatform(platform));
+}
+
+/** Kiosk and vending retain distinct channels but share self-service checkout behavior. */
+export function isSelfServicePlatform(platform) {
+  return SELF_SERVICE_PLATFORMS.has(normalizeRuntimePlatform(platform));
 }

package/lib/model/strategy/adapter/promotion/index.js

@@ -1 +1,46 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.BUY_X_GET_Y_FREE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.ITEM_REWARD_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "PromotionAdapter", {
+  enumerable: true,
+  get: function () {
+    return _adapter.PromotionAdapter;
+  }
+});
+Object.defineProperty(exports, "PromotionEvaluator", {
+  enumerable: true,
+  get: function () {
+    return _evaluator.PromotionEvaluator;
+  }
+});
+Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function () {
+    return _adapter.default;
+  }
+});
+var _evaluator = require("./evaluator");
+var _adapter = _interopRequireWildcard(require("./adapter"));
+var _examples = require("./examples");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }

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,15 @@ 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 _orderLineDisplay = require("./orderLineDisplay");
 /**
  * 从已加车的普通商品 order line 反查 SkuDetailModal edit 所需的 cacheItem。
  *
- * 与 `buildCacheItemFromOrderLine`（预约行 + booking）并列；不含 resource / duration / holder 等预约字段。
+ * 与 `buildCacheItemFromOrderLine`（预约行 + booking）并列；Holder 从订单关系回填，不生成预约字段。
  */
 /**
  * 解析 v2 主商品 source 价（不含 option、不含 bundle），供 SkuDetailModal / transform 使用。
@@ -84,6 +86,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 +126,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 +148,7 @@ function buildNormalProductCacheItemFromOrderLine(input) {
   }
   return {
     ...(sourceProduct || {}),
+    holder_config: sourceProduct?.holder_config !== undefined ? sourceProduct.holder_config : product.metadata?.holder_config,
     id: resolvedId,
     product_id: resolvedId,
     _id: uid,

package/lib/modules/Discount/index.js

@@ -142,6 +142,7 @@ class DiscountModule extends _BaseModule.BaseModule {
     } = options || {};
     const result = await this.request.get(`/machinecode/batch-search`, {
       code,
+      resolve_ticket_order: 1,
       translate_flag: 1,
       tags: ['entitlement_pass', 'good_pass', 'product_discount_card'],
       // available: 1,

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

@@ -687,6 +687,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

@@ -15,6 +15,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"));
@@ -602,7 +603,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);
   }
 
   /**
@@ -916,7 +917,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) {
@@ -1161,7 +1162,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,
@@ -1870,7 +1873,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 ?? '',
@@ -1906,7 +1912,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);
@@ -1921,7 +1927,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 ?? '',
@@ -1959,8 +1968,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);
   }
@@ -2027,7 +2036,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 = {
@@ -2248,9 +2257,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;
   }
@@ -3039,6 +3055,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 {
@@ -3580,10 +3597,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;
@@ -3674,6 +3694,7 @@ class OrderModule extends _BaseModule.BaseModule {
       if (linked) {
         tempOrder.bookings = [...(tempOrder.bookings || []), linked.booking];
       }
+      (0, _holderRelations.replaceProductHolderRelations)(tempOrder, committedProduct, holderRelationsPatch);
       return committedProduct;
     };
     if (!matchedProduct) {
@@ -3779,6 +3800,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 || {})
@@ -3803,6 +3825,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;
@@ -4255,6 +4278,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;
@@ -4536,6 +4560,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 (mutation.commit) tempOrder = await mutation.commit();
     await this.finalizeAfterProductsMutation(tempOrder);
@@ -4559,6 +4584,7 @@ class OrderModule extends _BaseModule.BaseModule {
     const mutation = this.beginCartMutation();
     let tempOrder = mutation.draft;
     this.ensureSalesNotesLoadedForMutation(tempOrder);
+    (0, _holderRelations.removeProductHolderRelations)(tempOrder, tempOrder.products);
     tempOrder.products = [];
     tempOrder.bookings = [];
     (0, _virtualSettlement.releaseTempOrderSettlementState)(tempOrder);
@@ -4589,6 +4615,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);
@@ -5331,6 +5358,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 || []),
@@ -5483,6 +5511,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;
@@ -5560,6 +5591,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);
     }
@@ -5720,7 +5752,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

@@ -242,6 +242,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;
@@ -339,6 +344,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;
@@ -378,6 +394,7 @@ export interface OrderTempOrder {
     created_at: string | undefined;
     request_unique_idempotency_token?: string;
     products: OrderProduct[];
+    holder_relations?: OrderHolderRelation[];
     notes: SalesNote[];
     bookings: any[];
     payments: any[];
@@ -397,7 +414,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;
@@ -598,6 +615,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

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