@pisell/pisellos 2.2.314 → 2.2.316

package/lib/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/lib/modules/Order/localEftposState.js

@@ -0,0 +1,44 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PAYMENT_REFRESH_MESSAGE = exports.LOCAL_EFTPOS_REFRESH_REQUIRED = exports.LOCAL_EFTPOS_FINALIZED = void 0;
+exports.isLocalFinalizedPayment = isLocalFinalizedPayment;
+exports.requiresLocalPaymentRefresh = requiresLocalPaymentRefresh;
+exports.stripLocalEftposState = stripLocalEftposState;
+/** Local reconciliation state; never part of a cloud checkout payload. */
+const LOCAL_EFTPOS_REFRESH_REQUIRED = exports.LOCAL_EFTPOS_REFRESH_REQUIRED = '_local_eftpos_refresh_required';
+const LOCAL_EFTPOS_FINALIZED = exports.LOCAL_EFTPOS_FINALIZED = '_local_eftpos_finalized';
+const PAYMENT_REFRESH_MESSAGE = exports.PAYMENT_REFRESH_MESSAGE = '订单需要刷新，请联网刷新订单后再付款';
+function requiresLocalPaymentRefresh(order) {
+  return order?.metadata?.[LOCAL_EFTPOS_REFRESH_REQUIRED] === true;
+}
+function isLocalFinalizedPayment(payment) {
+  return payment?.status === 'voided' && payment?.metadata?.[LOCAL_EFTPOS_FINALIZED] === true;
+}
+function stripLocalEftposState(order) {
+  const result = {
+    ...order
+  };
+  if (order.metadata) {
+    result.metadata = {
+      ...order.metadata
+    };
+    delete result.metadata[LOCAL_EFTPOS_REFRESH_REQUIRED];
+  }
+  if (Array.isArray(order.payments)) {
+    result.payments = order.payments.filter(payment => !isLocalFinalizedPayment(payment)).map(payment => {
+      if (!payment.metadata?.[LOCAL_EFTPOS_FINALIZED]) return payment;
+      const metadata = {
+        ...payment.metadata
+      };
+      delete metadata[LOCAL_EFTPOS_FINALIZED];
+      return {
+        ...payment,
+        metadata
+      };
+    });
+  }
+  return result;
+}

package/lib/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/lib/modules/Order/pickupTiming.js

@@ -0,0 +1,61 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.buildPickupTimingBooking = buildPickupTimingBooking;
+exports.isFulfillmentTimingBooking = isFulfillmentTimingBooking;
+var _orderCollectionIdentity = require("./utils/orderCollectionIdentity");
+/** The explicit marker is the only authority; unlinked ordinary bookings remain ordinary. */
+function isFulfillmentTimingBooking(booking) {
+  return booking?.metadata?.is_fulfillment_timing === true;
+}
+
+/** Update an independent pickup appointment without changing its persisted row identity. */
+function buildPickupTimingBooking(input, existing) {
+  const booking = {
+    ...(existing || {})
+  };
+  const metadata = {
+    ...(booking.metadata || {})
+  };
+  // A fulfillment appointment never becomes a product/resource/holder purchase line.
+  for (const key of ['product_uid', 'product', 'holder', 'holder_id', 'collect_pax', 'capacity']) {
+    delete booking[key];
+    delete metadata[key];
+  }
+  delete metadata.booking_uid;
+  return {
+    ...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: {
+      ...metadata,
+      unique_identification_number: String(metadata.unique_identification_number || (0, _orderCollectionIdentity.createUuidV4)()),
+      is_fulfillment_timing: true,
+      fulfillment_timing: {
+        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/lib/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/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;

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

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

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

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

package/lib/modules/Order/utils.js

@@ -109,6 +109,7 @@ Object.defineProperty(exports, "resolveSafeProductNum", {
 });
 exports.resolveSubmitCollectPax = resolveSubmitCollectPax;
 exports.resolveSubmitOrderType = resolveSubmitOrderType;
+exports.resolveTableOccupancyDuration = resolveTableOccupancyDuration;
 Object.defineProperty(exports, "shouldBuildManualProductDiscount", {
   enumerable: true,
   get: function () {
@@ -128,6 +129,7 @@ Object.defineProperty(exports, "syncManualProductDiscountProductNum", {
     return _manualProductDiscount.syncManualProductDiscountProductNum;
   }
 });
+var _lodashEs = require("lodash-es");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _customParseFormat = _interopRequireDefault(require("dayjs/plugin/customParseFormat"));
 var _decimal = _interopRequireDefault(require("decimal.js"));
@@ -137,6 +139,8 @@ var _utils = require("../Holder/utils");
 var _utils2 = require("../../solution/ScanOrder/utils");
 var _orderCollectionIdentity = require("./utils/orderCollectionIdentity");
 var _salesNotes = require("./salesNotes");
+var _pickupTiming = require("./pickupTiming");
+var _holderRelations = require("./holderRelations");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 _dayjs.default.extend(_customParseFormat.default);
 const POINT_CARD_SNAPSHOT_TAG = 'point_card';
@@ -283,6 +287,10 @@ function normalizeVirtualCurrencySnapshotItem(value) {
   if (productId !== undefined) {
     snapshot.product_id = productId;
   }
+  const code = normalizeSnapshotScalar(value.code);
+  if (code !== undefined) {
+    snapshot.code = String(code).trim();
+  }
   return snapshot;
 }
 function normalizeVirtualCurrencySnapshotList(value) {
@@ -313,6 +321,10 @@ function buildVirtualCurrencySnapshotFromList(value) {
     if (productId !== undefined) {
       snapshot.product_id = productId;
     }
+    const code = normalizeSnapshotScalar(item.code);
+    if (code !== undefined) {
+      snapshot.code = String(code).trim();
+    }
     result.push(snapshot);
     return result;
   }, []);
@@ -823,7 +835,7 @@ function resolveEffectivePerUnitDiscount(product) {
   if (!Number.isFinite(originalPrice) || !Number.isFinite(finalPrice)) return fromList;
   return fromList + (originalPrice - finalPrice);
 }
-function createDefaultOrderRulesHooks(getBookings) {
+function createDefaultOrderRulesHooks(getBookings, getHolderRelations) {
   const getProductStartDate = product => {
     const productUid = String(product.metadata?.unique_identification_number ?? product.unique_identification_number ?? '');
     const bookingUid = String(product.booking_uid ?? product.metadata?.booking_uid ?? '');
@@ -941,7 +953,9 @@ function createDefaultOrderRulesHooks(getBookings) {
         // 勿写死 false：否则 Rules 不会走 total≠origin_total 的手动价推断，
         // 无券时会把 bundle 价还原成 original_price（手动改价套餐会从 20 回到 30）。
         isManualDiscount: resolveRulesManualDiscountFlag(metadataAny),
-        holder_id: product.metadata?.holder_id,
+        holder_id: (0, _holderRelations.hasProductBooking)(product) || !getHolderRelations ? product.metadata?.holder_id : (0, _holderRelations.getProductHolderRelations)({
+          holder_relations: getHolderRelations()
+        }, product).filter(relation => relation.holder_type === 'form').map(relation => relation.holder_id),
         startDate: getProductStartDate(product),
         main_product_selling_price: metadataAny.main_product_selling_price !== undefined ? new _decimal.default(Number(metadataAny.main_product_selling_price) || 0).minus(optionSellingSum).toDecimalPlaces(2).toString() : undefined,
         inPromotion: metadataAny._promotion?.inPromotion === true,
@@ -1232,6 +1246,7 @@ function normalizeSubmitProduct(product, formatOptions = {}) {
   } = product;
   const {
     num,
+    _extend: _productExtend,
     surcharge_fee: _productSurchargeFee,
     discount_amount: _deprecatedDiscountAmount,
     discount_type: _deprecatedDiscountType,
@@ -1318,7 +1333,7 @@ function normalizeSubmitProduct(product, formatOptions = {}) {
     payment_price: formatOptions.virtualSettlementMode ? virtualPrice : submitProduct.payment_price ?? submitProduct.selling_price
   };
 }
-const SUBMIT_BOOKING_METADATA_WHITELIST = ['unique_identification_number', 'collect_pax', 'capacity', 'holder_id', 'resource_select_type', 'holder'];
+const SUBMIT_BOOKING_METADATA_WHITELIST = ['unique_identification_number', 'collect_pax', 'capacity', 'holder_id', 'resource_select_type', 'holder', 'is_fulfillment_timing', 'fulfillment_timing'];
 function normalizeBookingIsAll(booking) {
   return booking.is_all === true || booking.is_all === 1 || booking.is_all === '1' || booking.is_all === 'true' ? 1 : 0;
 }
@@ -1337,7 +1352,9 @@ function normalizeSubmitBooking(booking) {
       cleanMetadata[key] = rawMetadata[key];
     }
   }
-  if (cleanMetadata.holder_id === undefined) cleanMetadata.holder_id = null;
+  if (cleanMetadata.holder_id === undefined && !(0, _pickupTiming.isFulfillmentTimingBooking)(booking)) {
+    cleanMetadata.holder_id = null;
+  }
   const bookingRecord = booking;
   const startDate = bookingRecord.start_date;
   const shouldRestoreSelectDate = bookingRecord.select_date === undefined || bookingRecord.select_date === null || bookingRecord.select_date === '';
@@ -1349,6 +1366,10 @@ function normalizeSubmitBooking(booking) {
     } : {}),
     is_all: normalizeBookingIsAll(bookingRecord),
     sub_type: normalizeBookingSubType(bookingRecord),
+    ...((0, _pickupTiming.isFulfillmentTimingBooking)(booking) ? {
+      like_status: bookingRecord.like_status || 'common',
+      schedule_id: bookingRecord.schedule_id || 0
+    } : {}),
     metadata: cleanMetadata
   };
 }
@@ -1412,6 +1433,7 @@ function createDefaultTempOrder(params) {
     request_unique_idempotency_token: '',
     vouchers: [],
     products: [],
+    holder_relations: [],
     notes: [],
     bookings: [],
     payments: [],
@@ -1434,6 +1456,7 @@ function hasBoundBookingResource(bookings) {
   if (!Array.isArray(bookings)) return false;
   return bookings.some(booking => {
     if (!booking || typeof booking !== 'object') return false;
+    if ((0, _pickupTiming.isFulfillmentTimingBooking)(booking)) return false;
     if (Number(booking.parent_id) === 0) return false;
     const resources = booking.resources;
     if (!Array.isArray(resources)) return false;
@@ -1469,7 +1492,7 @@ function resolveSubmitOrderType(params) {
     return 'table-order';
   }
   if (currentType) return currentType;
-  if (Array.isArray(bookings) && bookings.length > 0) {
+  if (Array.isArray(bookings) && bookings.some(booking => !(0, _pickupTiming.isFulfillmentTimingBooking)(booking))) {
     return businessCode === 'dine_in' ? 'table-order' : 'appointment_booking';
   }
   return 'virtual';
@@ -1486,6 +1509,7 @@ function buildSubmitPayload(params) {
     summary,
     enhance
   } = params;
+  (0, _holderRelations.ensureHolderRelationUuids)(tempOrder);
   const scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
   const bookingUuid = (0, _orderCollectionIdentity.createUuidV4)();
   const virtualSettlementMode = tempOrder.metadata?.currency_settlement_config?.settlement_type === 'virtual_currency';
@@ -1525,6 +1549,9 @@ function buildSubmitPayload(params) {
   });
   const payload = {
     ...tempOrderRest,
+    ...(tempOrder.holder_relations !== undefined ? {
+      holder_relations: (0, _lodashEs.cloneDeep)(tempOrder.holder_relations)
+    } : {}),
     customer_id: tempOrder.customer_id ?? 1,
     customer_name: tempOrder.customer_name || 'Walk-In',
     country_calling_code: String(tempOrder.country_calling_code ?? ''),
@@ -1551,10 +1578,10 @@ function buildSubmitPayload(params) {
     shop_discount: tempOrder.shop_discount || '0.00',
     surcharge_fee: tempOrder.surcharge_fee || '0.00',
     note: tempOrder.note || '',
-    delivery_type: tempOrder.delivery_type || 'nil',
+    delivery_type: tempOrder.delivery_type || 'shop_service',
     schedule_date: scheduleDate,
     // created_at: tempOrder.created_at || formatDateTime(now), 和后端协定这个字段先不提交到接口
-    bookings: (tempOrder.bookings || []).filter(booking => Number(booking.parent_id) !== 0).map(booking => normalizeSubmitBooking(booking)),
+    bookings: (tempOrder.bookings || []).filter(booking => (0, _pickupTiming.isFulfillmentTimingBooking)(booking) || Number(booking.parent_id) !== 0).map(booking => normalizeSubmitBooking(booking)),
     payments: tempOrder.payments || [],
     relation_forms: tempOrder.relation_forms || [],
     // contacts: tempOrder.contacts || [],
@@ -1717,15 +1744,24 @@ function hasAssignedHolderId(value) {
  * clearTempOrderHolderAssignments(tempOrder);
  */
 function clearTempOrderHolderAssignments(tempOrder) {
-  let changed = false;
+  const previousRelationCount = tempOrder.holder_relations?.length || 0;
+  (0, _holderRelations.removeProductHolderRelations)(tempOrder, (tempOrder.products || []).filter(product => !(0, _holderRelations.hasProductBooking)(product)));
+  let changed = previousRelationCount !== (tempOrder.holder_relations?.length || 0);
   const resetHolderField = (target, key = 'holder_id') => {
     if (!hasAssignedHolderId(target[key])) return;
     target[key] = null;
     changed = true;
   };
+  const clearHolder = target => {
+    resetHolderField(target);
+    if (target.holder !== undefined && target.holder !== null) {
+      target.holder = null;
+      changed = true;
+    }
+  };
   for (const product of tempOrder.products || []) {
     if (product.metadata && typeof product.metadata === 'object') {
-      resetHolderField(product.metadata);
+      clearHolder(product.metadata);
     }
   }
   for (const booking of tempOrder.bookings || []) {
@@ -1743,11 +1779,13 @@ function clearTempOrderHolderAssignments(tempOrder) {
     for (const entry of Object.values(productsByUid)) {
       const origin = entry?.origin;
       if (!origin || typeof origin !== 'object') continue;
+      clearHolder(origin);
       if (origin.metadata && typeof origin.metadata === 'object') {
-        resetHolderField(origin.metadata);
+        clearHolder(origin.metadata);
       }
       if (origin._extend && typeof origin._extend === 'object') {
-        resetHolderField(origin._extend);
+        clearHolder(origin._extend);
+        delete origin._extend.holder_relations;
       }
     }
   }