@pisell/pisellos 2.2.42 → 2.2.43

package/dist/modules/Rules/index.js

@@ -27,13 +27,10 @@ import { BaseModule } from "../BaseModule";
 import { uniqueById, getDiscountAmount, getDiscountListAmountTotal, getDiscountListAmount, filterDiscountListByBookingTime } from "../../solution/ShopDiscount/utils";
 import { getProductOriginTotalPrice, getProductTotalPrice } from "../Cart/utils";
 import Decimal from 'decimal.js';
-import dayjs from 'dayjs';
 import { isBoolean } from 'lodash-es';
+import dayjs from 'dayjs';
 import { isOrderLevelFixedAmountDiscount } from "../../solution/ShopDiscount/utils";
 import { calculateOrderLevelDiscountAllocation } from "../../solution/ShopDiscount/utils";
-
-// 临时变量
-var flatItem;
 export var RulesModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(RulesModule, _BaseModule);
   var _super = _createSuper(RulesModule);
@@ -44,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;
@@ -58,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();
           }
@@ -95,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的券，直到填写才去匹配
   }, {
@@ -123,6 +129,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var oldDiscountList = _ref.oldDiscountList,
         newDiscountList = _ref.newDiscountList,
         productList = _ref.productList,
+        orderTotalAmount = _ref.orderTotalAmount,
         holders = _ref.holders,
         isFormSubject = _ref.isFormSubject;
       // 首先检查是否有新的优惠券可应用
@@ -155,6 +162,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var result = this.calcDiscount({
         discountList: mergedDiscountList,
         productList: _toConsumableArray(productList),
+        orderTotalAmount: orderTotalAmount,
         holders: holders,
         isFormSubject: isFormSubject
       }, {
@@ -200,7 +208,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var discountList = _ref2.discountList,
         productList = _ref2.productList,
         holders = _ref2.holders,
-        isFormSubject = _ref2.isFormSubject;
+        isFormSubject = _ref2.isFormSubject,
+        orderTotalAmount = _ref2.orderTotalAmount;
       // 识别出来是不是在编辑的界面里又新增了商品
       // 这种情况下，如果有可用的优惠券，也会自动勾选上
       var isEditModeAddNewProduct = productList.find(function (n) {
@@ -447,6 +456,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) => {
@@ -467,6 +527,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 标记已使用的优惠券
       var usedDiscounts = new Map();
 
+      // 🔥 统计每个 product_id（商品券商品id）已使用的数量，用于 maxUsagePerOrder 限制
+      var usedProductIdCounts = new Map();
+
       // 记录每个优惠券适用的商品ID
       var discountApplicability = new Map();
 
@@ -692,7 +755,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           originProduct = flatItem.originProduct;
         }
         addModeDiscount.forEach(function (discount) {
-          var _product5, _product6, _product7, _product8, _flatItem$bundleItem3, _flatItem$bundleItem4;
+          var _product5, _product6, _product7, _product8, _flatItem$bundleItem3, _flatItem$bundleItem4, _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;
@@ -703,7 +766,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var timeLimit = true;
           timeLimit = !!filterDiscountListByBookingTime([discount], (((_product5 = product) === null || _product5 === void 0 ? void 0 : _product5.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' ? !((_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) {
@@ -716,7 +779,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var isBundleAvailable = _this3.checkPackageSubItemUsageRules(discount, flatItem);
 
           // 判断优惠券是否适用于该商品
-          if (isAvailableProduct && isLimitedProduct && isBundleAvailable && timeLimit) {
+          if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable && (_discount$config = discount.config) !== null && _discount$config !== void 0 && _discount$config.isAvailable) {
             var _discountApplicabilit, _discount$metadata4, _discount$metadata5;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
@@ -740,7 +803,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
@@ -800,6 +864,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.length) && (discount.tag || discount.type) === 'good_pass') return false;
@@ -812,6 +886,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
@@ -830,6 +916,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;
@@ -996,7 +1085,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子商品分别处理
@@ -1006,7 +1101,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++) {
@@ -1015,6 +1111,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) || [];
@@ -1061,10 +1162,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 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: _objectSpread({
                 num: 1
               }, productDiscountDifference !== undefined && {
@@ -1085,7 +1188,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,
@@ -1104,7 +1206,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             } else {
               arr.push(_this3.hooks.setProduct(originProduct, {
                 discount_list: [discountDetail],
-                _id: product._id.split('___')[0] + "___" + _selectedDiscount.id + index,
+                _id: product._id.split('___')[0] + '___' + _selectedDiscount.id + index,
                 price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
                 quantity: isNeedSplit ? 1 : product.quantity,
                 total: total,
@@ -1127,11 +1229,20 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               var _selectedDiscount2$me;
               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,
@@ -1139,14 +1250,16 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   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
               };
 
               // 记录实际应用的折扣
@@ -1158,9 +1271,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
@@ -1183,6 +1296,11 @@ 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;
 
             // 🔥 检查是否是 order_level 固定金额折扣卡
@@ -1202,7 +1320,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               _targetProductTotal = getDiscountAmount(_selectedDiscount3, _productOriginTotal, _productOriginTotal);
               fixedAmountPerItem = new Decimal(_productOriginTotal).minus(_targetProductTotal).toNumber();
             }
-            debugger;
+
             // 🔥 使用当前的 _id 作为唯一标识
             var _uniqueId = flatItem._id;
             var _discountDetail2 = {
@@ -1216,7 +1334,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 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: _objectSpread({
                 // 🔥 使用唯一的 _id
@@ -1225,6 +1344,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               }, _productDiscountDifference !== undefined && {
                 product_discount_difference: _productDiscountDifference
               }),
+              config: _selectedDiscount3 === null || _selectedDiscount3 === void 0 ? void 0 : _selectedDiscount3.config,
               _num: (product.num || 1) * ((flatItem === null || flatItem === void 0 || (_flatItem$parentProdu8 = flatItem.parentProduct) === null || _flatItem$parentProdu8 === void 0 ? void 0 : _flatItem$parentProdu8.num) || 1)
             };
 

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

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

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

@@ -25,15 +25,6 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
     setOtherProductsIds(ids: number[]): void;
     getOtherProductsIds(): number[];
     storeChange(): void;
-    /**
-     * 传入一个时间, 判断改时间是否在schedule 内
-     * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
-     * @returns
-     */
-    isInScheduleByDate({ date, schedule, }: {
-        date: string;
-        schedule: any;
-    }): boolean | undefined;
     /**
      * 传入一个时间, 判断改时间是否在schedule 内
      * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule

package/dist/modules/Schedule/index.js

@@ -248,28 +248,12 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
      * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
      * @returns
      */
-  }, {
+  }], [{
     key: "isInScheduleByDate",
     value: function isInScheduleByDate(_ref2) {
+      var _schedule$repeat_rule, _schedule$repeat_rule2;
       var date = _ref2.date,
         schedule = _ref2.schedule;
-      return ScheduleModule.isInScheduleByDate({
-        date: date,
-        schedule: schedule
-      });
-    }
-
-    /**
-     * 传入一个时间, 判断改时间是否在schedule 内
-     * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
-     * @returns
-     */
-  }], [{
-    key: "isInScheduleByDate",
-    value: function isInScheduleByDate(_ref3) {
-      var _schedule$repeat_rule, _schedule$repeat_rule2;
-      var date = _ref3.date,
-        schedule = _ref3.schedule;
       if (schedule.start_time && schedule.end_time) {
         var isBeforeStartTime = dayjs(date).isBefore(dayjs(schedule.start_time));
         var isAfterEndTime = dayjs(date).isAfter(dayjs(schedule.end_time));

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

@@ -13,6 +13,12 @@ export declare const getBundleDiscountList: (bundle: any[]) => any[];
  * @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

@@ -7,16 +7,21 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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,
@@ -69,6 +74,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;

package/dist/solution/Checkout/index.js

@@ -405,6 +405,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,
             // 若商品不含税，计算得到的税费，单位（元）
@@ -429,6 +430,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,
@@ -1800,7 +1802,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             case 6:
               paymentItems = _context18.sent;
               if (!(!voucherPaymentItems || (voucherPaymentItems === null || voucherPaymentItems === void 0 ? void 0 : voucherPaymentItems.length) === 0)) {
-                _context18.next = 13;
+                _context18.next = 12;
                 break;
               }
               savedVoucherPaymentItems = (paymentItems === null || paymentItems === void 0 ? void 0 : paymentItems.filter(function (item) {
@@ -1811,23 +1813,22 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 savedVoucherPaymentItems: savedVoucherPaymentItems
               });
               if (!((savedVoucherPaymentItems === null || savedVoucherPaymentItems === void 0 ? void 0 : savedVoucherPaymentItems.length) === 0)) {
-                _context18.next = 13;
+                _context18.next = 12;
                 break;
               }
-              this.updateStateAmountToRemaining(false);
               return _context18.abrupt("return");
-            case 13:
+            case 12:
               allPaymentItemsSynced = paymentItems.every(function (item) {
                 return item.isSynced;
               });
-              _context18.next = 16;
+              _context18.next = 15;
               return this.calculateRemainingAmountAsync();
-            case 16:
+            case 15:
               remainingAmount = _context18.sent;
               remainingValue = new Decimal(remainingAmount);
               isOrderSynced = this.store.isOrderSynced;
               if (!(remainingValue.lte(0) && isOrderSynced && voucherPaymentItems.length === 0 && allPaymentItemsSynced)) {
-                _context18.next = 22;
+                _context18.next = 21;
                 break;
               }
               this.logInfo('订单已同步且支付完成，跳过清空代金券操作避免重复同步:', {
@@ -1839,7 +1840,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 reason: 'Order synced and payment completed, skip clear vouchers to avoid duplicate sync'
               });
               return _context18.abrupt("return");
-            case 22:
+            case 21:
               this.logInfo('开始批量更新代金券支付项:', {
                 voucherPaymentItems: voucherPaymentItems
               });
@@ -1861,18 +1862,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   metadata: metadata
                 });
               }); // 调用 Payment 模块的批量更新方法
-              _context18.next = 27;
+              _context18.next = 26;
               return this.payment.updateVoucherPaymentItemsAsync(this.store.currentOrder.uuid, voucherPaymentItemsWithType);
-            case 27:
+            case 26:
               // 🚀 清除计算缓存，确保获取最新数据
               this.clearCalculationCache();
 
               // 重新从Payment模块获取最新的订单数据，确保支付项同步
               currentOrderId = this.store.currentOrder.order_id; // 保存当前的订单ID
               isCurrentOrderReal = currentOrderId && !isVirtualOrderId(currentOrderId);
-              _context18.next = 32;
+              _context18.next = 31;
               return this.payment.getPaymentOrderByUuidAsync(this.store.currentOrder.uuid);
-            case 32:
+            case 31:
               updatedOrder = _context18.sent;
               if (updatedOrder) {
                 // 如果当前订单ID是真实ID，但获取到的订单ID是虚拟ID，需要保护真实ID
@@ -1887,10 +1888,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }
 
               // 更新 stateAmount 为剩余未支付金额
-              _context18.next = 36;
+              _context18.next = 35;
               return this.updateStateAmountToRemaining(false);
-            case 36:
-              _context18.next = 38;
+            case 35:
+              _context18.next = 37;
               return this.core.effects.emit("".concat(this.name, ":onPaymentStarted"), {
                 orderUuid: this.store.currentOrder.uuid,
                 paymentMethodCode: 'VOUCHER_BATCH',
@@ -1899,23 +1900,23 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 }, 0).toFixed(2),
                 timestamp: Date.now()
               });
-            case 38:
+            case 37:
               this.logInfo('代金券支付项批量更新成功');
-              _context18.next = 47;
+              _context18.next = 46;
               break;
-            case 41:
-              _context18.prev = 41;
+            case 40:
+              _context18.prev = 40;
               _context18.t0 = _context18["catch"](0);
               this.logError('[Checkout] 批量更新代金券支付项失败:', _context18.t0);
-              _context18.next = 46;
+              _context18.next = 45;
               return this.handleError(_context18.t0, CheckoutErrorType.PaymentFailed);
-            case 46:
+            case 45:
               throw _context18.t0;
-            case 47:
+            case 46:
             case "end":
               return _context18.stop();
           }
-        }, _callee18, this, [[0, 41]]);
+        }, _callee18, this, [[0, 40]]);
       }));
       function updateVoucherPaymentItemsAsync(_x18) {
         return _updateVoucherPaymentItemsAsync.apply(this, arguments);