@pisell/pisellos 0.10.49 → 0.10.51

package/lib/modules/Order/index.js

@@ -4,10 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.OrderModule = void 0;
+Object.defineProperty(exports, "isFulfillmentTimingBooking", {
+  enumerable: true,
+  get: function () {
+    return _pickupTiming.isFulfillmentTimingBooking;
+  }
+});
 var _BaseModule = require("../BaseModule");
 var _types = require("./types");
 var _utils = require("./utils");
 var _utils2 = require("../Product/utils");
+var _pickupTiming = require("./pickupTiming");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _availability = require("../Discount/availability");
 var _osPrivatePayload = require("../../utils/os-private-payload");
@@ -130,6 +137,8 @@ class OrderModule extends _BaseModule.BaseModule {
   sessionStorageRestoreRecord = null;
   /** 只允许当前订单最新的 prepare/config 请求回写客户资产态。 */
   customerWalletPrepareConfigEpoch = 0;
+  /** Payment 可能早于 prepare/config 返回；先按实例 ID 暂存卡号等待 Snapshot。 */
+  pointCardSnapshotCodeCandidates = new Map();
   salesSummaryModuleName;
   rulesHooksOverride;
   moduleHooksOverride;
@@ -168,6 +177,7 @@ class OrderModule extends _BaseModule.BaseModule {
         const key = Number.isFinite(id) ? id : String(resourceId);
         const title = item?.discount?.title ?? {};
         const amount = Number(item?.amount || 0);
+        const encoded = item?.metadata?.encoded || item?.encoded || item?.discount?.encoded || '';
         const discountCardType = item?.discount?.discount_card_type;
         const parValue = isDiscountCard ? discountCardType === 'fixed_amount' ? item?.discount?.fixed_amount ?? item?.amount : item?.discount?.percent : '0';
         const detail = {
@@ -186,6 +196,13 @@ class OrderModule extends _BaseModule.BaseModule {
         };
         const existed = discountMap.get(key);
         if (existed) {
+          if (!existed.encoded && encoded) {
+            existed.encoded = encoded;
+            existed.metadata = {
+              ...existed.metadata,
+              encoded
+            };
+          }
           existed.amount = Number(existed.amount || 0) + amount;
           existed.used_par_value = String(Number(existed.used_par_value || 0) + amount);
           if (!isDiscountCard) {
@@ -205,8 +222,11 @@ class OrderModule extends _BaseModule.BaseModule {
         discountMap.set(key, {
           id: key,
           product_name: '',
-          encoded: '',
-          code: '',
+          encoded,
+          code: item?.code || item?.discount?.code || '',
+          metadata: {
+            encoded
+          },
           tag: type,
           product_id: item?.discount?.discount_product_id ?? product?.product_id ?? 0,
           relation_type: '',
@@ -728,7 +748,10 @@ class OrderModule extends _BaseModule.BaseModule {
     let resolvedDiscountList = normalizedNewDiscountList || this.getDiscountList();
     if (isAvailable && normalizedNewDiscountList) {
       await this.store.discount?.setDiscountList(normalizedNewDiscountList);
-      this.applyDiscount();
+      // 实际写回商品时沿用扫码试算的优先级，避免旧商品行的选卡覆盖本次扫码。
+      this.applyDiscount({
+        preferredEntitlementPassIds: withScanList.filter(discount => (0, _entitlementPass.isEntitlementPass)(discount)).map(discount => discount.id)
+      });
       await this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
       resolvedDiscountList = this.getDiscountList();
     } else if (shouldRetainForLater) {
@@ -786,7 +809,8 @@ class OrderModule extends _BaseModule.BaseModule {
       isFormSubject: product => (0, _utils.resolveIsFormSubject)(tempOrder, product),
       orderTotalAmount: Number(this.store.summary?.total_amount || 0)
     }, {
-      reapplyBookingDiscountProductUids: options?.reapplyBookingDiscountProductUids
+      reapplyBookingDiscountProductUids: options?.reapplyBookingDiscountProductUids,
+      preferredEntitlementPassIds: options?.preferredEntitlementPassIds
     });
     if (result?.productList) {
       const previousProductsByUid = (0, _utils.indexOrderProductsByUid)(tempOrder.products);
@@ -1144,17 +1168,55 @@ class OrderModule extends _BaseModule.BaseModule {
   }
   clearCustomerWalletRuntimeState() {
     this.customerWalletPrepareConfigEpoch += 1;
+    this.pointCardSnapshotCodeCandidates.clear();
     this.store.availableWalletIds = [];
     this.store.virtualCurrencyList = [];
   }
+  rememberPointCardSnapshotCodeCandidates(value) {
+    (0, _utils.collectPointCardSnapshotCodeCandidates)(value).forEach(({
+      id,
+      code
+    }) => {
+      if (!this.pointCardSnapshotCodeCandidates.has(id)) {
+        this.pointCardSnapshotCodeCandidates.set(id, code);
+      }
+    });
+  }
+  getRememberedPointCardSnapshotCodeCandidates() {
+    return [...this.pointCardSnapshotCodeCandidates].map(([id, code]) => ({
+      id,
+      code
+    }));
+  }
+  getPointCardSnapshotOrderIdentityKey(identity) {
+    if (identity?.externalSaleNumber) {
+      return `external:${identity.externalSaleNumber}`;
+    }
+    if (identity?.orderId !== undefined && identity.orderId !== null) {
+      return `order:${identity.orderId}`;
+    }
+    if (identity?.localId) return `local:${identity.localId}`;
+    if (identity?.orderNumber) return `number:${identity.orderNumber}`;
+    return '';
+  }
+  isPointCardSnapshotMergeContextCurrent(context) {
+    if (!context) return true;
+    if (context.customerId !== undefined && String(context.customerId ?? '') !== String(this.store.tempOrder?.customer_id ?? '')) {
+      return false;
+    }
+    const expectedOrderKey = this.getPointCardSnapshotOrderIdentityKey(context.orderIdentity);
+    return !expectedOrderKey || expectedOrderKey === this.getPointCardSnapshotOrderIdentityKey(this.getOrderIdentity());
+  }
   writeCustomerWalletSnapshotsFromPrepareConfig(params) {
     const tempOrder = this.store.tempOrder;
     if (!tempOrder) return;
     if (String(tempOrder.customer_id ?? '') !== String(params.customerId)) return;
+    const currentOrderMetaList = (0, _utils.normalizeOrderMetaList)(tempOrder.order_meta_list);
     const virtualCurrencyList = Array.isArray(params.virtualCurrencyList) ? params.virtualCurrencyList : [];
+    const snapshotsWithExistingCodes = (0, _utils.mergePointCardSnapshotCodes)(params.availableWalletPassList, currentOrderMetaList?.point_cards_snapshot);
     tempOrder.order_meta_list = {
-      ...((0, _utils.normalizeOrderMetaList)(tempOrder.order_meta_list) || {}),
-      point_cards_snapshot: (0, _utils.buildPointCardSnapshotFromWalletPassList)(params.availableWalletPassList),
+      ...(currentOrderMetaList || {}),
+      point_cards_snapshot: (0, _utils.mergePointCardSnapshotCodes)(snapshotsWithExistingCodes, this.getRememberedPointCardSnapshotCodeCandidates()),
       virtual_currency_snapshot: (0, _utils.buildVirtualCurrencySnapshotFromList)(virtualCurrencyList)
     };
     this.store.availableWalletIds = [...params.availableWalletIds];
@@ -1162,6 +1224,31 @@ class OrderModule extends _BaseModule.BaseModule {
     this.persistTempOrder();
     this.saveDraftInBackground();
   }
+
+  /**
+   * 将 Payment WalletPass 返回的实例 code 回填到当前订单 Snapshot。
+   * 这里只按资产 ID 补空值，不新增卡、不覆盖 prepare/config 冻结的余额。
+   */
+  mergePointCardSnapshotCodes(walletPassList, context) {
+    const tempOrder = this.store.tempOrder;
+    const currentOrderMetaList = (0, _utils.normalizeOrderMetaList)(tempOrder?.order_meta_list);
+    const currentSnapshots = currentOrderMetaList?.point_cards_snapshot || [];
+    if (!tempOrder || !this.isPointCardSnapshotMergeContextCurrent(context)) {
+      return currentSnapshots;
+    }
+    this.rememberPointCardSnapshotCodeCandidates(walletPassList);
+    if (!currentSnapshots.length) return currentSnapshots;
+    const nextSnapshots = (0, _utils.mergePointCardSnapshotCodes)(currentSnapshots, this.getRememberedPointCardSnapshotCodeCandidates());
+    const hasChanged = nextSnapshots.some((snapshot, index) => snapshot.code !== currentSnapshots[index]?.code);
+    if (!hasChanged) return currentSnapshots;
+    tempOrder.order_meta_list = {
+      ...(currentOrderMetaList || {}),
+      point_cards_snapshot: nextSnapshots
+    };
+    this.persistTempOrder();
+    this.saveDraftInBackground();
+    return nextSnapshots;
+  }
   createExternalSaleNumber() {
     const timestamp = (0, _dayjs.default)().format('YYYYMMDDHHmmssSSS');
     const random6 = String(Math.floor(Math.random() * 1000000)).padStart(6, '0');
@@ -2193,6 +2280,7 @@ class OrderModule extends _BaseModule.BaseModule {
     const bookingByBookingUid = new Map();
     bookings.forEach(booking => {
       if (!booking || typeof booking !== 'object') return;
+      if ((0, _pickupTiming.isFulfillmentTimingBooking)(booking)) return;
       const productUid = booking.product_uid || booking.metadata?.product_uid;
       if (productUid !== undefined && productUid !== null && String(productUid) !== '') {
         bookingByProductUid.set(String(productUid), booking);
@@ -2243,6 +2331,7 @@ class OrderModule extends _BaseModule.BaseModule {
     let baseHolder = null;
     const seen = new Set();
     for (const booking of tempOrder.bookings || []) {
+      if ((0, _pickupTiming.isFulfillmentTimingBooking)(booking)) continue;
       const holder = booking?.holder && typeof booking.holder === 'object' ? booking.holder : null;
       if (!baseHolder && holder) {
         baseHolder = holder;
@@ -2283,7 +2372,7 @@ class OrderModule extends _BaseModule.BaseModule {
    * this.syncTempOrderHolderFromBookings(tempOrder);
    */
   syncTempOrderHolderFromBookings(tempOrder) {
-    const bookings = tempOrder.bookings || [];
+    const bookings = (tempOrder.bookings || []).filter(booking => !(0, _pickupTiming.isFulfillmentTimingBooking)(booking));
     const hasHolderSource = bookings.some(booking => {
       return booking?.holder !== undefined || booking?.metadata?.holder_id !== undefined;
     });
@@ -2308,6 +2397,7 @@ class OrderModule extends _BaseModule.BaseModule {
     const bookingUid = product?.booking_uid || product?.metadata?.booking_uid;
     if (!productUid && !bookingUid) return;
     tempOrder.bookings = (tempOrder.bookings || []).filter(booking => {
+      if ((0, _pickupTiming.isFulfillmentTimingBooking)(booking)) return true;
       const currentBookingUid = this.getBookingUniqueIdentificationNumber(booking);
       if (bookingUid && currentBookingUid === String(bookingUid)) return false;
       if (productUid && String(booking?.product_uid || '') === String(productUid)) return false;
@@ -2721,10 +2811,33 @@ class OrderModule extends _BaseModule.BaseModule {
     });
   }
   updateTempOrderServiceType(serviceType) {
+    if (serviceType !== 'pick_up') {
+      const tempOrder = this.ensureTempOrder();
+      tempOrder.bookings = (tempOrder.bookings || []).filter(booking => !(0, _pickupTiming.isFulfillmentTimingBooking)(booking));
+    }
     return this.updateTempOrderShopServiceData({
       service_type: serviceType
     });
   }
+  getPickupTimingBooking() {
+    return (this.store.tempOrder?.bookings || []).find(_pickupTiming.isFulfillmentTimingBooking) || null;
+  }
+  setPickupTimingBooking(input) {
+    const tempOrder = this.ensureTempOrder();
+    const bookings = tempOrder.bookings || [];
+    const firstIndex = bookings.findIndex(_pickupTiming.isFulfillmentTimingBooking);
+    const nextBooking = (0, _pickupTiming.buildPickupTimingBooking)(input, bookings[firstIndex]);
+    // Keep the first row's identity and position; repair duplicate marked rows only.
+    tempOrder.bookings = firstIndex === -1 ? [...bookings, nextBooking] : bookings.flatMap((booking, index) => index === firstIndex ? [nextBooking] : (0, _pickupTiming.isFulfillmentTimingBooking)(booking) ? [] : [booking]);
+    this.notifyTempOrderChanged();
+    return nextBooking;
+  }
+  clearPickupTimingBooking() {
+    const tempOrder = this.store.tempOrder;
+    if (!tempOrder?.bookings?.some(_pickupTiming.isFulfillmentTimingBooking)) return;
+    tempOrder.bookings = tempOrder.bookings.filter(booking => !(0, _pickupTiming.isFulfillmentTimingBooking)(booking));
+    this.notifyTempOrderChanged();
+  }
   updateTempOrderContactsInfo(contactsInfo) {
     const tempOrder = this.ensureTempOrder();
     tempOrder.contacts_info = contactsInfo && typeof contactsInfo === 'object' && !Array.isArray(contactsInfo) ? contactsInfo : null;

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 | '';
@@ -199,10 +200,15 @@ export interface PointCardSnapshotItem {
     id: number | string;
     tag: 'point_card';
     product_id?: number | string;
+    code?: string;
     product_name: string;
     par_value: string;
     used_par_value: string;
 }
+export interface PointCardSnapshotMergeContext {
+    customerId?: number | string | null;
+    orderIdentity?: OrderIdentitySnapshot | null;
+}
 export interface VirtualCurrencySnapshotItem {
     id: number | string;
     tag: 'virtual_currency';
@@ -858,6 +864,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[]>;
@@ -975,6 +984,7 @@ export interface OrderModuleAPI {
     getDiscountList: () => Discount[];
     getAvailableWalletIds: () => number[];
     getCustomerWalletPrepareConfigEpoch: () => number;
+    mergePointCardSnapshotCodes: (walletPassList: unknown, context?: PointCardSnapshotMergeContext) => PointCardSnapshotItem[];
     applyDiscount: () => void;
     /**
      * 注入促销评估器。

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

@@ -18,6 +18,16 @@ export interface OrderProductsDepositSummary {
 import type { WindowPlugin } from '../../plugins';
 export declare function normalizePointCardSnapshotItem(value: unknown): PointCardSnapshotItem | null;
 export declare function buildPointCardSnapshotFromWalletPassList(value: unknown): PointCardSnapshotItem[];
+export declare function collectPointCardSnapshotCodeCandidates(value: unknown): Array<{
+    id: string;
+    code: string;
+}>;
+/**
+ * Payment 的 WalletPass 列表包含实例 code，而 prepare/config 通常只提供
+ * 卡名称和余额。按实例 ID 仅补齐 Snapshot 缺失的 code，避免后到的运行态
+ * 数据覆盖下单时已经冻结的卡名称和余额。
+ */
+export declare function mergePointCardSnapshotCodes(snapshotsValue: unknown, walletPassesValue: unknown): PointCardSnapshotItem[];
 export declare function normalizeVirtualCurrencySnapshotItem(value: unknown): VirtualCurrencySnapshotItem | null;
 export declare function buildVirtualCurrencySnapshotFromList(value: unknown): VirtualCurrencySnapshotItem[];
 export declare function normalizeOrderMetaList(value: unknown): OrderMetaList | undefined;

package/lib/modules/Order/utils.js

@@ -14,6 +14,7 @@ exports.buildSubmitPayload = buildSubmitPayload;
 exports.buildVirtualCurrencySnapshotFromList = buildVirtualCurrencySnapshotFromList;
 exports.calculateOrderProductsDeposit = calculateOrderProductsDeposit;
 exports.clearTempOrderHolderAssignments = clearTempOrderHolderAssignments;
+exports.collectPointCardSnapshotCodeCandidates = collectPointCardSnapshotCodeCandidates;
 exports.composeLinePrice = composeLinePrice;
 exports.createDefaultOrderRulesHooks = createDefaultOrderRulesHooks;
 exports.createDefaultTempOrder = createDefaultTempOrder;
@@ -66,6 +67,7 @@ Object.defineProperty(exports, "mergeManualProductDiscountIntoList", {
   }
 });
 exports.mergeOrderProductDisplayFields = mergeOrderProductDisplayFields;
+exports.mergePointCardSnapshotCodes = mergePointCardSnapshotCodes;
 exports.mergeRelationForms = void 0;
 exports.normalizeBookingIsAll = normalizeBookingIsAll;
 exports.normalizeBookingSubType = normalizeBookingSubType;
@@ -133,6 +135,7 @@ 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 _manualProductDiscount = require("./utils/manualProductDiscount");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 _dayjs.default.extend(_customParseFormat.default);
@@ -165,6 +168,10 @@ function normalizePointCardSnapshotItem(value) {
   if (productId !== undefined) {
     snapshot.product_id = productId;
   }
+  const code = normalizeSnapshotScalar(value.code);
+  if (code !== undefined) {
+    snapshot.code = String(code).trim();
+  }
   return snapshot;
 }
 function buildPointCardSnapshotFromWalletPassList(value) {
@@ -175,6 +182,46 @@ function buildPointCardSnapshotFromWalletPassList(value) {
     return result;
   }, []);
 }
+function collectPointCardSnapshotCodeCandidates(value) {
+  if (!Array.isArray(value)) return [];
+  const codeById = new Map();
+  value.forEach(item => {
+    if (!isPlainObject(item)) return;
+    const id = normalizeSnapshotScalar(item.id ?? item.voucher_id);
+    const code = normalizeSnapshotScalar(item.code);
+    if (id === undefined || code === undefined) return;
+    const identity = String(id).trim();
+    const normalizedCode = String(code).trim();
+    if (!identity || !normalizedCode || codeById.has(identity)) return;
+    codeById.set(identity, normalizedCode);
+  });
+  return [...codeById].map(([id, code]) => ({
+    id,
+    code
+  }));
+}
+
+/**
+ * Payment 的 WalletPass 列表包含实例 code，而 prepare/config 通常只提供
+ * 卡名称和余额。按实例 ID 仅补齐 Snapshot 缺失的 code，避免后到的运行态
+ * 数据覆盖下单时已经冻结的卡名称和余额。
+ */
+function mergePointCardSnapshotCodes(snapshotsValue, walletPassesValue) {
+  const snapshots = buildPointCardSnapshotFromWalletPassList(snapshotsValue);
+  if (!snapshots.length || !Array.isArray(walletPassesValue)) return snapshots;
+  const codeById = new Map(collectPointCardSnapshotCodeCandidates(walletPassesValue).map(({
+    id,
+    code
+  }) => [id, code]));
+  return snapshots.map(snapshot => {
+    if (snapshot.code) return snapshot;
+    const code = codeById.get(String(snapshot.id).trim());
+    return code ? {
+      ...snapshot,
+      code
+    } : snapshot;
+  });
+}
 function normalizeSnapshotNameMap(value) {
   if (typeof value === 'string' || typeof value === 'number') {
     const normalizedText = String(value).trim();
@@ -1251,7 +1298,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;
 }
@@ -1270,7 +1317,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 === '';
@@ -1282,6 +1331,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
   };
 }
@@ -1367,6 +1420,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;
@@ -1402,7 +1456,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';
@@ -1487,7 +1541,7 @@ function buildSubmitPayload(params) {
     delivery_type: tempOrder.delivery_type || 'nil',
     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 || [],

package/lib/modules/Rules/index.js

@@ -104,10 +104,12 @@ class RulesModule extends _BaseModule.BaseModule {
         unavailableReason: _types.UnavailableReason.AlreadyUsed
       };
     }
+    const scannedEntitlementPassIds = newDiscountList.filter(discount => (0, _entitlementPass.isEntitlementPass)(discount)).map(discount => discount.id);
+    const scannedEntitlementPassIdSet = new Set(scannedEntitlementPassIds.map(String));
 
-    // 合并新旧折扣列表，并计算折扣结果,注意，如果旧折扣里有 isEditMode 为 true 的优惠券，则不合并
-    // 保留之前扫码得到的商品券（isScan: true）
-    const filteredOldDiscountList = oldDiscountList.filter(discount => !discount.isEditMode && (!(0, _entitlementPass.isFullCoveragePass)(discount) || discount.isScan));
+    // 客户次卡必须保留在完整列表中；同一实例以本次扫码数据更新。
+    // 历史折扣不参与试算，商品券继续沿用仅保留扫码来源的规则。
+    const filteredOldDiscountList = oldDiscountList.filter(discount => !discount.isEditMode && (!(0, _entitlementPass.isFullCoveragePass)(discount) || (0, _entitlementPass.isEntitlementPass)(discount) || discount.isScan) && !scannedEntitlementPassIdSet.has(String(discount.id)));
     const mergedDiscountList = (0, _utils.uniqueById)([...filteredOldDiscountList, ...newDiscountList]);
     const result = this.calcDiscount({
       discountList: mergedDiscountList,
@@ -116,7 +118,8 @@ class RulesModule extends _BaseModule.BaseModule {
       holders,
       isFormSubject
     }, {
-      scan: true
+      scan: true,
+      preferredEntitlementPassIds: scannedEntitlementPassIds
     });
 
     // 检查是否有产品使用了新折扣
@@ -216,6 +219,7 @@ class RulesModule extends _BaseModule.BaseModule {
     isFormSubject,
     orderTotalAmount
   }, options) {
+    const preferredEntitlementPassIds = new Set((options?.preferredEntitlementPassIds || []).map(String));
     const resolveIsFormSubject = product => typeof isFormSubject === 'function' ? Boolean(isFormSubject(product)) : Boolean(isFormSubject);
 
     // 识别出来是不是在编辑的界面里又新增了商品
@@ -969,6 +973,7 @@ class RulesModule extends _BaseModule.BaseModule {
               discount_product_id: discount.product_id
             },
             metadata: {
+              encoded: discount.metadata?.encoded || discount.encoded,
               num: num,
               discount_rule_uncheck_flag: discount?.discount_rule_uncheck_flag
             }
@@ -1164,7 +1169,7 @@ class RulesModule extends _BaseModule.BaseModule {
         return false;
       });
 
-      // 用户显式点击某张卡券时，本次选择优先于自动排序和扫码默认选择。
+      // 识别用户本次显式选择的卡券，供次卡和折扣卡各自的优先级使用。
       // 目标仍必须在当前商品的 applicableDiscounts 中，因此不会绕过 Holder、时间或商品范围校验。
       const explicitlySelectedDiscount = options?.isSelected === true && options.discountId !== undefined ? applicableDiscounts.find(discount => {
         const discountType = discount.tag || discount.type || '';
@@ -1173,21 +1178,24 @@ class RulesModule extends _BaseModule.BaseModule {
       // 折扣卡会复用于整条商品行；商品券必须继续按单张拆分，不能复用该分支。
       const explicitlySelectedDiscountCard = explicitlySelectedDiscount && !(0, _entitlementPass.isFullCoveragePass)(explicitlySelectedDiscount) ? explicitlySelectedDiscount : undefined;
 
-      // 商品数量等变化会触发无 discountId 的重算。只要当前行已应用的折扣卡仍在
+      // 商品数量等变化会触发无 discountId 的重算。只要当前行已应用的卡仍在
       // applicableDiscounts 中，就应保留该行选择，避免被自动排序中力度更大的卡替换。
-      const appliedDiscountCardIds = new Set((product.discount_list || []).filter(item => ['discount_card', 'product_discount_card'].includes(item?.tag || item?.type)).map(item => item?.discount?.resource_id ?? item?.resource_id ?? item?.id).filter(id => id !== undefined && id !== null).map(String));
+      const appliedWalletDiscountIds = new Set((product.discount_list || []).filter(item => ['entitlement_pass', 'discount_card', 'product_discount_card'].includes(item?.tag || item?.type)).map(item => item?.discount?.resource_id ?? item?.resource_id ?? item?.id).filter(id => id !== undefined && id !== null).map(String));
       const appliedDiscountCard = options?.scan ? undefined : applicableDiscounts.find(discount => {
         const discountType = discount.tag || discount.type || '';
-        return discount.isSelected === true && ['discount_card', 'product_discount_card'].includes(discountType) && appliedDiscountCardIds.has(String(discount.id));
+        return discount.isSelected === true && ['discount_card', 'product_discount_card'].includes(discountType) && appliedWalletDiscountIds.has(String(discount.id));
       });
+      const appliedEntitlementPass = options?.scan || options?.preserveEntitlementSelection === false ? undefined : applicableDiscounts.find(discount => (0, _entitlementPass.isEntitlementPass)(discount) && discount.isSelected === true && appliedWalletDiscountIds.has(String(discount.id)));
 
-      // Entitlement Pass 始终按协议优先级使用；没有新卡时沿用原选择优先级。
+      // 次卡内部按本次手选/扫码、当前行已应用、默认排序选择。
       const scannedSelectedDiscountCard = applicableDiscounts.find(n => n.isScan && n.isSelected && !(0, _entitlementPass.isFullCoveragePass)(n));
       const selectedDiscountCard = explicitlySelectedDiscountCard || appliedDiscountCard || scannedSelectedDiscountCard;
-      const highestPriorityEntitlementPass = applicableDiscounts.find(discount => (0, _entitlementPass.isEntitlementPass)(discount));
-      const selectedDiscount = highestPriorityEntitlementPass || explicitlySelectedDiscount || selectedDiscountCard || applicableDiscounts[0];
-      const prioritizedApplicableDiscounts = !highestPriorityEntitlementPass && explicitlySelectedDiscount && (0, _entitlementPass.isFullCoveragePass)(explicitlySelectedDiscount) ? [explicitlySelectedDiscount, ...applicableDiscounts.filter(discount => {
-        return (0, _entitlementPass.isFullCoveragePass)(discount) && String(discount.id) !== String(explicitlySelectedDiscount.id);
+      const selectedEntitlementPass = (explicitlySelectedDiscount && (0, _entitlementPass.isEntitlementPass)(explicitlySelectedDiscount) ? explicitlySelectedDiscount : undefined) || applicableDiscounts.find(discount => (0, _entitlementPass.isEntitlementPass)(discount) && preferredEntitlementPassIds.has(String(discount.id))) || appliedEntitlementPass || applicableDiscounts.find(discount => (0, _entitlementPass.isEntitlementPass)(discount));
+      // 手选优先；普通重算保留当前折扣卡，扫码和最优选择仍使用原有优先级。
+      const selectedDiscount = explicitlySelectedDiscount || (options?.preserveEntitlementSelection !== false && preferredEntitlementPassIds.size === 0 ? appliedDiscountCard : undefined) || selectedEntitlementPass || selectedDiscountCard || applicableDiscounts[0];
+      // 实际次数分配必须使用同一顺序，避免选中状态切换后仍将次数分配给默认卡。
+      const prioritizedApplicableDiscounts = selectedDiscount && (0, _entitlementPass.isFullCoveragePass)(selectedDiscount) ? [selectedDiscount, ...applicableDiscounts.filter(discount => {
+        return (0, _entitlementPass.isFullCoveragePass)(discount) && String(discount.id) !== String(selectedDiscount.id);
       }), ...applicableDiscounts.filter(discount => !(0, _entitlementPass.isFullCoveragePass)(discount))] : applicableDiscounts;
 
       // 如果是手动折扣，则不适用优惠券
@@ -1461,6 +1469,7 @@ class RulesModule extends _BaseModule.BaseModule {
             _num: isFullCoverage ? appliedUseCount : product.num,
             config: selectedDiscount?.config,
             metadata: {
+              encoded: selectedDiscount.metadata?.encoded || selectedDiscount.encoded,
               num: isFullCoverage ? appliedUseCount : 1,
               discount_rule_uncheck_flag: selectedDiscount?.discount_rule_uncheck_flag,
               // 🔥 order_level 分摊差值
@@ -1551,6 +1560,7 @@ class RulesModule extends _BaseModule.BaseModule {
                 discount_product_id: selectedDiscount.product_id
               },
               metadata: {
+                encoded: selectedDiscount.metadata?.encoded || selectedDiscount.encoded,
                 // 🔥 使用拆分后的唯一 _id
                 custom_product_bundle_map_id: uniqueId,
                 discount_rule_uncheck_flag: selectedDiscount?.discount_rule_uncheck_flag,
@@ -1646,6 +1656,7 @@ class RulesModule extends _BaseModule.BaseModule {
               discount_product_id: selectedDiscount.product_id
             },
             metadata: {
+              encoded: selectedDiscount.metadata?.encoded || selectedDiscount.encoded,
               // 🔥 使用唯一的 _id
               custom_product_bundle_map_id: uniqueId,
               discount_rule_uncheck_flag: selectedDiscount?.discount_rule_uncheck_flag,