@pisell/pisellos 0.10.49 → 0.10.51

package/lib/modules/Rules/types.d.ts

@@ -29,6 +29,10 @@ export interface RulesCalcDiscountOptions {
     discountId?: number;
     selectedList?: SetDiscountSelectedParams[];
     scan?: boolean;
+    /** 本次扫码优先使用的次卡实例；普通重算不传，继续保留商品行当前选择。 */
+    preferredEntitlementPassIds?: number[];
+    /** 普通重算保留商品行已应用的次卡；最优选择传 false 恢复自动排序。 */
+    preserveEntitlementSelection?: boolean;
     /** Change time 重报价目标行：允许已选编辑态折扣卡重新应用到这些 booking 商品。 */
     reapplyBookingDiscountProductUids?: string[];
 }

package/lib/modules/index.d.ts

@@ -17,6 +17,7 @@ export * from './Schedule';
 export * from './Quotation';
 export * from './ScanOrderLogger';
 export * from './OpenData';
+export * from './FulfillmentTiming';
 export * from './BookingContext';
 export * from './Holder';
 export * from './ResourcePlanner';

package/lib/modules/index.js

@@ -212,6 +212,17 @@ Object.keys(_OpenData).forEach(function (key) {
     }
   });
 });
+var _FulfillmentTiming = require("./FulfillmentTiming");
+Object.keys(_FulfillmentTiming).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _FulfillmentTiming[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _FulfillmentTiming[key];
+    }
+  });
+});
 var _BookingContext = require("./BookingContext");
 Object.keys(_BookingContext).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/lib/server/modules/order/index.d.ts

@@ -24,6 +24,7 @@ export declare class OrderModule extends BaseModule implements Module {
     private lastRecentSqliteWriteCleanupAtMs;
     /** 最近一次 SSE 全量拉取完成时间 */
     private lastServerFullFetchAtMs;
+    private businessDayRefreshPromise;
     constructor(name?: string, version?: string);
     /**
      * 广播订单变更事件，兼容全量列表订阅并额外携带本次变更订单。
@@ -130,6 +131,13 @@ export declare class OrderModule extends BaseModule implements Module {
     loadOrdersByServer(options?: {
         trigger?: string;
     }): Promise<OrderData[]>;
+    /**
+     * 供展示屏按需补齐当前营业日的订单快照；成功标记复用全量拉取落库逻辑。
+     * 拉取或落库失败时不记录已刷新，下一次调用仍可重试。
+     */
+    refreshOrdersForCurrentBusinessDay(options?: {
+        trigger?: string;
+    }): Promise<void>;
     /**
      * 静默全量刷新：后台重新拉取全量 SSE 订单数据并更新本地
      * 拿到完整数据后一次性替换 store，触发订单变更与同步完成事件

package/lib/server/modules/order/index.js

@@ -61,6 +61,7 @@ class OrderModule extends _BaseModule.BaseModule {
   lastRecentSqliteWriteCleanupAtMs = 0;
   /** 最近一次 SSE 全量拉取完成时间 */
   lastServerFullFetchAtMs = 0;
+  businessDayRefreshPromise = null;
   constructor(name, version) {
     super(name, version);
   }
@@ -864,6 +865,24 @@ class OrderModule extends _BaseModule.BaseModule {
     return memoryOrders;
   }
 
+  /**
+   * 供展示屏按需补齐当前营业日的订单快照；成功标记复用全量拉取落库逻辑。
+   * 拉取或落库失败时不记录已刷新，下一次调用仍可重试。
+   */
+  async refreshOrdersForCurrentBusinessDay(options = {}) {
+    if (this.businessDayRefreshPromise) return this.businessDayRefreshPromise;
+    if (!this.orderDataSource || !this.getCurrentShopId() || this.hasPulledOrdersToday()) return;
+    const refreshPromise = this.silentRefresh({
+      trigger: options.trigger || 'business_day_rollover'
+    }).then(() => undefined);
+    this.businessDayRefreshPromise = refreshPromise;
+    try {
+      await refreshPromise;
+    } finally {
+      this.businessDayRefreshPromise = null;
+    }
+  }
+
   /**
    * 静默全量刷新：后台重新拉取全量 SSE 订单数据并更新本地
    * 拿到完整数据后一次性替换 store，触发订单变更与同步完成事件

package/lib/server/modules/order/types.d.ts

@@ -454,6 +454,7 @@ export interface OrderData {
             id: number | string;
             tag: 'point_card';
             product_id?: number | string;
+            code?: string;
             product_name: string;
             par_value: string;
             used_par_value: string;

package/lib/server/utils/small-ticket.js

@@ -7,6 +7,7 @@ exports.buildSmallTicketData = buildSmallTicketData;
 exports.hasSmallTicketData = hasSmallTicketData;
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _decimal = _interopRequireDefault(require("decimal.js"));
+var _pickupTiming = require("../../modules/Order/pickupTiming");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const DEFAULT_LOCALES = ['en', 'zh_CN'];
 const SERVICE_TYPE_LABEL_KEYS = {
@@ -511,7 +512,16 @@ function resolveProductBasePrice(product) {
   const variantId = product.product_variant_id ?? product.variant_id;
   const variant = Array.isArray(origin.variant) && isPresentId(variantId) ? origin.variant.find(item => isSameId(item?.id, variantId)) : undefined;
   const isV2 = metadata.price_schema_version === 2 || metadata.price_schema_version === '2';
-  return firstPresentValue(metadata.source_product_price, variant?.price, product._origin?.price, product._origin?.base_price, !isV2 ? metadata.main_product_original_price : undefined, product.base_price, product.price);
+  const quantity = toNumber(product.product_quantity ?? product.quantity ?? product.num ?? 1, 1);
+  const hasEntitlementPass = normalizeArray(product.discount_list).some(discount => getProductWalletDiscountType(discount) === 'entitlement_pass');
+  const hasOptions = normalizeArray(product.options).length > 0 || normalizeArray(product.product_sku?.option).length > 0;
+  const hasCombinations = normalizeArray(product.combinations).length > 0 || normalizeArray(product.product_bundle).length > 0 || normalizeArray(product.bundle).length > 0;
+  const aggregateSourcePrice = firstPresentValue(metadata.source_product_price, product.price);
+  const originalPrice = product.original_price;
+  // 部分旧 entitlement 商品把 source/price 持久化成了整行总价，但
+  // original_price 仍是单件价。仅在等式能明确证明该口径时做窄幅回退。
+  const useOriginalPriceAsLegacyUnitPrice = hasEntitlementPass && quantity > 1 && !hasOptions && !hasCombinations && isNumericAmount(aggregateSourcePrice) && isNumericAmount(originalPrice) && new _decimal.default(aggregateSourcePrice).eq(new _decimal.default(originalPrice).mul(quantity));
+  return firstPresentValue(useOriginalPriceAsLegacyUnitPrice ? originalPrice : undefined, metadata.source_product_price, variant?.price, product._origin?.price, product._origin?.base_price, !isV2 ? metadata.main_product_original_price : undefined, product.base_price, product.price);
 }
 function normalizeProductDiscounts(params) {
   const {
@@ -527,7 +537,9 @@ function normalizeProductDiscounts(params) {
     const title = resolveDiscountTitleWithPercent(discount, locale);
     const amount = discount.amount ?? discount.value ?? discount.discount_amount;
     const isMarkup = isManualMarkup(discount);
-    const totalAmount = new _decimal.default(toMoneyNumber(amount)).mul(quantity);
+    const isAggregatedBundleDiscount = Boolean(getReceiptDiscountBundleMapId(discount));
+    const isEntitlementPass = getProductWalletDiscountType(discount) === 'entitlement_pass';
+    const totalAmount = new _decimal.default(toMoneyNumber(amount)).mul(isAggregatedBundleDiscount || isEntitlementPass ? 1 : quantity);
     const formattedAmount = isMarkup ? formatMoney(totalAmount.abs(), currencySymbol) : formatNegativeMoney(totalAmount, currencySymbol);
     return {
       item: title,
@@ -620,6 +632,9 @@ function buildProductQuantityPriceText(params) {
 }
 function resolveDiscountTitleWithPercent(discount, locale) {
   const title = resolveDiscountTitle(discount, locale);
+  if (getProductWalletDiscountType(discount) === 'entitlement_pass') {
+    return title;
+  }
   const percentRaw = discount.discount?.percent;
   const cardType = discount.discount?.discount_card_type ?? 'percent';
   const percent = percentRaw !== undefined && percentRaw !== null ? Math.trunc(Number(percentRaw)) : NaN;
@@ -760,9 +775,11 @@ function normalizeExistingCombinations(combinations, locale, currencySymbol) {
       options: rawOptions
     });
     const nestedCombinations = Array.isArray(combination.combinations) ? normalizeExistingCombinations(combination.combinations, locale, currencySymbol) : [];
+    const productTitle = getBundleProductTitleSource(combination, locale);
     const snapshot = {
       ...combination
     };
+    delete snapshot.product_title;
     delete snapshot.product_note;
     delete snapshot.note;
     delete snapshot.combinations;
@@ -782,6 +799,9 @@ function normalizeExistingCombinations(combinations, locale, currencySymbol) {
     const shouldIncludeBasePrice = normalizedOptions.length > 0 || nestedCombinations.length > 0 || hasProductDiscount(combination, extensionList);
     return {
       ...snapshot,
+      ...(productTitle ? {
+        product_title: productTitle
+      } : {}),
       product_quantity: quantity,
       total_selling_price: formatCalculatedMoney(new _decimal.default(toMoneyNumber(unitPrice)).mul(quantity), currencySymbol),
       ...(shouldIncludeBasePrice ? {
@@ -850,18 +870,18 @@ function resolveBundleProductTitle(params) {
     locale,
     parentProduct
   } = params;
-  const ownTitle = getProductTitleSource(bundle, locale);
+  const ownTitle = getBundleProductTitleSource(bundle, locale);
   if (ownTitle) return ownTitle;
   const parentBundleItem = resolveBundleItemFromParentProduct({
     bundle,
     parentProduct
   });
-  const parentBundleTitle = parentBundleItem ? getProductTitleSource(parentBundleItem, locale) : '';
+  const parentBundleTitle = parentBundleItem ? getBundleProductTitleSource(parentBundleItem, locale) : '';
   if (parentBundleTitle) return parentBundleTitle;
   const productId = bundle.bundle_product_id ?? bundle._bundle_product_id ?? bundle.product_id ?? bundle.id;
   const fallbackProduct = resolveProductFromMap(productId, productMap);
   if (!fallbackProduct) return '';
-  return getProductTitleSource(fallbackProduct, locale);
+  return getBundleProductTitleSource(fallbackProduct, locale);
 }
 function resolveProductFromMap(productId, productMap) {
   if (productId === undefined || productId === null || productId === '') return null;
@@ -933,7 +953,11 @@ function resolveVariantItem(group, itemPositionId) {
 }
 function getProductTitleSource(source, locale) {
   if (!source || typeof source !== 'object') return '';
-  return resolveTitleValue(source.product_title, locale) || resolveTitleValue(source.title, locale) || resolveTitleValue(source.name, locale);
+  return resolveTitleValue(source.product_title, locale) || resolveTitleValue(source.title_i18n, locale) || resolveTitleValue(source.title, locale) || resolveTitleValue(source.name, locale);
+}
+function getBundleProductTitleSource(source, locale) {
+  if (!source || typeof source !== 'object') return '';
+  return resolveTitleValue(source.bundle_title, locale) || resolveTitleValue(source.trans_title, locale) || resolveTitleValue(source.title_i18n, locale) || resolveTitleValue(source.product_title, locale) || resolveTitleValue(source.title, locale) || resolveTitleValue(source.name, locale);
 }
 function resolveTitleValue(value, locale) {
   if (value === undefined || value === null) return '';
@@ -1173,11 +1197,21 @@ function buildDelivery(order, locale) {
   const serviceTypeLabelKey = resolveServiceTypeLabelKey(serviceType);
   if (!serviceTypeLabelKey) return [];
   const items = [{
-    item: '',
-    value: label(locale, serviceTypeLabelKey),
-    size: 2,
-    align: 'left'
+    item: label(locale, serviceTypeLabelKey),
+    value: '',
+    size: 2
   }];
+  if (serviceType === 'pick_up') {
+    const pickupTime = formatPickupBookingStart(order.bookings, locale);
+    if (pickupTime) {
+      items.push({
+        item: pickupTime,
+        value: '',
+        size: 2
+      });
+      return items;
+    }
+  }
   const handoverTime = firstPresentValue(order.handover_time, order.handover_at, order.pickup_time, order.pickup_at, order.scheduled_pickup_time, order.delivery_time, order.delivery_at, order.scheduled_delivery_time, order.fulfillment_time, order.fulfillment_at, order.metadata?.handover_time, order.metadata?.handover_at, order.metadata?.pickup_time, order.metadata?.pickup_at, order.metadata?.scheduled_pickup_time, order.metadata?.delivery_time, order.metadata?.delivery_at, order.metadata?.scheduled_delivery_time, order.metadata?.fulfillment_time, order.metadata?.fulfillment_at);
   if (isPresentId(handoverTime)) {
     items.push({
@@ -1187,8 +1221,27 @@ function buildDelivery(order, locale) {
   }
   return items;
 }
+function formatPickupBookingStart(bookings, locale) {
+  const booking = normalizeArray(bookings).find(_pickupTiming.isFulfillmentTimingBooking);
+  const date = stringify(booking?.start_date).trim();
+  const time = stringify(booking?.start_time).trim();
+  if (!/^\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01])$/.test(date) || !/^([01]\d|2[0-3]):[0-5]\d(?::[0-5]\d)?$/.test(time)) {
+    return '';
+  }
+
+  // Validate only the calendar date in UTC; display the stored shop-local
+  // fields verbatim so the printing device's timezone cannot shift pickup.
+  const calendarDate = new Date(`${date}T00:00:00.000Z`);
+  if (!Number.isFinite(calendarDate.getTime()) || calendarDate.toISOString().slice(0, 10) !== date) {
+    return '';
+  }
+  const [year, month, day] = date.split('-');
+  const dateText = locale === 'en' ? `${day}/${month}/${year}` : `${year}/${month}/${day}`;
+  return `${time.slice(0, 5)} ${dateText}`;
+}
 function buildAppointment(order, locale) {
-  const bookings = sortBookings(normalizeArray(order.bookings));
+  const parentScheduleId = order.metadata?.appointment_booking_parent_schedule_id;
+  const bookings = sortBookings(normalizeArray(order.bookings).filter(booking => !(0, _pickupTiming.isFulfillmentTimingBooking)(booking) && isReceiptAppointmentBooking(booking, parentScheduleId)));
   if (bookings.length) {
     const allResources = normalizeArray(order.resources || order.resource_list);
     return bookings.flatMap(booking => buildAppointmentRows({
@@ -1205,6 +1258,19 @@ function buildAppointment(order, locale) {
     value: getLocalizedValue(tableName, locale)
   }];
 }
+function isReceiptAppointmentBooking(booking, parentScheduleId) {
+  if (!booking || typeof booking !== 'object' || Array.isArray(booking)) {
+    return false;
+  }
+  if (isPresentId(parentScheduleId) && isSameId(booking.schedule_event_id, parentScheduleId)) {
+    return false;
+  }
+  const parentId = booking.parent_id;
+  if (parentId === undefined || parentId === null || parentId === '') {
+    return true;
+  }
+  return Number(parentId) !== 0;
+}
 function buildAppointmentRows(params) {
   const {
     booking,
@@ -1591,11 +1657,14 @@ function getProductWalletDiscountTime(asset) {
 }
 function getProductEntitlementBalance(asset) {
   for (const record of asset.records) {
-    const balance = getEntitlementBalance(record.metadata?.balance, record.balance, record.discount?.metadata?.balance, record.discount?.balance);
+    const balance = getProductDiscountEntitlementBalance(record);
     if (balance) return balance;
   }
   return null;
 }
+function getProductDiscountEntitlementBalance(record) {
+  return getEntitlementBalance(record.metadata?.balance, record.balance, record.discount?.metadata?.balance, record.discount?.balance);
+}
 function getEntitlementBalance(...values) {
   for (const value of values) {
     if (!isNumericAmount(value)) continue;
@@ -1668,7 +1737,7 @@ function buildPointCardSnapshotAssets(params) {
       codes: []
     })) return [];
     const rows = [{
-      item: stringify(pointCard.product_name).trim() || label(params.locale, 'pointCard'),
+      item: appendMaskedCardCode(stringify(pointCard.product_name).trim() || label(params.locale, 'pointCard'), pointCard.code),
       value: ''
     }];
     const remainingPoints = getPointCardSnapshotRemainingPoints(pointCard);
@@ -2140,9 +2209,14 @@ function isPointCardPayment(payment) {
   return code === 'POINTCARD' || type === 'point_card';
 }
 function maskMachineCode(code) {
-  const text = stringify(code);
-  if (text.length <= 6) return text;
-  return `${text.slice(0, 2)}**${text.slice(-4)}`;
+  const text = stringify(code).trim();
+  if (!text) return '';
+  if (text.length <= 6) return '*'.repeat(text.length);
+  return `${text.slice(0, 2)}****${text.slice(-4)}`;
+}
+function appendMaskedCardCode(name, code) {
+  const maskedCode = maskMachineCode(code);
+  return maskedCode ? `${name}(${maskedCode})` : name;
 }
 function trimDecimal(value) {
   return value.toDecimalPlaces(2).toFixed(2).replace(/\.?0+$/, '');
@@ -2151,16 +2225,13 @@ function getFundRecordPaymentName(payment, locale) {
   const fundRecord = getFundRecord(payment);
   if (!fundRecord) return '';
   const name = getLocalizedValue(fundRecord.wallet_pass_name, locale);
-  const code = maskMachineCode(fundRecord.code);
-  if (!name && !code) return '';
-  if (!code) return name;
+  if (!name && !maskMachineCode(fundRecord.code)) return '';
   const fallbackName = getLocalizedValue(payment.name || payment.title || payment.payment_method_name || payment.method_name || payment.code, locale);
-  return `${name || fallbackName}(${code})`;
+  return appendMaskedCardCode(name || fallbackName, fundRecord.code);
 }
 function appendMachineCodeToName(name, payment) {
   const fundRecord = getFundRecord(payment);
-  if (!fundRecord?.code) return name;
-  return `${name}(${maskMachineCode(fundRecord.code)})`;
+  return appendMaskedCardCode(name, fundRecord?.code);
 }
 function paymentMethodName(payment, locale) {
   const fundRecordName = getFundRecordPaymentName(payment, locale);

package/lib/solution/BaseSales/index.d.ts

@@ -2,6 +2,8 @@ import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesUpdateOrderProductQuantityParams, BaseSalesCalculateProductBookingPriceParams, BaseSalesPriceRecalculationContextChange, BaseSalesProductBookingPriceResult, BaseSalesQuotationCustomerScopeInfo, BaseSalesScanCodeResult, BaseSalesCashPaymentConfig, BaseSalesPayCashParams, BaseSalesPayCashResult, BaseSalesCommitPaymentMethodParams, BaseSalesCommitPaymentMethodResult, BaseSalesConfirmWalletPaymentResult } from './types';
 import { OrderModule } from '../../modules/Order';
+import { type PickupTimingBookingInput } from '../../modules/Order/pickupTiming';
+import type { PickupTimingAvailability, PickupTimingSelection, PickupTimingValidationResult } from '../../modules/FulfillmentTiming';
 import type { AddProductBookingInput, AddProductToOrderOptions, LoadSalesDetailParams, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder, OrderSummary, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions, RemoveProductsFromOrderOptions, ReplaceTempOrderOptions, SalesNote, SalesNotesMutationSnapshot, SetSalesNoteInput, PickupReferenceMode, ShopServiceData, ShopServiceType } from '../../modules/Order/types';
 import type { SubmitPayloadEnhancer } from '../../modules/Order/utils';
 import type { Discount, VirtualCurrencyAsset } from '../../modules/Discount/types';
@@ -75,6 +77,8 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private serverOrderChangeHydrateInFlight;
     private queuedServerOrderChanges;
     private serverOrderChangeSyncEnabled;
+    protected pickupTimingEnabled: boolean;
+    private pickupTimingController?;
     constructor(name?: string, version?: string);
     /**
      * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -151,6 +155,22 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private getAuthoritativeBundleUnitPrice;
     private mergeProductForPriceQuery;
     protected getSubmitOrderSalesChannel(): string | undefined;
+    /** Only solutions opting into Pickup Timing supply effective OpenData. */
+    protected loadPickupTimingOpenData(_force: boolean): Promise<Record<string, unknown>>;
+    protected isPickupTimingEnabled(): boolean;
+    protected getPickupTimingContextData(key: string): unknown;
+    protected getPickupTimingScope(): string;
+    private getPickupTimingController;
+    getPickupTimingAvailability(params?: {
+        date?: string;
+        force?: boolean;
+    }): Promise<PickupTimingAvailability>;
+    getPickupTimingSelection(): PickupTimingSelection;
+    setPickupTimingSelection(selection: PickupTimingSelection): Promise<PickupTimingSelection>;
+    validatePickupTimingSelection(selection: PickupTimingSelection): Promise<PickupTimingValidationResult>;
+    preparePickupTimingForCheckout(options?: {
+        freeze?: boolean;
+    }): Promise<PickupTimingSelection>;
     /** Subclasses with target-scoped OpenData override this guard before reusing the cache. */
     protected isInvoiceOpenDataCacheCurrent(): boolean;
     private getFulfillmentRefModeConfigs;
@@ -248,6 +268,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     updateTempOrderDepositAmount(amount: string | number): OrderSummary;
     setPickupReferenceMode(mode: PickupReferenceMode): ShopServiceData;
     setServiceType(serviceType: ShopServiceType): ShopServiceData;
+    getPickupTimingBooking(): import("../../modules/Order").PickupTimingBooking | null;
+    setPickupTimingBooking(input: PickupTimingBookingInput): import("../../modules/Order").PickupTimingBooking;
+    clearPickupTimingBooking(): void;
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
     /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化。 */
     setEnableTempOrderPersist(enabled: boolean): void;

package/lib/solution/BaseSales/index.js

@@ -21,6 +21,8 @@ Object.keys(_types).forEach(function (key) {
   });
 });
 var _Order = require("../../modules/Order");
+var _pickupTiming = require("../../modules/Order/pickupTiming");
+var _pickupTiming2 = require("./pickupTiming");
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _lodashEs = require("lodash-es");
 var _types2 = require("../BookingByStep/types");
@@ -497,6 +499,8 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   serverOrderChangeHydrateInFlight = null;
   queuedServerOrderChanges = [];
   serverOrderChangeSyncEnabled = false;
+  pickupTimingEnabled = false;
+  pickupTimingController;
   constructor(name, version) {
     super(name, version);
   }
@@ -1146,6 +1150,66 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     return this.otherParams?.channel;
   }
 
+  /** Only solutions opting into Pickup Timing supply effective OpenData. */
+  async loadPickupTimingOpenData(_force) {
+    return {};
+  }
+  isPickupTimingEnabled() {
+    return this.pickupTimingEnabled && this.otherParams?.enablePickupTiming !== false;
+  }
+  getPickupTimingContextData(key) {
+    const context = this.core?.context;
+    const getData = context?.getData;
+    return typeof getData === 'function' ? getData.call(context, key) : undefined;
+  }
+  getPickupTimingScope() {
+    return JSON.stringify({
+      shop: this.getPickupTimingContextData('shop_id'),
+      businessCode: this.otherParams?.businessCode ?? this.otherParams?.business_code,
+      channel: this.getSubmitOrderSalesChannel(),
+      timezone: this.getPickupTimingContextData('timezone'),
+      platform: (0, _platform.normalizeRuntimePlatform)(this.otherParams?.platform),
+      cacheId: this.cacheId
+    });
+  }
+  getPickupTimingController() {
+    if (!this.pickupTimingController) {
+      this.pickupTimingController = new _pickupTiming2.PickupTimingController({
+        getOrder: () => {
+          if (!this.store.order) throw new Error('order 模块未初始化');
+          return this.store.order;
+        },
+        getSchedule: () => this.store.schedule,
+        loadOpenData: force => this.loadPickupTimingOpenData(force),
+        getTimezone: () => String(this.getPickupTimingContextData('timezone') ?? ''),
+        getScope: () => this.getPickupTimingScope(),
+        isPos: () => (0, _platform.normalizeRuntimePlatform)(this.otherParams?.platform) === 'pos'
+      });
+    }
+    return this.pickupTimingController;
+  }
+  getPickupTimingAvailability(params) {
+    return this.getPickupTimingController().getAvailability(params);
+  }
+  getPickupTimingSelection() {
+    return this.getPickupTimingController().getSelection();
+  }
+  setPickupTimingSelection(selection) {
+    return this.getPickupTimingController().setSelection(selection);
+  }
+  validatePickupTimingSelection(selection) {
+    return this.getPickupTimingController().validate(selection);
+  }
+  preparePickupTimingForCheckout(options) {
+    if (!this.isPickupTimingEnabled()) {
+      return Promise.resolve({
+        serviceType: String(this.getTempOrder()?.metadata?.shop_service_data?.service_type || ''),
+        mode: 'asap'
+      });
+    }
+    return this.getPickupTimingController().prepare(options);
+  }
+
   /** Subclasses with target-scoped OpenData override this guard before reusing the cache. */
   isInvoiceOpenDataCacheCurrent() {
     return true;
@@ -1537,9 +1601,12 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   /** 获取根 booking（is_next === 0 / is_root === 1），多个时取第一个。 */
   getRootBooking() {
     if (!this.currentSalesDetail) return null;
-    if (this.currentSalesDetail.rootBooking) return this.currentSalesDetail.rootBooking;
+    if (this.currentSalesDetail.rootBooking && !(0, _pickupTiming.isFulfillmentTimingBooking)(this.currentSalesDetail.rootBooking)) {
+      return this.currentSalesDetail.rootBooking;
+    }
     const bookings = this.currentSalesDetail.bookings || [];
     return bookings.find(booking => {
+      if ((0, _pickupTiming.isFulfillmentTimingBooking)(booking)) return false;
       const parentId = booking?.parent_id;
       return parentId === 0 || parentId === null || parentId === undefined;
     }) || null;
@@ -1656,6 +1723,16 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!this.store.order) throw new Error('order 模块未初始化');
     return this.store.order.updateTempOrderServiceType(serviceType);
   }
+  getPickupTimingBooking() {
+    return this.store.order?.getPickupTimingBooking() || null;
+  }
+  setPickupTimingBooking(input) {
+    if (!this.store.order) throw new Error('order 模块未初始化');
+    return this.store.order.setPickupTimingBooking(input);
+  }
+  clearPickupTimingBooking() {
+    this.store.order?.clearPickupTimingBooking();
+  }
   updateTempOrderContactsInfo(contactsInfo) {
     if (!this.store.order) throw new Error('order 模块未初始化');
     return this.store.order.updateTempOrderContactsInfo(contactsInfo);
@@ -2111,6 +2188,8 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
         holders: [],
         isFormSubject: product => (0, _utils.resolveIsFormSubject)(tempOrder, product),
         orderTotalAmount
+      }, {
+        preserveEntitlementSelection: false
       }) || result;
       if (result.productList) {
         tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, result.productList);
@@ -2454,6 +2533,9 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!this.store.order) {
       throw new Error('BaseSales 解决方案需要 order 模块支持');
     }
+    if (this.isPickupTimingEnabled()) await this.preparePickupTimingForCheckout({
+      freeze: true
+    });
     const virtualSettlement = await this.buildVirtualSettlementSubmitData();
     // this.store.order.persistTempOrder();
     const inferredPaymentStatus = this.getSubmitPaymentStatus(params?.paymentStatus);
@@ -2511,6 +2593,9 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!this.store.order) {
       throw new Error('BaseSales 解决方案需要 order 模块支持');
     }
+    if (this.isPickupTimingEnabled()) await this.preparePickupTimingForCheckout({
+      freeze: false
+    });
     return this.store.order.saveTempOrderAsDraft({
       cacheId: this.cacheId,
       platform: params?.platform ?? this.otherParams?.platform,
@@ -2526,6 +2611,11 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!this.store.order) {
       throw new Error('BaseSales 解决方案需要 order 模块支持');
     }
+    if (this.isPickupTimingEnabled()) {
+      await this.preparePickupTimingForCheckout({
+        freeze: true
+      });
+    }
     const inferredPaymentStatus = this.getSubmitPaymentStatus(params?.paymentStatus);
     const smallTicketDataFlag = params?.smallTicketDataFlag ?? this.getDefaultCheckoutSmallTicketDataFlag();
     const enhancePayload = this.buildSubmitPayloadEnhancerWithOpenDataConfig(params?.enhancePayload);
@@ -3025,6 +3115,10 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       };
     }
     const result = await this.store.payment.wallet.initializeWalletDataFromBusinessAsync(walletBusinessData);
+    this.store.order.mergePointCardSnapshotCodes?.(result.userIdentificationCodes, {
+      customerId: walletBusinessData.customer_id,
+      orderIdentity: snapshot?.identity
+    });
     await this.core.effects.emit(`${this.name}:onWalletDataInitialized`, {
       orderId: snapshot?.identity?.orderId,
       customerId: walletBusinessData.customer_id,
@@ -3151,6 +3245,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   async importWalletAssetsSnapshot(snapshot) {
     if (!this.store.payment) throw new Error('payment 模块未初始化');
     const state = this.store.payment.wallet.importWalletAssetsSnapshot(snapshot);
+    this.store.order?.mergePointCardSnapshotCodes?.(state.items);
     await this.syncSelectedWalletAssets(state);
     return this.publishWalletAssetsState(state);
   }
@@ -3172,6 +3267,10 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       });
       return this.publishWalletAssetsState(emptyState);
     }
+    const pointCardSnapshotMergeContext = {
+      customerId: businessData.customer_id,
+      orderIdentity: this.store.order.getOrderSnapshot()?.identity
+    };
     const previousState = wallet.getWalletAssetsState();
     const hasPreviousWalletContext = previousState.status !== 'idle' || previousState.items.length > 0 || previousState.selectedIds.length > 0 || previousState.customerId !== undefined;
     const customerChanged = hasPreviousWalletContext && String(previousState.customerId ?? '') !== String(businessData.customer_id ?? '');
@@ -3194,6 +3293,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (state.status !== 'error') {
       const committed = this.getCommittedWalletAssets();
       state = wallet.setCommittedWalletAssets(committed.ids, committed.assets);
+      this.store.order.mergePointCardSnapshotCodes?.(wallet.getUserIdentificationCodes?.() || [], pointCardSnapshotMergeContext);
     }
     await this.syncSelectedWalletAssets(state);
     return this.publishWalletAssetsState(state);
@@ -3434,6 +3534,9 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!Number.isFinite(actualPaidAmount) || actualPaidAmount + 0.01 < amount) {
       throw new Error('顾客实收现金不能小于支付金额');
     }
+    if (this.isPickupTimingEnabled()) await this.preparePickupTimingForCheckout({
+      freeze: true
+    });
     this.window?.interaction?.utils?.postMessageToApp?.({
       module: 'till',
       key: 'open_till',

package/lib/solution/BaseSales/pickupTiming.d.ts

@@ -0,0 +1,37 @@
+import type { OrderModule } from '../../modules/Order';
+import type { ScheduleModule } from '../../modules/Schedule';
+import { type PickupTimingAvailability, type PickupTimingSelection, type PickupTimingValidationResult } from '../../modules/FulfillmentTiming';
+interface PickupTimingHost {
+    getOrder: () => OrderModule;
+    getSchedule: () => ScheduleModule | undefined;
+    loadOpenData: (force: boolean) => Promise<Record<string, unknown>>;
+    getTimezone: () => string;
+    getScope: () => string;
+    isPos: () => boolean;
+    now?: () => Date;
+}
+/** Coordinates fresh configuration with the independent appointment; UI keeps edit drafts. */
+export declare class PickupTimingController {
+    private readonly host;
+    private latest?;
+    private readonly requests;
+    private writeSequence;
+    constructor(host: PickupTimingHost);
+    private now;
+    private snapshot;
+    getAvailability(params?: {
+        date?: string;
+        force?: boolean;
+    }): Promise<PickupTimingAvailability>;
+    getSelection(): PickupTimingSelection;
+    private validateSnapshot;
+    validate(selection: PickupTimingSelection): Promise<PickupTimingValidationResult>;
+    setSelection(selection: PickupTimingSelection, options?: {
+        frozen?: boolean;
+    }): Promise<PickupTimingSelection>;
+    /** Called before a new checkout/payment; payment callbacks keep their already prepared appointment. */
+    prepare(options?: {
+        freeze?: boolean;
+    }): Promise<PickupTimingSelection>;
+}
+export {};