@pisell/pisellos 2.1.53 → 2.1.54

package/dist/modules/Rules/index.js

@@ -24,12 +24,11 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
-import { uniqueById, getDiscountAmount, filterDiscountListByBookingTime, getDiscountListAmountTotal, getDiscountListAmount } from "../../solution/ShopDiscount/utils";
+import { uniqueById, getDiscountAmount, getDiscountListAmountTotal, getDiscountListAmount, filterDiscountListByBookingTime } from "../../solution/ShopDiscount/utils";
 import { getProductOriginTotalPrice, getProductTotalPrice } from "../Cart/utils";
 import Decimal from 'decimal.js';
 import { isBoolean } from 'lodash-es';
 import dayjs from 'dayjs';
-
 // 临时变量
 var flatItem;
 export var RulesModule = /*#__PURE__*/function (_BaseModule) {
@@ -42,6 +41,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "defaultName", 'rules');
     _defineProperty(_assertThisInitialized(_this), "defaultVersion", '1.0.0');
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
+    _defineProperty(_assertThisInitialized(_this), "window", void 0);
+    // WindowPlugin 实例
     _defineProperty(_assertThisInitialized(_this), "hooks", void 0);
     _this.hooks = {};
     return _this;
@@ -56,7 +57,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               this.core = core;
               this.hooks = options === null || options === void 0 ? void 0 : options.hooks;
               this.store = options === null || options === void 0 ? void 0 : options.store;
-            case 3:
+              this.window = core.getPlugin('window');
+            case 4:
             case "end":
               return _context.stop();
           }
@@ -93,6 +95,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
     value: function getRulesList() {
       return this.store.rulesList;
     }
+  }, {
+    key: "getWalletPassEvaluator",
+    value: function getWalletPassEvaluator() {
+      var _this$window$getWalle, _this$window;
+      return (_this$window$getWalle = (_this$window = this.window).getWalletPassEvaluator) === null || _this$window$getWalle === void 0 ? void 0 : _this$window$getWalle.call(_this$window);
+    }
 
     // 商品不需要holder,则不需要判断，直接返回true，商品需要holder但是还没填写，那么暂时不使用带有holder的券，直到填写才去匹配
   }, {
@@ -121,7 +129,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var oldDiscountList = _ref.oldDiscountList,
         newDiscountList = _ref.newDiscountList,
         productList = _ref.productList,
-        holders = _ref.holders;
+        holders = _ref.holders,
+        orderTotalAmount = _ref.orderTotalAmount;
       // 首先检查是否有新的优惠券可应用
       if (!newDiscountList || newDiscountList.length === 0) {
         return {
@@ -152,7 +161,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var result = this.calcDiscount({
         discountList: mergedDiscountList,
         productList: _toConsumableArray(productList),
-        holders: holders
+        holders: holders,
+        orderTotalAmount: orderTotalAmount
       }, {
         scan: true
       });
@@ -195,7 +205,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var _this3 = this;
       var discountList = _ref2.discountList,
         productList = _ref2.productList,
-        holders = _ref2.holders;
+        holders = _ref2.holders,
+        orderTotalAmount = _ref2.orderTotalAmount;
       // 识别出来是不是在编辑的界面里又新增了商品
       // 这种情况下，如果有可用的优惠券，也会自动勾选上
       var isEditModeAddNewProduct = productList.find(function (n) {
@@ -369,6 +380,57 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         return priceB.minus(priceA).toNumber();
       });
 
+      // 🔥 为每个折扣卡/商品券执行策略检查并附加config
+      var evaluator = this.getWalletPassEvaluator();
+      if (evaluator) {
+        addModeDiscount.forEach(function (discount) {
+          var discountType = discount.tag || discount.type;
+          // 只对 good_pass 和 discount_card 类型执行策略检查
+          if (['good_pass', 'discount_card', 'product_discount_card'].includes(discountType)) {
+            var _discount$limited_rel, _discount$limited_rel2;
+            // 转换 discount 为 Voucher 格式
+            var voucher = {
+              id: discount.id,
+              amount: Number(discount.par_value || 0),
+              balance: Number(discount.balance || 0),
+              type: discountType,
+              product_id: discount.product_id,
+              unified_available_status: 1,
+              available_product_type: (_discount$limited_rel = discount.limited_relation_product_data) === null || _discount$limited_rel === void 0 ? void 0 : _discount$limited_rel.type,
+              available_product_ids: (_discount$limited_rel2 = discount.limited_relation_product_data) === null || _discount$limited_rel2 === void 0 ? void 0 : _discount$limited_rel2.product_ids
+            };
+
+            // 转换 sortedFlattenedList 为 Product 格式
+            var productsForEvaluate = sortedFlattenedList.map(function (item) {
+              return {
+                product_id: item.id,
+                price: item.price || 0,
+                quantity: item.quantity || item.num || 1,
+                selling_price: item.price || 0
+              };
+            });
+
+            // 调用策略检查
+            var result = evaluator.checkVoucherAvailability({
+              orderTotalAmount: orderTotalAmount,
+              products: productsForEvaluate,
+              vouchers: [voucher]
+            });
+
+            // 将 config 附加到 discount 对象
+            if (result.isAvailable) {
+              discount.config = _objectSpread(_objectSpread({}, result.config), {}, {
+                isAvailable: true
+              });
+            } else {
+              discount.config = {
+                isAvailable: false
+              };
+            }
+          }
+        });
+      }
+
       /**
       // 对productList按价格降序排序（用于应用优惠券时优先选择高价商品） 价格相同时使用quantity 排序
       const sortedProductList = [...productList].sort((a, b) => {
@@ -389,6 +451,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 标记已使用的优惠券
       var usedDiscounts = new Map();
 
+      // 🔥 统计每个 product_id（商品券商品id）已使用的数量，用于 maxUsagePerOrder 限制
+      var usedProductIdCounts = new Map();
+
       // 记录每个优惠券适用的商品ID
       var discountApplicability = new Map();
 
@@ -431,7 +496,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           originProduct = flatItem.originProduct;
         }
         addModeDiscount.forEach(function (discount) {
-          var _product, _product2, _product3, _product4, _flatItem$bundleItem;
+          var _product, _product2, _product3, _product4, _flatItem$bundleItem, _discount$config;
           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;
@@ -442,7 +507,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var timeLimit = true;
           timeLimit = !!filterDiscountListByBookingTime([discount], (((_product = product) === null || _product === void 0 ? void 0 : _product.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
           // 是符合折扣的商品
-          var isLimitedProduct = (limitedData.type === 'product_all' || limitedData.product_ids && limitedData.product_ids.includes(product.id)) && isHolderMatch;
+          var isLimitedProduct = (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)) && isHolderMatch;
 
           // 编辑的商品 使用了优惠券不可用
           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 (discount) {
@@ -453,7 +518,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var isBundleAvailable = _this3.checkPackageSubItemUsageRules(discount, flatItem);
 
           // 判断优惠券是否适用于该商品
-          if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable) {
+          if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable && (_discount$config = discount.config) !== null && _discount$config !== void 0 && _discount$config.isAvailable) {
             var _discountApplicabilit, _discount$metadata;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
@@ -476,7 +541,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 title: discount.format_title,
                 original_amount: product.price || product.origin_total,
                 pre_value: discount.par_value,
-                product_id: originProduct.id
+                product_id: originProduct.id,
+                discount_product_id: discount.product_id
               },
               metadata: {
                 num: num
@@ -535,6 +601,16 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 找到适用于此商品的所有优惠券，仅考虑isSelected不为false的优惠券
         var applicableDiscounts = sortedDiscountList.filter(function (discount) {
           var _product$discount_lis3, _product$discount_lis4;
+          // 🔥 检查策略可用性（针对 good_pass 和折扣卡）
+          var discountType = discount.tag || discount.type;
+          if (['good_pass', 'discount_card', 'product_discount_card'].includes(discountType)) {
+            var _discount$config2;
+            // 如果策略检查后没有config，说明不可用
+            if (discount.config === undefined || !(discount !== null && discount !== void 0 && (_discount$config2 = discount.config) !== null && _discount$config2 !== void 0 && _discount$config2.isAvailable)) {
+              return false;
+            }
+          }
+
           // 如果商品价格为 0，其实不需要使用任何优惠券，直接 return true
           // 商品券时主商品价格为0不可用
           if ((Number(product.price) <= 0 || !product.price) && !((_product$discount_lis3 = product.discount_list) !== null && _product$discount_lis3 !== void 0 && _product$discount_lis3.find(function (n) {
@@ -550,6 +626,18 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 如果优惠券已被使用，则跳过
           var targetUsedDiscounts = usedDiscounts.get(discount.id);
           if (targetUsedDiscounts && (discount.tag || discount.type) === 'good_pass') return false;
+
+          // 🔥 检查 maxUsagePerOrder 限制：同一 product_id 的商品券使用数量不能超过配置值
+          if ((discount.tag || discount.type) === 'good_pass') {
+            var _discount$config3;
+            var maxUsagePerOrder = (_discount$config3 = discount.config) === null || _discount$config3 === void 0 ? void 0 : _discount$config3.maxUsagePerOrder;
+            if (maxUsagePerOrder && maxUsagePerOrder > 0) {
+              var currentUsedCount = usedProductIdCounts.get(discount.product_id) || 0;
+              if (currentUsedCount >= maxUsagePerOrder) {
+                return false;
+              }
+            }
+          }
           var limitedData = discount.limited_relation_product_data;
 
           // 拿到discount配置的holder信息 product信息 product.holder 不可用return false
@@ -568,6 +656,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 判断优惠券是否适用于该商品
           if (limitedData.type === 'product_all') {
+            if (limitedData.filter === 1 && limitedData.exclude_product_ids.includes(product.id)) {
+              return false;
+            }
             // 检查 package_sub_item_usage_rules
             if (!_this3.checkPackageSubItemUsageRules(discount, flatItem)) {
               return false;
@@ -734,7 +825,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var availableGoodPassCount = applicableDiscounts.filter(function (item) {
           return (item.tag || item.type) === 'good_pass';
         }).length;
-        var splitCount = isNeedSplit ? Math.min(totalQuantity, availableGoodPassCount) : 1;
+
+        // 🔥 如果selectedDiscount有config配置，则使用config.maxUsagePerOrder限制使用次数
+        var maxUsageLimit = availableGoodPassCount;
+        if (selectedDiscount.config && selectedDiscount.config.maxUsagePerOrder) {
+          maxUsageLimit = Math.min(availableGoodPassCount, selectedDiscount.config.maxUsagePerOrder);
+        }
+        var splitCount = isNeedSplit ? Math.min(product.quantity || product.num || 1, maxUsageLimit) : 1;
         var arr = [];
 
         // 🔥 主商品和bundle子商品分别处理
@@ -744,7 +841,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             arr.push(_this3.hooks.setProduct(originProduct, {
               discount_list: [],
               quantity: totalQuantity - splitCount,
-              _id: product._id.split('___')[0]
+              _id: product._id.split('___')[0],
+              total: product.origin_total || product.total
             }));
           }
           for (var i = 0; i < splitCount; i++) {
@@ -753,6 +851,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             var _selectedDiscount = selectedDiscountCard || applicableDiscounts[i];
             // 标记优惠券为已使用
             usedDiscounts.set(_selectedDiscount.id, true);
+            // 🔥 更新 product_id 使用计数
+            if ((_selectedDiscount.tag || _selectedDiscount.type) === 'good_pass') {
+              var currentCount = usedProductIdCounts.get(_selectedDiscount.product_id) || 0;
+              usedProductIdCounts.set(_selectedDiscount.product_id, currentCount + 1);
+            }
 
             // 记录实际应用了优惠券的商品信息
             var appliedProducts = appliedDiscountProducts.get(_selectedDiscount.id) || [];
@@ -770,23 +873,27 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
             // 计算使用折扣卡/商品券以后，单个商品的总 total
             var targetProductTotal = getDiscountAmount(_selectedDiscount, product.price, product.price);
-            var discountType = _selectedDiscount.tag || _selectedDiscount.type;
+            var discountType = _selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : _selectedDiscount.tag;
+
+            // 计算实际折扣金额
+            var actualDiscountAmount = new Decimal(product.price).minus(new Decimal(targetProductTotal)).toNumber();
             var isGoodPass = discountType === 'good_pass';
-            var amount = new Decimal(product.price).minus(new Decimal(targetProductTotal)).toNumber();
             var discountDetail = {
-              amount: amount,
-              type: _selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : discountType,
+              amount: actualDiscountAmount,
+              type: discountType,
               discount: {
                 discount_card_type: _selectedDiscount === null || _selectedDiscount === void 0 || (_selectedDiscount$met = _selectedDiscount.metadata) === null || _selectedDiscount$met === void 0 ? void 0 : _selectedDiscount$met.discount_card_type,
-                fixed_amount: amount,
+                fixed_amount: actualDiscountAmount,
                 resource_id: _selectedDiscount.id,
                 title: _selectedDiscount.format_title,
                 original_amount: product.price,
                 product_id: originProduct.id,
-                percent: _selectedDiscount.par_value
+                percent: _selectedDiscount.par_value,
+                discount_product_id: _selectedDiscount.product_id
               },
               // 前端使用的num数量，为了计算优惠金额
               _num: isGoodPass ? 1 : product.num,
+              config: _selectedDiscount === null || _selectedDiscount === void 0 ? void 0 : _selectedDiscount.config,
               metadata: {
                 num: 1
               }
@@ -805,7 +912,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // 记录应用了优惠券的商品
             // 后续更新价格改为 getProductTotalPrice getProductOriginTotalPrice逻辑
             if (product.isClient) {
-              debugger;
               arr.push(_this3.hooks.setProduct(originProduct, {
                 discount_list: [discountDetail],
                 price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
@@ -846,25 +952,36 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             for (var _i = 0; _i < discountNum; _i++) {
               var _selectedDiscount2 = applicableDiscounts[_i];
               usedDiscounts.set(_selectedDiscount2.id, true);
+              // 🔥 更新 product_id 使用计数
+              if ((_selectedDiscount2.tag || _selectedDiscount2.type) === 'good_pass') {
+                var _currentCount = usedProductIdCounts.get(_selectedDiscount2.product_id) || 0;
+                usedProductIdCounts.set(_selectedDiscount2.product_id, _currentCount + 1);
+              }
 
               // 🔥 生成唯一的 _id
               var uniqueId = "".concat(flatItem._id, "_split_").concat(_i);
+
+              // 计算折扣后的价格（使用 getDiscountAmount，内部已处理 maxDeductionAmount）
+              var discountedPrice = getDiscountAmount(_selectedDiscount2, product.origin_total, product.origin_total);
+              var bundleDiscountAmount = new Decimal(product.origin_total || 0).minus(discountedPrice).toNumber();
               var _discountDetail = {
-                amount: product.origin_total,
+                amount: bundleDiscountAmount,
                 type: 'good_pass',
                 discount: {
                   fixed_amount: product.origin_total,
                   resource_id: _selectedDiscount2.id,
                   title: _selectedDiscount2.format_title,
                   original_amount: product.origin_total,
-                  product_id: product.id
+                  product_id: product.id,
+                  discount_product_id: _selectedDiscount2.product_id
                 },
                 metadata: {
                   // 🔥 使用拆分后的唯一 _id
                   custom_product_bundle_map_id: uniqueId,
                   num: 1
                 },
-                _num: 1
+                _num: 1,
+                config: _selectedDiscount2 === null || _selectedDiscount2 === void 0 ? void 0 : _selectedDiscount2.config
               };
 
               // 记录实际应用的折扣
@@ -876,9 +993,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 _id: uniqueId,
                 num: 1,
                 quantity: 1,
-                price: 0,
-                // 商品券价格为0
-                total: 0,
+                price: discountedPrice,
+                // 折扣后的价格
+                total: discountedPrice,
                 discount_list: [_discountDetail],
                 processed: true,
                 _discountId: _selectedDiscount2.id
@@ -901,28 +1018,38 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // 折扣卡：不拆分数量，直接应用
             var _selectedDiscount3 = selectedDiscountCard || applicableDiscounts[0];
             usedDiscounts.set(_selectedDiscount3.id, true);
+            // 🔥 更新 product_id 使用计数（虽然此处主要是折扣卡，但保持一致性）
+            if ((_selectedDiscount3.tag || _selectedDiscount3.type) === 'good_pass') {
+              var _currentCount2 = usedProductIdCounts.get(_selectedDiscount3.product_id) || 0;
+              usedProductIdCounts.set(_selectedDiscount3.product_id, _currentCount2 + 1);
+            }
             var _productOriginTotal = product.original_price || product.price || 0;
             var _targetProductTotal = getDiscountAmount(_selectedDiscount3, _productOriginTotal, _productOriginTotal);
 
+            // 计算实际折扣金额
+            var bundleActualDiscountAmount = new Decimal(_productOriginTotal).minus(_targetProductTotal).toNumber();
+
             // 🔥 使用当前的 _id 作为唯一标识
             var _uniqueId = flatItem._id;
             var _discountDetail2 = {
-              amount: new Decimal(_productOriginTotal).minus(_targetProductTotal).toNumber() * (product.num || 1),
+              amount: bundleActualDiscountAmount * (product.num || 1),
               type: _selectedDiscount3.tag === 'product_discount_card' ? 'discount_card' : _selectedDiscount3.tag,
               discount: {
                 discount_card_type: _selectedDiscount3 === null || _selectedDiscount3 === void 0 || (_selectedDiscount3$me = _selectedDiscount3.metadata) === null || _selectedDiscount3$me === void 0 ? void 0 : _selectedDiscount3$me.discount_card_type,
-                fixed_amount: new Decimal(_productOriginTotal).minus(_targetProductTotal).toNumber(),
+                fixed_amount: bundleActualDiscountAmount,
                 resource_id: _selectedDiscount3.id,
                 title: _selectedDiscount3.format_title,
                 original_amount: product.original_price,
                 product_id: product.id,
-                percent: _selectedDiscount3.par_value
+                percent: _selectedDiscount3.par_value,
+                discount_product_id: _selectedDiscount3.product_id
               },
               metadata: {
                 // 🔥 使用唯一的 _id
                 custom_product_bundle_map_id: _uniqueId,
                 num: product.num || 1
               },
+              config: _selectedDiscount3 === null || _selectedDiscount3 === void 0 ? void 0 : _selectedDiscount3.config,
               _num: (product.num || 1) * ((flatItem === null || flatItem === void 0 || (_flatItem$parentProdu3 = flatItem.parentProduct) === null || _flatItem$parentProdu3 === void 0 ? void 0 : _flatItem$parentProdu3.num) || 1)
             };
 
@@ -988,7 +1115,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 检查是否有bundle子商品需要重组
           var hasBundle = product.bundle && Array.isArray(product.bundle) && product.bundle.length > 0;
-          debugger;
           if (!hasBundle) {
             // 没有bundle，直接使用主商品处理结果
             result.push.apply(result, _toConsumableArray(mainProductArr));

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

@@ -25,6 +25,7 @@ export interface RulesModuleAPI {
         holders: {
             form_record_id: number;
         }[];
+        orderTotalAmount: number;
     }) => DiscountResult;
 }
 type ProductDetail = {

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

@@ -5,6 +5,8 @@ export interface ISummaryState {
         subtotal: string | number;
         /** 最终总价 */
         total: string | number;
+        /** 最终原始价格 不包含折扣卡商品券折扣 */
+        originTotal: string | number;
         /** 税率标题 */
         taxTitle?: string;
         /** 商品总费率 */

package/dist/modules/Summary/utils.d.ts

@@ -8,6 +8,12 @@ export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[]) =
  * @returns 商品总价字符串，保留2位小数
  */
 export declare const calculateSubtotal: (items: CartItem[]) => string;
+/**
+ * 计算商品小计（不含其他费用 不包含折扣卡商品券抵扣金额）
+ * @param items - 购物车商品数组
+ * @returns 商品总价字符串，保留2位小数
+ */
+export declare const calculateOriginSubtotal: (items: CartItem[]) => string;
 /**
  * @title: 单个商品的税费
  * @description:

package/dist/modules/Summary/utils.js

@@ -1,16 +1,21 @@
 import Decimal from 'decimal.js';
 export var calculatePriceDetails = function calculatePriceDetails(shopInfo, items) {
   var subtotal = new Decimal(calculateSubtotal(items));
+  var subOriginTotal = new Decimal(calculateOriginSubtotal(items));
   var totalTaxFee = new Decimal(calculateTaxFee(shopInfo, items));
 
   // 计算总价
   var total = shopInfo !== null && shopInfo !== void 0 && shopInfo.is_price_include_tax ? subtotal : subtotal.plus(totalTaxFee);
 
+  // 计算总价 不包含折扣卡商品券折扣信息价格
+  var originTotal = shopInfo !== null && shopInfo !== void 0 && shopInfo.is_price_include_tax ? subOriginTotal : subOriginTotal.plus(totalTaxFee);
+
   // 计算定金
   var deposit = calculateDeposit(items);
   return {
     subtotal: subtotal.toFixed(2),
     total: total.toFixed(2),
+    originTotal: originTotal.toFixed(2),
     taxTitle: shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.tax_title,
     totalTaxFee: totalTaxFee.toFixed(2),
     isPriceIncludeTax: shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.is_price_include_tax,
@@ -34,6 +39,22 @@ export var calculateSubtotal = function calculateSubtotal(items) {
   return subtotal.toFixed(2);
 };
 
+/**
+ * 计算商品小计（不含其他费用 不包含折扣卡商品券抵扣金额）
+ * @param items - 购物车商品数组
+ * @returns 商品总价字符串，保留2位小数
+ */
+export var calculateOriginSubtotal = function calculateOriginSubtotal(items) {
+  if (!(items !== null && items !== void 0 && items.length)) {
+    return '0.00';
+  }
+  var subtotal = items.reduce(function (sum, item) {
+    var cartItemTotalPrice = new Decimal(item.summaryOriginTotal || 0);
+    return sum.plus(cartItemTotalPrice);
+  }, new Decimal(0));
+  return subtotal.toFixed(2);
+};
+
 /**
  * @title: 单个商品的税费
  * @description:

package/dist/plugins/window.d.ts

@@ -1,3 +1,4 @@
+import { WalletPassEvaluator } from '../model';
 import { Plugin } from '../types';
 /**
  * WindowPlugin 接口定义
@@ -14,6 +15,7 @@ export interface WindowPlugin extends Plugin {
     document: Partial<Document>;
     history: History;
     interaction?: any;
+    getWalletPassEvaluator?: () => WalletPassEvaluator;
 }
 /**
  * 简单的 Storage 接口实现

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

@@ -144,6 +144,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     getSummary(): Promise<{
         subtotal: string | number;
         total: string | number;
+        originTotal: string | number;
         taxTitle?: string | undefined;
         totalTaxFee?: string | number | undefined;
         isPriceIncludeTax?: 0 | 1 | undefined;
@@ -342,7 +343,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/dist/solution/Checkout/index.js

@@ -403,6 +403,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             product_id: item.product_id,
             product_variant_id: item.product_variant_id,
             quantity: item.num,
+            is_price_include_tax: item.is_price_include_tax,
             // 商品是否含税：1；0
             is_charge_tax: (_item$is_charge_tax = item.is_charge_tax) !== null && _item$is_charge_tax !== void 0 ? _item$is_charge_tax : 0,
             // 若商品不含税，计算得到的税费，单位（元）
@@ -427,6 +428,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             },
             product_bundle: item.product_bundle.map(function (bundle) {
               return {
+                is_price_include_tax: item.is_price_include_tax,
                 bundle_id: bundle.bundle_id,
                 bundle_product_id: bundle.bundle_product_id,
                 bundle_variant_id: bundle.bundle_variant_id,

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

@@ -21,6 +21,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     getCurrentBookingTime(): string | null;
     private filterDiscountListByBookingTime;
     setCustomer(customer: Customer): Promise<void>;
+    setOriginTotalAmount(amount: number): void;
     setHolders(holders: {
         form_record_id: number;
     }[]): void;

package/dist/solution/ShopDiscount/index.js

@@ -54,7 +54,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       holders: [],
       originalDiscountList: [],
       currentBookingTime: "",
-      filteredDiscountList: []
+      filteredDiscountList: [],
+      orderTotalAmount: 0
     };
     return _this;
   }
@@ -286,7 +287,14 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         return _setCustomer.apply(this, arguments);
       }
       return setCustomer;
-    }() // 设置holders
+    }()
+  }, {
+    key: "setOriginTotalAmount",
+    value: function setOriginTotalAmount(amount) {
+      this.store.orderTotalAmount = amount;
+    }
+
+    // 设置holders
   }, {
     key: "setHolders",
     value: function setHolders(holders) {
@@ -308,7 +316,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       var _ref = rulesModule.calcDiscount({
           productList: productList,
           discountList: this.getDiscountList(),
-          holders: this.store.holders || []
+          holders: this.store.holders || [],
+          orderTotalAmount: this.store.orderTotalAmount || 0
         }, options) || {
           productList: productList,
           discountList: this.getDiscountList()
@@ -447,7 +456,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 productList: this.store.productList || [],
                 oldDiscountList: this.getDiscountList(),
                 newDiscountList: withScanList,
-                holders: this.store.holders || []
+                holders: this.store.holders || [],
+                orderTotalAmount: this.store.orderTotalAmount || 0
               }) || {
                 isAvailable: false,
                 productList: this.store.productList || [],

package/dist/solution/ShopDiscount/types.d.ts

@@ -31,6 +31,7 @@ export interface ShopDiscountState {
     originalDiscountList: Discount[];
     currentBookingTime: string | null;
     filteredDiscountList: Discount[];
+    orderTotalAmount?: number;
 }
 export interface SetDiscountSelectedParams {
     discountId: number;

package/dist/solution/ShopDiscount/utils.js

@@ -34,22 +34,37 @@ export var isAllNormalProduct = function isAllNormalProduct(items) {
  * @returns 
  */
 export var getDiscountAmount = function getDiscountAmount(discount, total, price) {
-  var _discount$metadata;
+  var discountedPrice = 0;
+
   // 商品券
   if (discount.tag === 'good_pass') {
-    return new Decimal(price).minus(new Decimal(price || 0)).toNumber();
+    discountedPrice = new Decimal(price).minus(new Decimal(price || 0)).toNumber();
+  } else {
+    var _discount$metadata;
+    // 判断是否是固定金额
+    var isFixedAmount = (discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.discount_card_type) === 'fixed_amount';
+
+    // 固定金额 小于0时返回0
+    if (isFixedAmount) {
+      discountedPrice = Math.max(new Decimal(price).minus(new Decimal(discount.par_value || 0)).toNumber(), 0);
+    } else {
+      // 百分比：根据折扣卡金额计算
+      discountedPrice = new Decimal(100).minus(discount.par_value || 0).div(100).mul(new Decimal(price)).toNumber();
+    }
   }
 
-  // 判断是否是固定金额
-  var isFixedAmount = (discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.discount_card_type) === 'fixed_amount';
-
-  // 固定金额 小于0时返回0
-  if (isFixedAmount) {
-    return Math.max(new Decimal(price).minus(new Decimal(discount.par_value || 0)).toNumber(), 0);
-  }
+  /*
+    // 🔥 如果有 maxDeductionAmount 限制，确保折扣金额不超过限制
+    if (discount.config?.maxDeductionAmount) {
+      const actualDiscountAmount = new Decimal(price).minus(discountedPrice).toNumber();
+      if (actualDiscountAmount > discount.config.maxDeductionAmount) {
+        // 折扣金额超过限制，重新计算折扣后价格
+        discountedPrice = new Decimal(price).minus(discount.config.maxDeductionAmount).toNumber();
+      }
+    }
+  */
 
-  // 百分比：根据折扣卡金额计算
-  return new Decimal(100).minus(discount.par_value || 0).div(100).mul(new Decimal(price)).toNumber();
+  return discountedPrice;
 };
 export var getDiscountListAmountTotal = function getDiscountListAmountTotal(discount) {
   return discount.reduce(function (acc, cur) {

package/lib/index.d.ts

@@ -6,6 +6,7 @@ export * from './types';
 export * from './modules';
 export * from './plugins';
 export * from './solution';
+export * from './model';
 export { PisellOSCore } from './core';
 import PisellOSCore from './core';
 export default PisellOSCore;