@pisell/pisellos 2.2.314 → 2.2.316

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

@@ -0,0 +1,47 @@
+import type { OrderModule } from '../../modules/Order';
+import type { ShopServiceType } from '../../modules/Order/types';
+import type { ScheduleModule } from '../../modules/Schedule';
+import { type PickupTimingAvailability, type PickupTimingSelection, type PickupTimingValidationResult } from '../../modules/FulfillmentTiming';
+interface PickupTimingHost {
+    getOrder: () => OrderModule;
+    setServiceType?: (serviceType: ShopServiceType) => unknown | Promise<unknown>;
+    getSchedule: () => ScheduleModule | undefined;
+    loadOpenData: (force: boolean) => Promise<Record<string, unknown>>;
+    getTimezone: () => string;
+    getScope: () => string;
+    isPos: () => boolean;
+    now?: () => Date;
+}
+/** Reuses runtime configuration and schedules; every calculation still uses the live clock. */
+export declare class PickupTimingController {
+    private readonly host;
+    private latest?;
+    private runtime?;
+    private writeSequence;
+    constructor(host: PickupTimingHost);
+    private now;
+    /** A new solution context or an explicit settings refresh invalidates pending work too. */
+    invalidate(): void;
+    private assertCurrentRuntime;
+    private getRuntime;
+    private loadConfig;
+    private loadSchedules;
+    /** Preserve an existing POS choice without adding it to the shared settings cache. */
+    private getEffectiveConfig;
+    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 {};

package/lib/solution/BaseSales/pickupTiming.js

@@ -0,0 +1,290 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PickupTimingController = void 0;
+var _lodashEs = require("lodash-es");
+var _FulfillmentTiming = require("../../modules/FulfillmentTiming");
+async function withTimeout(request) {
+  let timer;
+  try {
+    return await Promise.race([request, new Promise((_, reject) => {
+      timer = setTimeout(() => reject(new Error('Unable to load pickup times. Please try again.')), 30000);
+    })]);
+  } finally {
+    if (timer !== undefined) clearTimeout(timer);
+  }
+}
+
+/** Reuses runtime configuration and schedules; every calculation still uses the live clock. */
+class PickupTimingController {
+  latest;
+  runtime;
+  writeSequence = 0;
+  constructor(host) {
+    this.host = host;
+  }
+  now() {
+    return this.host.now?.() ?? new Date();
+  }
+
+  /** A new solution context or an explicit settings refresh invalidates pending work too. */
+  invalidate() {
+    this.runtime = undefined;
+    this.latest = undefined;
+    this.writeSequence += 1;
+  }
+  assertCurrentRuntime(runtime) {
+    if (this.runtime !== runtime || runtime.scope !== this.host.getScope()) {
+      throw new Error('Store settings changed. Please try again.');
+    }
+  }
+  getRuntime() {
+    const scope = this.host.getScope();
+    if (this.runtime?.scope !== scope) {
+      this.latest = undefined;
+      this.runtime = {
+        scope
+      };
+    }
+    return this.runtime;
+  }
+  async loadConfig(runtime) {
+    if (runtime.config) return runtime.config;
+    if (!runtime.configRequest) {
+      const request = (async () => {
+        const config = (0, _FulfillmentTiming.normalizePickupTimingConfig)(await withTimeout(this.host.loadOpenData(false)));
+        this.assertCurrentRuntime(runtime);
+        runtime.config = config;
+        return config;
+      })();
+      runtime.configRequest = request;
+    }
+    const request = runtime.configRequest;
+    try {
+      return await request;
+    } finally {
+      if (runtime.configRequest === request) runtime.configRequest = undefined;
+    }
+  }
+  async loadSchedules(runtime, config) {
+    if (runtime.schedules) return runtime.schedules;
+    if (!runtime.scheduleRequest) {
+      const request = (async () => {
+        const schedule = this.host.getSchedule();
+        if (!schedule) throw new Error('Pickup schedule is unavailable. Please try again.');
+        // Reuse the catalog loaded by solution initialization, including its in-flight request.
+        await withTimeout(schedule.loadAllSchedule({
+          useCache: true
+        }));
+        this.assertCurrentRuntime(runtime);
+        const ids = [...new Set([...config.scheduleIds, ...(config.operatingHoursScheduleIds || [])])];
+        const schedules = (0, _lodashEs.cloneDeep)(schedule.getScheduleListByIds(ids) || []);
+        runtime.schedules = schedules;
+        return schedules;
+      })();
+      runtime.scheduleRequest = request;
+    }
+    const request = runtime.scheduleRequest;
+    try {
+      return await request;
+    } finally {
+      if (runtime.scheduleRequest === request) runtime.scheduleRequest = undefined;
+    }
+  }
+
+  /** Preserve an existing POS choice without adding it to the shared settings cache. */
+  getEffectiveConfig(config) {
+    if (!this.host.isPos()) return config;
+    const serviceType = this.host.getOrder().getTempOrder()?.metadata?.shop_service_data?.service_type;
+    if (serviceType !== 'dine_in' && serviceType !== 'takeaway' || config.handoverModes.includes(serviceType)) {
+      return config;
+    }
+    return {
+      ...config,
+      handoverModes: [...config.handoverModes, serviceType]
+    };
+  }
+  async snapshot(includeSchedule, tolerateScheduleError = false) {
+    const runtime = this.getRuntime();
+    const config = await this.loadConfig(runtime);
+    this.assertCurrentRuntime(runtime);
+    let schedules = [];
+    let error;
+    if (includeSchedule && config.handoverModes.includes('pick_up') && config.timingMode !== 'asap_only' && config.scheduleIds.length) {
+      try {
+        schedules = await this.loadSchedules(runtime, config);
+      } catch (reason) {
+        if (!tolerateScheduleError) throw reason;
+        error = reason instanceof Error ? reason.message : 'Pickup schedule is unavailable. Please try again.';
+      }
+    }
+    this.assertCurrentRuntime(runtime);
+    const result = {
+      config,
+      timezone: this.host.getTimezone(),
+      schedules,
+      scope: runtime.scope,
+      error
+    };
+    this.latest = result;
+    // Read the live order after async loading; cached snapshots retain only configured modes.
+    return {
+      ...result,
+      config: this.getEffectiveConfig(config)
+    };
+  }
+  async getAvailability(params = {}) {
+    // `force` remains accepted for older callers; refresh recomputes time using the runtime catalog.
+    const snapshot = await this.snapshot(true, true);
+    const now = this.now();
+    try {
+      return {
+        ...(0, _FulfillmentTiming.computePickupTimingAvailability)({
+          ...snapshot,
+          date: params.date,
+          now
+        }),
+        error: snapshot.error
+      };
+    } catch (reason) {
+      // Keep the handover selector usable when only Pickup's timezone is unavailable.
+      return {
+        config: snapshot.config,
+        timezone: snapshot.timezone,
+        now: now.toISOString(),
+        today: '',
+        maxDate: '',
+        date: params.date || '',
+        dates: [],
+        slots: [],
+        error: reason instanceof Error ? reason.message : 'Pickup times are unavailable. Please try again.'
+      };
+    }
+  }
+  getSelection() {
+    const order = this.host.getOrder();
+    const tempOrder = order.getTempOrder();
+    const booking = order.getPickupTimingBooking();
+    const config = this.latest?.scope === this.host.getScope() ? this.getEffectiveConfig(this.latest.config) : undefined;
+    const storedServiceType = String(tempOrder?.metadata?.shop_service_data?.service_type || '');
+    const serviceType = config?.handoverModes.length ? config.handoverModes.includes(storedServiceType) ? storedServiceType : config.handoverModes[0] : storedServiceType;
+    const details = serviceType === 'pick_up' ? booking?.metadata.fulfillment_timing : undefined;
+    const mode = config?.timingMode === 'asap_only' ? 'asap' : config?.timingMode === 'scheduled_only' ? 'scheduled' : details?.mode ?? 'asap';
+    const sameMode = details?.mode === mode;
+    return {
+      serviceType,
+      mode,
+      source: mode === 'asap' ? 'asap' : sameMode && details?.source || 'schedule',
+      ...(sameMode && booking ? {
+        date: booking.start_date,
+        time: booking.start_time,
+        instant: details?.instant
+      } : {})
+    };
+  }
+  async validateSnapshot(selection) {
+    const snapshot = await this.snapshot(selection.serviceType === 'pick_up' && selection.mode === 'scheduled' && selection.source !== 'pos_manual');
+    const now = this.now();
+    const result = (0, _FulfillmentTiming.validatePickupTimingSelection)(selection, {
+      ...snapshot,
+      now,
+      allowManualOverride: this.host.isPos()
+    });
+    return {
+      snapshot,
+      now,
+      result
+    };
+  }
+  async validate(selection) {
+    return (await this.validateSnapshot(selection)).result;
+  }
+  async setSelection(selection, options = {}) {
+    const order = this.host.getOrder();
+    const tempOrder = order.ensureTempOrder();
+    const sequence = ++this.writeSequence;
+    const {
+      snapshot,
+      now,
+      result
+    } = await this.validateSnapshot(selection);
+    if (sequence !== this.writeSequence || order.getTempOrder() !== tempOrder || snapshot.scope !== this.host.getScope()) {
+      throw new Error('The order changed. Please choose the pickup time again.');
+    }
+    if (!result.valid) throw new Error(result.message || 'Please choose a valid pickup time.');
+    if (!snapshot.config.handoverModes.length) {
+      order.clearPickupTimingBooking();
+      return this.getSelection();
+    }
+    if (selection.serviceType !== 'pick_up') {
+      if (this.host.setServiceType) {
+        await this.host.setServiceType(selection.serviceType);
+      } else {
+        order.updateTempOrderServiceType(selection.serviceType);
+      }
+      return this.getSelection();
+    }
+    const slot = selection.mode === 'asap' ? (0, _FulfillmentTiming.getAsapPickupTiming)({
+      ...snapshot,
+      now
+    }) : result.slot;
+    if (!slot) throw new Error('Please choose a pickup time.');
+    // Validate everything before either field is changed; notify once after the combined update.
+    tempOrder.metadata = {
+      ...(tempOrder.metadata || {}),
+      shop_service_data: {
+        ...(tempOrder.metadata?.shop_service_data || {}),
+        service_type: 'pick_up'
+      }
+    };
+    order.setPickupTimingBooking({
+      mode: selection.mode,
+      source: selection.mode === 'asap' ? 'asap' : selection.source === 'pos_manual' ? 'pos_manual' : 'schedule',
+      date: slot.date,
+      time: slot.time,
+      instant: slot.instant,
+      timezone: snapshot.timezone,
+      frozen: options.frozen ?? false
+    });
+    return this.getSelection();
+  }
+
+  /** Called before a new checkout/payment; payment callbacks keep their already prepared appointment. */
+  async prepare(options = {}) {
+    const order = this.host.getOrder();
+    const tempOrder = order.getTempOrder();
+    const sequence = this.writeSequence;
+    if (order.getOrderIdentity()?.isSubmitted) return this.getSelection();
+    const booking = order.getPickupTimingBooking();
+    if (booking?.metadata.fulfillment_timing?.frozen) return this.getSelection();
+    // An actual payment callback must never revalidate or move the time after funds have been taken.
+    const paymentStatus = order.getTempOrder()?.payment_status;
+    if (paymentStatus === 'paid' || paymentStatus === 'partially_paid') {
+      if (booking?.metadata.fulfillment_timing) {
+        const detail = booking.metadata.fulfillment_timing;
+        order.setPickupTimingBooking({
+          ...detail,
+          date: booking.start_date,
+          time: booking.start_time,
+          frozen: true
+        });
+      }
+      return this.getSelection();
+    }
+    const snapshot = await this.snapshot(false);
+    if (order !== this.host.getOrder() || order.getTempOrder() !== tempOrder || sequence !== this.writeSequence) {
+      throw new Error('The order changed. Please choose the pickup time again.');
+    }
+    const selection = this.getSelection();
+    if (!snapshot.config.handoverModes.length) {
+      order.clearPickupTimingBooking();
+      return selection;
+    }
+    return this.setSelection(selection, {
+      frozen: options.freeze ?? false
+    });
+  }
+}
+exports.PickupTimingController = PickupTimingController;

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

@@ -4,6 +4,8 @@ import type { ScanOrderLogInput as BaseSalesLogInput, ScanOrderLoggerProviderCon
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 import type { QuotationCustomerScopeInfo } from '../../modules/Quotation/types';
 import type { PaymentMethod } from '../../modules/Payment/types';
+import type { OrderHolderRelation, OrderPaymentSource } from '../../modules/Order/types';
+import type { SubmitPayloadEnhancer } from '../../modules/Order/utils';
 /**
  * BaseSales 流程 hook 后缀。
  * 完整事件名应由当前模块名动态拼接，避免多个实例共享固定事件 key。
@@ -27,6 +29,15 @@ export interface BaseSalesCashPaymentOptions {
     /** 指定现金支付方式；省略时使用默认 CASHMANUAL。 */
     paymentMethodId?: number | string;
 }
+export interface BaseSalesSubmitSalesOrderParams {
+    payments?: OrderPaymentSource[];
+    paymentStatus?: BaseSalesPaymentStatus;
+    smallTicketDataFlag?: number;
+    confirmPendingVoucherPayments?: boolean;
+    enhancePayload?: SubmitPayloadEnhancer;
+    /** Create the order without executing payment; payment status comes from the server. */
+    paymentExecution?: 'deferred';
+}
 export interface BaseSalesCashPaymentConfig {
     available: boolean;
     paymentMethod?: PaymentMethod;
@@ -266,6 +277,7 @@ export interface BaseSalesTempOrder {
     contacts: any[];
     contacts_info: Record<string, any> | null;
     holder: Record<string, any> | null;
+    holder_relations?: OrderHolderRelation[];
     metadata: Record<string, any>;
     _extend?: {
         productsByUid?: Record<string, Record<string, any>>;

package/lib/solution/BaseSales/utils/parseSalesResponse.d.ts

@@ -14,7 +14,7 @@
  * - 不在此处发明等价关系；UI 侧（ticketBooking）若需要别的字段，由 view-model 适配层做转换
  */
 import type { BaseSalesOrderProduct } from '../types';
-import type { OrderMetaList } from '../../../modules/Order/types';
+import type { OrderHolderRelation, OrderMetaList } from '../../../modules/Order/types';
 export interface ISalesDetailHeader {
     order_id: number | string | null;
     order_number?: string;
@@ -121,6 +121,8 @@ export interface ISalesDetail {
     header: ISalesDetailHeader;
     /** 商品行快照（保留 tempOrder / 后端详情原字段） */
     products: BaseSalesOrderProduct[];
+    /** 非预约商品 Holder 关系，保留关系及 metadata 的扩展字段。 */
+    holder_relations?: OrderHolderRelation[];
     /** 全部 bookings，按服务端原始顺序输出（含 root + child） */
     bookings: ISalesBooking[];
     /** root booking（parent_id === 0），多个时取首个，无则为 null */

package/lib/solution/BaseSales/utils/parseSalesResponse.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.parseSalesResponse = parseSalesResponse;
 var _orderCollectionIdentity = require("../../../modules/Order/utils/orderCollectionIdentity");
+var _pickupTiming = require("../../../modules/Order/pickupTiming");
+var _lodashEs = require("lodash-es");
 /**
  * 把 `/order/sales/{id}` 响应（OrderData）解析为 ISalesDetail。
  *
@@ -64,6 +66,7 @@ function pickCustomer(raw) {
  */
 function isRootBooking(booking) {
   if (!booking || typeof booking !== 'object') return false;
+  if ((0, _pickupTiming.isFulfillmentTimingBooking)(booking)) return false;
   const parentId = booking.parent_id;
   if (parentId === 0 || parentId === null || parentId === undefined) return true;
   return false;
@@ -71,6 +74,7 @@ function isRootBooking(booking) {
 function indexBookingsByProductUid(bookings) {
   const result = {};
   for (const b of bookings) {
+    if ((0, _pickupTiming.isFulfillmentTimingBooking)(b)) continue;
     const uid = b && (b.product_uid || b.metadata?.product_uid) || '';
     if (!uid) continue;
     const key = String(uid);
@@ -127,6 +131,9 @@ function parseSalesResponse(input) {
   return {
     header: pickHeader(raw),
     products,
+    ...(Array.isArray(raw?.holder_relations) ? {
+      holder_relations: (0, _lodashEs.cloneDeep)(raw.holder_relations)
+    } : {}),
     bookings,
     rootBooking,
     bookingsByProductUid,

package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -5,7 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.transformBaseProductToOrderProduct = transformBaseProductToOrderProduct;
 var _weighedProduct = require("../../../modules/Order/utils/weighedProduct");
-var _utils = require("../../../modules/Order/utils");
+var _utils = require("../../../modules/Holder/utils");
+var _serviceTimes = require("../../../modules/BookingContext/utils/serviceTimes");
+var _utils2 = require("../../../modules/Order/utils");
 var _manualProductDiscount = require("../../../modules/Order/utils/manualProductDiscount");
 function toNumber(value, fallback = 0) {
   const parsedValue = Number(value);
@@ -108,7 +110,7 @@ function normalizeBundleItems(bundleItems, preferPriceField = false, preferBundl
       discount_list: preferPriceField ? [] : bundleItem.discount_list
     };
     // bundle_selling_price 落「正净额」：markdown = |price| − Σoptions；markup/原价维持原值。
-    normalizedItem.bundle_selling_price = (0, _utils.getBundleSellingMagnitude)(magnitudeSource).toFixed(2);
+    normalizedItem.bundle_selling_price = (0, _utils2.getBundleSellingMagnitude)(magnitudeSource).toFixed(2);
     if ((normalizedItem.price_type ?? normalizedItem.custom_price_type) === 'markdown' && (normalizedItem.price_type_ext === '' || normalizedItem.price_type_ext === undefined || normalizedItem.price_type_ext === null)) {
       normalizedItem.custom_price = normalizedItem.custom_price ?? normalizedItem.price;
       normalizedItem.price = normalizedItem.bundle_selling_price;
@@ -158,14 +160,14 @@ function transformBaseProductToOrderProduct(params) {
   const explicitLineTotal = payload.line_total ?? payload.total ?? payload._extend?.total;
   const hasExplicitLineTotal = Number.isFinite(Number(explicitLineTotal));
   const lineCompositeTotal = toPriceString(explicitLineTotal, sourceProductPrice);
-  const productOptionItem = (0, _utils.normalizeProductSkuOptions)(normalizeOptionItems(payload.product_sku?.option ?? payload.option ?? payload.options ?? payload.product_option_item, hasPriceOverride || weighedSourcePrice !== undefined));
+  const productOptionItem = (0, _utils2.normalizeProductSkuOptions)(normalizeOptionItems(payload.product_sku?.option ?? payload.option ?? payload.options ?? payload.product_option_item, hasPriceOverride || weighedSourcePrice !== undefined));
   const productBundle = normalizeBundleItems(payload.bundle ?? payload.product_bundle, hasPriceOverride, hasPriceOverride && weighedSourcePrice !== undefined);
   // `payload.unique` 是业务侧商品/票务标识，可能在连续加同一商品时重复；
   // 行级唯一值只接受显式协议字段，缺省交给 OrderModule 生成。
   const uniqueIdentificationNumber = payload.unique_identification_number;
   const resolvedQuantity = toSafePositiveInt(payload.quantity ?? payload.num, 1);
-  const originTotal = weighedSourcePrice !== undefined ? Number((0, _utils.composeLinePrice)({
-    mainPrice: Number(weighedSourcePrice) + (0, _utils.sumOptionUnitPrice)(productOptionItem).toNumber(),
+  const originTotal = weighedSourcePrice !== undefined ? Number((0, _utils2.composeLinePrice)({
+    mainPrice: Number(weighedSourcePrice) + (0, _utils2.sumOptionUnitPrice)(productOptionItem).toNumber(),
     bundle: hasPriceOverride ? (0, _weighedProduct.withOriginalBundleOptionPrices)(productBundle) : productBundle,
     useOriginalBundle: true
   })) : (0, _manualProductDiscount.resolveManualDiscountOriginTotal)({
@@ -197,14 +199,15 @@ function transformBaseProductToOrderProduct(params) {
   })) : payload.discount_list || [];
 
   // v2：source 不含 option；main_product_* 含 option（与 normalizeOrderProduct 一致）
-  const optionSum = (0, _utils.sumOptionUnitPrice)(productOptionItem).toNumber();
+  const optionSum = (0, _utils2.sumOptionUnitPrice)(productOptionItem).toNumber();
   const mainProductOriginalPrice = toPriceString(Number(sourceProductPrice) + optionSum);
-  const bundleOnlyComposite = (0, _utils.composeLinePrice)({
+  const bundleOnlyComposite = (0, _utils2.composeLinePrice)({
     mainPrice: 0,
     bundle: productBundle
   });
   const derivedMainSelling = hasExplicitLineTotal ? Number(lineCompositeTotal) - Number(bundleOnlyComposite) : Number(mainProductOriginalPrice);
   const mainProductSellingPrice = toPriceString(Number.isFinite(derivedMainSelling) && derivedMainSelling >= 0 ? derivedMainSelling : Number(mainProductOriginalPrice));
+  const holderRelations = [payload._extend, callbackOrigin?._extend, sourceProduct?._extend].find(source => Array.isArray(source?.holder_relations))?.holder_relations;
   const metadata = {
     unique: payload.unique,
     session: payload.session,
@@ -219,7 +222,7 @@ function transformBaseProductToOrderProduct(params) {
     main_product_selling_price: mainProductSellingPrice,
     main_product_original_price: mainProductOriginalPrice,
     price_schema_version: 2,
-    holder_config: sourceProduct?.holder_config,
+    holder_config: (0, _utils.resolveProductHolderConfig)(sourceProduct) ?? undefined,
     ...(dataVariantIds !== undefined ? {
       data_variant_ids: dataVariantIds
     } : {}),
@@ -264,6 +267,11 @@ function transformBaseProductToOrderProduct(params) {
     tax_fee: toPriceString(payload.tax_fee ?? matchedVariant?.tax_fee ?? origin?.tax_fee ?? sourceProduct?.tax_fee, '0.00'),
     is_charge_tax: toNumber(payload.is_charge_tax ?? matchedVariant?.is_charge_tax ?? origin?.is_charge_tax ?? sourceProduct?.is_charge_tax, 0),
     metadata,
+    ...(holderRelations !== undefined && !(0, _serviceTimes.isBookingProduct)(origin) && !(0, _serviceTimes.isBookingProduct)(payload) ? {
+      _extend: {
+        holder_relations: holderRelations
+      }
+    } : {}),
     note: payload.note != null ? String(payload.note) : '',
     product_title: productTitle,
     product_cover: firstNonBlank(matchedVariant?.cover, sourceProduct?.cover),

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

@@ -210,6 +210,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      *     product: ProductData;
      *     date?: { startTime: string; endTime: string } | null;
      *     account?: Account | null;
+     *     isLegacyOrder?: boolean;
      *   })} {
      *     product,
      *     date,
@@ -218,13 +219,14 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * @return {*}
      * @memberof BookingByStepImpl
      */
-    addProductToCart({ product, date, account, }: {
+    addProductToCart({ product, date, account, isLegacyOrder, }: {
         product: ProductData;
         date?: {
             startTime: string;
             endTime: string;
         } | null;
         account?: Account | null;
+        isLegacyOrder?: boolean;
     }): {
         success: boolean;
         errorCode?: string;
@@ -326,7 +328,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 5 | 3 | 1 | 2 | 4 | 6;
+        weekNum: 0 | 5 | 1 | 2 | 4 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingByStep/index.js

@@ -636,7 +636,8 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
     // 直接调用 addProductToCart，不传递 date 参数以避免日期检查逻辑
     return this.addProductToCart({
       product: productData,
-      account: activeAccount
+      account: activeAccount,
+      isLegacyOrder: true
     });
   }
 
@@ -647,6 +648,7 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
    *     product: ProductData;
    *     date?: { startTime: string; endTime: string } | null;
    *     account?: Account | null;
+   *     isLegacyOrder?: boolean;
    *   })} {
    *     product,
    *     date,
@@ -658,7 +660,8 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
   addProductToCart({
     product,
     date,
-    account
+    account,
+    isLegacyOrder = false
   }) {
     const {
       bundle,
@@ -725,7 +728,8 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
       product: productData,
       bundle,
       options,
-      quantity
+      quantity,
+      isLegacyOrder
     };
     if (date) {
       addItemParams.date = date;

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

@@ -32,6 +32,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private orderCustomerDiscountRefreshCustomerId;
     private orderCustomerDiscountRefreshTarget;
     private orderCustomerPromotionRefreshInFlight;
+    private orderCustomerContactRequest;
     private readonly customerResolveRequests;
     protected loadOpenDataInFlight: Promise<OpenDataConfig> | null;
     protected loadOpenDataInFlightTarget: string | null;
@@ -42,6 +43,10 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      */
     protected getRegisteredModuleNames(): readonly string[];
     protected getSubmitOrderSalesChannel(): string;
+    /** 供销售展示层按 booking.resources[].form_id 读取当前多语言表单标题。 */
+    getFormTitleMap(): Record<string, Record<string, string> | string>;
+    /** 表单定义由 Ably 更新后通知展示层刷新，不改动订单里的历史 metadata。 */
+    onFormTitlesChanged(callback: (titles: Record<string, Record<string, string> | string>) => void): () => void;
     /**
      * 业务侧子模块工厂：BookingTicket 自带的 createBookingTicketModule 优先匹配；
      * 未识别的模块名（如 BookingByStep 公共类型）回退到父类工厂。
@@ -53,11 +58,13 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 在解决方案对外 ready 前准备 Invoice Document；失败只降级模板，不阻断销售。
      * 已由页面取得的 OpenData 直接交给模块接管，没有注入数据时再走 target-scoped 加载。
      */
-    private prepareInvoiceTemplateAtSolutionReady;
+    protected prepareInvoiceTemplateAtSolutionReady(injectedOpenData?: OpenDataConfig): Promise<void>;
     protected getBookingTicketBusinessCode(): string | null;
     private getIdGeneratorPlugin;
-    private loadOpenDataConfig;
+    protected loadOpenDataConfig(): Promise<OpenDataConfig | null>;
     getOpenData(): Promise<OpenDataConfig | null>;
+    protected loadContactInfoOpenData(): Promise<OpenDataConfig | null>;
+    protected loadFulfillmentItemRuleOpenData(): Promise<OpenDataConfig | null>;
     getInvoiceLayoutConfig(): Promise<InvoiceLayoutConfig>;
     getInvoiceTemplateSettings(): Promise<InvoiceTemplateSettings>;
     protected isInvoiceOpenDataCacheCurrent(): boolean;
@@ -66,6 +73,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private getShortNumberOrDeviceId;
     private configureIdGeneratorFromOpenData;
     private normalizePositiveInteger;
+    private normalizeShortNumberMaximum;
     private normalizeIdPrefix;
     /**
      * 加载销售详情，并在父类基础上把 customer 信息装配到 CustomerModule。
@@ -275,6 +283,16 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     setOrderCustomer(customer: ICustomer | null, options?: {
         source?: OrderCustomerChangePayload['source'];
     }): void;
+    private resetOrderCustomerContactInfo;
+    /** Explicit edits, including clearing the contact, must win over a pending default. */
+    updateTempOrderContactsInfo(contact: Record<string, any> | null): Record<string, any> | null;
+    private getCustomerContactScope;
+    private getCustomerContactOrderKey;
+    replaceTempOrder(...args: Parameters<BaseSalesImpl['replaceTempOrder']>): Promise<import("../../modules/Order/types").OrderTempOrder>;
+    private applyDefaultOrderCustomerContactInfo;
+    private prefillOrderCustomerContactInfo;
+    protected waitForOrderCustomerContactInfo(): Promise<void>;
+    validateContactInfo(): Promise<void>;
     /**
      * 读取 tempOrder 上的下单客户协议字段；customer_id 缺失时返回 null。
      */
@@ -286,7 +304,9 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     /**
      * 清空下单客户（协议字段 + snapshot）。
      */
-    clearOrderCustomer(): void;
+    clearOrderCustomer(options?: {
+        preserveContactInfo?: boolean;
+    }): void;
     /**
      * 重置 tempOrder，并同步清空下单客户运行态。
      *