@pisell/pisellos 2.2.310 → 2.2.312-vm.0

package/lib/modules/Order/index.js

@@ -11,6 +11,7 @@ var _utils2 = require("../Product/utils");
 var _weighedProduct = require("./utils/weighedProduct");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _availability = require("../Discount/availability");
+var _productVoucherGroups = require("./utils/productVoucherGroups");
 var _osPrivatePayload = require("../../utils/os-private-payload");
 var _salesNotes = require("./salesNotes");
 var _paymentUtils = require("./payment-utils");
@@ -137,6 +138,62 @@ class OrderModule extends _BaseModule.BaseModule {
   rulesHooksOverride;
   moduleHooksOverride;
   orderHooks;
+  cartCommandQueue = Promise.resolve();
+  queueCartCommand(run) {
+    if (!this.orderHooks?.onBeforeCartCommit && !this.store.tempOrder?._extend?.productVoucherGroups?.length) return run();
+    const pending = this.cartCommandQueue.then(run, run);
+    this.cartCommandQueue = pending.catch(() => undefined);
+    return pending;
+  }
+
+  /** Use the exact Order normalizers/merge rules on a private draft, not a second projection. */
+  beginCartMutation() {
+    const current = this.ensureTempOrder();
+    const guard = this.orderHooks?.onBeforeCartCommit;
+    if (!guard && !current._extend?.productVoucherGroups?.length) return {
+      draft: current,
+      commit: undefined
+    };
+    const before = (0, _lodashEs.cloneDeep)(current);
+    const draft = (0, _lodashEs.cloneDeep)(current);
+    return {
+      draft,
+      commit: async () => {
+        (0, _productVoucherGroups.validateProductVoucherGroups)(draft, this.getDiscountList(), before);
+        await guard?.({
+          currentItems: (0, _lodashEs.cloneDeep)(before.products),
+          proposedItems: (0, _lodashEs.cloneDeep)(draft.products)
+        });
+        if (this.store.tempOrder !== current || guard !== this.orderHooks?.onBeforeCartCommit || !(0, _lodashEs.isEqual)(current, before)) {
+          throw Object.assign(new Error('The cart changed. Please try again.'), {
+            code: 'SALES_GUARD_REJECTED'
+          });
+        }
+        Object.assign(current, draft);
+        return current;
+      }
+    };
+  }
+
+  /** Serializes checkout preparation with local cart commands; hydration remains outside this guard. */
+  async prepareCheckout(prepare) {
+    const run = async () => {
+      const order = this.ensureTempOrder();
+      (0, _productVoucherGroups.validateProductVoucherGroups)(order, this.getDiscountList(), undefined, true);
+      const items = (0, _lodashEs.cloneDeep)(order.products);
+      const result = await prepare(items);
+      if (this.store.tempOrder !== order || !(0, _lodashEs.isEqual)(order.products, items)) {
+        throw Object.assign(new Error('The cart changed. Please try again.'), {
+          code: 'SALES_GUARD_REJECTED'
+        });
+      }
+      (0, _productVoucherGroups.validateProductVoucherGroups)(order, this.getDiscountList(), undefined, true);
+      return result;
+    };
+    const pending = this.cartCommandQueue.then(run, run);
+    this.cartCommandQueue = pending.catch(() => undefined);
+    return pending;
+  }
   otherParams;
   // ─── 促销/赠品 ────────────────────────────────────
   /** 评估器引用；由 SalesSdkProvider 注入，未注入时 applyPromotion 静默跳过 */
@@ -424,8 +481,11 @@ class OrderModule extends _BaseModule.BaseModule {
    * @example
    * orderModule.updateOtherParams({ cacheId: 'cache-2', channel: 'pos' });
    */
-  updateOtherParams(params) {
+  updateOtherParams(params, options) {
     const otherParams = params || {};
+    if (options && Object.prototype.hasOwnProperty.call(options, 'hooks')) {
+      this.moduleHooksOverride = options.hooks;
+    }
     this.syncSessionStorageOptions(otherParams);
     this.salesSummaryModuleName = otherParams.salesSummaryModuleName;
     this.rulesHooksOverride = otherParams.rules?.hooks;
@@ -509,6 +569,26 @@ class OrderModule extends _BaseModule.BaseModule {
       hooks: this.rulesHooksOverride || this.createDefaultRulesHooks()
     });
     this.store.rules = rules;
+    rules.setDiscountScope((product, discount) => (0, _productVoucherGroups.allowsProductVoucher)(this.store.tempOrder, product, discount));
+  }
+  setProductVoucherGroups(groups) {
+    const order = this.ensureTempOrder();
+    const ids = new Set();
+    const keys = new Set();
+    const known = new Map(this.getDiscountList().map(discount => [String(discount.id), discount]));
+    for (const group of groups) {
+      if (!group.key || keys.has(group.key)) throw (0, _productVoucherGroups.voucherGroupError)();
+      keys.add(group.key);
+      for (const id of group.discountIds) {
+        const discount = known.get(String(id));
+        if (!discount || (discount.tag || discount.type) !== 'good_pass' || ids.has(String(id))) throw (0, _productVoucherGroups.voucherGroupError)();
+        ids.add(String(id));
+      }
+    }
+    this.ensureExtend(order).productVoucherGroups = (0, _lodashEs.cloneDeep)(groups);
+  }
+  validateProductVoucherSelection() {
+    (0, _productVoucherGroups.validateProductVoucherGroups)(this.ensureTempOrder(), this.getDiscountList(), undefined, true);
   }
   createDefaultRulesHooks() {
     return (0, _utils.createDefaultOrderRulesHooks)(() => this.store.tempOrder?.bookings || []);
@@ -660,7 +740,7 @@ class OrderModule extends _BaseModule.BaseModule {
       apply: false
     });
   }
-  async scanCode(code, customerId) {
+  async scanCode(code, customerId, options) {
     if (this.isActiveVirtualSettlementOrder(this.store.tempOrder)) {
       return {
         type: 'clientCalc',
@@ -671,16 +751,22 @@ class OrderModule extends _BaseModule.BaseModule {
         unavailableReason: _types2.UnavailableReason.ProductNotApplicable
       };
     }
+    const scanOrderKey = this.getDiscountConfigOrderIdentityKey(this.store.tempOrder);
     const resultDiscountWithReason = (await this.store.discount?.batchSearch(code, {
       customerId
     })) || {
       discountList: [],
       unavailableReasonKey: null
     };
+    if (scanOrderKey !== this.getDiscountConfigOrderIdentityKey(this.store.tempOrder)) {
+      throw Object.assign(new Error('The scan session ended.'), {
+        code: 'SALES_GUARD_REJECTED'
+      });
+    }
     const {
-      discountList: resultDiscountList,
       unavailableReasonKey
     } = resultDiscountWithReason;
+    const resultDiscountList = resultDiscountWithReason.discountList.filter(discount => !options?.productVouchersOnly || (discount.tag || discount.type) === 'good_pass');
     const rulesModule = this.store.rules;
     if (!rulesModule) {
       return {
@@ -707,7 +793,7 @@ class OrderModule extends _BaseModule.BaseModule {
       isScan: true
     }));
     const currentSelected = this.getDiscountList().filter(n => n.isSelected);
-    if (currentSelected.length && currentSelected.some(n => withScanList.some(m => m.id === n.id))) {
+    if (currentSelected.length && (options?.productVouchersOnly ? withScanList.every(scanned => currentSelected.some(selected => selected.id === scanned.id)) : currentSelected.some(n => withScanList.some(m => m.id === n.id)))) {
       await this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
       return {
         type: 'clientCalc',
@@ -2196,8 +2282,12 @@ class OrderModule extends _BaseModule.BaseModule {
       ...existed,
       ...(origin !== undefined ? {
         origin
+      } : {}),
+      ...(rawProduct._productVoucherGroupKey ? {
+        productVoucherGroupKey: rawProduct._productVoucherGroupKey
       } : {})
     };
+    delete normalizedProduct._productVoucherGroupKey;
     delete normalizedProduct._origin;
     delete normalizedProduct.unique_identification_number;
   }
@@ -3463,6 +3553,7 @@ class OrderModule extends _BaseModule.BaseModule {
     const isIncomingCustomItem = productToAdd.metadata?.origin?.isCustomItem === true || productToAdd._origin?.isCustomItem === true;
     const shouldForceNewLine = disableMerge || !!booking || hasIncomingGoodPass || isIncomingPersistedEntitlementPass || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
     const matchedIndex = shouldForceNewLine ? -1 : tempOrder.products.findIndex(item => {
+      if ((0, _productVoucherGroups.productVoucherGroupKey)(tempOrder, item) !== productToAdd._productVoucherGroupKey) return false;
       if (this.hasGoodPassDiscount(item)) return false;
       const isRuntimeEntitlementPass = this.isRuntimeEntitlementAppend(item, tempOrder);
       if (isIncomingEntitlementAppend !== isRuntimeEntitlementPass) {
@@ -3642,7 +3733,18 @@ class OrderModule extends _BaseModule.BaseModule {
    * // → tempOrder.products 新增 3 行，每行 num=1，bookings 3 条
    */
   async addProductToOrder(product, booking, options) {
-    const tempOrder = this.ensureTempOrder();
+    return this.queueCartCommand(() => this.addProductToOrderDraft(product, booking, options));
+  }
+  async addProductToOrderDraft(product, booking, options) {
+    const mutation = this.beginCartMutation();
+    let tempOrder = mutation.draft;
+    if (options?.productVoucherGroupKey) {
+      if (!tempOrder._extend?.productVoucherGroups?.some(group => group.key === options.productVoucherGroupKey)) throw (0, _productVoucherGroups.voucherGroupError)();
+      product = {
+        ...product,
+        _productVoucherGroupKey: options.productVoucherGroupKey
+      };
+    }
     const salesNoteDrafts = (options?.salesNotes || []).map(draft => ({
       note_type: String(draft.note_type || '').trim(),
       text: {
@@ -3736,6 +3838,7 @@ class OrderModule extends _BaseModule.BaseModule {
       rollbackProductAndNotesMutation();
       throw error;
     }
+    if (mutation.commit) tempOrder = await mutation.commit();
     await this.finalizeProductOrderMutation(tempOrder);
     this.logInfo('addProductToOrder success', {
       product_id: product.product_id,
@@ -3754,7 +3857,11 @@ class OrderModule extends _BaseModule.BaseModule {
    * ]);
    */
   async addProductsToOrder(items, options) {
-    const tempOrder = this.ensureTempOrder();
+    return this.queueCartCommand(() => this.addProductsToOrderDraft(items, options));
+  }
+  async addProductsToOrderDraft(items, options) {
+    const mutation = this.beginCartMutation();
+    let tempOrder = mutation.draft;
     if (!Array.isArray(items) || items.length === 0) return tempOrder.products;
     for (const item of items || []) {
       const {
@@ -3777,6 +3884,7 @@ class OrderModule extends _BaseModule.BaseModule {
       const appendResult = this.appendProductLineToTempOrder(tempOrder, product, booking);
       if (appendResult) await appendResult;
     }
+    if (mutation.commit) tempOrder = await mutation.commit();
     await this.finalizeProductOrderMutation(tempOrder, options);
     this.logInfo('addProductsToOrder success', {
       itemsCount: items.length
@@ -4109,9 +4217,14 @@ class OrderModule extends _BaseModule.BaseModule {
     return tempOrder.products[productIndex].metadata?.unique_identification_number;
   }
   async updateOrderProduct(params) {
-    const tempOrder = this.ensureTempOrder();
+    return this.queueCartCommand(() => this.updateOrderProductDraft(params));
+  }
+  async updateOrderProductDraft(params) {
+    const mutation = this.beginCartMutation();
+    let tempOrder = mutation.draft;
     const reapplyWeighedDiscountProductUids = [];
     const updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params, reapplyWeighedDiscountProductUids);
+    if (mutation.commit) tempOrder = await mutation.commit();
     const promotionPayload = await this.evaluatePromotion();
     this.applyDiscount({
       reapplyWeighedDiscountProductUids,
@@ -4129,7 +4242,11 @@ class OrderModule extends _BaseModule.BaseModule {
     return tempOrder.products;
   }
   async updateOrderProducts(paramsList) {
-    const tempOrder = this.ensureTempOrder();
+    return this.queueCartCommand(() => this.updateOrderProductsDraft(paramsList));
+  }
+  async updateOrderProductsDraft(paramsList) {
+    const mutation = this.beginCartMutation();
+    let tempOrder = mutation.draft;
     if (!paramsList.length) {
       return tempOrder.products;
     }
@@ -4142,6 +4259,7 @@ class OrderModule extends _BaseModule.BaseModule {
       }
       return acc;
     }, []);
+    if (mutation.commit) tempOrder = await mutation.commit();
     await this.finalizeAfterProductsMutation(tempOrder, {
       reapplyWeighedDiscountProductUids,
       reapplyBookingDiscountProductUids: reapplyBookingDiscountProductUids.length ? reapplyBookingDiscountProductUids : undefined
@@ -4152,6 +4270,9 @@ class OrderModule extends _BaseModule.BaseModule {
     return tempOrder.products;
   }
   async updateOrderProductQuantity(params) {
+    return this.queueCartCommand(() => this.updateOrderProductQuantityDraft(params));
+  }
+  async updateOrderProductQuantityDraft(params) {
     const {
       product_id,
       product_variant_id,
@@ -4161,7 +4282,8 @@ class OrderModule extends _BaseModule.BaseModule {
       product_sku,
       product_bundle
     } = params;
-    const tempOrder = this.ensureTempOrder();
+    const mutation = this.beginCartMutation();
+    let tempOrder = mutation.draft;
     this.repairDuplicateProductLineIdentities(tempOrder);
     const identityLookup = {
       product_id,
@@ -4218,6 +4340,7 @@ class OrderModule extends _BaseModule.BaseModule {
       }
     }
     tempOrder.products[productIndex] = normalizedProduct;
+    if (mutation.commit) tempOrder = await mutation.commit();
     this.prepareVirtualSettlementTempOrder(tempOrder);
     const isVirtualSettlement = this.isActiveVirtualSettlementOrder(tempOrder);
     const promotionPayload = !isVirtualSettlement ? await this.evaluatePromotion() : null;
@@ -4294,7 +4417,11 @@ class OrderModule extends _BaseModule.BaseModule {
    * await order.removeProductsFromOrder([identityA, identityB]);
    */
   async removeProductsFromOrder(identities, options) {
-    const tempOrder = this.ensureTempOrder();
+    return this.queueCartCommand(() => this.removeProductsFromOrderDraft(identities, options));
+  }
+  async removeProductsFromOrderDraft(identities, options) {
+    const mutation = this.beginCartMutation();
+    let tempOrder = mutation.draft;
     if (!identities.length) {
       return tempOrder.products;
     }
@@ -4361,6 +4488,7 @@ class OrderModule extends _BaseModule.BaseModule {
       }
     }
     this.removeSalesNotesForMissingProductLines(tempOrder);
+    if (mutation.commit) tempOrder = await mutation.commit();
     await this.finalizeAfterProductsMutation(tempOrder);
     this.logInfo('removeProductsFromOrder success', {
       identities
@@ -4376,7 +4504,11 @@ class OrderModule extends _BaseModule.BaseModule {
    * 普通整单 note 保持不变；以商品行为主体的 Sales Notes 同步删除。
    */
   async clearOrderCartLines() {
-    const tempOrder = this.ensureTempOrder();
+    return this.queueCartCommand(() => this.clearOrderCartLinesDraft());
+  }
+  async clearOrderCartLinesDraft() {
+    const mutation = this.beginCartMutation();
+    let tempOrder = mutation.draft;
     this.ensureSalesNotesLoadedForMutation(tempOrder);
     tempOrder.products = [];
     tempOrder.bookings = [];
@@ -4389,6 +4521,7 @@ class OrderModule extends _BaseModule.BaseModule {
         productsByUid: {}
       };
     }
+    if (mutation.commit) tempOrder = await mutation.commit();
     const promotionPayload = await this.evaluatePromotion();
     this.applyDiscount();
     this.sanitizeTempOrderProducts(tempOrder);
@@ -4525,6 +4658,7 @@ class OrderModule extends _BaseModule.BaseModule {
   }
   async runSubmitTempOrder(params) {
     const tempOrder = this.ensureTempOrder();
+    (0, _productVoucherGroups.validateProductVoucherGroups)(tempOrder, this.getDiscountList(), undefined, true);
     this.prepareVirtualSettlementTempOrder(tempOrder);
     const isOnlineStorePlatform = this.isOnlineStorePlatform();
     const shouldConfirmPendingVoucherPayments = params?.confirmPendingVoucherPayments !== false;

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

@@ -438,6 +438,8 @@ export type AddProductBookingInput = Record<string, any>;
  * 避免步进器修改数量改变该组展示位置。
  */
 export interface AddProductToOrderOptions {
+    /** Associates a selection with an existing runtime voucher group. */
+    productVoucherGroupKey?: string;
     insertAfterProductUid?: string;
     /** 跳过同商品/规格匹配，始终新增购物车行。 */
     disableMerge?: boolean;
@@ -517,6 +519,11 @@ export type OrderProductMergeDecisionResult = boolean | {
     [key: string]: any;
 };
 export interface OrderHooksConfig {
+    /** Awaited before a local cart draft is published. Reject to leave the live order unchanged. */
+    onBeforeCartCommit?: (context: {
+        currentItems: readonly OrderProduct[];
+        proposedItems: readonly OrderProduct[];
+    }) => void | Promise<void>;
     onBeforeMergeProductToOrder?: (context: OrderProductMergeDecisionContext) => OrderProductMergeDecisionResult | Promise<OrderProductMergeDecisionResult>;
 }
 /**

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

@@ -192,7 +192,7 @@ function consolidateDiscountFreeProductLines(tempOrder) {
         bundle_selling_price: String(bundle?.bundle_selling_price ?? '')
       }))
     });
-    const mergeKey = [discountSplitOriginUid, product.product_id, product.product_variant_id ?? 0, fingerprint, priceSignature].join('#');
+    const mergeKey = [discountSplitOriginUid, productUid ? tempOrder._extend?.productsByUid?.[productUid]?.productVoucherGroupKey ?? '' : '', product.product_id, product.product_variant_id ?? 0, fingerprint, priceSignature].join('#');
     const matchedIndex = productIndexByKey.get(mergeKey);
 
     // 当前拆分来源 + 商品结构组合第一次出现时，保留该行作为回并目标。

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

@@ -0,0 +1,15 @@
+import type { Discount } from '../../Discount/types';
+import type { OrderTempOrder } from '../types';
+/** Runtime-only allocation constraints. Never copied into order/product metadata. */
+export interface ProductVoucherGroup {
+    key: string;
+    discountIds: Array<number | string>;
+}
+export declare function productVoucherGroupKey(order: OrderTempOrder, product: any): string | undefined;
+export declare function isUsableProductVoucher(discount: Discount): boolean;
+export declare function voucherGroupError(): Error & {
+    code: string;
+};
+export declare function allowsProductVoucher(order: OrderTempOrder | null | undefined, product: any, discount: Discount): boolean;
+/** Reductions stay possible when a voucher expires; checkout always requires full coverage. */
+export declare function validateProductVoucherGroups(order: OrderTempOrder, discounts: Discount[], previous?: OrderTempOrder, requireCoverage?: boolean): void;

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

@@ -0,0 +1,64 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.allowsProductVoucher = allowsProductVoucher;
+exports.isUsableProductVoucher = isUsableProductVoucher;
+exports.productVoucherGroupKey = productVoucherGroupKey;
+exports.validateProductVoucherGroups = validateProductVoucherGroups;
+exports.voucherGroupError = voucherGroupError;
+var _availability = require("../../Discount/availability");
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _utils = require("../../../solution/ShopDiscount/utils");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/** Runtime-only allocation constraints. Never copied into order/product metadata. */
+
+function productVoucherGroupKey(order, product) {
+  const uid = product?.metadata?.unique_identification_number ?? product?.unique_identification_number;
+  return order._extend?.productsByUid?.[String(uid)]?.productVoucherGroupKey;
+}
+function isUsableProductVoucher(discount) {
+  return (discount.tag || discount.type) === 'good_pass' && !discount.isEditMode && !discount.isDisabled && !(0, _availability.getDiscountUsageBlockReason)(discount) && !(0, _utils.getDiscountTimeUnavailableReason)(discount, (0, _dayjs.default)().format('YYYY-MM-DD HH:mm:ss'));
+}
+function voucherGroupError() {
+  return Object.assign(new Error('The selected items no longer match the available vouchers. Please adjust your selection.'), {
+    code: 'PRODUCT_VOUCHER_GROUP_INVALID'
+  });
+}
+function allowsProductVoucher(order, product, discount) {
+  const groups = order?._extend?.productVoucherGroups;
+  if (!order || !groups?.length) return true;
+  const key = productVoucherGroupKey(order, product);
+  if (!key) return !groups.some(group => group.discountIds.some(id => String(id) === String(discount.id)));
+  return (discount.tag || discount.type) === 'good_pass' && Boolean(groups.find(group => group.key === key)?.discountIds.some(id => String(id) === String(discount.id)));
+}
+
+/** Reductions stay possible when a voucher expires; checkout always requires full coverage. */
+function validateProductVoucherGroups(order, discounts, previous, requireCoverage = false) {
+  const groups = order._extend?.productVoucherGroups;
+  if (!groups?.length) return;
+  const usedIds = new Set();
+  const byId = new Map(discounts.filter(isUsableProductVoucher).map(discount => [String(discount.id), discount]));
+  const quantity = item => Number(item.num ?? item.product_quantity ?? 0);
+  for (const group of groups) {
+    const items = order.products.filter(item => productVoucherGroupKey(order, item) === group.key);
+    const selected = items.reduce((sum, item) => sum + quantity(item), 0);
+    const before = previous?.products.filter(item => productVoucherGroupKey(previous, item) === group.key).reduce((sum, item) => sum + quantity(item), 0) ?? 0;
+    if (!requireCoverage && previous && selected <= before) continue;
+    const ids = new Set(group.discountIds.map(String).filter(id => byId.has(id)));
+    if (!Number.isInteger(selected) || selected < 0 || selected > ids.size) throw voucherGroupError();
+    if (!requireCoverage) continue;
+    for (const item of items) {
+      const applied = (item.discount_list || []).filter(entry => (entry.type || entry.tag) === 'good_pass');
+      // Rules splits a good_pass allocation into one physical line per instance.
+      const id = String(applied[0]?.discount?.resource_id ?? '');
+      const voucher = byId.get(id);
+      if (quantity(item) !== 1 || applied.length !== 1 || !ids.has(id) || !voucher?.isAvailable || voucher.config?.isAvailable === false || usedIds.has(id)) throw voucherGroupError();
+      usedIds.add(id);
+    }
+  }
+  if (order.products.some(item => !groups.some(group => group.key === productVoucherGroupKey(order, item)))) {
+    throw voucherGroupError();
+  }
+}

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

@@ -121,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 内部保持不变）：
@@ -131,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 归零）

package/lib/modules/Order/utils.js

@@ -632,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 内部保持不变）：
@@ -642,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 归零）
@@ -842,6 +844,14 @@ function createDefaultOrderRulesHooks(getBookings) {
     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('|');
   };
@@ -884,12 +894,14 @@ function createDefaultOrderRulesHooks(getBookings) {
     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);
       }
@@ -919,6 +931,11 @@ function createDefaultOrderRulesHooks(getBookings) {
         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 的手动价推断，
@@ -926,7 +943,7 @@ function createDefaultOrderRulesHooks(getBookings) {
         isManualDiscount: resolveRulesManualDiscountFlag(metadataAny),
         holder_id: product.metadata?.holder_id,
         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,
+        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
       };
@@ -937,8 +954,10 @@ function createDefaultOrderRulesHooks(getBookings) {
       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);
@@ -947,8 +966,8 @@ function createDefaultOrderRulesHooks(getBookings) {
       // 缺省时保留现有 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({
@@ -969,7 +988,7 @@ function createDefaultOrderRulesHooks(getBookings) {
         ...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/ProductList/index.js

@@ -66,7 +66,13 @@ class ProductList extends _BaseModule.BaseModule {
    * productList.updateOtherParams({ channel: 'pos' });
    */
   updateOtherParams(params) {
+    const previousScope = this.otherParams.catalogScopeKey;
     this.otherParams = params || {};
+    if (previousScope !== this.otherParams.catalogScopeKey && (previousScope || this.otherParams.catalogScopeKey)) {
+      this.store.list = [];
+      this.rawProductPriceSources.clear();
+      this.core.effects.emit(`${this.name}:changed`, this.store.list);
+    }
   }
   async storeChange(path, value) {
     // No longer needed - products are stored as plain objects instead of Product instances
@@ -101,6 +107,12 @@ class ProductList extends _BaseModule.BaseModule {
     status = 'published',
     strategy_context
   } = {}, options) {
+    const scope = this.otherParams.catalogScopeKey;
+    const assertScope = () => {
+      if (scope !== this.otherParams.catalogScopeKey) throw Object.assign(new Error('Product catalog context changed'), {
+        name: 'AbortError'
+      });
+    };
     // // 如果 schedule_ids 为空，则需要尝试从 schedule 模块里获取
     // if (!schedule_ids?.length) {
     //   const schedule_ids_data = this.store.schedule
@@ -180,6 +192,7 @@ class ProductList extends _BaseModule.BaseModule {
     const handledByOsServer = (0, _clientDataVariants.isProductQueryHandledByOsServer)(this.core, this.request);
     const originalCallback = options?.callback;
     const subscriptionCallback = typeof originalCallback === 'function' ? async result => {
+      if (scope !== this.otherParams.catalogScopeKey) return;
       const callbackList = result?.data?.list;
       if (!Array.isArray(callbackList)) {
         originalCallback(result);
@@ -197,6 +210,7 @@ class ProductList extends _BaseModule.BaseModule {
         queryPayload,
         handledByOsServer
       });
+      assertScope();
       await this.addProduct(products);
       originalCallback(handledByOsServer ? result : {
         ...result,
@@ -212,6 +226,7 @@ class ProductList extends _BaseModule.BaseModule {
       subscriberId: options?.subscriberId,
       customToast: () => {}
     });
+    assertScope();
     if (!handledByOsServer && Array.isArray(productsData.data.list)) {
       this.replaceRawProductQueryResult(productsData.data.list, product_ids);
     }

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

@@ -9,6 +9,8 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     private store;
     window: WindowPlugin;
     private hooks;
+    private discountScope?;
+    setDiscountScope(scope: (product: any, discount: Discount) => boolean): void;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     setRulesList(rulesList: Rules[]): Promise<void>;