@pisell/pisellos 2.2.314 → 2.2.316

package/dist/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/dist/solution/BaseSales/utils/parseSalesResponse.js

@@ -24,6 +24,8 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
  */
 
 import { normalizeOrderCollections } from "../../../modules/Order/utils/orderCollectionIdentity";
+import { isFulfillmentTimingBooking } from "../../../modules/Order/pickupTiming";
+import { cloneDeep } from 'lodash-es';
 /** OrderData 中除大数组外的"顶层 header 字段"白名单，按需扩展。 */
 var HEADER_KEYS = ['order_id', 'order_number', 'shop_order_number', 'shop_full_order_number', 'type', 'business_code', 'platform', 'sales_channel', 'order_sales_channel', 'vouchers', 'status', 'payment_status', 'shipping_status', 'customer_id', 'customer_name', 'country_calling_code', 'phone', 'email', 'is_price_include_tax', 'tax_title', 'tax_country_code', 'currency_code', 'currency_symbol', 'currency_format', 'is_deposit', 'deposit_amount', 'shop_discount', 'surcharge_fee', 'note', 'schedule_date', 'created_at', 'updated_at', 'order_meta_list', 'metadata', 'total_amount', 'shop_id', 'create_date', 'holder', 'relation_forms', 'contacts', 'contacts_info'];
 function pickHeader(raw) {
@@ -78,6 +80,7 @@ function pickCustomer(raw) {
  */
 function isRootBooking(booking) {
   if (!booking || _typeof(booking) !== 'object') return false;
+  if (isFulfillmentTimingBooking(booking)) return false;
   var parentId = booking.parent_id;
   if (parentId === 0 || parentId === null || parentId === undefined) return true;
   return false;
@@ -90,6 +93,7 @@ function indexBookingsByProductUid(bookings) {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var _b$metadata;
       var b = _step2.value;
+      if (isFulfillmentTimingBooking(b)) continue;
       var uid = b && (b.product_uid || ((_b$metadata = b.metadata) === null || _b$metadata === void 0 ? void 0 : _b$metadata.product_uid)) || '';
       if (!uid) continue;
       var _key2 = String(uid);
@@ -141,9 +145,12 @@ export function parseSalesResponse(input) {
     return _objectSpread({}, d || {});
   }) : [];
   var summary = raw !== null && raw !== void 0 && raw.summary && _typeof(raw.summary) === 'object' ? _objectSpread({}, raw.summary) : {};
-  return {
+  return _objectSpread(_objectSpread({
     header: pickHeader(raw),
-    products: products,
+    products: products
+  }, Array.isArray(raw === null || raw === void 0 ? void 0 : raw.holder_relations) ? {
+    holder_relations: cloneDeep(raw.holder_relations)
+  } : {}), {}, {
     bookings: bookings,
     rootBooking: rootBooking,
     bookingsByProductUid: bookingsByProductUid,
@@ -153,5 +160,5 @@ export function parseSalesResponse(input) {
     customer: pickCustomer(raw),
     summary: summary,
     raw: raw
-  };
+  });
 }

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

@@ -12,6 +12,8 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import { resolveWeighedSourcePrice, withOriginalBundleOptionPrices } from "../../../modules/Order/utils/weighedProduct";
+import { resolveProductHolderConfig } from "../../../modules/Holder/utils";
+import { isBookingProduct } from "../../../modules/BookingContext/utils/serviceTimes";
 import { composeLinePrice, getBundleSellingMagnitude, normalizeProductSkuOptions, sumOptionUnitPrice } from "../../../modules/Order/utils";
 import { buildManualProductDiscountItem, mergeManualProductDiscountIntoList, resolveManualDiscountOriginTotal, resolveManualDiscountReasonFromSources, shouldBuildManualProductDiscount } from "../../../modules/Order/utils/manualProductDiscount";
 function toNumber(value) {
@@ -168,7 +170,7 @@ function findVariantById(origin, variantId) {
  * 注意：这里不生成 identity，缺省时由 OrderModule 自动补齐。
  */
 export function transformBaseProductToOrderProduct(params) {
-  var _ref12, _ref13, _ref14, _payload$product_id, _ref15, _ref16, _payload$product_vari, _payload$_origin, _payload$_origin2, _payload$metadata, _sourceProduct$metada, _callbackOrigin$metad, _origin$metadata, _payload$metadata2, _payload$_extend, _sourceProduct$metada2, _sourceProduct$_exten, _callbackOrigin$metad2, _callbackOrigin$_exte, _payload$_dataVariant, _sourceProduct$_dataV, _callbackOrigin$_data, _origin$_dataVariant, _ref17, _findVariantById, _origin$production_co, _ref18, _ref19, _ref20, _ref21, _ref22, _matchedVariant$price, _payload$product_sku, _payload$_extend$weig, _payload$_extend2, _origin$_extend, _ref23, _ref24, _payload$price, _ref25, _payload$line_total, _payload$_extend3, _ref26, _ref27, _payload$product_sku$, _payload$product_sku2, _payload$bundle, _payload$quantity, _payload$_extend4, _extend, _extend2, _ref28, _ref29, _origin$base_price, _ref30, _ref31, _payload$line_total2, _payload$_extend5, _payload$_extend6, _extend3, _payload$_extend7, _payload$_extend8, _ref32, _ref33, _payload$tax_fee, _ref34, _ref35, _payload$is_charge_ta;
+  var _ref12, _ref13, _ref14, _payload$product_id, _ref15, _ref16, _payload$product_vari, _payload$_origin, _payload$_origin2, _payload$metadata, _sourceProduct$metada, _callbackOrigin$metad, _origin$metadata, _payload$metadata2, _payload$_extend, _sourceProduct$metada2, _sourceProduct$_exten, _callbackOrigin$metad2, _callbackOrigin$_exte, _payload$_dataVariant, _sourceProduct$_dataV, _callbackOrigin$_data, _origin$_dataVariant, _ref17, _findVariantById, _origin$production_co, _ref18, _ref19, _ref20, _ref21, _ref22, _matchedVariant$price, _payload$product_sku, _payload$_extend$weig, _payload$_extend2, _origin$_extend, _ref23, _ref24, _payload$price, _ref25, _payload$line_total, _payload$_extend3, _ref26, _ref27, _payload$product_sku$, _payload$product_sku2, _payload$bundle, _payload$quantity, _payload$_extend4, _extend, _extend2, _ref28, _ref29, _origin$base_price, _ref30, _ref31, _payload$line_total2, _payload$_extend5, _payload$_extend6, _extend3, _payload$_extend7, _payload$_extend8, _find, _resolveProductHolder, _ref32, _ref33, _payload$tax_fee, _ref34, _ref35, _payload$is_charge_ta;
   var payload = params.payload,
     _params$fallbackProdu = params.fallbackProductId,
     fallbackProductId = _params$fallbackProdu === void 0 ? null : _params$fallbackProdu;
@@ -242,6 +244,9 @@ export function transformBaseProductToOrderProduct(params) {
   });
   var derivedMainSelling = hasExplicitLineTotal ? Number(lineCompositeTotal) - Number(bundleOnlyComposite) : Number(mainProductOriginalPrice);
   var mainProductSellingPrice = toPriceString(Number.isFinite(derivedMainSelling) && derivedMainSelling >= 0 ? derivedMainSelling : Number(mainProductOriginalPrice));
+  var holderRelations = (_find = [payload._extend, callbackOrigin === null || callbackOrigin === void 0 ? void 0 : callbackOrigin._extend, sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct._extend].find(function (source) {
+    return Array.isArray(source === null || source === void 0 ? void 0 : source.holder_relations);
+  })) === null || _find === void 0 ? void 0 : _find.holder_relations;
   var metadata = _objectSpread(_objectSpread(_objectSpread(_objectSpread({
     unique: payload.unique,
     session: payload.session,
@@ -256,7 +261,7 @@ export function transformBaseProductToOrderProduct(params) {
     main_product_selling_price: mainProductSellingPrice,
     main_product_original_price: mainProductOriginalPrice,
     price_schema_version: 2,
-    holder_config: sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.holder_config
+    holder_config: (_resolveProductHolder = resolveProductHolderConfig(sourceProduct)) !== null && _resolveProductHolder !== void 0 ? _resolveProductHolder : undefined
   }, dataVariantIds !== undefined ? {
     data_variant_ids: dataVariantIds
   } : {}), selectedSettlementSnapshot ? {
@@ -275,7 +280,7 @@ export function transformBaseProductToOrderProduct(params) {
   var productTitle = _objectSpread(_objectSpread({}, productTitleI18n), {}, {
     original: productTitleI18n.original || (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.original_title) || (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) || ''
   });
-  return _objectSpread(_objectSpread({
+  return _objectSpread(_objectSpread(_objectSpread({
     product_id: productId,
     product_variant_id: productVariantId,
     production_code: productionCode,
@@ -294,7 +299,12 @@ export function transformBaseProductToOrderProduct(params) {
     original_price: lineOriginalPrice,
     tax_fee: toPriceString((_ref32 = (_ref33 = (_payload$tax_fee = payload.tax_fee) !== null && _payload$tax_fee !== void 0 ? _payload$tax_fee : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.tax_fee) !== null && _ref33 !== void 0 ? _ref33 : origin === null || origin === void 0 ? void 0 : origin.tax_fee) !== null && _ref32 !== void 0 ? _ref32 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.tax_fee, '0.00'),
     is_charge_tax: toNumber((_ref34 = (_ref35 = (_payload$is_charge_ta = payload.is_charge_tax) !== null && _payload$is_charge_ta !== void 0 ? _payload$is_charge_ta : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.is_charge_tax) !== null && _ref35 !== void 0 ? _ref35 : origin === null || origin === void 0 ? void 0 : origin.is_charge_tax) !== null && _ref34 !== void 0 ? _ref34 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.is_charge_tax, 0),
-    metadata: metadata,
+    metadata: metadata
+  }, holderRelations !== undefined && !isBookingProduct(origin) && !isBookingProduct(payload) ? {
+    _extend: {
+      holder_relations: holderRelations
+    }
+  } : {}), {}, {
     note: payload.note != null ? String(payload.note) : '',
     product_title: productTitle,
     product_cover: firstNonBlank(matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.cover, sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.cover),

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

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

package/dist/solution/BookingByStep/index.js

@@ -1189,7 +1189,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       // 直接调用 addProductToCart，不传递 date 参数以避免日期检查逻辑
       return this.addProductToCart({
         product: productData,
-        account: activeAccount
+        account: activeAccount,
+        isLegacyOrder: true
       });
     }
 
@@ -1200,6 +1201,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
      *     product: ProductData;
      *     date?: { startTime: string; endTime: string } | null;
      *     account?: Account | null;
+     *     isLegacyOrder?: boolean;
      *   })} {
      *     product,
      *     date,
@@ -1213,7 +1215,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: function addProductToCart(_ref6) {
       var product = _ref6.product,
         date = _ref6.date,
-        account = _ref6.account;
+        account = _ref6.account,
+        _ref6$isLegacyOrder = _ref6.isLegacyOrder,
+        isLegacyOrder = _ref6$isLegacyOrder === void 0 ? false : _ref6$isLegacyOrder;
       var _ref7 = product || {},
         bundle = _ref7.bundle,
         options = _ref7.options,
@@ -1278,7 +1282,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         product: productData,
         bundle: bundle,
         options: options,
-        quantity: quantity
+        quantity: quantity,
+        isLegacyOrder: isLegacyOrder
       };
       if (date) {
         addItemParams.date = date;

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

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