@pisell/pisellos 2.2.308 → 2.2.310

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

@@ -199,12 +199,27 @@ export interface PointCardSnapshotItem {
     id: number | string;
     tag: 'point_card';
     product_id?: number | string;
+    code?: string;
     product_name: string;
     par_value: string;
     used_par_value: string;
 }
+export interface PointCardSnapshotMergeContext {
+    customerId?: number | string | null;
+    orderIdentity?: OrderIdentitySnapshot | null;
+}
+export interface VirtualCurrencySnapshotItem {
+    id: number | string;
+    tag: 'virtual_currency';
+    product_id?: number | string;
+    product_name: string;
+    par_value: string;
+    used_par_value: string;
+    name: Record<string, string>;
+}
 export interface OrderMetaList {
     point_cards_snapshot?: PointCardSnapshotItem[];
+    virtual_currency_snapshot?: VirtualCurrencySnapshotItem[];
 }
 export interface OrderProduct extends OrderProductIdentity {
     order_detail_id: number | null;
@@ -964,6 +979,8 @@ export interface OrderModuleAPI {
     }) => Promise<Discount[]>;
     getDiscountList: () => Discount[];
     getAvailableWalletIds: () => number[];
+    getCustomerWalletPrepareConfigEpoch: () => number;
+    mergePointCardSnapshotCodes: (walletPassList: unknown, context?: PointCardSnapshotMergeContext) => PointCardSnapshotItem[];
     applyDiscount: () => void;
     /**
      * 注入促销评估器。

package/lib/modules/Order/utils/orderCollectionIdentity.js

@@ -17,6 +17,7 @@ exports.normalizeOrderCollections = normalizeOrderCollections;
 exports.repairDuplicateProductLineIdentities = repairDuplicateProductLineIdentities;
 exports.setOrderCollectionUid = setOrderCollectionUid;
 var _lodashEs = require("lodash-es");
+var _entitlementPass = require("../../Discount/entitlementPass");
 const IDENTITY_CONFIG = {
   product: {
     persistentIdField: 'order_detail_id',
@@ -81,20 +82,22 @@ function setOrderCollectionUid(kind, item, uid) {
   delete record[uidField];
   return record;
 }
-function getGoodPassResourceId(product) {
-  const goodPass = (product.discount_list || []).find(item => {
-    const type = item?.type || item?.tag || item?.discount?.type || item?.discount?.tag;
-    return type === 'good_pass';
-  });
-  if (!goodPass) return null;
-  const resourceId = goodPass.discount?.resource_id ?? goodPass.resource_id ?? goodPass.discount_id ?? goodPass.id;
-  return isBlankOrderCollectionIdentity(resourceId) ? null : String(resourceId);
+function getFullCoveragePassIdentity(product) {
+  const pass = (product.discount_list || []).find(item => (0, _entitlementPass.isFullCoveragePass)(item));
+  if (!pass) return null;
+  const resourceId = pass.discount?.resource_id ?? pass.resource_id ?? pass.discount_id ?? pass.id;
+  if (isBlankOrderCollectionIdentity(resourceId)) return null;
+  return {
+    type: String(pass.type || pass.tag),
+    resourceId: String(resourceId)
+  };
 }
 function buildSplitProductUid(originalUid, product, duplicateOrdinal) {
   const encodedOriginalUid = encodeURIComponent(originalUid);
-  const resourceId = getGoodPassResourceId(product);
-  if (resourceId) {
-    return `os-split:product:${encodedOriginalUid}:good-pass:${encodeURIComponent(resourceId)}:${duplicateOrdinal}`;
+  const passIdentity = getFullCoveragePassIdentity(product);
+  if (passIdentity) {
+    const passType = passIdentity.type === 'good_pass' ? 'good-pass' : 'entitlement-pass';
+    return `os-split:product:${encodedOriginalUid}:${passType}:${encodeURIComponent(passIdentity.resourceId)}:${duplicateOrdinal}`;
   }
   return `os-split:product:${encodedOriginalUid}:duplicate:${duplicateOrdinal}`;
 }

package/lib/modules/Order/utils/weighedProduct.d.ts

@@ -0,0 +1,12 @@
+/** Only pricing/measurement fields participate; display and option data do not. */
+export declare function getWeighedProductPriceFingerprint(sku?: Record<string, any>): string;
+/**
+ * A weighed line's source is the amount for its net weight, never its catalog unit price.
+ * Persisted SKU measurements and the full catalog snapshot take priority over runtime
+ * _extend.weighing, which can survive repricing with an obsolete total_amount.
+ */
+export declare function resolveWeighedSourcePrice(sku?: Record<string, any>, weighing?: Record<string, any>): string | undefined;
+/** Original bundle totals must use the nested options before manual distribution. */
+export declare function withOriginalBundleOptionPrices(bundles?: Array<Record<string, any>>): {
+    option: any;
+}[] | undefined;

package/lib/modules/Order/utils/weighedProduct.js

@@ -0,0 +1,89 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getWeighedProductPriceFingerprint = getWeighedProductPriceFingerprint;
+exports.resolveWeighedSourcePrice = resolveWeighedSourcePrice;
+exports.withOriginalBundleOptionPrices = withOriginalBundleOptionPrices;
+var _decimal = _interopRequireDefault(require("decimal.js"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const UNIT_GRAMS = {
+  kg: '1000',
+  KILOGRAMS: '1000',
+  g: '1',
+  GRAMS: '1',
+  lb: '453.59237',
+  POUNDS: '453.59237',
+  oz: '28.349523125',
+  OUNCES: '28.349523125'
+};
+function nonNegative(value) {
+  if (value === null || value === undefined || value === '') return undefined;
+  try {
+    const result = new _decimal.default(value);
+    return result.isFinite() && result.gte(0) ? result : undefined;
+  } catch {
+    return undefined;
+  }
+}
+function numericKey(value) {
+  return nonNegative(value)?.toString();
+}
+function unitKey(value) {
+  return UNIT_GRAMS[String(value)] || (value == null ? undefined : String(value));
+}
+function snapshotKey(snapshot) {
+  return [numericKey(snapshot?.price), unitKey(snapshot?.unit), numericKey(snapshot?.unit_value ?? 1)];
+}
+
+/** Only pricing/measurement fields participate; display and option data do not. */
+function getWeighedProductPriceFingerprint(sku) {
+  if (Number(sku?.open_sold_weight) !== 1) return 'unweighed';
+  return JSON.stringify([1, numericKey(sku?.net_weight), unitKey(sku?.unit), numericKey(sku?.unit_price), numericKey(sku?.unit_weight ?? 1), snapshotKey(sku?.unit_data_snapshot)]);
+}
+
+/**
+ * A weighed line's source is the amount for its net weight, never its catalog unit price.
+ * Persisted SKU measurements and the full catalog snapshot take priority over runtime
+ * _extend.weighing, which can survive repricing with an obsolete total_amount.
+ */
+function resolveWeighedSourcePrice(sku, weighing) {
+  if (sku?.open_sold_weight != null && Number(sku.open_sold_weight) !== 1) return undefined;
+  if (Number(sku?.open_sold_weight) !== 1 && !weighing) return undefined;
+  const hasSkuMeasurement = sku?.net_weight !== undefined && sku?.net_weight !== null;
+  const measurement = hasSkuMeasurement ? sku : weighing;
+  const netWeight = nonNegative(measurement?.net_weight);
+  if (netWeight === undefined) return undefined;
+  const snapshot = hasSkuMeasurement ? sku?.unit_data_snapshot : weighing?.scalePriceProduct;
+  const snapshotPrice = nonNegative(snapshot?.price);
+  const snapshotUnits = nonNegative(snapshot?.unit_value ?? 1);
+  const sourceGrams = UNIT_GRAMS[String(snapshot?.unit)];
+  const targetGrams = UNIT_GRAMS[String(measurement?.unit)];
+  if (snapshotPrice && snapshotUnits?.gt(0) && sourceGrams && targetGrams) {
+    return snapshotPrice.mul(netWeight).mul(targetGrams).div(sourceGrams).div(snapshotUnits).toFixed(2);
+  }
+
+  // Legacy callers may only retain the native scale's amount. Do not let an old
+  // amount overwrite a changed SKU measurement, unit price, or pricing snapshot.
+  const runtimeAmount = nonNegative(weighing?.total_amount);
+  const runtimeMatchesSku = !hasSkuMeasurement || numericKey(weighing?.net_weight) === numericKey(sku?.net_weight) && unitKey(weighing?.unit) === unitKey(sku?.unit) && numericKey(weighing?.unit_price) === numericKey(sku?.unit_price) && numericKey(weighing?.unit_weight ?? 1) === numericKey(sku?.unit_weight ?? 1) && JSON.stringify(snapshotKey(weighing?.scalePriceProduct)) === JSON.stringify(snapshotKey(sku?.unit_data_snapshot));
+  if (runtimeAmount && runtimeMatchesSku) return runtimeAmount.toFixed(2);
+
+  // Older persisted orders have only a rounded per-scale-unit price.
+  const unitPrice = nonNegative(measurement?.unit_price);
+  const unitWeight = nonNegative(measurement?.unit_weight ?? 1);
+  if (!unitPrice || !unitWeight?.gt(0)) return undefined;
+  return netWeight.div(unitWeight).mul(unitPrice).toFixed(2);
+}
+
+/** Original bundle totals must use the nested options before manual distribution. */
+function withOriginalBundleOptionPrices(bundles) {
+  return bundles?.map(bundle => ({
+    ...bundle,
+    option: bundle.option?.map(option => ({
+      ...option,
+      add_price: option.original_price ?? option.add_price ?? option.price
+    }))
+  }));
+}

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

@@ -1,6 +1,6 @@
 import Decimal from 'decimal.js';
 import type { CartItem } from "../Cart";
-import type { OrderProductDiscountItem, OrderMetaList, OrderProduct, OrderSubmitPayload, OrderSubmitProduct, OrderSummary, OrderTempOrder, PointCardSnapshotItem } from './types';
+import type { OrderProductDiscountItem, OrderMetaList, OrderProduct, OrderSubmitPayload, OrderSubmitProduct, OrderSummary, OrderTempOrder, PointCardSnapshotItem, VirtualCurrencySnapshotItem } from './types';
 import type { RulesParamsHooks } from '../Rules/types';
 import type { MapOrderPaymentsOptions, OrderPaymentData, OrderPaymentSource } from './types';
 import { createUuidV4 } from './utils/orderCollectionIdentity';
@@ -18,6 +18,18 @@ export interface OrderProductsDepositSummary {
 import type { WindowPlugin } from '../../plugins';
 export declare function normalizePointCardSnapshotItem(value: unknown): PointCardSnapshotItem | null;
 export declare function buildPointCardSnapshotFromWalletPassList(value: unknown): PointCardSnapshotItem[];
+export declare function collectPointCardSnapshotCodeCandidates(value: unknown): Array<{
+    id: string;
+    code: string;
+}>;
+/**
+ * Payment 的 WalletPass 列表包含实例 code，而 prepare/config 通常只提供
+ * 卡名称和余额。按实例 ID 仅补齐 Snapshot 缺失的 code，避免后到的运行态
+ * 数据覆盖下单时已经冻结的卡名称和余额。
+ */
+export declare function mergePointCardSnapshotCodes(snapshotsValue: unknown, walletPassesValue: unknown): PointCardSnapshotItem[];
+export declare function normalizeVirtualCurrencySnapshotItem(value: unknown): VirtualCurrencySnapshotItem | null;
+export declare function buildVirtualCurrencySnapshotFromList(value: unknown): VirtualCurrencySnapshotItem[];
 export declare function normalizeOrderMetaList(value: unknown): OrderMetaList | undefined;
 /**
  * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
@@ -159,7 +171,7 @@ export declare function resolveManualOverrideLineOriginalPrice(params: {
  * // => -4
  */
 export declare function resolveEffectivePerUnitDiscount(product: Record<string, any>): number;
-export declare function createDefaultOrderRulesHooks(): RulesParamsHooks;
+export declare function createDefaultOrderRulesHooks(getBookings?: () => OrderTempOrder['bookings']): RulesParamsHooks;
 /**
  * 通过 session 类商品的开始时间结束时间生成商品的时长
  * @param {CartItem} cartItem

package/lib/modules/Order/utils.js

@@ -11,8 +11,10 @@ Object.defineProperty(exports, "buildManualProductDiscountItem", {
 });
 exports.buildPointCardSnapshotFromWalletPassList = buildPointCardSnapshotFromWalletPassList;
 exports.buildSubmitPayload = buildSubmitPayload;
+exports.buildVirtualCurrencySnapshotFromList = buildVirtualCurrencySnapshotFromList;
 exports.calculateOrderProductsDeposit = calculateOrderProductsDeposit;
 exports.clearTempOrderHolderAssignments = clearTempOrderHolderAssignments;
+exports.collectPointCardSnapshotCodeCandidates = collectPointCardSnapshotCodeCandidates;
 exports.composeLinePrice = composeLinePrice;
 exports.createDefaultOrderRulesHooks = createDefaultOrderRulesHooks;
 exports.createDefaultTempOrder = createDefaultTempOrder;
@@ -65,6 +67,7 @@ Object.defineProperty(exports, "mergeManualProductDiscountIntoList", {
   }
 });
 exports.mergeOrderProductDisplayFields = mergeOrderProductDisplayFields;
+exports.mergePointCardSnapshotCodes = mergePointCardSnapshotCodes;
 exports.mergeRelationForms = void 0;
 exports.normalizeBookingIsAll = normalizeBookingIsAll;
 exports.normalizeBookingSubType = normalizeBookingSubType;
@@ -74,6 +77,7 @@ exports.normalizePointCardSnapshotItem = normalizePointCardSnapshotItem;
 exports.normalizeProductSkuOptions = normalizeProductSkuOptions;
 exports.normalizeSubmitBooking = normalizeSubmitBooking;
 exports.normalizeSubmitCollectPaxValue = normalizeSubmitCollectPaxValue;
+exports.normalizeVirtualCurrencySnapshotItem = normalizeVirtualCurrencySnapshotItem;
 exports.productRequiresFormSubject = productRequiresFormSubject;
 exports.resolveEffectivePerUnitDiscount = resolveEffectivePerUnitDiscount;
 exports.resolveIsFormSubject = resolveIsFormSubject;
@@ -125,14 +129,18 @@ Object.defineProperty(exports, "syncManualProductDiscountProductNum", {
   }
 });
 var _dayjs = _interopRequireDefault(require("dayjs"));
+var _customParseFormat = _interopRequireDefault(require("dayjs/plugin/customParseFormat"));
 var _decimal = _interopRequireDefault(require("decimal.js"));
+var _weighedProduct = require("./utils/weighedProduct");
+var _manualProductDiscount = require("./utils/manualProductDiscount");
 var _utils = require("../Holder/utils");
 var _utils2 = require("../../solution/ScanOrder/utils");
 var _orderCollectionIdentity = require("./utils/orderCollectionIdentity");
 var _salesNotes = require("./salesNotes");
-var _manualProductDiscount = require("./utils/manualProductDiscount");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+_dayjs.default.extend(_customParseFormat.default);
 const POINT_CARD_SNAPSHOT_TAG = 'point_card';
+const VIRTUAL_CURRENCY_SNAPSHOT_TAG = 'virtual_currency';
 function isPlainObject(value) {
   return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
 }
@@ -160,6 +168,10 @@ function normalizePointCardSnapshotItem(value) {
   if (productId !== undefined) {
     snapshot.product_id = productId;
   }
+  const code = normalizeSnapshotScalar(value.code);
+  if (code !== undefined) {
+    snapshot.code = String(code).trim();
+  }
   return snapshot;
 }
 function buildPointCardSnapshotFromWalletPassList(value) {
@@ -170,6 +182,141 @@ function buildPointCardSnapshotFromWalletPassList(value) {
     return result;
   }, []);
 }
+function collectPointCardSnapshotCodeCandidates(value) {
+  if (!Array.isArray(value)) return [];
+  const codeById = new Map();
+  value.forEach(item => {
+    if (!isPlainObject(item)) return;
+    const id = normalizeSnapshotScalar(item.id ?? item.voucher_id);
+    const code = normalizeSnapshotScalar(item.code);
+    if (id === undefined || code === undefined) return;
+    const identity = String(id).trim();
+    const normalizedCode = String(code).trim();
+    if (!identity || !normalizedCode || codeById.has(identity)) return;
+    codeById.set(identity, normalizedCode);
+  });
+  return [...codeById].map(([id, code]) => ({
+    id,
+    code
+  }));
+}
+
+/**
+ * Payment 的 WalletPass 列表包含实例 code，而 prepare/config 通常只提供
+ * 卡名称和余额。按实例 ID 仅补齐 Snapshot 缺失的 code，避免后到的运行态
+ * 数据覆盖下单时已经冻结的卡名称和余额。
+ */
+function mergePointCardSnapshotCodes(snapshotsValue, walletPassesValue) {
+  const snapshots = buildPointCardSnapshotFromWalletPassList(snapshotsValue);
+  if (!snapshots.length || !Array.isArray(walletPassesValue)) return snapshots;
+  const codeById = new Map(collectPointCardSnapshotCodeCandidates(walletPassesValue).map(({
+    id,
+    code
+  }) => [id, code]));
+  return snapshots.map(snapshot => {
+    if (snapshot.code) return snapshot;
+    const code = codeById.get(String(snapshot.id).trim());
+    return code ? {
+      ...snapshot,
+      code
+    } : snapshot;
+  });
+}
+function normalizeSnapshotNameMap(value) {
+  if (typeof value === 'string' || typeof value === 'number') {
+    const normalizedText = String(value).trim();
+    return normalizedText ? {
+      original: normalizedText
+    } : {};
+  }
+  if (!isPlainObject(value)) return {};
+  return Object.entries(value).reduce((result, [locale, text]) => {
+    if (!locale.trim()) return result;
+    if (typeof text !== 'string' && typeof text !== 'number') return result;
+    const normalizedText = String(text).trim();
+    if (normalizedText) result[locale] = normalizedText;
+    return result;
+  }, {});
+}
+function buildVirtualCurrencySnapshotName(value) {
+  if (!isPlainObject(value)) return {};
+  const amountFormat = String(value.amount_format ?? '').trim();
+  let configuredName;
+  if (amountFormat === '{{amount}} {{unit}}') {
+    configuredName = value.unit_label;
+  } else if (amountFormat === '{{amount}} {{sym}}') {
+    configuredName = value.symbol;
+  } else {
+    return {};
+  }
+  const configuredNameMap = normalizeSnapshotNameMap(configuredName);
+  const shortNameMap = normalizeSnapshotNameMap(value.short_name);
+
+  // The configured unit/symbol is resolved before short_name. If it already
+  // carries a global fallback, keep it authoritative so (for example)
+  // short_name.en cannot mask unit_label.original. When it only has explicit
+  // locale entries, merge short_name so other receipt locales can still fall
+  // back after the configured value has no match.
+  const hasConfiguredGlobalFallback = ['original', 'auto', 'default', 'en'].some(locale => Boolean(configuredNameMap[locale]));
+  if (hasConfiguredGlobalFallback) return configuredNameMap;
+  return {
+    ...shortNameMap,
+    ...configuredNameMap
+  };
+}
+function normalizeVirtualCurrencySnapshotItem(value) {
+  if (!isPlainObject(value)) return null;
+  const id = normalizeSnapshotScalar(value.id);
+  if (id === undefined) return null;
+  if (String(value.tag || '').trim().toLowerCase() !== VIRTUAL_CURRENCY_SNAPSHOT_TAG) {
+    return null;
+  }
+  const snapshot = {
+    id,
+    tag: 'virtual_currency',
+    product_name: String(value.product_name ?? ''),
+    par_value: String(value.par_value ?? ''),
+    used_par_value: String(value.used_par_value ?? ''),
+    name: normalizeSnapshotNameMap(value.name)
+  };
+  const productId = normalizeSnapshotScalar(value.product_id);
+  if (productId !== undefined) {
+    snapshot.product_id = productId;
+  }
+  return snapshot;
+}
+function normalizeVirtualCurrencySnapshotList(value) {
+  if (!Array.isArray(value)) return [];
+  return value.reduce((result, item) => {
+    const normalized = normalizeVirtualCurrencySnapshotItem(item);
+    if (normalized) result.push(normalized);
+    return result;
+  }, []);
+}
+function buildVirtualCurrencySnapshotFromList(value) {
+  if (!Array.isArray(value)) return [];
+  return value.reduce((result, item) => {
+    if (!isPlainObject(item)) return result;
+    const id = normalizeSnapshotScalar(item.id);
+    if (id === undefined) return result;
+    const sourceTag = String(item.tag ?? '').trim().toLowerCase();
+    if (sourceTag !== VIRTUAL_CURRENCY_SNAPSHOT_TAG) return result;
+    const snapshot = {
+      id,
+      tag: 'virtual_currency',
+      product_name: String(item.product_name ?? ''),
+      par_value: String(item.par_value ?? ''),
+      used_par_value: String(item.used_par_value ?? ''),
+      name: buildVirtualCurrencySnapshotName(item.virtual_currency_display)
+    };
+    const productId = normalizeSnapshotScalar(item.product_id);
+    if (productId !== undefined) {
+      snapshot.product_id = productId;
+    }
+    result.push(snapshot);
+    return result;
+  }, []);
+}
 function normalizeOrderMetaList(value) {
   if (value === undefined) return undefined;
   if (!isPlainObject(value)) return undefined;
@@ -177,6 +324,9 @@ function normalizeOrderMetaList(value) {
   if (Object.prototype.hasOwnProperty.call(value, 'point_cards_snapshot')) {
     normalized.point_cards_snapshot = buildPointCardSnapshotFromWalletPassList(value.point_cards_snapshot);
   }
+  if (Object.prototype.hasOwnProperty.call(value, 'virtual_currency_snapshot')) {
+    normalized.virtual_currency_snapshot = normalizeVirtualCurrencySnapshotList(value.virtual_currency_snapshot);
+  }
   if (Object.keys(normalized).length > 0) return normalized;
   return {};
 }
@@ -565,6 +715,24 @@ function resolveSubmitBundleMapId(bundle) {
   }
   return undefined;
 }
+function ensureSubmitDiscountIdentity(discount) {
+  if (!discount || typeof discount !== 'object' || Array.isArray(discount)) {
+    return discount;
+  }
+  const discountRecord = discount;
+  const metadata = discountRecord.metadata && typeof discountRecord.metadata === 'object' && !Array.isArray(discountRecord.metadata) ? discountRecord.metadata : {};
+  const uniqueIdentificationNumber = metadata.unique_identification_number;
+  if (uniqueIdentificationNumber !== undefined && uniqueIdentificationNumber !== null && String(uniqueIdentificationNumber).trim() !== '') {
+    return discount;
+  }
+  return {
+    ...discountRecord,
+    metadata: {
+      ...metadata,
+      unique_identification_number: (0, _orderCollectionIdentity.createUuidV4)()
+    }
+  };
+}
 function collectSubmitProductDiscountList(product) {
   const submitDiscountList = Array.isArray(product?.discount_list) ? [...product.discount_list] : [];
   for (const bundle of product?.product_bundle || []) {
@@ -586,7 +754,7 @@ function collectSubmitProductDiscountList(product) {
       });
     }
   }
-  return normalizeOrderProductDiscountList(submitDiscountList);
+  return normalizeOrderProductDiscountList(submitDiscountList.map(ensureSubmitDiscountIdentity));
 }
 
 /**
@@ -653,7 +821,23 @@ function resolveEffectivePerUnitDiscount(product) {
   if (!Number.isFinite(originalPrice) || !Number.isFinite(finalPrice)) return fromList;
   return fromList + (originalPrice - finalPrice);
 }
-function createDefaultOrderRulesHooks() {
+function createDefaultOrderRulesHooks(getBookings) {
+  const getProductStartDate = product => {
+    const productUid = String(product.metadata?.unique_identification_number ?? product.unique_identification_number ?? '');
+    const bookingUid = String(product.booking_uid ?? product.metadata?.booking_uid ?? '');
+    // 每次读取当前 bookings，覆盖改期、订单回显以及直接调用 Rules 的选券入口。
+    const bookings = getBookings?.() || [];
+    const booking = bookings.find(item => productUid && String(item?.product_uid ?? item?.metadata?.product_uid ?? '') === productUid) || bookings.find(item => bookingUid && String(item?.metadata?.unique_identification_number ?? item?.booking_uid ?? '') === bookingUid);
+    if (booking) {
+      // 严格解析并保留 Invalid Date，让公共时间校验拒绝缺失/非法时间，避免回退到当前时间。
+      return (0, _dayjs.default)(`${booking.start_date} ${booking.start_time}`, ['YYYY-MM-DD HH:mm', 'YYYY-MM-DD HH:mm:ss', 'YYYY-MM-DD H:mm', 'YYYY-MM-DD H:mm:ss'], true);
+    }
+    if (getBookings && (bookingUid || product.booking_id || product.metadata?.booking_id)) {
+      return (0, _dayjs.default)('');
+    }
+    const legacyStartDate = product.metadata?.start_date || product.metadata?.startDate;
+    return legacyStartDate ? (0, _dayjs.default)(legacyStartDate) : undefined;
+  };
   const toUnitPriceString = (totalLike, num) => {
     const effectiveNum = Number(num) > 0 ? Number(num) : 1;
     return new _decimal.default(Number(totalLike) || 0).dividedBy(effectiveNum).toDecimalPlaces(2).toString();
@@ -741,7 +925,7 @@ function createDefaultOrderRulesHooks() {
         // 无券时会把 bundle 价还原成 original_price（手动改价套餐会从 20 回到 30）。
         isManualDiscount: resolveRulesManualDiscountFlag(metadataAny),
         holder_id: product.metadata?.holder_id,
-        startDate: product.metadata?.start_date || product.metadata?.startDate,
+        startDate: getProductStartDate(product),
         main_product_selling_price: metadataAny.main_product_selling_price !== undefined ? new _decimal.default(Number(metadataAny.main_product_selling_price) || 0).minus(optionSum).toDecimalPlaces(2).toString() : undefined,
         inPromotion: metadataAny._promotion?.inPromotion === true,
         _promotion: metadataAny._promotion
@@ -773,7 +957,7 @@ function createDefaultOrderRulesHooks() {
       });
       const composedOriginalPrice = composeLinePrice({
         mainPrice: nextMainOriginalPrice,
-        bundle: nextBundle,
+        bundle: Number(product.product_sku?.open_sold_weight) === 1 && (0, _manualProductDiscount.hasManualProductDiscountFlag)(metadataAny) ? (0, _weighedProduct.withOriginalBundleOptionPrices)(nextBundle) : nextBundle,
         useOriginalBundle: true
       });
       const finalOriginalPrice = resolveManualOverrideLineOriginalPrice({

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

@@ -171,11 +171,6 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
      * 获取钱包支付方式
      */
     getWalletPaymentMethod(): Promise<PaymentMethod | null>;
-    /**
-     * 确保支付模块所需的数据库表已创建
-     */
-    /** @deprecated */
-    private ensurePaymentTables;
     /**
      * 获取部分支付的订单
      */

package/lib/modules/Payment/index.js

@@ -159,10 +159,6 @@ class PaymentModule extends _BaseModule.BaseModule {
     this.app = this.appPlugin.getApp();
     this.dbManager = this.app.dbManager;
     this.logger = this.app.logger;
-
-    // 确保支付模块所需的对象存储已创建
-    // await this.ensurePaymentTables();
-
     this.registerNetworkHandlers();
 
     // // 预连接数据库
@@ -1111,7 +1107,7 @@ class PaymentModule extends _BaseModule.BaseModule {
    */
   async getCashPaymentMethod() {
     try {
-      const payMethods = await this.dbManager.getAll('pay_method');
+      const payMethods = await this.getPayMethodListAsync();
       return payMethods.find(method => method.code === _types.PaymentMethodType.Cash) || null;
     } catch (error) {
       console.error('[PaymentModule] 获取现金支付方式失败', error);
@@ -1124,7 +1120,7 @@ class PaymentModule extends _BaseModule.BaseModule {
    */
   async getEftposPaymentMethod() {
     try {
-      const payMethods = await this.dbManager.getAll('pay_method');
+      const payMethods = await this.getPayMethodListAsync();
       return payMethods.find(method => method.code === _types.PaymentMethodType.Eftpos) || null;
     } catch (error) {
       console.error('[PaymentModule] 获取Eftpos支付方式失败', error);
@@ -1137,7 +1133,7 @@ class PaymentModule extends _BaseModule.BaseModule {
    */
   async getWalletPaymentMethod() {
     try {
-      const payMethods = await this.dbManager.getAll('pay_method');
+      const payMethods = await this.getPayMethodListAsync();
       return payMethods.find(method => method.code === _types.PaymentMethodType.Wallet) || null;
     } catch (error) {
       console.error('[PaymentModule] 获取钱包支付方式失败', error);
@@ -1145,27 +1141,6 @@ class PaymentModule extends _BaseModule.BaseModule {
     }
   }
 
-  /**
-   * 确保支付模块所需的数据库表已创建
-   */
-  /** @deprecated */
-  async ensurePaymentTables() {
-    try {
-      // 尝试访问 pay_method 表，如果不存在会抛出错误
-      await this.dbManager.getAll('pay_method');
-    } catch (error) {
-      console.warn('[PaymentModule] pay_method 表不存在，请在数据库配置中添加以下配置：');
-      console.warn('{ name: "pay_method", keyPath: "id" }');
-    }
-    try {
-      // 尝试访问 order 表，如果不存在会抛出错误
-      await this.dbManager.getAll('order');
-    } catch (error) {
-      console.warn('[PaymentModule] order 表不存在，请在数据库配置中添加以下配置：');
-      console.warn('{ name: "order", keyPath: "uuid" }');
-    }
-  }
-
   /**
    * 获取部分支付的订单
    */

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

@@ -412,6 +412,8 @@ export interface WalletAssetsBehaviorOptions {
 export interface RefreshWalletAssetsOptions {
     /** 商品/金额变化默认保留并重验选择；客户变化由实现层强制清空。 */
     preserveSelection?: boolean;
+    /** 客户变化时，仅保留与本次扫码匹配的搜索结果；其他搜索缓存仍会清空。 */
+    retainSearchResultCodes?: string[];
 }
 export interface SelectWalletAssetOptions {
     selected: boolean;
@@ -419,6 +421,8 @@ export interface SelectWalletAssetOptions {
 }
 export interface ScanWalletAssetResult {
     type: SearchIdentificationCodeResult['type'];
+    /** walletCode 时保留完整 Wallet Detail，供客户解析与客户选择器使用。 */
+    data?: WalletDetailSearchData;
     asset?: any;
     selected: boolean;
     state: WalletAssetsState;
@@ -864,6 +868,8 @@ export interface SearchIdentificationCodeParams extends WalletDeductionRecommend
  * 搜索识别码响应数据
  */
 export interface SearchIdentificationCodeResponse {
+    /** 业务是否成功 */
+    status?: boolean;
     /** 响应状态码 */
     code?: number;
     /** 响应消息 */
@@ -871,12 +877,26 @@ export interface SearchIdentificationCodeResponse {
     /** 响应数据 */
     data?: SearchIdentificationCodeItem[];
 }
+/** Wallet code 精确搜索返回的 Wallet Detail。 */
+export interface WalletDetailSearchData {
+    id?: string | number;
+    customer_id?: string | number;
+    customer?: Record<string, any> | null;
+    is_cross_shop_wallet?: boolean | 0 | 1;
+    [key: string]: any;
+}
+export interface WalletDetailSearchResponse {
+    status?: boolean;
+    code?: number;
+    message?: string;
+    data?: WalletDetailSearchData | null;
+}
 /**
  * 搜索识别码结果类型
  */
 export type SearchIdentificationCodeResult = {
     type: 'walletCode';
-    data: SearchIdentificationCodeItem[];
+    data: WalletDetailSearchData;
 } | {
     type: 'normalCode';
     data: SearchIdentificationCodeItem[];

package/lib/modules/Payment/types.js

@@ -221,6 +221,7 @@ let PaymentHooks = exports.PaymentHooks = /*#__PURE__*/function (PaymentHooks) {
 /**
  * 搜索识别码响应数据
  */
+/** Wallet code 精确搜索返回的 Wallet Detail。 */
 /**
  * 搜索识别码结果类型
  */

package/lib/modules/Payment/walletpass.d.ts

@@ -96,7 +96,7 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
      * 搜索识别码信息
      * 通过识别码搜索相关的钱包通行证信息
      * 基于 WalletDeductionRecommendParams 参数结构
-     * 特殊逻辑：当识别码长度为9位且前3位为"000"时，调用 /wallet/detail/search 接口
+     * 特殊逻辑：WL 或指定 200 格式的 Wallet Code 调用 /wallet/detail/search 接口。
      */
     searchIdentificationCodeAsync(params: SearchIdentificationCodeParams, config?: {
         noCache?: boolean;