@pisell/pisellos 2.2.314 → 2.2.316

package/lib/modules/Cart/utils/cartProduct.d.ts

@@ -21,6 +21,7 @@ export declare const formatProductToCartItem: (params: {
     product_variant_id?: number;
     quantity?: number;
     discounts?: any[];
+    isLegacyOrder?: boolean;
 }) => CartItem;
 export declare const formatProductToCartItemOrigin: (params: {
     cartItem: CartItem;
@@ -29,6 +30,7 @@ export declare const formatProductToCartItemOrigin: (params: {
     options?: any;
     product_variant_id?: number;
     quantity?: number;
+    isLegacyOrder?: boolean;
 }) => any;
 /**
  * 获取商品总价
@@ -61,7 +63,7 @@ export declare const getProductOriginTotalPrice: (params: {
  * @param options 套餐规格信息
  * @returns 格式化后的套餐规格信息
  */
-export declare const formatOptions: (options: any) => any;
+export declare const formatOptions: (options: any, product?: ProductData) => any;
 export declare const formatOptionsToOrigin: (options: any) => any;
 /**
  * 格式化商品套餐信息

package/lib/modules/Cart/utils/cartProduct.js

@@ -106,7 +106,7 @@ const formatProductToCartItem = params => {
     cartItem.bundle = formatBundle(bundle);
   }
   if (options?.length) {
-    cartItem.options = formatOptions(options);
+    cartItem.options = formatOptions(options, product);
   }
   // 拼装出 product_option_string
   if (product_variant_id) {
@@ -148,22 +148,32 @@ const formatProductToCartItemOrigin = params => {
     bundle,
     options,
     product_variant_id,
-    quantity = 1
+    quantity = 1,
+    isLegacyOrder = false
   } = params;
   let origin = cartItem._origin;
   const product_discount_difference = (origin.product?.discount_list || []).filter(item => !item?.metadata?.custom_product_bundle_map_id).reduce((pre, cur) => {
     return pre + (cur?.metadata?.product_discount_difference || 0);
   }, 0);
   if (product) {
+    const {
+      option: _option,
+      ...legacyProductSku
+    } = origin.product?.product_sku || {};
     origin.product = {
       ...(origin.product || {}),
       num: quantity,
       product_id: product.id,
       product_variant_id: product_variant_id || 0,
       product_bundle: origin.product?.product_bundle || [],
-      product_sku: origin.product?.product_sku || {
-        option: []
-      },
+      ...(isLegacyOrder ? {
+        product_sku: legacyProductSku,
+        product_option_item: origin.product?.product_option_item || []
+      } : {
+        product_sku: origin.product?.product_sku || {
+          option: []
+        }
+      }),
       metadata: {
         product_discount_difference
       }
@@ -176,17 +186,22 @@ const formatProductToCartItemOrigin = params => {
       origin.product.product_bundle = formatBundleToOrigin(bundle);
     }
     if (options?.length) {
-      origin.product.product_sku = {
-        ...(origin.product.product_sku || {}),
-        option: formatOptionsToOrigin(options).map(option => {
-          const next = {
-            ...option,
-            add_price: option.add_price ?? option.price
-          };
-          delete next.price;
-          return next;
-        })
-      };
+      const formattedOptions = formatOptionsToOrigin(options);
+      if (isLegacyOrder) {
+        origin.product.product_option_item = formattedOptions;
+      } else {
+        origin.product.product_sku = {
+          ...(origin.product.product_sku || {}),
+          option: formattedOptions.map(option => {
+            const next = {
+              ...option,
+              add_price: option.add_price ?? option.price
+            };
+            delete next.price;
+            return next;
+          })
+        };
+      }
     }
   }
   return origin;
@@ -299,12 +314,16 @@ const getProductOriginTotalPrice = params => {
  * @returns 格式化后的套餐规格信息
  */
 exports.getProductOriginTotalPrice = getProductOriginTotalPrice;
-const formatOptions = options => {
+const formatOptions = (options, product) => {
   if (!options?.length) return [];
   return options.map(item => {
+    const optionGroupId = item?.option_group_id;
+    const optionItemId = item?.id ?? item?.option_group_item_id ?? item?.product_option_item_id;
+    const optionGroup = product?.option_group?.find(group => String(group?.id) === String(optionGroupId));
+    const optionItem = optionGroup?.option_item?.find(candidate => String(candidate?.id) === String(optionItemId));
     return {
-      id: item?.id,
-      name: item?.name,
+      id: optionItemId,
+      name: item?.name ?? item?.title ?? optionItem?.name ?? optionItem?.title,
       num: item?.num,
       price: item?.price,
       total: item?.price,
@@ -320,7 +339,7 @@ const formatOptionsToOrigin = options => {
   return options.map(d => {
     return {
       num: d.num,
-      option_group_item_id: d.option_group_item_id,
+      option_group_item_id: d?.option_group_item_id || d?.product_option_item_id,
       option_group_id: d.option_group_id
     };
   });

package/lib/modules/FulfillmentTiming/index.d.ts

@@ -0,0 +1,11 @@
+import type { PickupTimingAvailability, PickupTimingBookingTimes, PickupTimingClockInput, PickupTimingComputeInput, PickupTimingConfig, PickupTimingSelection, PickupTimingSlot, PickupTimingValidationResult } from './types';
+export * from './types';
+/** Consume effective OpenData values only; legacy switches never enable Pickup. */
+export declare function normalizePickupTimingConfig(openData: Record<string, unknown>): PickupTimingConfig;
+export declare function resolvePickupTimingDateTime(date: string, time: string, timezone: string, instant?: string): PickupTimingSlot | undefined;
+export declare function getAsapPickupTiming({ config, timezone, now }: PickupTimingClockInput): PickupTimingSlot;
+export declare function pickupTimingSlotToBookingTimes(slot: PickupTimingSlot): PickupTimingBookingTimes;
+export declare function computePickupTimingAvailability(input: PickupTimingComputeInput): PickupTimingAvailability;
+export declare function validatePickupTimingSelection(selection: PickupTimingSelection, input: PickupTimingComputeInput & {
+    allowManualOverride?: boolean;
+}): PickupTimingValidationResult;

package/lib/modules/FulfillmentTiming/index.js

@@ -0,0 +1,359 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _exportNames = {
+  normalizePickupTimingConfig: true,
+  resolvePickupTimingDateTime: true,
+  getAsapPickupTiming: true,
+  pickupTimingSlotToBookingTimes: true,
+  computePickupTimingAvailability: true,
+  validatePickupTimingSelection: true
+};
+exports.computePickupTimingAvailability = computePickupTimingAvailability;
+exports.getAsapPickupTiming = getAsapPickupTiming;
+exports.normalizePickupTimingConfig = normalizePickupTimingConfig;
+exports.pickupTimingSlotToBookingTimes = pickupTimingSlotToBookingTimes;
+exports.resolvePickupTimingDateTime = resolvePickupTimingDateTime;
+exports.validatePickupTimingSelection = validatePickupTimingSelection;
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _isSameOrAfter = _interopRequireDefault(require("dayjs/plugin/isSameOrAfter"));
+var _isSameOrBefore = _interopRequireDefault(require("dayjs/plugin/isSameOrBefore"));
+var _getDateIsInSchedule = require("../Schedule/getDateIsInSchedule");
+var _types = require("./types");
+Object.keys(_types).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _types[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _types[key];
+    }
+  });
+});
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+// The shared Schedule resolver uses these comparisons without registering them.
+_dayjs.default.extend(_isSameOrAfter.default);
+_dayjs.default.extend(_isSameOrBefore.default);
+const MINUTE = 60_000;
+const DAY = 24 * 60 * MINUTE;
+const integerSetting = (value, min, max, fallback) => typeof value === 'number' && Number.isInteger(value) && value >= min && value <= max ? value : fallback;
+
+/** Consume effective OpenData values only; legacy switches never enable Pickup. */
+function normalizePickupTimingConfig(openData) {
+  const handovers = openData['fulfillment.handover_mode'];
+  const scheduleIds = openData['fulfillment.pickup.schedule'];
+  const operatingHoursScheduleIds = openData['availability.operating_hours'];
+  const mode = openData['fulfillment.pickup.timing_mode'];
+  return {
+    handoverModes: Array.isArray(handovers) ? [...new Set(handovers.filter(value => typeof value === 'string' && value.length > 0))] : [],
+    timingMode: mode === 'scheduled_only' || mode === 'asap_and_scheduled' ? mode : 'asap_only',
+    scheduleIds: Array.isArray(scheduleIds) ? [...new Set(scheduleIds.filter(value => typeof value === 'number' && Number.isInteger(value) && value > 0))] : [],
+    operatingHoursScheduleIds: Array.isArray(operatingHoursScheduleIds) ? [...new Set(operatingHoursScheduleIds.map(value => typeof value === 'number' || typeof value === 'string' ? Number(value) : NaN).filter(value => Number.isInteger(value) && value > 0))] : [],
+    slotIntervalMinutes: integerSetting(openData['fulfillment.pickup.slot_interval_minutes'], 1, 1440, 15),
+    preparationTimeMinutes: integerSetting(openData['fulfillment.pickup.preparation_time_minutes'], 0, 1440, 0),
+    advanceDays: integerSetting(openData['fulfillment.pickup.advance_days'], 0, 365, 7),
+    fulfillmentRefMode: typeof openData['fulfillment.fulfillment_ref_mode'] === 'string' ? openData['fulfillment.fulfillment_ref_mode'] : undefined,
+    manualInputType: typeof openData['fulfillment.manual_input_type'] === 'string' ? openData['fulfillment.manual_input_type'] : undefined
+  };
+}
+function dateStamp(date) {
+  if (!/^\d{4}-\d{2}-\d{2}$/.test(date)) return NaN;
+  const value = Date.parse(`${date}T00:00:00Z`);
+  return Number.isFinite(value) && new Date(value).toISOString().slice(0, 10) === date ? value : NaN;
+}
+function addDays(date, days) {
+  return new Date(dateStamp(date) + days * DAY).toISOString().slice(0, 10);
+}
+function timeMinutes(time, allowDayEnd = false) {
+  if (!/^\d{2}:\d{2}(?::00)?$/.test(time)) return NaN;
+  const [hours, minutes] = time.split(':').map(Number);
+  if (allowDayEnd && hours === 24 && minutes === 0) return 1440;
+  return hours < 24 && minutes < 60 ? hours * 60 + minutes : NaN;
+}
+function instantStamp(value) {
+  // A local string would silently use the device timezone instead of the store.
+  if (typeof value === 'string' && !/(Z|[+-]\d{2}:?\d{2})$/i.test(value)) return NaN;
+  return value instanceof Date ? value.getTime() : new Date(value).getTime();
+}
+
+/** Per-query timezone adapter; no device-offset arithmetic or global time cache. */
+function createClock(timezone) {
+  if (!timezone || typeof timezone !== 'string') throw new Error('Store timezone is unavailable.');
+  let formatter;
+  try {
+    formatter = new Intl.DateTimeFormat('en-GB', {
+      timeZone: timezone,
+      year: 'numeric',
+      month: '2-digit',
+      day: '2-digit',
+      hour: '2-digit',
+      minute: '2-digit',
+      second: '2-digit',
+      hourCycle: 'h23'
+    });
+  } catch {
+    throw new Error('Store timezone is invalid.');
+  }
+  const offsetsByDate = new Map();
+  const local = timestamp => {
+    const parts = {};
+    formatter.formatToParts(timestamp).forEach(part => {
+      parts[part.type] = part.value;
+    });
+    return {
+      date: `${parts.year}-${parts.month}-${parts.day}`,
+      time: `${parts.hour}:${parts.minute}`,
+      second: parts.second
+    };
+  };
+  const offsets = date => {
+    const cached = offsetsByDate.get(date);
+    if (cached) return cached;
+    const result = new Set();
+    const nominal = dateStamp(date);
+    // Sampling both sides of the target day discovers pre/post-transition offsets.
+    for (let hours = -36; hours <= 36; hours += 6) {
+      const sample = nominal + hours * 60 * MINUTE;
+      const wall = local(sample);
+      result.add(Date.parse(`${wall.date}T${wall.time}:${wall.second}Z`) - sample);
+    }
+    const values = [...result];
+    offsetsByDate.set(date, values);
+    return values;
+  };
+  const resolve = (date, time) => {
+    const day = dateStamp(date);
+    const minutes = timeMinutes(time);
+    if (!Number.isFinite(day) || !Number.isFinite(minutes)) return [];
+    const label = time.slice(0, 5);
+    const nominal = day + minutes * MINUTE;
+    return offsets(date).map(offset => nominal - offset).filter(timestamp => {
+      const wall = local(timestamp);
+      return wall.date === date && wall.time === label;
+    }).sort((a, b) => a - b);
+  };
+  const slot = timestamp => {
+    const {
+      date,
+      time
+    } = local(timestamp);
+    const instant = new Date(timestamp).toISOString();
+    return {
+      id: instant,
+      date,
+      time,
+      instant
+    };
+  };
+  return {
+    local,
+    resolve,
+    slot,
+    hasOffsetTransition: date => offsets(date).length > 1
+  };
+}
+function resolvePickupTimingDateTime(date, time, timezone, instant) {
+  const clock = createClock(timezone);
+  const matches = clock.resolve(date, time);
+  const selected = instant ? instantStamp(instant) : matches.length === 1 ? matches[0] : NaN;
+  return matches.includes(selected) ? clock.slot(selected) : undefined;
+}
+function getAsapPickupTiming({
+  config,
+  timezone,
+  now
+}) {
+  const timestamp = instantStamp(now);
+  if (!Number.isFinite(timestamp)) throw new Error('Current time is invalid.');
+  return createClock(timezone).slot(timestamp + config.preparationTimeMinutes * MINUTE);
+}
+function pickupTimingSlotToBookingTimes(slot) {
+  return {
+    start_date: slot.date,
+    start_time: slot.time,
+    end_date: slot.date,
+    end_time: slot.time
+  };
+}
+function createEvaluation(input) {
+  const {
+    config,
+    timezone
+  } = input;
+  const clock = createClock(timezone);
+  const now = instantStamp(input.now);
+  if (!Number.isFinite(now)) throw new Error('Current time is invalid.');
+  const today = clock.local(now).date;
+  const maxDate = addDays(today, config.advanceDays);
+  const earliest = now + config.preparationTimeMinutes * MINUTE;
+  const schedules = input.schedules.filter(schedule => config.scheduleIds.includes(schedule.id));
+  const windowCache = new Map();
+  const windows = date => {
+    if (!windowCache.has(date)) {
+      windowCache.set(date, (0, _getDateIsInSchedule.getScheduleStartEndTimePoints)(date, schedules));
+    }
+    return windowCache.get(date);
+  };
+  const operatingIds = config.operatingHoursScheduleIds || [];
+  const operatingSchedules = input.schedules.filter(schedule => operatingIds.includes(schedule.id));
+  const operatingWindowCache = new Map();
+  const operatingWindows = date => {
+    if (!operatingWindowCache.has(date)) {
+      const ranges = [];
+      for (const offset of [-1, 0]) {
+        for (const window of (0, _getDateIsInSchedule.getScheduleStartEndTimePoints)(addDays(date, offset), operatingSchedules)) {
+          const start = timeMinutes(window.start_time);
+          let end = timeMinutes(window.end_time, true);
+          if (!Number.isFinite(start) || !Number.isFinite(end)) continue;
+          // Store hours use equal endpoints for a full operating day, while
+          // the Pickup Schedule may deliberately contain a single time point.
+          if (end <= start) end += 1440;
+          ranges.push({
+            start: start + offset * 1440,
+            end: end + offset * 1440
+          });
+        }
+      }
+      operatingWindowCache.set(date, ranges);
+    }
+    return operatingWindowCache.get(date);
+  };
+  const slotsForDate = (date, firstOnly = false) => {
+    if (!Number.isFinite(dateStamp(date)) || date < today || date > maxDate || !config.handoverModes.includes('pick_up') || config.timingMode === 'asap_only') return [];
+    const found = new Map();
+    // Missing hours configuration preserves the existing all-day convention.
+    // Referenced but missing schedules yield no windows, never an all-day fallback.
+    const businessWindows = operatingIds.length ? operatingWindows(date) : undefined;
+    // Include the prior day's windows so overnight tails belong to their actual date.
+    for (const windowDate of [addDays(date, -1), date]) {
+      for (const window of windows(windowDate)) {
+        const start = timeMinutes(window.start_time);
+        let end = timeMinutes(window.end_time, true);
+        if (!Number.isFinite(start) || !Number.isFinite(end)) continue;
+        if (end < start) end += 1440;
+        let firstFoundInWindow = false;
+        for (let minute = start; minute <= end; minute += config.slotIntervalMinutes) {
+          const targetDate = minute >= 1440 ? addDays(windowDate, 1) : windowDate;
+          if (targetDate !== date) continue;
+          const localMinute = minute % 1440;
+          // Filter the original Pickup grid rather than moving its anchor to
+          // the store opening time. A zero-duration pickup may be at closing.
+          if (businessWindows && !businessWindows.some(({
+            start,
+            end
+          }) => localMinute >= start && localMinute <= end)) continue;
+          const time = `${String(Math.floor(localMinute / 60)).padStart(2, '0')}:${String(localMinute % 60).padStart(2, '0')}`;
+          for (const timestamp of clock.resolve(date, time)) {
+            if (timestamp < earliest) continue;
+            found.set(timestamp, clock.slot(timestamp));
+            firstFoundInWindow = true;
+          }
+          // Summary needs only an available candidate, not a full year's slots.
+          // During a repeated hour, an earlier wall label's second occurrence can
+          // be later than a subsequent label's first occurrence. Sort them all.
+          if (firstOnly && firstFoundInWindow && !clock.hasOffsetTransition(date)) break;
+        }
+      }
+    }
+    const result = [...found.entries()].sort(([a], [b]) => a - b).map(([, slot]) => slot);
+    return firstOnly ? result.slice(0, 1) : result;
+  };
+  return {
+    clock,
+    now,
+    today,
+    maxDate,
+    slotsForDate
+  };
+}
+function computePickupTimingAvailability(input) {
+  if (!input.config.handoverModes.includes('pick_up')) {
+    const now = instantStamp(input.now);
+    if (!Number.isFinite(now)) throw new Error('Current time is invalid.');
+    return {
+      config: input.config,
+      timezone: input.timezone,
+      now: new Date(now).toISOString(),
+      today: '',
+      maxDate: '',
+      date: input.date || '',
+      dates: [],
+      slots: []
+    };
+  }
+  const evaluation = createEvaluation(input);
+  const {
+    today,
+    maxDate,
+    slotsForDate
+  } = evaluation;
+  const date = input.date || today;
+  if (!Number.isFinite(dateStamp(date))) throw new Error('Pickup date is invalid.');
+  const slots = slotsForDate(date);
+  const dates = [];
+  let firstSlot;
+  for (let day = today; day <= maxDate; day = addDays(day, 1)) {
+    const first = day === date ? slots[0] : slotsForDate(day, true)[0];
+    dates.push({
+      date: day,
+      status: first ? 'available' : 'unavailable'
+    });
+    if (!firstSlot && first) firstSlot = first;
+  }
+  return {
+    config: input.config,
+    timezone: input.timezone,
+    now: new Date(evaluation.now).toISOString(),
+    today,
+    maxDate,
+    date,
+    dates,
+    slots,
+    firstSlot
+  };
+}
+function validatePickupTimingSelection(selection, input) {
+  const fail = (code, message) => ({
+    valid: false,
+    code,
+    message
+  });
+  const {
+    config
+  } = input;
+  if (config.handoverModes.length === 0) return {
+    valid: true
+  };
+  if (!config.handoverModes.includes(selection.serviceType)) {
+    return fail('handover_unavailable', 'Choose an available handover method.');
+  }
+  if (selection.serviceType !== 'pick_up') return {
+    valid: true
+  };
+  if (selection.mode === 'asap') {
+    return config.timingMode === 'scheduled_only' ? fail('scheduled_required', 'Choose a pickup date and time.') : {
+      valid: true,
+      slot: getAsapPickupTiming(input)
+    };
+  }
+  if (selection.mode !== 'scheduled' || config.timingMode === 'asap_only') {
+    return fail('mode_unavailable', 'The selected pickup timing mode is unavailable.');
+  }
+  const slot = resolvePickupTimingDateTime(selection.date || '', selection.time || '', input.timezone, selection.instant);
+  if (!slot) return fail('invalid_time', 'Choose a valid pickup date and time.');
+  const now = instantStamp(input.now);
+  if (!Number.isFinite(now)) throw new Error('Current time is invalid.');
+  if (instantStamp(slot.instant) < now) return fail('time_in_past', 'Pickup time cannot be in the past.');
+  if (selection.source === 'pos_manual' && input.allowManualOverride) return {
+    valid: true,
+    slot
+  };
+  const legal = createEvaluation(input).slotsForDate(slot.date).some(candidate => candidate.instant === slot.instant);
+  return legal ? {
+    valid: true,
+    slot
+  } : fail('time_unavailable', 'This pickup time is no longer available. Choose another time.');
+}

package/lib/modules/FulfillmentTiming/types.d.ts

@@ -0,0 +1,67 @@
+import type { ScheduleItem } from '../Schedule/types';
+export type PickupTimingMode = 'asap_only' | 'scheduled_only' | 'asap_and_scheduled';
+export interface PickupTimingConfig {
+    handoverModes: string[];
+    timingMode: PickupTimingMode;
+    scheduleIds: number[];
+    /** Empty or absent means no additional store-hours restriction. */
+    operatingHoursScheduleIds?: number[];
+    slotIntervalMinutes: number;
+    preparationTimeMinutes: number;
+    advanceDays: number;
+    fulfillmentRefMode?: string;
+    manualInputType?: string;
+}
+export interface PickupTimingSelection {
+    serviceType: string;
+    mode: 'asap' | 'scheduled';
+    date?: string;
+    time?: string;
+    /** The absolute instant disambiguates a repeated local minute during DST. */
+    instant?: string;
+    source?: 'schedule' | 'pos_manual' | 'asap';
+}
+export interface PickupTimingSlot {
+    id: string;
+    date: string;
+    time: string;
+    instant: string;
+}
+export interface PickupTimingAvailability {
+    /** Config remains available when Schedule or store timezone cannot be loaded. */
+    error?: string;
+    config: PickupTimingConfig;
+    timezone: string;
+    now: string;
+    today: string;
+    maxDate: string;
+    date: string;
+    dates: Array<{
+        date: string;
+        status: 'available' | 'unavailable';
+    }>;
+    slots: PickupTimingSlot[];
+    /** Earliest legal candidate across all permitted dates, for POS prefill. */
+    firstSlot?: PickupTimingSlot;
+}
+export interface PickupTimingClockInput {
+    config: PickupTimingConfig;
+    timezone: string;
+    now: Date | string | number;
+}
+export interface PickupTimingComputeInput extends PickupTimingClockInput {
+    schedules: ScheduleItem[];
+    date?: string;
+}
+export interface PickupTimingValidationResult {
+    valid: boolean;
+    code?: string;
+    message?: string;
+    slot?: PickupTimingSlot;
+}
+export interface PickupTimingBookingTimes {
+    start_date: string;
+    start_time: string;
+    end_date: string;
+    end_time: string;
+}

package/lib/modules/FulfillmentTiming/types.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/modules/Holder/utils.d.ts

@@ -1,5 +1,7 @@
 import { ProductData } from '../Product/types';
 import { IFormItemData, IHolderConfig } from './types';
+/** 保留显式禁用配置；仅在新配置缺失时兼容商品旧 holder 定义。 */
+export declare function resolveProductHolderConfig(product?: ProductData | Record<string, any> | null): Record<string, any> | null;
 export declare function getProductHolderConfig(product?: ProductData | Record<string, any> | null): IHolderConfig | null;
 export declare function getFormIdFromHolderConfig(config: IHolderConfig): number;
 export declare function normalizeFormId(formId: number | string): number;

package/lib/modules/Holder/utils.js

@@ -8,9 +8,35 @@ exports.getFormIdFromHolderConfig = getFormIdFromHolderConfig;
 exports.getProductHolderConfig = getProductHolderConfig;
 exports.normalizeFormId = normalizeFormId;
 exports.resolveFormMetaFromHolderItem = resolveFormMetaFromHolderItem;
+exports.resolveProductHolderConfig = resolveProductHolderConfig;
+/** 保留显式禁用配置；仅在新配置缺失时兼容商品旧 holder 定义。 */
+function resolveProductHolderConfig(product) {
+  if (!product || typeof product !== 'object') return null;
+  const source = product;
+  const configSources = [source.holder_config, source.metadata?.holder_config, source.origin?.holder_config, source.metadata?.origin?.holder_config, source._origin?.holder_config, source._extend?.holder_config, source._extend?.product?.holder_config, source._extend?.product?.origin?.holder_config, source._extend?.product?.metadata?.holder_config, source._extend?.product?.metadata?.origin?.holder_config, source._extend?.product?._origin?.holder_config, source._extend?.product?._extend?.holder_config];
+  const config = configSources.find(value => value !== null && typeof value === 'object');
+  if (config) return config;
+
+  // metadata.holder / _extend.holder 是选择结果，不能作为商品配置读取。
+  const legacySources = [source.holder, source.origin?.holder, source.metadata?.origin?.holder, source._origin?.holder, source._extend?.product?.holder, source._extend?.product?.origin?.holder, source._extend?.product?.metadata?.origin?.holder, source._extend?.product?._origin?.holder];
+  const legacy = legacySources.find(value => value && typeof value === 'object' && !Array.isArray(value) && typeof value.type === 'string');
+  if (!legacy) return null;
+  const formId = legacy.custom?.custom_id;
+  if (legacy.type === 'custom' && legacy.custom?.type === 'form' && (typeof formId === 'number' || typeof formId === 'string') && Number.isInteger(Number(formId)) && Number(formId) > 0) {
+    return {
+      status: 'enable',
+      required: 0,
+      resource_id: formId
+    };
+  }
+  return {
+    status: 'disable',
+    required: 0
+  };
+}
 function getProductHolderConfig(product) {
   if (!product) return null;
-  const config = product?.holder_config ?? product?.origin?.holder_config;
+  const config = resolveProductHolderConfig(product);
   if (config?.status && config?.status !== 'enable') return null;
   if (!config?.resource_id) return null;
   return config;

package/lib/modules/OpenData/contactInfo.d.ts

@@ -0,0 +1,20 @@
+import type { OpenDataConfig } from './types';
+export declare const CONTACT_INFO_FIELDS: readonly ["first_name", "last_name", "phone", "email"];
+export type ContactInfoField = typeof CONTACT_INFO_FIELDS[number];
+export interface ContactInfoConfig {
+    enabled: boolean;
+    fields: Record<ContactInfoField, {
+        visible: boolean;
+        required: boolean;
+    }>;
+}
+export declare function resolveContactInfoConfig(data?: OpenDataConfig | null): ContactInfoConfig;
+export declare function getMissingContactInfoFields(config: ContactInfoConfig, value: unknown): ContactInfoField[];
+export declare function isContactRecord(value: unknown): value is Record<string, any>;
+/** Customer relations wrap the contact in value; sales orders store the object itself. */
+export declare function extractCustomerContactInfo(customer: unknown): Record<string, any> | null;
+export declare class ContactInfoRequiredError extends Error {
+    readonly fields: ContactInfoField[];
+    readonly code = "CONTACT_INFO_REQUIRED";
+    constructor(fields: ContactInfoField[]);
+}