@pisell/pisellos 0.10.64 → 0.10.65

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

@@ -456,6 +456,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;

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

@@ -279,7 +279,7 @@ export function consolidateDiscountFreeProductLines(tempOrder) {
     _step6;
   try {
     for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-      var _product$booking_uid, _product$metadata4, _booking_id, _product$metadata5, _product$order_detail, _holder_id, _product$metadata6, _product$metadata7, _product$metadata8, _product$product_sku2, _product$metadata9, _tempOrder$_extend, _product$selling_pric, _product$original_pri, _custom_price, _product$is_charge_ta, _product$gift_card, _product$bundle_edit, _product$metadata$pri, _product$metadata10, _product$metadata$sou, _product$metadata11, _product$metadata$mai, _product$metadata12, _product$metadata$mai2, _product$metadata13, _product$product_vari;
+      var _product$booking_uid, _product$metadata4, _booking_id, _product$metadata5, _product$order_detail, _holder_id, _product$metadata6, _product$metadata7, _product$metadata8, _product$product_sku2, _product$metadata9, _tempOrder$_extend, _product$selling_pric, _product$original_pri, _custom_price, _product$is_charge_ta, _product$gift_card, _product$bundle_edit, _product$metadata$pri, _product$metadata10, _product$metadata$sou, _product$metadata11, _product$metadata$mai, _product$metadata12, _product$metadata$mai2, _product$metadata13, _tempOrder$_extend$pr, _tempOrder$_extend2, _product$product_vari;
       var product = _step6.value;
       var productBundle = Array.isArray(product.product_bundle) ? product.product_bundle : [];
       var hasDiscount = (product.discount_list || []).length > 0 || productBundle.some(function (bundle) {
@@ -337,7 +337,7 @@ export function consolidateDiscountFreeProductLines(tempOrder) {
           };
         })
       });
-      var mergeKey = [discountSplitOriginUid, product.product_id, (_product$product_vari = product.product_variant_id) !== null && _product$product_vari !== void 0 ? _product$product_vari : 0, fingerprint, priceSignature].join('#');
+      var mergeKey = [discountSplitOriginUid, productUid ? (_tempOrder$_extend$pr = (_tempOrder$_extend2 = tempOrder._extend) === null || _tempOrder$_extend2 === void 0 || (_tempOrder$_extend2 = _tempOrder$_extend2.productsByUid) === null || _tempOrder$_extend2 === void 0 || (_tempOrder$_extend2 = _tempOrder$_extend2[productUid]) === null || _tempOrder$_extend2 === void 0 ? void 0 : _tempOrder$_extend2.productVoucherGroupKey) !== null && _tempOrder$_extend$pr !== void 0 ? _tempOrder$_extend$pr : '' : '', product.product_id, (_product$product_vari = product.product_variant_id) !== null && _product$product_vari !== void 0 ? _product$product_vari : 0, fingerprint, priceSignature].join('#');
       var matchedIndex = productIndexByKey.get(mergeKey);
 
       // 当前拆分来源 + 商品结构组合第一次出现时，保留该行作为回并目标。

package/dist/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/dist/modules/Order/utils/productVoucherGroups.js

@@ -0,0 +1,115 @@
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+import { getDiscountUsageBlockReason } from "../../Discount/availability";
+import dayjs from 'dayjs';
+import { getDiscountTimeUnavailableReason } from "../../../solution/ShopDiscount/utils";
+
+/** Runtime-only allocation constraints. Never copied into order/product metadata. */
+
+export function productVoucherGroupKey(order, product) {
+  var _product$metadata$uni, _product$metadata, _order$_extend;
+  var uid = (_product$metadata$uni = product === null || product === void 0 || (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.unique_identification_number) !== null && _product$metadata$uni !== void 0 ? _product$metadata$uni : product === null || product === void 0 ? void 0 : product.unique_identification_number;
+  return (_order$_extend = order._extend) === null || _order$_extend === void 0 || (_order$_extend = _order$_extend.productsByUid) === null || _order$_extend === void 0 || (_order$_extend = _order$_extend[String(uid)]) === null || _order$_extend === void 0 ? void 0 : _order$_extend.productVoucherGroupKey;
+}
+export function isUsableProductVoucher(discount) {
+  return (discount.tag || discount.type) === 'good_pass' && !discount.isEditMode && !discount.isDisabled && !getDiscountUsageBlockReason(discount) && !getDiscountTimeUnavailableReason(discount, dayjs().format('YYYY-MM-DD HH:mm:ss'));
+}
+export 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'
+  });
+}
+export function allowsProductVoucher(order, product, discount) {
+  var _order$_extend2, _groups$find;
+  var groups = order === null || order === void 0 || (_order$_extend2 = order._extend) === null || _order$_extend2 === void 0 ? void 0 : _order$_extend2.productVoucherGroups;
+  if (!order || !(groups !== null && groups !== void 0 && groups.length)) return true;
+  var key = productVoucherGroupKey(order, product);
+  if (!key) return !groups.some(function (group) {
+    return group.discountIds.some(function (id) {
+      return String(id) === String(discount.id);
+    });
+  });
+  return (discount.tag || discount.type) === 'good_pass' && Boolean((_groups$find = groups.find(function (group) {
+    return group.key === key;
+  })) === null || _groups$find === void 0 ? void 0 : _groups$find.discountIds.some(function (id) {
+    return String(id) === String(discount.id);
+  }));
+}
+
+/** Reductions stay possible when a voucher expires; checkout always requires full coverage. */
+export function validateProductVoucherGroups(order, discounts, previous) {
+  var _order$_extend3;
+  var requireCoverage = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  var groups = (_order$_extend3 = order._extend) === null || _order$_extend3 === void 0 ? void 0 : _order$_extend3.productVoucherGroups;
+  if (!(groups !== null && groups !== void 0 && groups.length)) return;
+  var usedIds = new Set();
+  var byId = new Map(discounts.filter(isUsableProductVoucher).map(function (discount) {
+    return [String(discount.id), discount];
+  }));
+  var quantity = function quantity(item) {
+    var _ref, _item$num;
+    return Number((_ref = (_item$num = item.num) !== null && _item$num !== void 0 ? _item$num : item.product_quantity) !== null && _ref !== void 0 ? _ref : 0);
+  };
+  var _iterator = _createForOfIteratorHelper(groups),
+    _step;
+  try {
+    var _loop = function _loop() {
+        var _previous$products$fi;
+        var group = _step.value;
+        var items = order.products.filter(function (item) {
+          return productVoucherGroupKey(order, item) === group.key;
+        });
+        var selected = items.reduce(function (sum, item) {
+          return sum + quantity(item);
+        }, 0);
+        var before = (_previous$products$fi = previous === null || previous === void 0 ? void 0 : previous.products.filter(function (item) {
+          return productVoucherGroupKey(previous, item) === group.key;
+        }).reduce(function (sum, item) {
+          return sum + quantity(item);
+        }, 0)) !== null && _previous$products$fi !== void 0 ? _previous$products$fi : 0;
+        if (!requireCoverage && previous && selected <= before) return 0; // continue
+        var ids = new Set(group.discountIds.map(String).filter(function (id) {
+          return byId.has(id);
+        }));
+        if (!Number.isInteger(selected) || selected < 0 || selected > ids.size) throw voucherGroupError();
+        if (!requireCoverage) return 0; // continue
+        var _iterator2 = _createForOfIteratorHelper(items),
+          _step2;
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var _applied$0$discount$r, _applied$, _voucher$config;
+            var item = _step2.value;
+            var applied = (item.discount_list || []).filter(function (entry) {
+              return (entry.type || entry.tag) === 'good_pass';
+            });
+            // Rules splits a good_pass allocation into one physical line per instance.
+            var id = String((_applied$0$discount$r = (_applied$ = applied[0]) === null || _applied$ === void 0 || (_applied$ = _applied$.discount) === null || _applied$ === void 0 ? void 0 : _applied$.resource_id) !== null && _applied$0$discount$r !== void 0 ? _applied$0$discount$r : '');
+            var voucher = byId.get(id);
+            if (quantity(item) !== 1 || applied.length !== 1 || !ids.has(id) || !(voucher !== null && voucher !== void 0 && voucher.isAvailable) || ((_voucher$config = voucher.config) === null || _voucher$config === void 0 ? void 0 : _voucher$config.isAvailable) === false || usedIds.has(id)) throw voucherGroupError();
+            usedIds.add(id);
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
+        }
+      },
+      _ret;
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      _ret = _loop();
+      if (_ret === 0) continue;
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  if (order.products.some(function (item) {
+    return !groups.some(function (group) {
+      return group.key === productVoucherGroupKey(order, item);
+    });
+  })) {
+    throw voucherGroupError();
+  }
+}

package/dist/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/dist/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>;

package/dist/modules/Rules/index.js

@@ -58,10 +58,16 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "window", void 0);
     // WindowPlugin 实例
     _defineProperty(_assertThisInitialized(_this), "hooks", void 0);
+    _defineProperty(_assertThisInitialized(_this), "discountScope", void 0);
     _this.hooks = {};
     return _this;
   }
   _createClass(RulesModule, [{
+    key: "setDiscountScope",
+    value: function setDiscountScope(scope) {
+      this.discountScope = scope;
+    }
+  }, {
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
@@ -299,7 +305,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var discount = _step.value;
+          var _discount = _step.value;
           var bookingTimes = productList.length ? productList.map(function (item) {
             var product = _this3.hooks.getProduct(item);
             return ((product === null || product === void 0 ? void 0 : product.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss');
@@ -309,7 +315,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           try {
             for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
               var bookingTime = _step3.value;
-              var filteredList = filterDiscountListByBookingTime([discount], bookingTime);
+              var filteredList = filterDiscountListByBookingTime([_discount], bookingTime);
               if (filteredList.length === 0) {
                 return UnavailableReason.TimeLimit;
               }
@@ -331,8 +337,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         _step2;
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var _discount = _step2.value;
-          var limitedData = _discount.limited_relation_product_data;
+          var _discount2 = _step2.value;
+          var limitedData = _discount2.limited_relation_product_data;
           var hasApplicableProduct = false;
           var _iterator4 = _createForOfIteratorHelper(productList),
             _step4;
@@ -340,11 +346,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
               var _limitedData$product_;
               var item = _step4.value;
-              var product = this.hooks.getProduct(item);
+              var _product = this.hooks.getProduct(item);
               if (limitedData.type === 'product_all') {
                 hasApplicableProduct = true;
                 break;
-              } else if ((_limitedData$product_ = limitedData.product_ids) !== null && _limitedData$product_ !== void 0 && _limitedData$product_.includes(product.id)) {
+              } else if ((_limitedData$product_ = limitedData.product_ids) !== null && _limitedData$product_ !== void 0 && _limitedData$product_.includes(_product.id)) {
                 hasApplicableProduct = true;
                 break;
               }
@@ -405,13 +411,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         return selectedDiscount.isEditMode === true && selectedDiscount.isSelected === true && ['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(discountType !== null && discountType !== void 0 ? discountType : '');
       };
       var resolveReapplyBookingDiscountPercent = function resolveReapplyBookingDiscountPercent(originProduct, selectedDiscount) {
-        var _discount2;
+        var _discount3;
         if (!shouldReapplyBookingDiscount(originProduct, selectedDiscount)) return undefined;
         var discountType = (selectedDiscount === null || selectedDiscount === void 0 ? void 0 : selectedDiscount.tag) || (selectedDiscount === null || selectedDiscount === void 0 ? void 0 : selectedDiscount.type);
         if (discountType !== 'discount_card' && discountType !== 'product_discount_card') {
           return undefined;
         }
-        var percent = Number((_discount2 = selectedDiscount.discount) === null || _discount2 === void 0 ? void 0 : _discount2.percent);
+        var percent = Number((_discount3 = selectedDiscount.discount) === null || _discount3 === void 0 ? void 0 : _discount3.percent);
         return Number.isFinite(percent) ? percent : undefined;
       };
       var editModeDiscount = [];
@@ -947,7 +953,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
       // 辅助函数：检查商品是否对某个折扣卡可用
       var checkItemApplicableForDiscount = function checkItemApplicableForDiscount(flatItem, discount) {
-        var _discount$config2, _product, _product2, _product3, _flatItem$bundleItem, _flatItem$bundleItem2, _product4;
+        var _discount$config2, _product2, _product3, _product4, _flatItem$bundleItem, _flatItem$bundleItem2, _product5;
+        if (_this4.discountScope && !_this4.discountScope(flatItem.originProduct, discount)) return false;
         if (((_discount$config2 = discount.config) === null || _discount$config2 === void 0 ? void 0 : _discount$config2.isAvailable) === false) return false;
         var product;
         if (flatItem.type === 'main') {
@@ -970,7 +977,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         }
 
         // 编辑的商品使用了优惠券不可用
-        var isAvailableProduct = flatItem.type === 'main' ? !((_product = product) !== null && _product !== void 0 && _product.booking_id && (_product2 = product) !== null && _product2 !== void 0 && (_product2 = _product2.discount_list) !== null && _product2 !== void 0 && _product2.length && (_product3 = product) !== null && _product3 !== void 0 && (_product3 = _product3.discount_list) !== null && _product3 !== void 0 && _product3.every(function (d) {
+        var isAvailableProduct = flatItem.type === 'main' ? !((_product2 = product) !== null && _product2 !== void 0 && _product2.booking_id && (_product3 = product) !== null && _product3 !== void 0 && (_product3 = _product3.discount_list) !== null && _product3 !== void 0 && _product3.length && (_product4 = product) !== null && _product4 !== void 0 && (_product4 = _product4.discount_list) !== null && _product4 !== void 0 && _product4.every(function (d) {
           return d.id && ['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(d.tag || d.type);
         })) : !(flatItem !== null && flatItem !== void 0 && flatItem.booking_id && !!(flatItem !== null && flatItem !== void 0 && (_flatItem$bundleItem = flatItem.bundleItem) !== null && _flatItem$bundleItem !== void 0 && (_flatItem$bundleItem = _flatItem$bundleItem.discount_list) !== null && _flatItem$bundleItem !== void 0 && _flatItem$bundleItem.length) && flatItem !== null && flatItem !== void 0 && (_flatItem$bundleItem2 = flatItem.bundleItem) !== null && _flatItem$bundleItem2 !== void 0 && (_flatItem$bundleItem2 = _flatItem$bundleItem2.discount_list) !== null && _flatItem$bundleItem2 !== void 0 && _flatItem$bundleItem2.every(function (d) {
           return d.id;
@@ -991,7 +998,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var limitedData = discount.limited_relation_product_data;
 
         // 时间限制检查
-        var timeLimit = !!filterDiscountListByBookingTime([discount], (((_product4 = product) === null || _product4 === void 0 ? void 0 : _product4.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
+        var timeLimit = !!filterDiscountListByBookingTime([discount], (((_product5 = product) === null || _product5 === void 0 ? void 0 : _product5.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
         if (!timeLimit) {
           return false;
         }
@@ -1156,7 +1163,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         }
         var isItemRewardProductDiscount = _this4.isItemRewardProductDiscount(product);
         addModeDiscount.forEach(function (discount) {
-          var _product5, _product6, _product7, _product8, _flatItem$bundleItem3, _flatItem$bundleItem4, _discount$config3;
+          var _product6, _product7, _product8, _product9, _flatItem$bundleItem3, _flatItem$bundleItem4, _discount$config3;
           var limitedData = discount === null || discount === void 0 ? void 0 : discount.limited_relation_product_data;
           // 拿到discount配置的holder信息 product信息 product.holder 加在 isLimitedProduct
           var _tempVar = (flatItem === null || flatItem === void 0 ? void 0 : flatItem.type) === 'bundle' ? flatItem === null || flatItem === void 0 ? void 0 : flatItem.parentProduct : flatItem === null || flatItem === void 0 ? void 0 : flatItem.product;
@@ -1164,14 +1171,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             isNeedHolder: resolveIsFormSubject(_tempVar) && !(_tempVar !== null && _tempVar !== void 0 && _tempVar.isNormalProduct),
             holder_id: (_tempVar === null || _tempVar === void 0 ? void 0 : _tempVar.holder_id) || product.holder_id
           }, flatItem.originProduct, holders);
-          var timeReason = getDiscountTimeUnavailableReason(discount, (((_product5 = product) === null || _product5 === void 0 ? void 0 : _product5.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss'));
+          var timeReason = getDiscountTimeUnavailableReason(discount, (((_product6 = product) === null || _product6 === void 0 ? void 0 : _product6.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss'));
           var timeLimit = !timeReason;
           // 是符合折扣的商品
           var isProductInScope = limitedData.type === 'product_all' && limitedData.filter !== 1 || limitedData.type === 'product_all' && limitedData.filter === 1 && !limitedData.exclude_product_ids.includes(product.id) || limitedData.product_ids && limitedData.product_ids.includes(product.id);
           var isLimitedProduct = isProductInScope && isHolderMatch;
 
           // 编辑的商品 使用了优惠券不可用
-          var isAvailableProduct = flatItem.type === 'main' ? !((_product6 = product) !== null && _product6 !== void 0 && _product6.booking_id && (_product7 = product) !== null && _product7 !== void 0 && (_product7 = _product7.discount_list) !== null && _product7 !== void 0 && _product7.length && (_product8 = product) !== null && _product8 !== void 0 && (_product8 = _product8.discount_list) !== null && _product8 !== void 0 && _product8.every(function (discount) {
+          var isAvailableProduct = flatItem.type === 'main' ? !((_product7 = product) !== null && _product7 !== void 0 && _product7.booking_id && (_product8 = product) !== null && _product8 !== void 0 && (_product8 = _product8.discount_list) !== null && _product8 !== void 0 && _product8.length && (_product9 = product) !== null && _product9 !== void 0 && (_product9 = _product9.discount_list) !== null && _product9 !== void 0 && _product9.every(function (discount) {
             return discount.id && ['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag || discount.type);
           })) : !(flatItem !== null && flatItem !== void 0 && flatItem.booking_id && !!(flatItem !== null && flatItem !== void 0 && (_flatItem$bundleItem3 = flatItem.bundleItem) !== null && _flatItem$bundleItem3 !== void 0 && (_flatItem$bundleItem3 = _flatItem$bundleItem3.discount_list) !== null && _flatItem$bundleItem3 !== void 0 && _flatItem$bundleItem3.length) && flatItem !== null && flatItem !== void 0 && (_flatItem$bundleItem4 = flatItem.bundleItem) !== null && _flatItem$bundleItem4 !== void 0 && (_flatItem$bundleItem4 = _flatItem$bundleItem4.discount_list) !== null && _flatItem$bundleItem4 !== void 0 && _flatItem$bundleItem4.every(function (discount) {
             return discount.id;
@@ -1287,7 +1294,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 然后再处理应用哪些优惠券，此时只考虑filteredDiscountList中的优惠券
       // 🔥 使用扁平化后的列表进行处理
       sortedFlattenedList.forEach(function (flatItem, index) {
-        var _product9, _originProduct, _originProduct2, _originProduct3, _product$discount_lis2, _product10;
+        var _product10, _originProduct, _originProduct2, _originProduct3, _product$discount_lis2, _product11;
         // 获取商品数据
         var product, originProduct;
         if (flatItem.type === 'main') {
@@ -1311,8 +1318,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           };
           originProduct = flatItem.originProduct;
         }
-        var isPersistedProduct = ((_product9 = product) === null || _product9 === void 0 ? void 0 : _product9.booking_id) || ((_originProduct = originProduct) === null || _originProduct === void 0 ? void 0 : _originProduct.order_detail_id) || ((_originProduct2 = originProduct) === null || _originProduct2 === void 0 ? void 0 : _originProduct2.orderDetailId) || ((_originProduct3 = originProduct) === null || _originProduct3 === void 0 ? void 0 : _originProduct3.booking_id);
-        var hasExistingWalletDiscount = ((_product$discount_lis2 = product.discount_list) === null || _product$discount_lis2 === void 0 ? void 0 : _product$discount_lis2.length) && ((_product10 = product) === null || _product10 === void 0 || (_product10 = _product10.discount_list) === null || _product10 === void 0 ? void 0 : _product10.every(function (discount) {
+        var isPersistedProduct = ((_product10 = product) === null || _product10 === void 0 ? void 0 : _product10.booking_id) || ((_originProduct = originProduct) === null || _originProduct === void 0 ? void 0 : _originProduct.order_detail_id) || ((_originProduct2 = originProduct) === null || _originProduct2 === void 0 ? void 0 : _originProduct2.orderDetailId) || ((_originProduct3 = originProduct) === null || _originProduct3 === void 0 ? void 0 : _originProduct3.booking_id);
+        var hasExistingWalletDiscount = ((_product$discount_lis2 = product.discount_list) === null || _product$discount_lis2 === void 0 ? void 0 : _product$discount_lis2.length) && ((_product11 = product) === null || _product11 === void 0 || (_product11 = _product11.discount_list) === null || _product11 === void 0 ? void 0 : _product11.every(function (discount) {
           var _discount$id, _discount$discount4;
           var discountIdentity = (_discount$id = discount.id) !== null && _discount$id !== void 0 ? _discount$id : (_discount$discount4 = discount.discount) === null || _discount$discount4 === void 0 ? void 0 : _discount$discount4.resource_id;
           var discountType = discount.tag || discount.type;
@@ -1334,6 +1341,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 找到适用于此商品的所有优惠券，仅考虑isSelected不为false的优惠券
         var applicableDiscounts = sortedDiscountList.filter(function (discount) {
           var _product$discount_lis3, _product$discount_lis4;
+          if (_this4.discountScope && !_this4.discountScope(originProduct, discount)) return false;
           if (_this4.isItemRewardProductDiscount(product)) return false;
           // 🔥 检查策略可用性（针对全额抵扣卡和折扣卡）
           var discountType = discount.tag || discount.type;
@@ -1467,14 +1475,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var isManualDiscount = false;
         var isItemRewardProductDiscount = false;
         if (flatItem.type === 'main') {
-          var _product$discount_lis5, _product$discount_lis6, _product11, _product11$every;
+          var _product$discount_lis5, _product$discount_lis6, _product12, _product12$every;
           // 主商品：判断自身是否手动折扣
           isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : ((_product$discount_lis5 = product.discount_list) === null || _product$discount_lis5 === void 0 ? void 0 : _product$discount_lis5.some(function (item) {
             return item.type === 'product';
           })) || product.total != product.origin_total && (product.bundle || []).every(function (item) {
             var _ref25;
             return !((_ref25 = item.discount_list || []) !== null && _ref25 !== void 0 && _ref25.length);
-          }) && (!((_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.length) || ((_product11 = product) === null || _product11 === void 0 || (_product11 = _product11.discount_list) === null || _product11 === void 0 || (_product11$every = _product11.every) === null || _product11$every === void 0 ? void 0 : _product11$every.call(_product11, function (item) {
+          }) && (!((_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.length) || ((_product12 = product) === null || _product12 === void 0 || (_product12 = _product12.discount_list) === null || _product12 === void 0 || (_product12$every = _product12.every) === null || _product12$every === void 0 ? void 0 : _product12$every.call(_product12, function (item) {
             return item.type === 'product';
           })));
           isItemRewardProductDiscount = _this4.isItemRewardProductDiscount(product);
@@ -1583,8 +1591,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 discount_list: isManualDiscount ? _this4.resolveDiscountListForManualOverride(product.discount_list) : _this4.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             } else {
-              var _ref27, _product$_promotion$f, _product12, _product$origin_total;
-              var total = product.inPromotion ? (_ref27 = (_product$_promotion$f = (_product12 = product) === null || _product12 === void 0 || (_product12 = _product12._promotion) === null || _product12 === void 0 ? void 0 : _product12.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref27 !== void 0 ? _ref27 : product.total : (_product$origin_total = product.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
+              var _ref27, _product$_promotion$f, _product13, _product$origin_total;
+              var total = product.inPromotion ? (_ref27 = (_product$_promotion$f = (_product13 = product) === null || _product13 === void 0 || (_product13 = _product13._promotion) === null || _product13 === void 0 ? void 0 : _product13.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref27 !== void 0 ? _ref27 : product.total : (_product$origin_total = product.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
               var main_product_selling_price = product.price;
               if ((product.discount_list || []).some(function (item) {
                 return item.type === 'promotion';

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

@@ -338,7 +338,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         discountList: Discount[];
         originalDiscountList?: Discount[];
     }): Promise<void>;
-    scanPromotionCode(code: string, customerId?: number): Promise<BaseSalesScanCodeResult>;
+    scanPromotionCode(code: string, customerId?: number, options?: {
+        productVouchersOnly?: boolean;
+    }): Promise<BaseSalesScanCodeResult>;
     setDiscountSelected(params: {
         discountId: number;
         isSelected: boolean;
@@ -519,6 +521,11 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private hasSmartPricingStrategies;
     shouldRecalculateProductBookingPricesForContextChange(params: BaseSalesPriceRecalculationContextChange): boolean;
     calculateProductBookingPrices(paramsList: BaseSalesCalculateProductBookingPriceParams[]): Promise<BaseSalesProductBookingPriceResult[]>;
+    setProductVoucherGroups(groups: Array<{
+        key: string;
+        discountIds: Array<number | string>;
+    }>): void;
+    validateProductVoucherSelection(): void;
     addProductToOrder(product: Partial<BaseSalesOrderProduct> & BaseSalesOrderProductIdentity, booking?: AddProductBookingInput, options?: AddProductToOrderOptions): Promise<import("../../modules/Order/types").OrderProduct[]>;
     updateOrderProduct(params: UpdateOrderProductParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
     updateOrderProducts(paramsList: UpdateOrderProductParams[]): Promise<import("../../modules/Order/types").OrderProduct[]>;