@pisell/pisellos 0.10.50 → 0.10.52

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;
@@ -1159,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];
@@ -1177,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');
@@ -2208,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);
@@ -2258,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;
@@ -2298,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;
     });
@@ -2323,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;
@@ -2736,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

@@ -1187,11 +1187,12 @@ class RulesModule extends _BaseModule.BaseModule {
       });
       const appliedEntitlementPass = options?.scan || options?.preserveEntitlementSelection === false ? undefined : applicableDiscounts.find(discount => (0, _entitlementPass.isEntitlementPass)(discount) && discount.isSelected === true && appliedWalletDiscountIds.has(String(discount.id)));
 
-      // 次卡内部按本次手选/扫码、当前行已应用、默认排序选择；仍保留次卡相对其他券的优先级。
+      // 次卡内部按本次手选/扫码、当前行已应用、默认排序选择。
       const scannedSelectedDiscountCard = applicableDiscounts.find(n => n.isScan && n.isSelected && !(0, _entitlementPass.isFullCoveragePass)(n));
       const selectedDiscountCard = explicitlySelectedDiscountCard || appliedDiscountCard || scannedSelectedDiscountCard;
       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 = selectedEntitlementPass || explicitlySelectedDiscount || selectedDiscountCard || applicableDiscounts[0];
+      // 手选优先；普通重算保留当前折扣卡，扫码和最优选择仍使用原有优先级。
+      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);

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

@@ -10,6 +10,10 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
     private openCache;
     private fatherModule;
     private hasLoadedScheduleList;
+    private scheduleListPromise;
+    private scheduleListRequestVersion;
+    private scheduleCatalogScope;
+    private otherParams;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     /**
@@ -19,6 +23,9 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
      * scheduleModule.updateOtherParams({ openCache: true, cacheId: 'cache-2' });
      */
     updateOtherParams(params: Record<string, any>): void;
+    private syncScheduleCatalogScope;
+    private resetScheduleCatalog;
+    destroy(): void;
     /**
      * 加载当前店铺下所有 schedule
      *
@@ -27,6 +34,7 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
     loadAllSchedule(options?: {
         useCache?: boolean;
     }): Promise<void>;
+    private loadScheduleCatalog;
     setScheduleList(list: ScheduleItem[]): void;
     private syncScheduleMap;
     getScheduleList(): ScheduleItem[];

package/lib/modules/Schedule/index.js

@@ -24,10 +24,15 @@ class ScheduleModule extends _BaseModule.BaseModule {
   openCache = false;
   fatherModule;
   hasLoadedScheduleList = false;
+  scheduleListPromise = null;
+  scheduleListRequestVersion = 0;
+  scheduleCatalogScope = '';
+  otherParams = {};
   constructor(name, version) {
     super(name, version);
   }
   async initialize(core, options) {
+    this.resetScheduleCatalog();
     this.core = core;
 
     // 获取依赖的插件
@@ -40,8 +45,9 @@ class ScheduleModule extends _BaseModule.BaseModule {
     //   this.state = { ...this.state, ...options.initialState }
     // }
     this.store = options?.store;
+    this.updateOtherParams(options.otherParams || {});
     if (options.initialState) {
-      this.store.scheduleList = options.initialState.scheduleList;
+      this.store.scheduleList = options.initialState.scheduleList || [];
       this.syncScheduleMap();
       this.store.availabilityDateList = options.initialState.availabilityDateList;
       this.hasLoadedScheduleList = Array.isArray(options.initialState.scheduleList);
@@ -51,13 +57,6 @@ class ScheduleModule extends _BaseModule.BaseModule {
       this.store.availabilityDateList = [];
       this.hasLoadedScheduleList = false;
     }
-    if (options.otherParams?.cacheId) {
-      this.openCache = options.otherParams.openCache;
-      this.cacheId = options.otherParams.cacheId;
-    }
-    if (options.otherParams?.fatherModule) {
-      this.fatherModule = options.otherParams.fatherModule;
-    }
   }
 
   /**
@@ -68,9 +67,34 @@ class ScheduleModule extends _BaseModule.BaseModule {
    */
   updateOtherParams(params) {
     const otherParams = params || {};
+    this.otherParams = {
+      ...otherParams
+    };
     this.openCache = otherParams.openCache ?? false;
     this.cacheId = otherParams.cacheId;
     this.fatherModule = otherParams.fatherModule;
+    this.syncScheduleCatalogScope();
+  }
+  syncScheduleCatalogScope() {
+    const context = this.core?.context;
+    const shopId = typeof context?.getData === 'function' ? context.getData('shop_id') : context?.shop_id;
+    const params = this.otherParams;
+    const scope = JSON.stringify([this.cacheId, this.fatherModule, params.businessCode ?? params.business_code, params.channel, params.platform, params.businessTimezone, shopId].map(value => String(value ?? '').trim()));
+    if (scope !== this.scheduleCatalogScope) {
+      this.resetScheduleCatalog();
+      this.scheduleCatalogScope = scope;
+    }
+  }
+  resetScheduleCatalog() {
+    this.scheduleListRequestVersion += 1;
+    this.scheduleListPromise = null;
+    this.hasLoadedScheduleList = false;
+    this.store.scheduleList = [];
+    this.store.map = new Map();
+  }
+  destroy() {
+    this.resetScheduleCatalog();
+    super.destroy();
   }
 
   /**
@@ -79,14 +103,40 @@ class ScheduleModule extends _BaseModule.BaseModule {
    * @memberof ScheduleModule
    */
   async loadAllSchedule(options = {}) {
-    const scheduleList = await this.request.get(`/schedule`, {
+    this.syncScheduleCatalogScope();
+    const useCache = options.useCache ?? true;
+    if (useCache) {
+      if (this.scheduleListPromise) return this.scheduleListPromise;
+      if (this.hasLoadedScheduleList) return;
+    }
+    const requestVersion = ++this.scheduleListRequestVersion;
+    const promise = this.loadScheduleCatalog(useCache, requestVersion);
+    this.scheduleListPromise = promise;
+    try {
+      await promise;
+    } finally {
+      if (this.scheduleListPromise === promise) {
+        this.scheduleListPromise = null;
+      }
+    }
+  }
+  async loadScheduleCatalog(useCache, requestVersion) {
+    const response = await this.request.get(`/schedule`, {
       num: 999
     }, {
-      useCache: options.useCache ?? true
+      useCache
     });
-    this.setScheduleList(scheduleList.data?.list || []);
+    if (response.code !== undefined && Number(response.code) !== 200 || response.status === false || typeof response.status === 'number' && response.status >= 400 || response.success === false) {
+      throw new Error(response.message || 'Schedule catalog request failed');
+    }
+    this.syncScheduleCatalogScope();
+    // A refresh or a different runtime may have superseded this request.
+    if (requestVersion === this.scheduleListRequestVersion) {
+      this.setScheduleList(response.data?.list || []);
+    }
   }
   setScheduleList(list) {
+    this.syncScheduleCatalogScope();
     this.store.scheduleList = list;
     this.syncScheduleMap();
     this.hasLoadedScheduleList = true;
@@ -95,9 +145,11 @@ class ScheduleModule extends _BaseModule.BaseModule {
     this.store.map = new Map((this.store.scheduleList || []).map(schedule => [Number(schedule.id), schedule]));
   }
   getScheduleList() {
+    this.syncScheduleCatalogScope();
     return this.store.scheduleList || [];
   }
   isScheduleListLoaded() {
+    this.syncScheduleCatalogScope();
     return this.hasLoadedScheduleList;
   }
   async loadScheduleAvailableDate({
@@ -149,6 +201,7 @@ class ScheduleModule extends _BaseModule.BaseModule {
     return dates;
   }
   getScheduleListByIds(ids) {
+    this.syncScheduleCatalogScope();
     const idSet = new Set(ids.map(id => String(id)));
     if (this.store.map instanceof Map && this.store.map.size > 0) {
       return ids.map(id => this.store.map.get(Number(id))).filter(Boolean);