@pisell/pisellos 2.2.314 → 2.2.316

package/dist/modules/Order/localEftposState.d.ts

@@ -0,0 +1,13 @@
+/** Local reconciliation state; never part of a cloud checkout payload. */
+export declare const LOCAL_EFTPOS_REFRESH_REQUIRED = "_local_eftpos_refresh_required";
+export declare const LOCAL_EFTPOS_FINALIZED = "_local_eftpos_finalized";
+export declare const PAYMENT_REFRESH_MESSAGE = "\u8BA2\u5355\u9700\u8981\u5237\u65B0\uFF0C\u8BF7\u8054\u7F51\u5237\u65B0\u8BA2\u5355\u540E\u518D\u4ED8\u6B3E";
+export interface LocalEftposFinalization {
+    saleId: string | number;
+    paymentNumber: string;
+    result: 'failed' | 'not_started';
+    failedTransactionNumbers: string[];
+}
+export declare function requiresLocalPaymentRefresh(order: any): boolean;
+export declare function isLocalFinalizedPayment(payment: any): boolean;
+export declare function stripLocalEftposState<T extends Record<string, any>>(order: T): T;

package/dist/modules/Order/localEftposState.js

@@ -0,0 +1,39 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+/** Local reconciliation state; never part of a cloud checkout payload. */
+export var LOCAL_EFTPOS_REFRESH_REQUIRED = '_local_eftpos_refresh_required';
+export var LOCAL_EFTPOS_FINALIZED = '_local_eftpos_finalized';
+export var PAYMENT_REFRESH_MESSAGE = '订单需要刷新，请联网刷新订单后再付款';
+export function requiresLocalPaymentRefresh(order) {
+  var _order$metadata;
+  return (order === null || order === void 0 || (_order$metadata = order.metadata) === null || _order$metadata === void 0 ? void 0 : _order$metadata[LOCAL_EFTPOS_REFRESH_REQUIRED]) === true;
+}
+export function isLocalFinalizedPayment(payment) {
+  var _payment$metadata;
+  return (payment === null || payment === void 0 ? void 0 : payment.status) === 'voided' && (payment === null || payment === void 0 || (_payment$metadata = payment.metadata) === null || _payment$metadata === void 0 ? void 0 : _payment$metadata[LOCAL_EFTPOS_FINALIZED]) === true;
+}
+export function stripLocalEftposState(order) {
+  var result = _objectSpread({}, order);
+  if (order.metadata) {
+    result.metadata = _objectSpread({}, order.metadata);
+    delete result.metadata[LOCAL_EFTPOS_REFRESH_REQUIRED];
+  }
+  if (Array.isArray(order.payments)) {
+    result.payments = order.payments.filter(function (payment) {
+      return !isLocalFinalizedPayment(payment);
+    }).map(function (payment) {
+      var _payment$metadata2;
+      if (!((_payment$metadata2 = payment.metadata) !== null && _payment$metadata2 !== void 0 && _payment$metadata2[LOCAL_EFTPOS_FINALIZED])) return payment;
+      var metadata = _objectSpread({}, payment.metadata);
+      delete metadata[LOCAL_EFTPOS_FINALIZED];
+      return _objectSpread(_objectSpread({}, payment), {}, {
+        metadata: metadata
+      });
+    });
+  }
+  return result;
+}

package/dist/modules/Order/pickupTiming.d.ts

@@ -0,0 +1,46 @@
+export type PickupTimingSelectionMode = 'asap' | 'scheduled';
+export type PickupTimingSource = 'asap' | 'schedule' | 'pos_manual';
+export interface PickupTimingBookingInput {
+    mode: PickupTimingSelectionMode;
+    source: PickupTimingSource;
+    /** Store-local calendar date and minute; the caller validates availability. */
+    date: string;
+    time: string;
+    /** Absolute timestamp disambiguates a repeated local minute at a DST change. */
+    instant?: string;
+    timezone?: string;
+    frozen?: boolean;
+}
+export interface PickupTimingBookingMetadata {
+    unique_identification_number: string;
+    is_fulfillment_timing: true;
+    fulfillment_timing: {
+        method: 'pick_up';
+        mode: PickupTimingSelectionMode;
+        source: PickupTimingSource;
+        instant?: string;
+        timezone?: string;
+        frozen?: boolean;
+    };
+    [key: string]: any;
+}
+export interface PickupTimingBooking {
+    schedule_id: number | string;
+    start_date: string;
+    end_date: string;
+    start_time: string;
+    end_time: string;
+    select_date: string;
+    duration: 0;
+    is_all: 0;
+    sub_type: 'minutes';
+    like_status: string;
+    resources: [];
+    metadata: PickupTimingBookingMetadata;
+    schedule_event_id?: number | string;
+    [key: string]: any;
+}
+/** The explicit marker is the only authority; unlinked ordinary bookings remain ordinary. */
+export declare function isFulfillmentTimingBooking(booking: unknown): boolean;
+/** Update an independent pickup appointment without changing its persisted row identity. */
+export declare function buildPickupTimingBooking(input: PickupTimingBookingInput, existing?: Record<string, any> | null): PickupTimingBooking;

package/dist/modules/Order/pickupTiming.js

@@ -0,0 +1,53 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { createUuidV4 } from "./utils/orderCollectionIdentity";
+/** The explicit marker is the only authority; unlinked ordinary bookings remain ordinary. */
+export function isFulfillmentTimingBooking(booking) {
+  var _metadata;
+  return (booking === null || booking === void 0 || (_metadata = booking.metadata) === null || _metadata === void 0 ? void 0 : _metadata.is_fulfillment_timing) === true;
+}
+
+/** Update an independent pickup appointment without changing its persisted row identity. */
+export function buildPickupTimingBooking(input, existing) {
+  var booking = _objectSpread({}, existing || {});
+  var metadata = _objectSpread({}, booking.metadata || {});
+  // A fulfillment appointment never becomes a product/resource/holder purchase line.
+  for (var _i = 0, _arr = ['product_uid', 'product', 'holder', 'holder_id', 'collect_pax', 'capacity']; _i < _arr.length; _i++) {
+    var _key = _arr[_i];
+    delete booking[_key];
+    delete metadata[_key];
+  }
+  delete metadata.booking_uid;
+  return _objectSpread(_objectSpread({}, booking), {}, {
+    schedule_id: booking.schedule_id || 0,
+    start_date: input.date,
+    end_date: input.date,
+    start_time: input.time,
+    end_time: input.time,
+    select_date: input.date,
+    duration: 0,
+    is_all: 0,
+    sub_type: 'minutes',
+    like_status: booking.like_status || 'common',
+    resources: [],
+    metadata: _objectSpread(_objectSpread({}, metadata), {}, {
+      unique_identification_number: String(metadata.unique_identification_number || createUuidV4()),
+      is_fulfillment_timing: true,
+      fulfillment_timing: _objectSpread(_objectSpread(_objectSpread({
+        method: 'pick_up',
+        mode: input.mode,
+        source: input.source
+      }, input.instant !== undefined ? {
+        instant: input.instant
+      } : {}), input.timezone !== undefined ? {
+        timezone: input.timezone
+      } : {}), input.frozen !== undefined ? {
+        frozen: input.frozen
+      } : {})
+    })
+  });
+}

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

@@ -7,9 +7,10 @@ import type { SubmitPayloadEnhancer } from './utils';
 import type { PaymentItem } from '../Payment/types';
 import type { ICustomer } from '../AccountList/types';
 import type { OrderProductDiscountItem } from '../../server/modules/order/types';
+import type { PickupTimingBooking, PickupTimingBookingInput } from './pickupTiming';
 export type { OrderProductDiscountItem } from '../../server/modules/order/types';
 export type PickupReferenceMode = 'counter_pickup' | 'table_service';
-export type ShopServiceType = 'dine_in' | 'takeaway';
+export type ShopServiceType = 'dine_in' | 'takeaway' | 'pick_up' | 'delivery';
 export interface ShopServiceData {
     pickup_reference_mode?: PickupReferenceMode;
     service_type?: ShopServiceType | '';
@@ -212,6 +213,7 @@ export interface VirtualCurrencySnapshotItem {
     id: number | string;
     tag: 'virtual_currency';
     product_id?: number | string;
+    code?: string;
     product_name: string;
     par_value: string;
     used_par_value: string;
@@ -241,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;
@@ -338,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;
@@ -377,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[];
@@ -396,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;
@@ -439,16 +458,29 @@ export type AddProductBookingInput = Record<string, any>;
  */
 export interface AddProductToOrderOptions {
     insertAfterProductUid?: string;
+    /** 新增商品行插入 products 首位，优先于 insertAfterProductUid。 */
+    insertAtStart?: boolean;
     /** 跳过同商品/规格匹配，始终新增购物车行。 */
     disableMerge?: boolean;
     /** 商品行 UID 落定后，由 OrderModule 原子绑定到该行的 Sales Notes 草稿。 */
     salesNotes?: SalesNoteDraftInput[];
+    /**
+     * 自动预约加购的同步提交门禁；抛错时不发布本次新增。
+     * 带门禁时先在私有草稿中准备全部商品/booking，异步等待后及原子发布前重新调用。
+     * 门禁须校验当前订单身份/版本和真实时间；发布前不会因本次拆行改变订单版本。
+     * 不传时保留原有人工加购行为。
+     */
+    availabilityCommitGuard?: () => void;
+    /** 发布后的订单/业务归属检查；只用于阻止旧异步收尾写入新单，不再校验截止或 revision。 */
+    availabilityCommitTargetGuard?: () => boolean;
 }
 /**
  * 删除商品后的可选位置保持策略。
  * 预约合并行减量时仍删除最新真实行，再把剩余代表行移动到被删除代表行原位置。
  */
 export interface RemoveProductsFromOrderOptions {
+    /** 自动购物车写入的订单归属检查；失效时不再变更或发布异步收尾结果。 */
+    isCurrentOrder?: () => boolean;
     preserveDisplayPosition?: {
         remainingProductUid: string;
         anchorProductUid: string;
@@ -516,7 +548,15 @@ export type OrderProductMergeDecisionResult = boolean | {
     reason?: string;
     [key: string]: any;
 };
+export interface OrderCartIntentCommitContext {
+    action: 'add_product' | 'update_product' | 'increase_quantity' | 'scan_promotion';
+    tempOrder: OrderTempOrder | null;
+}
 export interface OrderHooksConfig {
+    /** Optional customer-order guard; called synchronously before the first cart write. */
+    beforeCartIntentCommit?: (context: OrderCartIntentCommitContext) => void;
+    /** Captures tenant/business runtime identity for asynchronous cart intents. */
+    getCartIntentScope?: () => unknown;
     onBeforeMergeProductToOrder?: (context: OrderProductMergeDecisionContext) => OrderProductMergeDecisionResult | Promise<OrderProductMergeDecisionResult>;
 }
 /**
@@ -584,6 +624,7 @@ export interface SubmitSalesOrderParams {
         schedule_date: string;
         created_at?: string | undefined;
         products: OrderSubmitProduct[];
+        holder_relations?: OrderHolderRelation[];
         bookings: OrderSubmitBooking[];
         payments: any[];
         vouchers: any[];
@@ -863,6 +904,9 @@ export interface OrderModuleAPI {
     updateTempOrderCustomer: (customer: UpdateTempOrderCustomerInput) => OrderSnapshot['customer'];
     updateTempOrderPickupReferenceMode: (mode: PickupReferenceMode) => ShopServiceData;
     updateTempOrderServiceType: (serviceType: ShopServiceType) => ShopServiceData;
+    getPickupTimingBooking: () => PickupTimingBooking | null;
+    setPickupTimingBooking: (input: PickupTimingBookingInput) => PickupTimingBooking;
+    clearPickupTimingBooking: () => void;
     updateTempOrderBuzzer: (buzzer: string) => string;
     updateTempOrderContactsInfo: (contactsInfo: Record<string, any> | null) => Record<string, any> | null;
     addProductToOrder: (product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput, options?: AddProductToOrderOptions) => Promise<OrderProduct[]>;
@@ -875,7 +919,9 @@ export interface OrderModuleAPI {
     updateOrderProduct: (params: UpdateOrderProductParams) => Promise<OrderProduct[]>;
     /** 批量更新购物车行，末尾仅触发一次促销重算与 summary 刷新 */
     updateOrderProducts: (paramsList: UpdateOrderProductParams[]) => Promise<OrderProduct[]>;
-    updateOrderProductQuantity: (params: UpdateOrderProductQuantityParams) => Promise<OrderProduct[]>;
+    updateOrderProductQuantity: (params: UpdateOrderProductQuantityParams, options?: {
+        isCurrentOrder?: () => boolean;
+    }) => Promise<OrderProduct[]>;
     updateOrderBooking: (params: UpdateOrderBookingParams) => any[];
     removeProductFromOrder: (identity: OrderProductIdentity, options?: RemoveProductsFromOrderOptions) => Promise<OrderProduct[]>;
     /** 批量删除购物车行，末尾仅触发一次促销重算与 summary 刷新 */

package/dist/modules/Order/types.js

@@ -69,6 +69,8 @@ export var OrderHooks = /*#__PURE__*/function (OrderHooks) {
  * 该对象应视为 opaque token，只用于原样传回 restoreSalesNotesMutationSnapshot。
  */
 
+/** 后端关系及 metadata 均为开放对象，未知字段必须往返保留。 */
+
 /**
  * 添加商品行时的顺序控制。
  * 默认追加到 products 尾部；预约数量同步可插入到既有预约组的最新行之后，

package/dist/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/dist/modules/Order/utils/discountProductLineIdentity.js

@@ -1,3 +1,11 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
@@ -10,6 +18,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 import { cloneDeep } from 'lodash-es';
 import { buildProductLineFingerprint, getSafeProductNum } from "../../../solution/ScanOrder/utils";
 import { createUuidV4 } from "./orderCollectionIdentity";
+import { getProductHolderRelations } from "../holderRelations";
 
 /**
  * 商品券拆行的身份与回并工具。
@@ -80,15 +89,20 @@ function ensureProductsByUid(tempOrder) {
  * 正常 Order 写路径会在 normalize 阶段提前创建 UID。
  */
 export function ensureUniqueProductLineUids(tempOrder) {
+  var discounts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   // usedUids 只描述本次 Rules 返回的商品集合，不能直接依赖 productsByUid：
   // productsByUid 可能还保留已删除行的历史 runtime，历史 UID 不应导致当前行被改号。
   var usedUids = new Set();
   var productsByUid = ensureProductsByUid(tempOrder);
+  var splitGroups = new Map();
   tempOrder.products = (tempOrder.products || []).map(function (product) {
     var sourceUid = getProductLineUid(product);
     // 单测 mock 或兼容旧 Rules 时可能返回没有 UID 的裸商品。
     // 这里不主动补 UID，避免一个“校验重复”的工具意外改变旧协议对象形状。
     if (!sourceUid) return product;
+    var group = splitGroups.get(sourceUid) || [];
+    group.push(product);
+    splitGroups.set(sourceUid, group);
 
     // 实际场景：可乐 ×5 首次进入 Rules 时只有一行。
     // 使用三张券后 Rules 可能返回「可乐 ×2 + 三条可乐 ×1」，但四条都复制原 UID。
@@ -122,6 +136,127 @@ export function ensureUniqueProductLineUids(tempOrder) {
     usedUids.add(splitUid);
     return product;
   });
+
+  // 仅按本次券上的明确 Holder 分配迁移。数组顺序不能代表券对应的人。
+  // 未能明确分配时保留原 UID，不把整组关系复制给每一个拆分行。
+  var _iterator = _createForOfIteratorHelper(splitGroups),
+    _step;
+  try {
+    var _loop = function _loop() {
+        var _step$value = _slicedToArray(_step.value, 2),
+          sourceUid = _step$value[0],
+          products = _step$value[1];
+        if (products.length < 2) return 0; // continue
+        var relations = getProductHolderRelations(tempOrder, {
+          metadata: {
+            unique_identification_number: sourceUid
+          }
+        });
+        if (!relations.length || relations.some(function (relation) {
+          return relation.holder_type !== 'form';
+        })) return 0; // continue
+        var assignments = new Map();
+        var remaining = _toConsumableArray(relations);
+        var ambiguous = false;
+        var _iterator2 = _createForOfIteratorHelper(products),
+          _step2;
+        try {
+          var _loop2 = function _loop2() {
+              var product = _step2.value;
+              var holderIds = new Set();
+              var _iterator4 = _createForOfIteratorHelper(product.discount_list || []),
+                _step4;
+              try {
+                var _loop3 = function _loop3() {
+                  var _discount$holder;
+                  var item = _step4.value;
+                  var discount = discounts.find(function (candidate) {
+                    var _item$discount;
+                    return String(candidate.id) === String((_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.resource_id);
+                  });
+                  if ((discount === null || discount === void 0 || (_discount$holder = discount.holder) === null || _discount$holder === void 0 ? void 0 : _discount$holder.holder_type) !== 'form') return 1; // continue
+                  var value = discount.holder.holder_id;
+                  (Array.isArray(value) ? value : [value]).forEach(function (id) {
+                    var recordId = id && _typeof(id) === 'object' ? id.form_record_id : id;
+                    if (recordId !== undefined && recordId !== null && recordId !== '') holderIds.add(String(recordId));
+                  });
+                };
+                for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                  if (_loop3()) continue;
+                }
+              } catch (err) {
+                _iterator4.e(err);
+              } finally {
+                _iterator4.f();
+              }
+              if (!holderIds.size) return 0; // continue
+              var assigned = remaining.filter(function (relation) {
+                return holderIds.has(String(relation.holder_id));
+              });
+              if (assigned.length !== Number(product.num)) {
+                ambiguous = true;
+                return 1; // break
+              }
+              assignments.set(product, assigned);
+              remaining = remaining.filter(function (relation) {
+                return !assigned.includes(relation);
+              });
+            },
+            _ret2;
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            _ret2 = _loop2();
+            if (_ret2 === 0) continue;
+            if (_ret2 === 1) break;
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
+        }
+        var unassigned = products.filter(function (product) {
+          return !assignments.has(product);
+        });
+        if (ambiguous || unassigned.length > 1) return 0; // continue
+        if (unassigned.length === 1) {
+          if (remaining.length !== Number(unassigned[0].num)) return 0; // continue
+          assignments.set(unassigned[0], remaining);
+        } else if (remaining.length) return 0; // continue
+        var _iterator3 = _createForOfIteratorHelper(assignments),
+          _step3;
+        try {
+          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+            var _step3$value = _slicedToArray(_step3.value, 2),
+              product = _step3$value[0],
+              assigned = _step3$value[1];
+            var _iterator5 = _createForOfIteratorHelper(assigned),
+              _step5;
+            try {
+              for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+                var relation = _step5.value;
+                relation.relation_uuid = String(getProductLineUid(product));
+              }
+            } catch (err) {
+              _iterator5.e(err);
+            } finally {
+              _iterator5.f();
+            }
+          }
+        } catch (err) {
+          _iterator3.e(err);
+        } finally {
+          _iterator3.f();
+        }
+      },
+      _ret;
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      _ret = _loop();
+      if (_ret === 0) continue;
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
 }
 
 /**
@@ -140,12 +275,12 @@ export function consolidateDiscountFreeProductLines(tempOrder) {
   // 清除客户/商品券后，四行都恢复为无折扣状态，应在本轮重算中立即回并为「可乐 ×5」。
   var consolidatedProducts = [];
   var productIndexByKey = new Map();
-  var _iterator = _createForOfIteratorHelper(tempOrder.products || []),
-    _step;
+  var _iterator6 = _createForOfIteratorHelper(tempOrder.products || []),
+    _step6;
   try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+    for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
       var _product$booking_uid, _product$metadata4, _booking_id, _product$metadata5, _product$order_detail, _holder_id, _product$metadata6, _product$metadata7, _product$metadata8, _product$product_sku2, _product$metadata9, _tempOrder$_extend, _product$selling_pric, _product$original_pri, _custom_price, _product$is_charge_ta, _product$gift_card, _product$bundle_edit, _product$metadata$pri, _product$metadata10, _product$metadata$sou, _product$metadata11, _product$metadata$mai, _product$metadata12, _product$metadata$mai2, _product$metadata13, _product$product_vari;
-      var product = _step.value;
+      var product = _step6.value;
       var productBundle = Array.isArray(product.product_bundle) ? product.product_bundle : [];
       var hasDiscount = (product.discount_list || []).length > 0 || productBundle.some(function (bundle) {
         return ((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []).length > 0;
@@ -161,7 +296,7 @@ export function consolidateDiscountFreeProductLines(tempOrder) {
       // - 手动改价/备注：用户显式表达了不同价格或不同制作要求；
       // - 称重商品：每次称重的净重和金额属于独立交易事实；
       // - 预约/holder/历史订单行：分别关联预约、持有人或后端 order_detail。
-      var hasMergeBoundary = hasDiscount || Boolean(((_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7._giftInfo) || product._giftInfo) || Boolean((_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8._promotion) || isManualProductDiscountLine(product) || hasProductLineNote(product) || Number(((_product$product_sku2 = product.product_sku) === null || _product$product_sku2 === void 0 ? void 0 : _product$product_sku2.open_sold_weight) || 0) === 1 || ((_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.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 !== '';
+      var hasMergeBoundary = hasDiscount || Boolean(((_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7._giftInfo) || product._giftInfo) || Boolean((_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8._promotion) || isManualProductDiscountLine(product) || hasProductLineNote(product) || Number(((_product$product_sku2 = product.product_sku) === null || _product$product_sku2 === void 0 ? void 0 : _product$product_sku2.open_sold_weight) || 0) === 1 || ((_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.is_edit_for_runtime) === true || bookingId !== undefined && bookingId !== null && bookingId !== 0 && bookingId !== '0' || bookingUid !== undefined && bookingUid !== null && String(bookingUid) !== '' || getProductHolderRelations(tempOrder, product).length > 0 || holderId !== undefined && holderId !== null && String(holderId) !== '' || orderDetailId !== undefined && orderDetailId !== null && orderDetailId !== '';
       if (hasMergeBoundary) {
         consolidatedProducts.push(product);
         continue;
@@ -219,9 +354,9 @@ export function consolidateDiscountFreeProductLines(tempOrder) {
       // 保留历史索引比立即清理更安全；当前购物车身份始终以 tempOrder.products 为准。
     }
   } catch (err) {
-    _iterator.e(err);
+    _iterator6.e(err);
   } finally {
-    _iterator.f();
+    _iterator6.f();
   }
   tempOrder.products = consolidatedProducts;
 }

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

@@ -367,12 +367,26 @@ export function applyOrderCollectionUidRemaps(sourceOrder, uidRemaps) {
             _iterator4.f();
           }
           if (remap.scope !== 'linked-owner') {
-            var _iterator5 = _createForOfIteratorHelper(order.products || []),
+            var _iterator5 = _createForOfIteratorHelper(order.holder_relations || []),
               _step5;
             try {
               for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+                var relation = _step5.value;
+                if (relation.relation_model === 'order_detail' && String(relation.relation_uuid) === remap.from) {
+                  relation.relation_uuid = remap.to;
+                }
+              }
+            } catch (err) {
+              _iterator5.e(err);
+            } finally {
+              _iterator5.f();
+            }
+            var _iterator6 = _createForOfIteratorHelper(order.products || []),
+              _step6;
+            try {
+              for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
                 var _product$metadata, _product$metadata2;
-                var product = _step5.value;
+                var product = _step6.value;
                 if (String((product === null || product === void 0 || (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.parent_unique_identification_number) || '') === remap.from) {
                   product.metadata = _objectSpread(_objectSpread({}, product.metadata || {}), {}, {
                     parent_unique_identification_number: remap.to
@@ -394,9 +408,9 @@ export function applyOrderCollectionUidRemaps(sourceOrder, uidRemaps) {
                 }
               }
             } catch (err) {
-              _iterator5.e(err);
+              _iterator6.e(err);
             } finally {
-              _iterator5.f();
+              _iterator6.f();
             }
           }
           var productsByUid = (_order$_extend = order._extend) === null || _order$_extend === void 0 ? void 0 : _order$_extend.productsByUid;
@@ -429,12 +443,12 @@ export function applyOrderCollectionUidRemaps(sourceOrder, uidRemaps) {
           }
         }
         if (remap.kind === 'booking') {
-          var _iterator6 = _createForOfIteratorHelper(order.products || []),
-            _step6;
+          var _iterator7 = _createForOfIteratorHelper(order.products || []),
+            _step7;
           try {
-            for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+            for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
               var _product$metadata3;
-              var _product = _step6.value;
+              var _product = _step7.value;
               if (remap.scope === 'linked-owner' && (linkedOwnerIsAmbiguous || getOrderCollectionUid('product', _product) !== remap.referenceOwnerUid)) {
                 continue;
               }
@@ -448,9 +462,9 @@ export function applyOrderCollectionUidRemaps(sourceOrder, uidRemaps) {
               }
             }
           } catch (err) {
-            _iterator6.e(err);
+            _iterator7.e(err);
           } finally {
-            _iterator6.f();
+            _iterator7.f();
           }
         }
       },

package/dist/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 */