@pisell/pisellos 2.2.314 → 2.2.316

package/lib/solution/BaseSales/index.js

@@ -8,6 +8,7 @@ var _exportNames = {
 };
 exports.BaseSalesImpl = void 0;
 var _BaseModule = require("../../modules/BaseModule");
+var _localEftposState = require("../../modules/Order/localEftposState");
 var _types = require("./types");
 Object.keys(_types).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -21,6 +22,11 @@ Object.keys(_types).forEach(function (key) {
   });
 });
 var _Order = require("../../modules/Order");
+var _pickupTiming = require("../../modules/Order/pickupTiming");
+var _pickupTiming2 = require("./pickupTiming");
+var _fulfillmentItemRules = require("./fulfillmentItemRules");
+var _holderRelations = require("../../modules/Order/holderRelations");
+var _contactInfo = require("../../modules/OpenData/contactInfo");
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _lodashEs = require("lodash-es");
 var _types2 = require("../BookingByStep/types");
@@ -345,6 +351,38 @@ function areBaseSalesNotesEquivalent(currentValue, loadedValue, options) {
   const loadedNotes = normalizeBaseSalesNotesForComparison(loadedValue);
   return currentNotes !== null && loadedNotes !== null && (0, _lodashEs.isEqual)(currentNotes, loadedNotes);
 }
+function mergeBaseSalesHolderRelations(currentRecord, incomingRecord, strategy) {
+  if (!Array.isArray(incomingRecord.holder_relations)) {
+    return (0, _lodashEs.cloneDeep)(currentRecord.holder_relations);
+  }
+
+  // 仅保留商品集合合并实际留下的本地行关系；匹配的行沿用 incoming 快照。
+  // 未提供 products 的稀疏包不能据此判断哪些行已被删除或被本地保留。
+  const retainedProductUids = new Set();
+  if (Array.isArray(incomingRecord.products)) {
+    for (const product of currentRecord.products || []) {
+      const retained = !incomingRecord.products.some(incomingProduct => (0, _orderCollectionIdentity.isSameOrderCollectionItem)('product', product, incomingProduct)) && (strategy === 'preserve-local' || !(0, _orderCollectionIdentity.getOrderCollectionPersistentId)('product', product));
+      const uid = (0, _orderCollectionIdentity.getOrderCollectionReferenceUid)('product', product);
+      if (retained && uid) retainedProductUids.add(uid);
+    }
+  }
+  const belongsToRetainedProduct = relation => relation?.relation_model === 'order_detail' && retainedProductUids.has(String(relation.relation_uuid));
+  const selectedRelations = [...incomingRecord.holder_relations.filter(relation => !belongsToRetainedProduct(relation)), ...(Array.isArray(currentRecord.holder_relations) ? currentRecord.holder_relations.filter(belongsToRetainedProduct) : [])];
+  const result = [];
+  const indexByIdentity = new Map();
+  for (const relation of selectedRelations) {
+    const identityParts = [relation?.relation_model, relation?.relation_uuid, relation?.holder_type, relation?.holder_id];
+    const identity = identityParts.every(value => value !== undefined && value !== null) ? JSON.stringify(identityParts) : null;
+    const existingIndex = identity === null ? undefined : indexByIdentity.get(identity);
+    if (existingIndex !== undefined) {
+      result[existingIndex] = (0, _lodashEs.cloneDeep)(relation);
+    } else {
+      if (identity !== null) indexByIdentity.set(identity, result.length);
+      result.push((0, _lodashEs.cloneDeep)(relation));
+    }
+  }
+  return result;
+}
 function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, strategy) {
   const loadedHasOrderMetaList = Object.prototype.hasOwnProperty.call(loadedRecord || {}, 'order_meta_list');
   const loadedHasSalesNotes = Object.prototype.hasOwnProperty.call(loadedRecord || {}, 'notes');
@@ -363,8 +401,12 @@ function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, str
   const normalizedCurrentTempOrder = normalizeBaseSalesRecordCollections(currentTempOrder, {
     ensureUid: false
   });
+  const mergedHolderRelations = mergeBaseSalesHolderRelations(normalizedCurrentTempOrder, normalizedLoadedRecord, strategy);
   const uidRemaps = [];
-  const mergedRecord = (0, _lodashEs.mergeWith)(normalizedCurrentTempOrder, normalizedLoadedRecord, (currentValue, loadedValue, key) => {
+  const mergedRecord = (0, _lodashEs.mergeWith)(normalizedCurrentTempOrder, normalizedLoadedRecord, (currentValue, loadedValue, key, object) => {
+    if (key === 'holder_relations' && object === normalizedCurrentTempOrder) {
+      return (0, _lodashEs.cloneDeep)(mergedHolderRelations);
+    }
     // order_meta_list 是服务端/本地订单携带的完整业务快照。若 incoming
     // 明确提供它，必须整体替换；若省略，则保留当前值，避免 snapshot
     // 数组递归拼接后出现同 ID 的旧数据。
@@ -499,6 +541,9 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   serverOrderChangeHydrateInFlight = null;
   queuedServerOrderChanges = [];
   serverOrderChangeSyncEnabled = false;
+  pickupTimingEnabled = false;
+  pickupTimingController;
+  fulfillmentItemRulesController;
   constructor(name, version) {
     super(name, version);
   }
@@ -584,8 +629,12 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     }
     this.queuedServerOrderChanges.push(snapshot);
   }
+  shouldSyncServerOrderChanges() {
+    const payments = this.store.order?.getTempOrder()?.payments || [];
+    return this.serverOrderChangeSyncEnabled || payments.some(_localEftposState.isLocalFinalizedPayment) && !payments.some(_paymentUtils.isPendingOrderPayment);
+  }
   async drainQueuedServerOrderChanges() {
-    if (!this.serverOrderChangeSyncEnabled || this.salesDetailLoadInFlightCount > 0 || this.serverOrderChangeHydrateInFlight || this.queuedServerOrderChanges.length === 0) return;
+    if (!this.shouldSyncServerOrderChanges() || this.salesDetailLoadInFlightCount > 0 || this.serverOrderChangeHydrateInFlight || this.queuedServerOrderChanges.length === 0) return;
     const changedOrders = this.queuedServerOrderChanges;
     this.queuedServerOrderChanges = [];
     await this.syncCurrentSalesDetailFromServerOrderChange({
@@ -593,8 +642,9 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     });
   }
   async syncCurrentSalesDetailFromServerOrderChange(payload) {
-    const changedOrders = Array.isArray(payload) ? payload : Array.isArray(payload?.changedOrders) ? payload.changedOrders : payload?.data && typeof payload.data === 'object' ? [payload.data] : [];
-    if (!this.serverOrderChangeSyncEnabled) return;
+    const fullSnapshotAfterFinalization = Array.isArray(payload?.list) && this.store.order?.getTempOrder()?.payments?.some(_localEftposState.isLocalFinalizedPayment);
+    const changedOrders = Array.isArray(payload) ? payload : Array.isArray(payload?.changedOrders) && payload.changedOrders.length > 0 ? payload.changedOrders : fullSnapshotAfterFinalization ? payload.list : payload?.data && typeof payload.data === 'object' ? [payload.data] : [];
+    if (!this.shouldSyncServerOrderChanges()) return;
 
     // 显式详情加载期间 current 可能仍是上一单，先按订单身份 latest-only 缓存；
     // load 完成后再用新的 current 过滤，避免恰好到达的最新支付快照丢失。
@@ -1037,7 +1087,30 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
         customerId: params.customerId,
         channel: params.channel
       });
-      return productIds.map(productId => productId === null ? null : productsById.get(productId) || null);
+      const shouldAlignSelectedVariantPrice = handledByOsServer && this.preferAuthoritativeProductQueryPrice();
+      return productIds.map((productId, index) => {
+        const authoritativeProduct = productId === null ? null : productsById.get(productId) || null;
+        if (!shouldAlignSelectedVariantPrice || !authoritativeProduct) return authoritativeProduct;
+        const selectedProduct = selectedProducts[index];
+        const selectedVariantId = this.getSelectedProductVariantId(selectedProduct);
+        if (!selectedVariantId || this.getSelectedProductVariantId(authoritativeProduct) === selectedVariantId) {
+          return authoritativeProduct;
+        }
+
+        // OS 返回的是目录商品；已命中的智能价格不能被规格基础价覆盖。
+        const appliedFields = authoritativeProduct._dataVariant?.appliedFields;
+        if (Array.isArray(appliedFields) && ['price', 'selling_price', 'original_price', 'base_price'].some(field => appliedFields.includes(field))) {
+          return authoritativeProduct;
+        }
+        const selectedVariant = Array.isArray(authoritativeProduct.variant) ? authoritativeProduct.variant.find(variant => Number(variant?.id) === selectedVariantId) : undefined;
+        const selectedPrice = [selectedVariant?.price, selectedVariant?.selling_price, selectedVariant?.base_price, params.priceQueries[index].fallback_price, selectedProduct.price, selectedProduct.selling_price, selectedProduct.original_price].find(value => (typeof value === 'number' || typeof value === 'string' && value.trim() !== '') && Number.isFinite(Number(value)));
+
+        // 每行独立保留所选规格价格（含 0 元），避免同商品多规格共用目录对象串价。
+        return selectedPrice === undefined ? authoritativeProduct : {
+          ...authoritativeProduct,
+          price: selectedPrice
+        };
+      });
     }
     const queryPayload = this.buildPriceQueryPayload({
       ids,
@@ -1157,6 +1230,98 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     return this.otherParams?.channel;
   }
 
+  /** Only solutions opting into Pickup Timing supply effective OpenData. */
+  async loadPickupTimingOpenData(_force) {
+    return {};
+  }
+  async loadFulfillmentItemRuleOpenData() {
+    const openData = this.otherParams?.openData ?? this.otherParams?.dineInConfig;
+    return openData && typeof openData === 'object' && !Array.isArray(openData) ? openData : null;
+  }
+  getFulfillmentItemRulesController() {
+    if (!this.fulfillmentItemRulesController) {
+      this.fulfillmentItemRulesController = new _fulfillmentItemRules.FulfillmentItemRulesController({
+        getOrder: () => {
+          if (!this.store.order) throw new Error('order 模块未初始化');
+          return this.store.order;
+        },
+        getProducts: () => this.store.products,
+        loadOpenData: () => this.loadFulfillmentItemRuleOpenData(),
+        getScope: () => this.getPickupTimingScope(),
+        getOtherParams: () => this.otherParams,
+        fetchStrategyModels: ids => this.request.get('/promotion', {
+          skip: 1,
+          num: 99,
+          status: 'active',
+          ids
+        }),
+        reportError: error => this.logWarning('履约费用策略执行失败，保留服务类型设置', {
+          error: error instanceof Error ? error.message : String(error)
+        })
+      });
+    }
+    return this.fulfillmentItemRulesController;
+  }
+  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
+    });
+  }
+  resetPickupTimingCache() {
+    this.pickupTimingController?.invalidate();
+  }
+  getPickupTimingController() {
+    if (!this.pickupTimingController) {
+      this.pickupTimingController = new _pickupTiming2.PickupTimingController({
+        getOrder: () => {
+          if (!this.store.order) throw new Error('order 模块未初始化');
+          return this.store.order;
+        },
+        setServiceType: serviceType => this.setServiceType(serviceType),
+        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;
@@ -1438,6 +1603,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     return isChanged;
   }
   async initialize(core, options = {}) {
+    this.resetPickupTimingCache();
     this.core = core;
     this.initializeOptions = options || {};
     this.paymentNumberDevicePrefix = null;
@@ -1490,6 +1656,8 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     this.core.effects.emit(`${this.name}:onInited`, {});
   }
   async destroy() {
+    this.resetPickupTimingCache();
+    this.fulfillmentItemRulesController?.invalidate();
     this.serverOrderChangeUnsubscribe?.();
     this.serverOrderChangeUnsubscribe = null;
     this.paymentMethodsChangedUnsubscribe?.();
@@ -1589,9 +1757,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;
@@ -1704,14 +1875,54 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!this.store.order) throw new Error('order 模块未初始化');
     return this.store.order.updateTempOrderPickupReferenceMode(mode);
   }
-  setServiceType(serviceType) {
+  async setServiceType(serviceType) {
     if (!this.store.order) throw new Error('order 模块未初始化');
-    return this.store.order.updateTempOrderServiceType(serviceType);
+    const serviceData = this.store.order.updateTempOrderServiceType(serviceType);
+    await this.getFulfillmentItemRulesController().apply(serviceType);
+    // 费用规则可能增删商品；即使没有普通促销，也要同步页面的购物车和金额快照。
+    const tempOrder = this.getTempOrder();
+    if (tempOrder) await this.effectsEmit('onTempOrderReplaced', {
+      tempOrder
+    });
+    return serviceData;
+  }
+  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);
   }
+  async loadContactInfoOpenData() {
+    return this.otherParams?.openData ?? null;
+  }
+  async getContactInfoConfig() {
+    const scope = this.getPickupTimingScope();
+    const data = await this.loadContactInfoOpenData();
+    if (scope !== this.getPickupTimingScope()) throw new Error('Store settings changed. Please try again.');
+    return (0, _contactInfo.resolveContactInfoConfig)(data);
+  }
+  async validateContactInfo() {
+    const order = this.getTempOrder();
+    const customerId = order?.customer_id;
+    // Missing customer IDs and the reserved Walk-In IDs do not require contact info.
+    if (!Number.isFinite(Number(customerId)) || Number(customerId) <= 1) return;
+    const identity = order?._extend?.localId || order?.external_sale_number || order?.order_id || order;
+    const config = await this.getContactInfoConfig();
+    const current = this.getTempOrder();
+    if (identity !== (current?._extend?.localId || current?.external_sale_number || current?.order_id || current) || customerId !== current?.customer_id) {
+      throw new Error('The order changed. Please try again.');
+    }
+    const missing = (0, _contactInfo.getMissingContactInfoFields)(config, current?.contacts_info);
+    if (missing.length) throw new _contactInfo.ContactInfoRequiredError(missing);
+  }
 
   /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化。 */
   setEnableTempOrderPersist(enabled) {
@@ -1788,6 +1999,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   async clearOrderCartLines() {
     try {
       if (!this.store.order) throw new Error('order 模块未初始化');
+      this.fulfillmentItemRulesController?.invalidate();
       const tempOrder = await this.store.order.clearOrderCartLines();
       if (this.currentSalesDetail) {
         this.currentSalesDetail = {
@@ -1815,6 +2027,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   /** 切换法币 / WalletPass 单位时清空商品、折扣与支付状态，保留客户。 */
   async clearOrderForSettlementSwitch() {
     if (!this.store.order) throw new Error('order 模块未初始化');
+    this.fulfillmentItemRulesController?.invalidate();
     const tempOrder = await this.store.order.clearOrderForSettlementSwitch();
     if (this.currentSalesDetail) {
       this.currentSalesDetail = {
@@ -2402,7 +2615,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     // Deprecated compatibility alias. New BaseSales callers should use submitSalesOrder.
     return this.submitSalesOrder(params);
   }
-  async buildVirtualSettlementSubmitData() {
+  buildVirtualSettlementOrderData() {
     if (!this.store.order) return null;
     const tempOrder = this.store.order.getTempOrder();
     if (!this.isActiveVirtualSettlementOrder(tempOrder)) return null;
@@ -2411,6 +2624,21 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!snapshot || !Number.isFinite(currencyProductId) || currencyProductId <= 0) {
       throw new Error('Virtual currency settlement configuration is invalid.');
     }
+    return {
+      snapshot,
+      currencyProductId,
+      currencyCode: String(tempOrder?.currency_code || ''),
+      currencySymbol: String(tempOrder?.currency_symbol || ''),
+      currencyFormat: String(tempOrder?.currency_format || 'symbol_first')
+    };
+  }
+  async buildVirtualSettlementSubmitData() {
+    const settlement = this.buildVirtualSettlementOrderData();
+    if (!settlement || !this.store.order) return null;
+    const tempOrder = this.store.order.getTempOrder();
+    const {
+      currencyProductId
+    } = settlement;
     const summary = await this.store.order.recalculateSummary({
       createIfMissing: true
     });
@@ -2425,17 +2653,10 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       });
     }
     const asset = this.store.order.getVirtualCurrencyList().find(item => Number(item?.product_id) === currencyProductId);
-    const currencyCode = String(tempOrder?.currency_code || '');
-    const currencySymbol = String(tempOrder?.currency_symbol || '');
-    const currencyFormat = String(tempOrder?.currency_format || 'symbol_first');
     if (amount.lte(0)) {
       return {
-        payments: [],
-        snapshot,
-        currencyProductId,
-        currencyCode,
-        currencySymbol,
-        currencyFormat
+        ...settlement,
+        payments: []
       };
     }
     if (!asset) {
@@ -2489,12 +2710,8 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       };
     }
     return {
-      payments: [payment],
-      snapshot,
-      currencyProductId,
-      currencyCode,
-      currencySymbol,
-      currencyFormat
+      ...settlement,
+      payments: [payment]
     };
   }
 
@@ -2508,11 +2725,49 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!this.store.order) {
       throw new Error('BaseSales 解决方案需要 order 模块支持');
     }
-    const virtualSettlement = await this.buildVirtualSettlementSubmitData();
+    await this.validateContactInfo();
+    if (this.isPickupTimingEnabled()) await this.preparePickupTimingForCheckout({
+      freeze: true
+    });
+    const isDeferredPayment = params?.paymentExecution === 'deferred';
+    const virtualPaymentSettlement = isDeferredPayment ? null : await this.buildVirtualSettlementSubmitData();
+    const virtualSettlement = isDeferredPayment ? this.buildVirtualSettlementOrderData() : virtualPaymentSettlement;
     // this.store.order.persistTempOrder();
-    const inferredPaymentStatus = this.getSubmitPaymentStatus(params?.paymentStatus);
+    const inferredPaymentStatus = isDeferredPayment ? undefined : this.getSubmitPaymentStatus(params?.paymentStatus);
     const smallTicketDataFlag = params?.smallTicketDataFlag ?? this.getDefaultCheckoutSmallTicketDataFlag();
-    const enhancePayload = this.buildSubmitPayloadEnhancerWithOpenDataConfig(params?.enhancePayload);
+    const virtualSettlementEnhancePayload = virtualSettlement ? (payload, ctx) => {
+      const callerPayload = params?.enhancePayload ? params.enhancePayload(payload, ctx) : payload;
+      const currencySettlementConfig = callerPayload.metadata?.currency_settlement_config || {};
+      return {
+        ...callerPayload,
+        metadata: {
+          ...(callerPayload.metadata || {}),
+          currency_settlement_config: {
+            ...currencySettlementConfig,
+            settlement_type: 'virtual_currency',
+            settlement_ids: [virtualSettlement.currencyProductId],
+            currency_display_snapshot: (0, _lodashEs.cloneDeep)(currencySettlementConfig.currency_display_snapshot ?? (0, _virtualSettlement.buildCurrencyDisplaySnapshot)(virtualSettlement.snapshot))
+          }
+        },
+        currency_code: virtualSettlement.currencyCode,
+        currency_symbol: virtualSettlement.currencySymbol,
+        currency_format: virtualSettlement.currencyFormat
+      };
+    } : params?.enhancePayload;
+    const configuredEnhancePayload = this.buildSubmitPayloadEnhancerWithOpenDataConfig(virtualSettlementEnhancePayload);
+    // Apply this last so neither a stale draft status nor a caller enhancer can
+    // turn deferred submission into payment. The live wallet selection is untouched.
+    const enhancePayload = isDeferredPayment ? (payload, ctx) => {
+      const enhancedPayload = configuredEnhancePayload ? configuredEnhancePayload(payload, ctx) : payload;
+      const {
+        payment_status: _paymentStatus,
+        ...orderPayload
+      } = enhancedPayload;
+      return {
+        ...orderPayload,
+        payments: []
+      };
+    } : configuredEnhancePayload;
     const submitParams = {
       cacheId: this.cacheId,
       platform: this.otherParams?.platform,
@@ -2520,8 +2775,10 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       channel: this.getSubmitOrderSalesChannel(),
       type: this.otherParams?.type,
       request_unique_idempotency_token: this.store.order.generateIdempotencyToken(),
-      ...(virtualSettlement ? {
-        payments: virtualSettlement.payments
+      ...(isDeferredPayment ? {
+        payments: []
+      } : virtualPaymentSettlement ? {
+        payments: virtualPaymentSettlement.payments
       } : params?.payments !== undefined ? {
         payments: params.payments
       } : {}),
@@ -2531,7 +2788,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       ...(smallTicketDataFlag !== undefined ? {
         smallTicketDataFlag
       } : {}),
-      ...(virtualSettlement ? {
+      ...(isDeferredPayment || virtualSettlement ? {
         confirmPendingVoucherPayments: false
       } : params?.confirmPendingVoucherPayments !== undefined ? {
         confirmPendingVoucherPayments: params.confirmPendingVoucherPayments
@@ -2562,10 +2819,110 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     };
     return this.shouldUseCheckoutSyncTask() ? this.store.order.submitTempOrder(submitParams) : this.store.order.submitTempOrderAsync(submitParams);
   }
+  pendingLocalEftposFinalizations = new Map();
+  async finalizeLocalEftposPayment(params) {
+    const key = `${params.saleId}:${params.paymentNumber}`;
+    // If SQLite rejects the write, retry this known result before another payment can start.
+    this.pendingLocalEftposFinalizations.set(key, params);
+    const response = await this.request.post('/local/finalizeLocalEftposPayment', {
+      sale_id: params.saleId,
+      payment_number: params.paymentNumber,
+      result: params.result,
+      failed_transaction_numbers: params.failedTransactionNumbers
+    }, {
+      osServer: true,
+      customToast: () => {}
+    });
+    if (response?.code !== 200 || !response?.data?.order) {
+      throw new Error(response?.message || '本地支付收尾失败，请刷新订单后重试');
+    }
+    this.pendingLocalEftposFinalizations.delete(key);
+    const {
+      order,
+      payment
+    } = response.data;
+    const temp = this.getTempOrder();
+    const isCurrentOrder = String(temp?.external_sale_number || temp?.order_id) === String(params.saleId) || temp?.order_id && String(temp.order_id) === String(order.order_id);
+    if (isCurrentOrder) {
+      // Persisted by the local route already. Saving a draft here would re-enable protection.
+      if (temp?.payments?.some(item => String(item.payment_number) === params.paymentNumber)) {
+        await this.updateOrderPayment(params.paymentNumber, payment, {
+          persistDraft: false,
+          submitWhenPaid: false
+        });
+      }
+      if ((0, _localEftposState.requiresLocalPaymentRefresh)(order)) {
+        // Set the in-memory gate before the GET so a failed refresh also blocks this page.
+        const currentTemp = this.getTempOrder();
+        if (currentTemp) currentTemp.metadata = {
+          ...currentTemp.metadata,
+          ...order.metadata
+        };
+        try {
+          await this.loadSalesDetail({
+            orderId: order.order_id,
+            forceRemote: true,
+            merge: false
+          });
+        } catch {
+          throw new Error(_localEftposState.PAYMENT_REFRESH_MESSAGE);
+        }
+      }
+    } else if ((0, _localEftposState.requiresLocalPaymentRefresh)(order)) {
+      const refreshed = await this.store.order?.getSalesOrderByLookup({
+        lookup: order.order_id,
+        forceRemote: true
+      });
+      if (refreshed?.code !== 200) throw new Error(_localEftposState.PAYMENT_REFRESH_MESSAGE);
+    }
+    return response.data;
+  }
+
+  /** Entry gate also reads SQLite state, so stale sessions/restarts cannot bypass it. */
+  async ensureSalesOrderReadyForPayment() {
+    const temp = this.getTempOrder();
+    const unfinished = [...this.pendingLocalEftposFinalizations.values()].filter(params => String(params.saleId) === String(temp?.external_sale_number) || String(params.saleId) === String(temp?.order_id));
+    if (unfinished.length > 0) {
+      for (const params of unfinished) await this.finalizeLocalEftposPayment(params);
+      throw new Error('订单已更新，请确认商品和金额后重新付款');
+    }
+    await this.validateContactInfo();
+    const lookup = temp?.order_id || temp?.external_sale_number;
+    let localOrder = null;
+    if (lookup && this.core?.server?.hasRoute?.('post', '/shop/local/orderPaymentReadiness')) {
+      const response = await this.request.post('/local/orderPaymentReadiness', {
+        sale_id: lookup
+      }, {
+        osServer: true,
+        customToast: () => {}
+      });
+      if (response?.code !== 200) throw new Error(_localEftposState.PAYMENT_REFRESH_MESSAGE);
+      localOrder = response.data;
+    }
+    if (!(0, _localEftposState.requiresLocalPaymentRefresh)(temp) && !(0, _localEftposState.requiresLocalPaymentRefresh)(localOrder)) return;
+    const orderId = localOrder?.order_id || temp?.order_id;
+    if (!orderId || String(orderId) === String(temp?.external_sale_number)) {
+      throw new Error(_localEftposState.PAYMENT_REFRESH_MESSAGE);
+    }
+    try {
+      await this.loadSalesDetail({
+        orderId,
+        forceRemote: true,
+        merge: false
+      });
+    } catch {
+      throw new Error(_localEftposState.PAYMENT_REFRESH_MESSAGE);
+    }
+    // The initiating UI may have captured the old amount before this await.
+    throw new Error('订单已刷新，请确认商品和金额后重新付款');
+  }
   async saveSalesOrderDraft(params) {
     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,
@@ -2581,6 +2938,10 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!this.store.order) {
       throw new Error('BaseSales 解决方案需要 order 模块支持');
     }
+    await this.validateContactInfo();
+    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);
@@ -2996,7 +3357,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
 
     const walletProducts = tempOrder?.products.map(product => {
       const metadata = product.metadata || {};
-      const rawHolderId = product.holder_id ?? metadata.holder_id;
+      const rawHolderId = (0, _holderRelations.hasProductBooking)(product) ? product.holder_id ?? metadata.holder_id : (0, _holderRelations.getProductHolderRelations)(tempOrder, product).filter(relation => relation.holder_type === 'form').map(relation => relation.holder_id);
       const holderIdValue = Array.isArray(rawHolderId) ? rawHolderId[0] : rawHolderId;
       const holder_id = Number.isInteger(Number(holderIdValue)) ? Number(holderIdValue) : undefined;
       return {
@@ -3412,6 +3773,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
    */
   async confirmWalletPayment() {
     if (!this.store.order) throw new Error('order 模块未初始化');
+    await this.validateContactInfo();
     const beforePayments = (0, _lodashEs.cloneDeep)(this.store.order.getOrderPayments());
     const pendingWalletAmount = this.getPendingWalletPaymentAmount(beforePayments);
     const amountSnapshot = this.store.order.getOrderAmountSnapshot?.();
@@ -3483,6 +3845,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
    */
   async payCash(params) {
     if (!this.store.order) throw new Error('order 模块未初始化');
+    await this.validateContactInfo();
     const amount = Number(params.amount || 0);
     if (!Number.isFinite(amount) || amount <= 0) {
       throw new Error('现金支付金额必须大于 0');
@@ -3508,6 +3871,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',
@@ -3887,7 +4253,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   async addProductToOrder(product, booking, options) {
     try {
       if (!this.store.order) throw new Error('order 模块未初始化');
-      const products = await this.store.order.addProductToOrder(product, booking, options);
+      const products = options === undefined ? await this.store.order.addProductToOrder(product, booking) : await this.store.order.addProductToOrder(product, booking, options);
       // // 需要叠加
       // if (this.hooks.onAddProductOverlay) {
       //   const res = this.hooks.onAddProductOverlay(是否叠加, product)
@@ -3976,7 +4342,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   async removeProductsFromOrder(identities, options) {
     try {
       if (!this.store.order) throw new Error('order 模块未初始化');
-      return await this.store.order.removeProductsFromOrder(identities, options);
+      return options === undefined ? await this.store.order.removeProductsFromOrder(identities) : await this.store.order.removeProductsFromOrder(identities, options);
     } catch (error) {
       throw error;
     }
@@ -4061,6 +4427,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   async setOtherParams(params, {
     cover = false
   } = {}) {
+    const previousPickupTimingScope = this.getPickupTimingScope();
     if (cover) {
       this.otherParams = {
         ...params
@@ -4072,6 +4439,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       };
     }
     this.cacheId = this.otherParams?.cacheId;
+    if (previousPickupTimingScope !== this.getPickupTimingScope()) this.resetPickupTimingCache();
     await this.syncOtherParamsToSubModules(params, {
       cover
     });