@pisell/pisellos 2.1.85 → 2.1.86

package/dist/modules/Rules/index.js

@@ -31,6 +31,7 @@ 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) {
@@ -43,8 +44,6 @@ 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;
@@ -59,8 +58,7 @@ 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;
-              this.window = core.getPlugin('window');
-            case 4:
+            case 3:
             case "end":
               return _context.stop();
           }
@@ -97,12 +95,6 @@ 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的券，直到填写才去匹配
   }, {
@@ -131,7 +123,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         newDiscountList = _ref.newDiscountList,
         productList = _ref.productList,
         holders = _ref.holders,
-        orderTotalAmount = _ref.orderTotalAmount,
         isFormSubject = _ref.isFormSubject;
       // 首先检查是否有新的优惠券可应用
       if (!newDiscountList || newDiscountList.length === 0) {
@@ -166,7 +157,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         discountList: mergedDiscountList,
         productList: _toConsumableArray(productList),
         holders: holders,
-        orderTotalAmount: orderTotalAmount,
         isFormSubject: isFormSubject
       }, {
         scan: true
@@ -292,7 +282,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var discountList = _ref2.discountList,
         productList = _ref2.productList,
         holders = _ref2.holders,
-        orderTotalAmount = _ref2.orderTotalAmount,
         isFormSubject = _ref2.isFormSubject;
       // 识别出来是不是在编辑的界面里又新增了商品
       // 这种情况下，如果有可用的优惠券，也会自动勾选上
@@ -540,57 +529,6 @@ 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) => {
@@ -611,9 +549,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 标记已使用的优惠券
       var usedDiscounts = new Map();
 
-      // 🔥 统计每个 product_id（商品券商品id）已使用的数量，用于 maxUsagePerOrder 限制
-      var usedProductIdCounts = new Map();
-
       // 记录每个优惠券适用的商品ID
       var discountApplicability = new Map();
 
@@ -843,7 +778,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           originProduct = flatItem.originProduct;
         }
         addModeDiscount.forEach(function (discount) {
-          var _product6, _product7, _product8, _product9, _flatItem$bundleItem3, _flatItem$bundleItem4, _discount$config;
+          var _product6, _product7, _product8, _product9, _flatItem$bundleItem3, _flatItem$bundleItem4;
           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;
@@ -854,7 +789,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var timeLimit = true;
           timeLimit = !!filterDiscountListByBookingTime([discount], (((_product6 = product) === null || _product6 === void 0 ? void 0 : _product6.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
           // 是符合折扣的商品
-          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 isLimitedProduct = (limitedData.type === 'product_all' || limitedData.product_ids && limitedData.product_ids.includes(product.id)) && isHolderMatch;
 
           // 编辑的商品 使用了优惠券不可用
           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) {
@@ -867,7 +802,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var isBundleAvailable = _this3.checkPackageSubItemUsageRules(discount, flatItem);
 
           // 判断优惠券是否适用于该商品
-          if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable && (_discount$config = discount.config) !== null && _discount$config !== void 0 && _discount$config.isAvailable) {
+          if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable) {
             var _discountApplicabilit, _discount$metadata4, _discount$metadata5;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
@@ -891,8 +826,7 @@ 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,
-                discount_product_id: discount.product_id
+                product_id: originProduct.id
               },
               metadata: {
                 num: num
@@ -952,16 +886,6 @@ 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;
@@ -974,18 +898,6 @@ 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
@@ -1004,9 +916,6 @@ 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;
@@ -1173,13 +1082,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var availableGoodPassCount = applicableDiscounts.filter(function (item) {
           return (item.tag || item.type) === 'good_pass';
         }).length;
-
-        // 🔥 如果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 splitCount = isNeedSplit ? Math.min(totalQuantity, availableGoodPassCount) : 1;
         var arr = [];
 
         // 🔥 主商品和bundle子商品分别处理
@@ -1189,8 +1092,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             arr.push(_this3.hooks.setProduct(originProduct, {
               discount_list: [],
               quantity: totalQuantity - splitCount,
-              _id: product._id.split('___')[0],
-              total: product.origin_total || product.total
+              _id: product._id.split('___')[0]
             }));
           }
           for (var i = 0; i < splitCount; i++) {
@@ -1199,11 +1101,6 @@ 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) || [];
@@ -1237,7 +1134,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               targetProductTotal = getDiscountAmount(_selectedDiscount, product.price, product.price);
               amount = new Decimal(product.price).minus(new Decimal(targetProductTotal)).toNumber();
             }
-            var discountType = _selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : _selectedDiscount.tag;
+            var discountType = _selectedDiscount.tag || _selectedDiscount.type;
             var isGoodPass = discountType === 'good_pass';
             var discountDetail = {
               amount: amount,
@@ -1250,12 +1147,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 title: _selectedDiscount.format_title,
                 original_amount: product.price,
                 product_id: originProduct.id,
-                percent: _selectedDiscount.par_value,
-                discount_product_id: _selectedDiscount.product_id
+                percent: _selectedDiscount.par_value
               },
               // 前端使用的num数量，为了计算优惠金额
               _num: isGoodPass ? 1 : product.num,
-              config: _selectedDiscount === null || _selectedDiscount === void 0 ? void 0 : _selectedDiscount.config,
               metadata: _objectSpread({
                 num: 1
               }, productDiscountDifference !== undefined && {
@@ -1276,6 +1171,7 @@ 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,
@@ -1317,20 +1213,11 @@ 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: bundleDiscountAmount,
+                amount: product.origin_total,
                 type: 'good_pass',
                 discount: {
                   fixed_amount: product.origin_total,
@@ -1338,16 +1225,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   resource_id: _selectedDiscount2.id,
                   title: _selectedDiscount2.format_title,
                   original_amount: product.origin_total,
-                  product_id: product.id,
-                  discount_product_id: _selectedDiscount2.product_id
+                  product_id: product.id
                 },
                 metadata: {
                   // 🔥 使用拆分后的唯一 _id
                   custom_product_bundle_map_id: uniqueId,
                   num: 1
                 },
-                _num: 1,
-                config: _selectedDiscount2 === null || _selectedDiscount2 === void 0 ? void 0 : _selectedDiscount2.config
+                _num: 1
               };
 
               // 记录实际应用的折扣
@@ -1359,9 +1244,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 _id: uniqueId,
                 num: 1,
                 quantity: 1,
-                price: discountedPrice,
-                // 折扣后的价格
-                total: discountedPrice,
+                price: 0,
+                // 商品券价格为0
+                total: 0,
                 discount_list: [_discountDetail],
                 processed: true,
                 _discountId: _selectedDiscount2.id
@@ -1384,11 +1269,6 @@ 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 固定金额折扣卡
@@ -1408,7 +1288,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 = {
@@ -1422,8 +1302,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 title: _selectedDiscount3.format_title,
                 original_amount: product.original_price,
                 product_id: product.id,
-                percent: _selectedDiscount3.par_value,
-                discount_product_id: _selectedDiscount3.product_id
+                percent: _selectedDiscount3.par_value
               },
               metadata: _objectSpread({
                 // 🔥 使用唯一的 _id
@@ -1432,7 +1311,6 @@ 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$parentProdu9 = flatItem.parentProduct) === null || _flatItem$parentProdu9 === void 0 ? void 0 : _flatItem$parentProdu9.num) || 1)
             };
 

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

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

package/dist/modules/Summary/index.js

@@ -1,4 +1,7 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+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; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -86,7 +89,7 @@ export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _context2.next = 2;
-              return this.request.get('/order/custom-surcharge/available', {
+              return this.request.get('/order/custom-surcharge/available/v2', {
                 channel: 'online-store',
                 is_assemble_product_data: 1,
                 is_assemble_schedule_data: 1,
@@ -111,15 +114,34 @@ export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(cartItems) {
         var _this$shopStore$get;
-        var shopInfo, summary;
+        var shopInfo, scheduleModule, needScheduleIds, scheduleList, scheduleById, _iterator, _step, item, summary;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               shopInfo = ((_this$shopStore$get = this.shopStore.get('core')) === null || _this$shopStore$get === void 0 || (_this$shopStore$get = _this$shopStore$get.core) === null || _this$shopStore$get === void 0 ? void 0 : _this$shopStore$get.shop) || {};
-              summary = calculatePriceDetails(shopInfo, cartItems, ScheduleModule.isInScheduleByDate, this.store.surchargeList);
+              scheduleModule = this.core.getModule('appointmentBooking_schedule');
+              needScheduleIds = this.store.surchargeList.map(function (item) {
+                return item.available_schedule_ids;
+              }).flat();
+              scheduleList = scheduleModule === null || scheduleModule === void 0 ? void 0 : scheduleModule.getScheduleListByIds(needScheduleIds);
+              scheduleById = {};
+              if (Array.isArray(scheduleList)) {
+                _iterator = _createForOfIteratorHelper(scheduleList);
+                try {
+                  for (_iterator.s(); !(_step = _iterator.n()).done;) {
+                    item = _step.value;
+                    scheduleById[item.id] = item;
+                  }
+                } catch (err) {
+                  _iterator.e(err);
+                } finally {
+                  _iterator.f();
+                }
+              }
+              summary = calculatePriceDetails(shopInfo, cartItems, ScheduleModule === null || ScheduleModule === void 0 ? void 0 : ScheduleModule.isInScheduleByDate, this.store.surchargeList, scheduleById);
               this.store.summary = summary;
               return _context3.abrupt("return", this.store.summary);
-            case 4:
+            case 9:
             case "end":
               return _context3.stop();
           }
@@ -187,6 +209,26 @@ export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
     key: "getSurchargeforUtils",
     value: function getSurchargeforUtils(items) {
       // const surchargeList = this.store.surchargeList;
+      var scheduleModule = this.core.getModule('appointmentBooking_schedule');
+      var needScheduleIds = this.store.surchargeList.map(function (item) {
+        return item.available_schedule_ids;
+      }).flat();
+      var scheduleList = scheduleModule === null || scheduleModule === void 0 ? void 0 : scheduleModule.getScheduleListByIds(needScheduleIds);
+      var scheduleById = {};
+      if (Array.isArray(scheduleList)) {
+        var _iterator2 = _createForOfIteratorHelper(scheduleList),
+          _step2;
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var item = _step2.value;
+            scheduleById[item.id] = item;
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
+        }
+      }
       var surchargeList = getSurcharge({
         service: items,
         addons: [],
@@ -196,7 +238,7 @@ export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
         isEdit: false,
         isInScheduleByDate: ScheduleModule.isInScheduleByDate,
         surcharge_list: this.store.surchargeList,
-        scheduleById: {}
+        scheduleById: scheduleById
       });
       var surchargeAmount = new Decimal(getSurchargeAmount({
         bookingDetail: null,

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

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

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

@@ -1,7 +1,7 @@
 import Decimal from 'decimal.js';
 import { CartItem } from '../Cart/types';
 import { ISummaryState } from './types';
-export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[], isInScheduleByDate: any, surchargeList: any[]) => ISummaryState['summary'];
+export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[], isInScheduleByDate: any, surchargeList: any[], scheduleById: Record<string, any>) => ISummaryState['summary'];
 /**
  * 获取子商品折扣信息
  * @param item
@@ -58,12 +58,6 @@ export declare const getTax: ({ service, addons, bookingDetail, bookingId }: {
  * @returns 商品总价字符串，保留2位小数
  */
 export declare const calculateSubtotal: (items: CartItem[]) => string;
-/**
- * 计算商品小计（不含其他费用 不包含折扣卡商品券抵扣金额）
- * @param items - 购物车商品数组
- * @returns 商品总价字符串，保留2位小数
- */
-export declare const calculateOriginSubtotal: (items: CartItem[]) => string;
 /**
  * @title: 单个商品的税费
  * @description: