@pisell/pisellos 2.2.309 → 2.2.311

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.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 单价"。
@@ -109,8 +121,9 @@ export declare function getBundleSellingMagnitude(bundle: Record<string, any> |
  *   = `metadata.main_product_original_price` + Σ(bundle 原价 × num)。
  * - `metadata.source_product_price`：主商品/variant 基础价（已应用报价单），不含 option、
  *   不含折扣。**权威源**。
- * - `metadata.main_product_original_price` = source + Σ(option.price × option.num)（含 option、不含折扣）。
- * - `metadata.main_product_selling_price` = main_original − 主商品券 per-unit amount（含 option、含折扣）。
+ * - `product_sku.option[].add_price` 保留单规格折前单价；Rules 的 option.price 只用于本次计算。
+ * - `metadata.main_product_original_price` = source + Σ(option.add_price × option.num)（含 option、不含折扣）。
+ * - `metadata.main_product_selling_price` = main_original − 行内 per-unit amount（含主商品及 option 优惠）。
  * - `payment_price`：出站 payload 中为行 composite 已减整单折扣均摊价（无折扣时与 `selling_price` 同义）。
  *
  * Rules 钩子契约（hook_adapt 方案，Rules 内部保持不变）：
@@ -119,8 +132,9 @@ export declare function getBundleSellingMagnitude(bundle: Record<string, any> |
  *   `getProductOriginTotalPrice` 会自行叠加 option + bundle，喂 source 可避免 option 双加。
  * - `getProduct.total` = `selling_price × num`（行 composite × num），与 Rules 内部产出的
  *   total（source + option + bundle）对齐。
+ * - `getProduct.options` 用单规格原价参与重算；主商品折后价从 main_selling 减去 option 折后合计反推。
  * - `setProduct` 反向流程：把 Rules 返回的 source-level `main_product_selling_price` / `price`
- *   加回 Σoptions，重新合成含 option 的 main_product_* 并派生 composite。
+ *   加回单规格原价合计，再减去 optionDiscountAmount；保留订单单规格原价供取消折扣及后续重算。
  *   优先级：
  *     1. `values.main_product_selling_price`（券应用分支，per-unit 券后 source-level 主价）
  *     2. `values.price`（还原分支 `restoredPrice`、good_pass 归零）
@@ -159,7 +173,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,6 +129,7 @@ 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");
@@ -133,7 +138,9 @@ var _utils2 = require("../../solution/ScanOrder/utils");
 var _orderCollectionIdentity = require("./utils/orderCollectionIdentity");
 var _salesNotes = require("./salesNotes");
 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);
 }
@@ -161,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) {
@@ -171,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;
@@ -178,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 {};
 }
@@ -483,8 +632,9 @@ function getBundleSellingMagnitude(bundle) {
  *   = `metadata.main_product_original_price` + Σ(bundle 原价 × num)。
  * - `metadata.source_product_price`：主商品/variant 基础价（已应用报价单），不含 option、
  *   不含折扣。**权威源**。
- * - `metadata.main_product_original_price` = source + Σ(option.price × option.num)（含 option、不含折扣）。
- * - `metadata.main_product_selling_price` = main_original − 主商品券 per-unit amount（含 option、含折扣）。
+ * - `product_sku.option[].add_price` 保留单规格折前单价；Rules 的 option.price 只用于本次计算。
+ * - `metadata.main_product_original_price` = source + Σ(option.add_price × option.num)（含 option、不含折扣）。
+ * - `metadata.main_product_selling_price` = main_original − 行内 per-unit amount（含主商品及 option 优惠）。
  * - `payment_price`：出站 payload 中为行 composite 已减整单折扣均摊价（无折扣时与 `selling_price` 同义）。
  *
  * Rules 钩子契约（hook_adapt 方案，Rules 内部保持不变）：
@@ -493,8 +643,9 @@ function getBundleSellingMagnitude(bundle) {
  *   `getProductOriginTotalPrice` 会自行叠加 option + bundle，喂 source 可避免 option 双加。
  * - `getProduct.total` = `selling_price × num`（行 composite × num），与 Rules 内部产出的
  *   total（source + option + bundle）对齐。
+ * - `getProduct.options` 用单规格原价参与重算；主商品折后价从 main_selling 减去 option 折后合计反推。
  * - `setProduct` 反向流程：把 Rules 返回的 source-level `main_product_selling_price` / `price`
- *   加回 Σoptions，重新合成含 option 的 main_product_* 并派生 composite。
+ *   加回单规格原价合计，再减去 optionDiscountAmount；保留订单单规格原价供取消折扣及后续重算。
  *   优先级：
  *     1. `values.main_product_selling_price`（券应用分支，per-unit 券后 source-level 主价）
  *     2. `values.price`（还原分支 `restoredPrice`、good_pass 归零）
@@ -566,6 +717,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 || []) {
@@ -587,7 +756,7 @@ function collectSubmitProductDiscountList(product) {
       });
     }
   }
-  return normalizeOrderProductDiscountList(submitDiscountList);
+  return normalizeOrderProductDiscountList(submitDiscountList.map(ensureSubmitDiscountIdentity));
 }
 
 /**
@@ -654,11 +823,35 @@ 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();
   };
+
+  // optionDiscountAmount 已是每件主商品内的单规格优惠合计，不再乘商品数量。
+  const getOptionDiscountAmount = discountList => {
+    return (discountList || []).reduce((total, discount) => {
+      if (discount?.metadata?.custom_product_bundle_map_id) return total;
+      return total.plus(Number(discount?.metadata?.optionDiscountAmount) || 0);
+    }, new _decimal.default(0));
+  };
   const getBundleIdentity = bundle => {
     return [bundle.bundle_id ?? bundle.id ?? '', bundle.bundle_product_id ?? bundle._bundle_product_id ?? bundle.product_id ?? '', bundle.bundle_variant_id ?? bundle.variant_id ?? bundle.product_variant_id ?? 0, bundle.bundle_group_id ?? bundle.group_id ?? ''].join('|');
   };
@@ -701,12 +894,14 @@ function createDefaultOrderRulesHooks() {
     getProduct: product => {
       // source_product_price 是权威源；兜底链：source → mainSelling − options（反推）→ 行 selling_price
       const metadataAny = product.metadata || {};
-      const optionSum = sumOptionUnitPrice(getProductSkuOptions(product));
+      const productOptions = getProductSkuOptions(product);
+      const optionSum = sumOptionUnitPrice(productOptions);
+      const optionSellingSum = optionSum.minus(getOptionDiscountAmount(product.discount_list));
       let sourcePrice;
       if (metadataAny.source_product_price !== undefined) {
         sourcePrice = String(metadataAny.source_product_price);
       } else if (metadataAny.main_product_selling_price !== undefined) {
-        sourcePrice = new _decimal.default(Number(metadataAny.main_product_selling_price) || 0).minus(optionSum).toDecimalPlaces(2).toString();
+        sourcePrice = new _decimal.default(Number(metadataAny.main_product_selling_price) || 0).minus(optionSellingSum).toDecimalPlaces(2).toString();
       } else {
         sourcePrice = String(product.selling_price ?? 0);
       }
@@ -736,14 +931,19 @@ function createDefaultOrderRulesHooks() {
         num: product.num || 1,
         discount_list: product.discount_list || [],
         bundle: product.product_bundle || [],
+        // 仅在 Rules 入参中映射 price，避免折后价污染订单的 add_price。
+        options: productOptions.map(option => ({
+          ...option,
+          price: option.add_price
+        })),
         booking_id: product.metadata?.booking_id || null,
         isClient: false,
         // 勿写死 false：否则 Rules 不会走 total≠origin_total 的手动价推断，
         // 无券时会把 bundle 价还原成 original_price（手动改价套餐会从 20 回到 30）。
         isManualDiscount: resolveRulesManualDiscountFlag(metadataAny),
         holder_id: product.metadata?.holder_id,
-        startDate: product.metadata?.start_date || product.metadata?.startDate,
-        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,
+        startDate: getProductStartDate(product),
+        main_product_selling_price: metadataAny.main_product_selling_price !== undefined ? new _decimal.default(Number(metadataAny.main_product_selling_price) || 0).minus(optionSellingSum).toDecimalPlaces(2).toString() : undefined,
         inPromotion: metadataAny._promotion?.inPromotion === true,
         _promotion: metadataAny._promotion
       };
@@ -754,8 +954,10 @@ function createDefaultOrderRulesHooks() {
       const existedSource = metadataAny.source_product_price ?? product.selling_price ?? '0';
       const nextOptions = getProductSkuOptions(product);
       const optionSum = sumOptionUnitPrice(nextOptions);
+      const nextDiscountList = values.discount_list ?? product.discount_list;
+      const optionSellingSum = optionSum.minus(getOptionDiscountAmount(nextDiscountList));
 
-      // Rules 返回的 main_product_selling_price / price / total 均为 source-level。
+      // Rules 返回的 main_product_selling_price / price 为不含 option 的主商品价。
       // 优先级：main_product_selling_price（per-unit 券后 source）> price（还原/good_pass 分支）>
       // total/num（仅当 Rules 只给 total 时的兜底）> 保留当前 source。
       const nextSourceSellingPrice = values.main_product_selling_price !== undefined ? String(values.main_product_selling_price) : values.price !== undefined ? String(values.price) : values.total !== undefined ? toUnitPriceString(values.total, nextNum) : String(existedSource);
@@ -764,8 +966,8 @@ function createDefaultOrderRulesHooks() {
       // 缺省时保留现有 source（券前 = 当前 source）。
       const nextSourceOriginalPrice = values.original_price !== undefined ? String(values.original_price) : String(existedSource);
 
-      // 含 option 的 main_product_*
-      const nextMainSellingPrice = new _decimal.default(Number(nextSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
+      // 成交价只加回 option 折后合计；原价仍使用订单中保存的 option 原价。
+      const nextMainSellingPrice = new _decimal.default(Number(nextSourceSellingPrice) || 0).plus(optionSellingSum).toDecimalPlaces(2).toFixed(2);
       const nextMainOriginalPrice = new _decimal.default(Number(nextSourceOriginalPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
       const nextBundle = values.bundle !== undefined ? mergeRulesBundlePrices(product.product_bundle, values.bundle) : product.product_bundle;
       const composedSellingPrice = composeLinePrice({
@@ -786,7 +988,7 @@ function createDefaultOrderRulesHooks() {
         ...product,
         selling_price: composedSellingPrice,
         original_price: finalOriginalPrice,
-        discount_list: values.discount_list ?? product.discount_list,
+        discount_list: nextDiscountList,
         num: values.quantity ?? product.num,
         product_bundle: nextBundle,
         metadata: {

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;