@pisell/pisellos 2.3.164 → 2.3.166

package/lib/solution/BaseSales/index.js

@@ -25,6 +25,8 @@ 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");
@@ -349,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');
@@ -367,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 的旧数据。
@@ -1862,6 +1900,29 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     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) {
@@ -2664,6 +2725,7 @@ 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
     });
@@ -2824,6 +2886,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       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')) {
@@ -2875,6 +2938,7 @@ 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
     });
@@ -3293,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 {
@@ -3709,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?.();
@@ -3780,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');

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

@@ -4,7 +4,7 @@ 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 { OrderPaymentSource } from '../../modules/Order/types';
+import type { OrderHolderRelation, OrderPaymentSource } from '../../modules/Order/types';
 import type { SubmitPayloadEnhancer } from '../../modules/Order/utils';
 /**
  * BaseSales 流程 hook 后缀。
@@ -277,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

@@ -6,6 +6,7 @@ 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。
  *
@@ -130,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/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;
@@ -62,6 +63,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private getIdGeneratorPlugin;
     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>;
@@ -281,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。
      */
@@ -292,7 +304,9 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     /**
      * 清空下单客户（协议字段 + snapshot）。
      */
-    clearOrderCustomer(): void;
+    clearOrderCustomer(options?: {
+        preserveContactInfo?: boolean;
+    }): void;
     /**
      * 重置 tempOrder，并同步清空下单客户运行态。
      *

package/lib/solution/BookingTicket/index.js

@@ -39,6 +39,9 @@ var _orderLineDisplay = require("../../modules/BookingContext/utils/orderLineDis
 var _bookingStatus = require("./utils/bookingStatus");
 var _resolveBestAddTimePlan = require("./utils/resolveBestAddTimePlan");
 var _utils = require("../../modules/Order/utils");
+var _contactInfo = require("../../modules/OpenData/contactInfo");
+var _platform = require("../../utils/platform");
+var _lodashEs = require("lodash-es");
 var _types2 = require("../../server/modules/form/types");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const OPEN_DATA_SECTION_CODES = ['sale', 'reservation', 'fulfillment', 'menu', 'workflow', 'documents'];
@@ -163,6 +166,7 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
   orderCustomerDiscountRefreshCustomerId = null;
   orderCustomerDiscountRefreshTarget = null;
   orderCustomerPromotionRefreshInFlight = null;
+  orderCustomerContactRequest = null;
   customerResolveRequests = new Map();
   loadOpenDataInFlight = null;
   loadOpenDataInFlightTarget = null;
@@ -300,6 +304,9 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
   async getOpenData() {
     return this.loadOpenDataConfig();
   }
+  async loadContactInfoOpenData() {
+    return this.store.openData ? this.getOpenData() : super.loadContactInfoOpenData();
+  }
   async loadFulfillmentItemRuleOpenData() {
     return this.store.openData ? this.getOpenData() : super.loadFulfillmentItemRuleOpenData();
   }
@@ -1035,7 +1042,9 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
    */
   setOrderCustomer(customer, options) {
     if (!customer) {
-      this.clearOrderCustomer();
+      this.clearOrderCustomer({
+        preserveContactInfo: options?.source === 'detailHydrate'
+      });
       return;
     }
     const previousCustomerId = this.store.order.getOrderCustomer()?.customer_id;
@@ -1046,7 +1055,16 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
       this.discountConfigCacheKey = null;
       this.hasManualDiscountSelection = false;
     }
+    if (!customerUnchanged && options?.source !== 'detailHydrate') {
+      this.resetOrderCustomerContactInfo();
+      this.store.order.updateTempOrderContactsInfo((0, _lodashEs.cloneDeep)((0, _contactInfo.extractCustomerContactInfo)(customer)));
+    }
     this.store.order.setOrderCustomer(patch, customer);
+    if (options?.source === 'detailHydrate') {
+      this.orderCustomerContactRequest = null;
+    } else {
+      this.prefillOrderCustomerContactInfo(customer, !customerUnchanged);
+    }
     const snapshotAfterOrderSet = this.store.order.getOrderCustomerSnapshot();
     if (customerUnchanged) {
       // hydrate 后 customer_id 已存在但 _extend.customerSnapshot 仍为空时，
@@ -1079,6 +1097,105 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
       this.orderCustomerPromotionRefreshInFlight = null;
     });
   }
+  resetOrderCustomerContactInfo() {
+    this.orderCustomerContactRequest = null;
+    const order = this.getTempOrder();
+    if (order?._extend) delete order._extend.contactInfoEdited;
+  }
+
+  /** Explicit edits, including clearing the contact, must win over a pending default. */
+  updateTempOrderContactsInfo(contact) {
+    const order = this.store.order.ensureTempOrder();
+    order._extend || (order._extend = {});
+    order._extend.contactInfoEdited = true;
+    this.orderCustomerContactRequest = null;
+    return super.updateTempOrderContactsInfo(contact);
+  }
+  getCustomerContactScope() {
+    return JSON.stringify([this.getPickupTimingScope(), this.otherParams?.channel, this.otherParams?.shop_id, this.otherParams?.tenantId]);
+  }
+  getCustomerContactOrderKey() {
+    const order = this.getTempOrder();
+    // Cart mutations can replace the object without changing the order.
+    const identity = order?.external_sale_number || order?.request_unique_idempotency_token || order?._extend?.localId || order?.order_id;
+    return identity ? JSON.stringify([identity, order?.order_id]) : order;
+  }
+  async replaceTempOrder(...args) {
+    this.orderCustomerContactRequest = null;
+    return super.replaceTempOrder(...args);
+  }
+  async applyDefaultOrderCustomerContactInfo(contact) {
+    this.store.order.updateTempOrderContactsInfo((0, _lodashEs.cloneDeep)(contact));
+    // Metadata may finish after promotion/discount refresh; publish the updated cart explicitly.
+    await this.effectsEmit('onTempOrderReplaced', {
+      tempOrder: this.getTempOrder()
+    });
+  }
+  prefillOrderCustomerContactInfo(customer, customerChanged) {
+    const order = this.getTempOrder();
+    const customerId = Number(order?.customer_id);
+    if (!order || !Number.isInteger(customerId) || customerId <= 1 || order.contacts_info != null || order._extend?.contactInfoEdited) return;
+    // A restored new cart may already have its customer ID. Existing sales keep their snapshot,
+    // even when it is empty; only an explicit customer switch replaces it.
+    if (!customerChanged && order.order_id && !String(order.order_id).startsWith('local_order')) return;
+    const contact = (0, _contactInfo.extractCustomerContactInfo)(customer);
+    if (contact) {
+      this.orderCustomerContactRequest = null;
+      void this.applyDefaultOrderCustomerContactInfo(contact);
+      return;
+    }
+    // A relation explicitly returned as null is authoritative. Only a missing relation needs fetching.
+    if (customer.contacts_info !== undefined) return;
+    const userPlatform = (0, _platform.isCustomerUserPlatform)(this.otherParams?.platform);
+    const getAuthenticatedCustomerId = () => Number(this.core?.getPlugin?.('user')?.get?.()?.id);
+    if (userPlatform && getAuthenticatedCustomerId() !== customerId) return;
+    const scope = this.getCustomerContactScope();
+    const orderKey = this.getCustomerContactOrderKey();
+    const previous = this.orderCustomerContactRequest;
+    if (previous?.orderKey === orderKey && previous.customerId === customerId && previous.scope === scope) return;
+    const pending = {
+      orderKey,
+      customerId,
+      scope,
+      promise: Promise.resolve()
+    };
+    this.orderCustomerContactRequest = pending;
+    const loadContact = async () => {
+      if (userPlatform) {
+        // Same endpoint as BookingByStep.getContactInfo; the PC/H5 host adds /h5 and login headers.
+        const result = await this.request.get('/customer/metadata', {
+          key: 'contacts_info'
+        });
+        if (result?.code !== 200 || result?.status === false) throw new Error('Customer contact lookup failed');
+        return (0, _contactInfo.isContactRecord)(result.data) ? result.data : null;
+      }
+      // POS and physical Kiosk share the /shop request plugin and current-shop customer resolver.
+      const resolved = await this.resolveCustomerById(customerId);
+      return Number(resolved?.id) === customerId ? (0, _contactInfo.extractCustomerContactInfo)(resolved) : null;
+    };
+    pending.promise = loadContact().then(async value => {
+      const current = this.getTempOrder();
+      if (this.orderCustomerContactRequest !== pending || this.getCustomerContactOrderKey() !== orderKey || Number(current?.customer_id) !== customerId || scope !== this.getCustomerContactScope() || current?._extend?.contactInfoEdited || current?.contacts_info != null || userPlatform && getAuthenticatedCustomerId() !== customerId) return;
+      if (value) await this.applyDefaultOrderCustomerContactInfo(value);
+    }).catch(() => {
+      // A failed default does not prevent manual entry; a subsequent sync can retry.
+      if (this.orderCustomerContactRequest === pending) this.orderCustomerContactRequest = null;
+      console.warn('[BookingTicket] Failed to load saved customer contact information');
+    });
+  }
+  waitForOrderCustomerContactInfo() {
+    return this.orderCustomerContactRequest?.promise ?? Promise.resolve();
+  }
+  async validateContactInfo() {
+    const orderKey = this.getCustomerContactOrderKey();
+    const customerId = this.getTempOrder()?.customer_id;
+    const scope = this.getCustomerContactScope();
+    await this.waitForOrderCustomerContactInfo();
+    if (this.getCustomerContactOrderKey() !== orderKey || this.getTempOrder()?.customer_id !== customerId || this.getCustomerContactScope() !== scope) {
+      throw new Error('The order changed. Please try again.');
+    }
+    await super.validateContactInfo();
+  }
 
   /**
    * 读取 tempOrder 上的下单客户协议字段；customer_id 缺失时返回 null。
@@ -1097,7 +1214,10 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
   /**
    * 清空下单客户（协议字段 + snapshot）。
    */
-  clearOrderCustomer() {
+  clearOrderCustomer(options) {
+    this.orderCustomerContactRequest = null;
+    if (!options?.preserveContactInfo) this.resetOrderCustomerContactInfo();
+    if (!options?.preserveContactInfo) this.store.order.updateTempOrderContactsInfo(null);
     this.store.order.clearOrderCustomer();
     this.discountConfigCacheKey = null;
     this.hasManualDiscountSelection = false;
@@ -1667,7 +1787,10 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
    * 从已加车的普通商品 order line 反查 SkuDetailModal edit 所需的 cacheItem。
    */
   buildNormalProductCacheItemFromOrderLine(input) {
-    return (0, _buildNormalProductCacheItemFromOrderLine.buildNormalProductCacheItemFromOrderLine)(input);
+    return (0, _buildNormalProductCacheItemFromOrderLine.buildNormalProductCacheItemFromOrderLine)({
+      ...input,
+      holder_relations: input.holder_relations ?? this.store.order?.getTempOrder()?.holder_relations
+    });
   }
 
   /** 文档别名：与 OrderModule.updateOrderProduct 一致。 */
@@ -1900,6 +2023,11 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
   async setOtherParams(params, {
     cover = false
   } = {}) {
+    const nextParams = cover ? params : {
+      ...this.otherParams,
+      ...params
+    };
+    if (['businessCode', 'business_code', 'channel', 'platform', 'shop_id', 'tenantId', 'cacheId'].some(key => nextParams?.[key] !== this.otherParams?.[key])) this.orderCustomerContactRequest = null;
     await super.setOtherParams(params, {
       cover
     });
@@ -2015,6 +2143,7 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
    * 再清理 BookingTicket 自有资源（scan 监听 + scan 内存缓存）。
    */
   async destroy() {
+    this.orderCustomerContactRequest = null;
     await super.destroy();
     try {
       this.scan?.removeAllListeners();

package/lib/solution/UnifiedBookingSales/index.js

@@ -1877,7 +1877,7 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
     }
     this.store.customer?.setSelectedCustomer?.(authenticatedCustomer);
     this.setOrderCustomer(authenticatedCustomer);
-    await Promise.all([this.refreshDiscountConfigAfterOrderCustomerChange(authenticatedCustomerId), this.waitForOrderCustomerPromotionRefresh()]);
+    await Promise.all([this.refreshDiscountConfigAfterOrderCustomerChange(authenticatedCustomerId), this.waitForOrderCustomerPromotionRefresh(), this.waitForOrderCustomerContactInfo()]);
     return true;
   }
   isAuthenticatedCustomerUserPlatform() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.3.164",
+  "version": "2.3.166",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",