@pisell/pisellos 2.2.315 → 2.2.316

package/lib/shared/receipt/small-ticket.js

@@ -7,6 +7,7 @@ exports.buildSmallTicketData = buildSmallTicketData;
 exports.hasSmallTicketData = hasSmallTicketData;
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _decimal = _interopRequireDefault(require("decimal.js"));
+var _holderRelations = require("../../modules/Order/holderRelations");
 var _pickupTiming = require("../../modules/Order/pickupTiming");
 var _templateVisibility = require("./templateVisibility");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -97,6 +98,7 @@ const LABELS = {
     bookingDateTime: 'Date & time',
     bookingResource: 'Resource',
     bookingHolder: 'Holder',
+    productHolder: 'Holder',
     orderDiscount: 'Order discount',
     manualDiscount: 'Manual discount',
     manualMarkup: 'Manual markup',
@@ -142,6 +144,7 @@ const LABELS = {
     bookingDateTime: '日期和时间',
     bookingResource: '资源',
     bookingHolder: '预约人',
+    productHolder: '持有人',
     orderDiscount: '整单折扣',
     manualDiscount: '手动折扣',
     manualMarkup: '手动加价',
@@ -187,6 +190,7 @@ const LABELS = {
     bookingDateTime: '日期和時間',
     bookingResource: '資源',
     bookingHolder: '預約人',
+    productHolder: '持有人',
     orderDiscount: '整單折扣',
     manualDiscount: '手動折扣',
     manualMarkup: '手動加價',
@@ -230,6 +234,7 @@ const LABELS = {
     bookingDateTime: '日時',
     bookingResource: 'リソース',
     bookingHolder: '予約者',
+    productHolder: '利用者',
     orderDiscount: '注文割引',
     manualDiscount: '手動割引',
     manualMarkup: '手動値上げ',
@@ -274,6 +279,7 @@ const LABELS = {
     bookingDateTime: 'Data e hora',
     bookingResource: 'Recurso',
     bookingHolder: 'Titular',
+    productHolder: 'Titular',
     orderDiscount: 'Desconto do pedido',
     manualDiscount: 'Desconto manual',
     manualMarkup: 'Acréscimo manual',
@@ -341,7 +347,7 @@ function buildLocaleData(params) {
       financials
     }),
     customer: buildCustomer(order, locale, visibility.customer),
-    appointment: buildAppointment(order, locale),
+    appointment: buildAppointment(order, locale, visibility.lineGroups.resourceTitle),
     ...(delivery.length ? {
       delivery
     } : {}),
@@ -445,6 +451,15 @@ function buildProducts(order, locale, productMap) {
       quantity,
       originalPrice
     });
+    const holderName = (0, _holderRelations.hasProductBooking)(product) ? '' : (0, _holderRelations.getProductHolderRelations)(order, product).map(relation => getLocalizedValue(relation.metadata?.name, locale).trim()).filter(Boolean).join(', ');
+    if (holderName) {
+      // 复用 Web Invoice / 原生均支持的文本扩展行，不混入金额或商品备注。
+      extensionList.push({
+        ...receiptKey(rawProduct, 'product-holder'),
+        item: `${label(locale, 'productHolder')}: ${holderName}`,
+        value: ''
+      });
+    }
     const productNote = resolveProductNote(product, locale);
     const allergy = isPresentId(productUid) ? allergyByProductUid.get(String(productUid).trim()) || '' : '';
     const basePrice = resolveProductBasePrice(product);
@@ -1165,13 +1180,6 @@ function buildFees(params) {
   const isPriceIncludeTax = firstPresentValue(summary.is_price_include_tax, order.is_price_include_tax, shopInfo.is_price_include_tax);
   const roundingAmount = firstPresentValue(summary.rounding_amount, order.rounding_amount);
   const payProcessingFee = financials.payProcessingFee;
-  if (isNonZero(payProcessingFee)) {
-    fees.push({
-      ...receiptKey(order, 'payment-processing-fee'),
-      item: label(locale, 'payProcessingFee'),
-      value: formatMoney(payProcessingFee, currencySymbol)
-    });
-  }
   const productExpectAmount = firstPresentValue(summary.product_expect_amount, summary.product_amount, order.product_expect_amount);
   const productOriginalAmount = firstPresentValue(summary.product_original_amount, order.product_original_amount) ?? calculateProductOriginalAmount(order);
   const totalSavingsAmount = new _decimal.default(toMoneyNumber(productOriginalAmount)).minus(toMoneyNumber(productExpectAmount)).plus(toMoneyNumber(discountAmount));
@@ -1322,7 +1330,7 @@ function formatPickupBookingStart(bookings, locale) {
   const dateText = locale === 'en' ? `${day}/${month}/${year}` : `${year}/${month}/${day}`;
   return `${time.slice(0, 5)} ${dateText}`;
 }
-function buildAppointment(order, locale) {
+function buildAppointment(order, locale, showResourceTitle) {
   const parentScheduleId = order.metadata?.appointment_booking_parent_schedule_id;
   const bookings = sortBookings(normalizeArray(order.bookings).filter(booking => !(0, _pickupTiming.isFulfillmentTimingBooking)(booking) && isReceiptAppointmentBooking(booking, parentScheduleId)));
   if (bookings.length) {
@@ -1331,7 +1339,8 @@ function buildAppointment(order, locale) {
       booking,
       allResources,
       bookingCount: bookings.length,
-      locale
+      locale,
+      showResourceTitle
     }));
   }
   const tableName = order.table_name || order.metadata?.table_name || order.metadata?.table?.name || order.form_data?.table_name;
@@ -1370,7 +1379,7 @@ function buildAppointmentRows(params) {
   };
   const bookingId = stringify(firstPresentValue(booking.booking_id, booking.schedule_event_id, bookingUid)).trim();
   const bookingTime = formatBookingRange(booking, locale);
-  const resourceText = formatBookingResources(resolveBookingResourcesForReceipt(booking, allResources, bookingCount), locale);
+  const resourceText = formatBookingResources(resolveBookingResourcesForReceipt(booking, allResources, bookingCount), locale, params.showResourceTitle);
   const holder = getLocalizedValue(booking.holder?.name ?? booking.metadata?.holder?.name, locale).trim();
   return [{
     ...receiptKey(booking, 'booking-id'),
@@ -1432,8 +1441,8 @@ function resolveBookingResourcesForReceipt(booking, allResources, bookingCount)
   if (bookingCount === 1 && allResources.length) return allResources;
   return [];
 }
-function formatBookingResources(resources, locale) {
-  return resources.map(resource => [getLocalizedValue(resource.form_title || resource.metadata?.form_name || resource.relation_form_name || resource.metadata?.relation_form_name, locale), getLocalizedValue(resource.title || resource.name || resource.main_field || resource.metadata?.main_field || resource.metadata?.resource_name, locale)].filter(Boolean).join(' ')).filter(Boolean).join(', ');
+function formatBookingResources(resources, locale, showResourceTitle) {
+  return resources.map(resource => [showResourceTitle ? getLocalizedValue(resource.form_title || resource.metadata?.form_name || resource.relation_form_name || resource.metadata?.relation_form_name, locale) : '', getLocalizedValue(resource.title || resource.name || resource.main_field || resource.metadata?.main_field || resource.metadata?.resource_name, locale)].filter(Boolean).join(' ')).filter(Boolean).join(', ');
 }
 function sortBookings(bookings) {
   return bookings.map((booking, index) => ({

package/lib/shared/receipt/templateVisibility.d.ts

@@ -1,5 +1,8 @@
 /** Template children are direct module members; legacy missing values stay visible. */
 export interface InvoiceDataVisibility {
+    lineGroups: {
+        resourceTitle: boolean;
+    };
     handover: {
         show: boolean;
         method: boolean;

package/lib/shared/receipt/templateVisibility.js

@@ -34,6 +34,9 @@ function resolveInvoiceDataVisibility(settings) {
   const field = (config, key) => invoiceSettingIsVisible(config?.[key]?.is_show);
   const passTypes = Array.isArray(card?.pass_type) && card.pass_type.length > 0 ? new Set(card.pass_type.filter(tag => typeof tag === 'string' && tag.length > 0)) : null;
   return {
+    lineGroups: {
+      resourceTitle: field(module('line_groups'), 'resource_title')
+    },
     handover: {
       show: invoiceSettingIsVisible(handover?.is_show),
       method: field(handover, 'method'),
@@ -57,7 +60,8 @@ function requiresInvoiceDataFiltering(settings) {
   const {
     handover,
     customer,
-    card
+    card,
+    lineGroups
   } = resolveInvoiceDataVisibility(settings);
-  return !handover.show || !handover.method || !handover.fulfillmentTime || !customer.show || !customer.name || !customer.email || !customer.phone || !card.show || card.passTypes !== null;
+  return !lineGroups.resourceTitle || !handover.show || !handover.method || !handover.fulfillmentTime || !customer.show || !customer.name || !customer.email || !customer.phone || !card.show || card.passTypes !== null;
 }

package/lib/shared/sales/loadSalesOrderSnapshot.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.SALES_ORDER_RELATIONS = void 0;
 exports.loadSalesOrderSnapshot = loadSalesOrderSnapshot;
-const SALES_ORDER_RELATIONS = exports.SALES_ORDER_RELATIONS = ['products', 'bookings', 'payments', 'customer', 'summary', 'contacts_info', 'order_meta_list', 'refunds', 'notes'];
+const SALES_ORDER_RELATIONS = exports.SALES_ORDER_RELATIONS = ['products', 'bookings', 'payments', 'customer', 'summary', 'contacts_info', 'order_meta_list', 'refunds', 'notes', 'holder_relations'];
 
 /** Shared transport contract; remote callers use their host's /h5 prefix. */
 function loadSalesOrderSnapshot(request, params) {

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

@@ -5,6 +5,7 @@ import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentS
 import { OrderModule } from '../../modules/Order';
 import { type PickupTimingBookingInput } from '../../modules/Order/pickupTiming';
 import type { PickupTimingAvailability, PickupTimingSelection, PickupTimingValidationResult } from '../../modules/FulfillmentTiming';
+import { type ContactInfoConfig } from '../../modules/OpenData/contactInfo';
 import type { AddProductBookingInput, AddProductToOrderOptions, LoadSalesDetailParams, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder, OrderSummary, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions, RemoveProductsFromOrderOptions, ReplaceTempOrderOptions, SalesNote, SalesNotesMutationSnapshot, SetSalesNoteInput, PickupReferenceMode, ShopServiceData, ShopServiceType } from '../../modules/Order/types';
 import type { SubmitPayloadEnhancer } from '../../modules/Order/utils';
 import type { Discount, VirtualCurrencyAsset } from '../../modules/Discount/types';
@@ -281,6 +282,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     setPickupTimingBooking(input: PickupTimingBookingInput): import("../../modules/Order").PickupTimingBooking;
     clearPickupTimingBooking(): void;
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
+    protected loadContactInfoOpenData(): Promise<OpenDataConfig | null>;
+    getContactInfoConfig(): Promise<ContactInfoConfig>;
+    validateContactInfo(): Promise<void>;
     /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化。 */
     setEnableTempOrderPersist(enabled: boolean): void;
     /** 是否允许 saveDraft 写入 IndexedDB 草稿。 */

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/BookingByStep/index.d.ts

@@ -328,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/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，并同步清空下单客户运行态。
      *