@pisell/private-materials 6.7.7 → 6.7.8

package/es/components/booking/components/footer/amount.js

@@ -1,12 +1,4 @@
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -42,7 +34,7 @@ export var getRelationDetailsTotal = function getRelationDetailsTotal(relation_d
  * @param state
  * @returns
  */
-var getProductExpectAmount = function getProductExpectAmount(state, isEdit, isOriginTotal) {
+var getProductExpectAmount = function getProductExpectAmount(state, isEdit) {
   var price = new Decimal(0);
   var duration = new Decimal(0);
   // 是否是跨日预约
@@ -62,8 +54,7 @@ var getProductExpectAmount = function getProductExpectAmount(state, isEdit, isOr
             if (isDay || isNormalProductByDurationSchedule(item)) {
               var quantity = new Decimal(item._extend.quantity || 1);
               var itemTotal = new Decimal(item._extend.total || 0);
-              var itemOriginTotal = new Decimal(item._extend.origin_total || 0);
-              price = price.add((isOriginTotal ? itemOriginTotal : itemTotal).mul(quantity));
+              price = price.add(itemTotal.mul(quantity));
 
               // 普通商品不能加到时长上
               var _duration = isDayBookingProduct(item, state) ? new Decimal(item._extend.duration || 0) : new Decimal(0);
@@ -71,8 +62,7 @@ var getProductExpectAmount = function getProductExpectAmount(state, isEdit, isOr
             } else {
               var _quantity = new Decimal(item._extend.quantity || 1);
               var _itemTotal = new Decimal(item._extend.total || 0);
-              var _itemOriginTotal = new Decimal(item._extend.origin_total || 0);
-              price = price.add((isOriginTotal ? _itemOriginTotal : _itemTotal).mul(_quantity));
+              price = price.add(_itemTotal.mul(_quantity));
 
               // 附加商品
               var relationTotal = new Decimal(getRelationDetailsTotal(item._extend.relation_details || []));
@@ -97,8 +87,7 @@ var getProductExpectAmount = function getProductExpectAmount(state, isEdit, isOr
             var _item = _step3.value;
             var _quantity2 = new Decimal(_item._extend.quantity || 1);
             var _itemTotal2 = new Decimal(_item._extend.total || 0);
-            var _itemOriginTotal2 = new Decimal(_item._extend.origin_total || 0);
-            price = price.add((isOriginTotal ? _itemOriginTotal2 : _itemTotal2).mul(_quantity2));
+            price = price.add(_itemTotal2.mul(_quantity2));
           }
         } catch (err) {
           _iterator3.e(err);
@@ -175,52 +164,7 @@ var getProductItemTax = function getProductItemTax(item, state, options) {
   }
 
   // 结果 = 单个商品税费 × 数量
-  return singleItemTax.times(quantity).toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
-};
-
-/**
- * 计算商品附加费 包含子商品的总附加费
- */
-var getProductSurchargeFee = function getProductSurchargeFee(product) {
-  var _extend = product._extend;
-  if (!_extend) {
-    return 0;
-  }
-  var surcharge_fee = _extend.surcharge_fee,
-    relation_details = _extend.relation_details,
-    other = _extend.other,
-    surcharge_rounding_remainder = _extend.surcharge_rounding_remainder;
-  var totalSurchargeFee = new Decimal(0);
-  if (surcharge_fee) {
-    totalSurchargeFee = totalSurchargeFee.plus(surcharge_fee);
-  }
-  if (surcharge_rounding_remainder) {
-    totalSurchargeFee = totalSurchargeFee.plus(surcharge_rounding_remainder);
-  }
-  if (relation_details) {
-    var _iterator4 = _createForOfIteratorHelper(relation_details),
-      _step4;
-    try {
-      for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-        var item = _step4.value;
-        totalSurchargeFee = totalSurchargeFee.plus(getProductSurchargeFee(item));
-      }
-    } catch (err) {
-      _iterator4.e(err);
-    } finally {
-      _iterator4.f();
-    }
-  }
-  if (other !== null && other !== void 0 && other.bundle) {
-    totalSurchargeFee = totalSurchargeFee.plus(other.bundle.reduce(function (total, item) {
-      var surchargeFee = new Decimal(item.surcharge_fee || 0).times(item.num || item.quantity || 1);
-      if (item.surcharge_rounding_remainder) {
-        surchargeFee = surchargeFee.plus(item.surcharge_rounding_remainder);
-      }
-      return total.plus(surchargeFee);
-    }, new Decimal(0)));
-  }
-  return totalSurchargeFee.toNumber();
+  return singleItemTax.times(quantity);
 };
 
 /**
@@ -239,21 +183,17 @@ var processItemsTax = function processItemsTax(items, state, options) {
     productExpectAmount = computed.productExpectAmount;
   var originTax = new Decimal(0);
   var tax = new Decimal(0);
-  var _iterator5 = _createForOfIteratorHelper(items),
-    _step5;
+  var _iterator4 = _createForOfIteratorHelper(items),
+    _step4;
   try {
-    for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-      var _item$_extend, _item$_extend2, _item$_extend$other;
-      var item = _step5.value;
+    for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+      var item = _step4.value;
       var quantity = new Decimal(item._extend.quantity || 1);
       var unitPrice = new Decimal(item._extend.total || 0);
-      var mainProductPrice = new Decimal(getMainProductTotal(item) || 0);
-
-      // const surchargeFee = getProductSurchargeFee(item);
 
       // 计算原始税费（折扣前）- 单个商品
       var originalTaxPerItem = getProductItemTax(_objectSpread(_objectSpread({}, item), {}, {
-        total: mainProductPrice.add(((_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.surcharge_fee) || 0).toNumber(),
+        total: unitPrice.toNumber(),
         quantity: 1
       }), state, {
         tax_rate: tax_rate,
@@ -266,31 +206,12 @@ var processItemsTax = function processItemsTax(items, state, options) {
         itemDiscount = unitPrice.dividedBy(productExpectAmount).times(shopDiscount);
       }
 
-      // // 商品折后单价 = 商品单价 - 商品折后单价
-      // const itemDiscountedUnitPrice = unitPrice.minus(itemDiscount).add(surchargeFee);
-
-      // // 计算折后税费（折扣后）- 单个商品 加子商品的税费
-      // const discountedTaxPerItem = getProductItemTax(
-      //   {
-      //     ...item,
-      //     total: itemDiscountedUnitPrice.toNumber(),
-      //     price: item._extend.total,
-      //     quantity: 1,
-      //   },
-      //   state,
-      //   { tax_rate, is_price_include_tax }
-      // );
+      // 商品折后单价 = 商品单价 - 商品折后单价
+      var itemDiscountedUnitPrice = unitPrice.minus(itemDiscount);
 
-      // 按比例计算主商品应分摊的折扣
-      var mainItemDiscount = new Decimal(0);
-      if (unitPrice.greaterThan(0)) {
-        mainItemDiscount = mainProductPrice.dividedBy(productExpectAmount).times(shopDiscount);
-      }
-      var mainItemDiscountedUnitPrice = mainProductPrice.minus(mainItemDiscount).add(((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.surcharge_fee) || 0);
-
-      // 计算折后税费（折扣后）- 主商品的税费
-      var maxDiscountedTaxPerItem = getProductItemTax(_objectSpread(_objectSpread({}, item), {}, {
-        total: mainItemDiscountedUnitPrice.toNumber(),
+      // 计算折后税费（折扣后）- 单个商品
+      var discountedTaxPerItem = getProductItemTax(_objectSpread(_objectSpread({}, item), {}, {
+        total: itemDiscountedUnitPrice.toNumber(),
         price: item._extend.total,
         quantity: 1
       }), state, {
@@ -298,20 +219,18 @@ var processItemsTax = function processItemsTax(items, state, options) {
         is_price_include_tax: is_price_include_tax
       });
 
-      // item._extend.payment_price = itemDiscountedUnitPrice;
-      // 保存到商品扩展信息中（保留两位小数）
-      // item._extend.original_tax_fee = originalTaxPerItem.toNumber();
-      // item._extend.tax_fee = discountedTaxPerItem.toNumber();
-      item._extend.main_product_attached_bundle_tax_fee = maxDiscountedTaxPerItem.toNumber();
+      // 保存到商品扩展信息中
+      item._extend.original_tax_fee = originalTaxPerItem.toNumber();
+      item._extend.tax_fee = discountedTaxPerItem.toNumber();
 
       // 注意：加时商品独立计算，不考虑主商品数量
       var addTimeTotalTax = new Decimal(0);
       if (Array.isArray(item._extend.relation_details)) {
-        var _iterator6 = _createForOfIteratorHelper(item._extend.relation_details),
-          _step6;
+        var _iterator5 = _createForOfIteratorHelper(item._extend.relation_details),
+          _step5;
         try {
-          for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-            var atItem = _step6.value;
+          for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+            var atItem = _step5.value;
             // 计算单件加时商品折扣后价格
             var _originTotal = new Decimal(atItem.selling_price || atItem.price || 0);
             var _discountedTotal = _originTotal;
@@ -319,7 +238,8 @@ var processItemsTax = function processItemsTax(items, state, options) {
               _discountedTotal = _originTotal.minus(_originTotal.dividedBy(productExpectAmount).times(shopDiscount));
             }
             var addTimeTaxPerItem = getProductItemTax(_objectSpread(_objectSpread({}, atItem), {}, {
-              total: _discountedTotal.add((atItem === null || atItem === void 0 ? void 0 : atItem.surcharge_fee) || 0).toNumber(),
+              total: _discountedTotal,
+              // 可能包含原有数据，或前端临时数据
               quantity: atItem.product_quantity || atItem.num || 1
             }), state, {
               tax_rate: tax_rate,
@@ -328,84 +248,20 @@ var processItemsTax = function processItemsTax(items, state, options) {
             addTimeTotalTax = addTimeTotalTax.plus(addTimeTaxPerItem);
           }
         } catch (err) {
-          _iterator6.e(err);
+          _iterator5.e(err);
         } finally {
-          _iterator6.f();
+          _iterator5.f();
         }
       }
 
-      // 处理 bundle 子商品（仅原价子商品）
-      var bundleTotalOriginTax = new Decimal(0);
-      var bundleTotalTax = new Decimal(0);
-      if (Array.isArray((_item$_extend$other = item._extend.other) === null || _item$_extend$other === void 0 ? void 0 : _item$_extend$other.bundle)) {
-        var _iterator7 = _createForOfIteratorHelper(item._extend.other.bundle),
-          _step7;
-        try {
-          for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-            var bundleItem = _step7.value;
-            // 只处理原价的子商品
-            if (getBundleItemIsOriginalPrice(bundleItem)) {
-              var _ref2, _bundleItem$bundle_se;
-              var bundleQuantity = new Decimal(bundleItem.quantity || 1);
-              var bundleUnitPrice = new Decimal((_ref2 = (_bundleItem$bundle_se = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se !== void 0 ? _bundleItem$bundle_se : bundleItem.price) !== null && _ref2 !== void 0 ? _ref2 : 0);
-
-              // 计算原始税费（折扣前）- 单个商品
-              var bundleOriginalTaxPerItem = getProductItemTax(_objectSpread(_objectSpread({}, bundleItem), {}, {
-                total: bundleUnitPrice.add((bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.surcharge_fee) || 0).toNumber(),
-                quantity: 1
-              }), state, {
-                tax_rate: tax_rate,
-                is_price_include_tax: is_price_include_tax
-              });
-
-              // 计算平摊到该bundle商品的折扣
-              var bundleItemDiscount = new Decimal(0);
-              if (productExpectAmount > 0) {
-                bundleItemDiscount = bundleUnitPrice.dividedBy(productExpectAmount).times(shopDiscount);
-              }
-
-              // bundle商品折后单价
-              var bundleDiscountedUnitPrice = bundleUnitPrice.minus(bundleItemDiscount).add((bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.surcharge_fee) || 0);
-
-              // 计算折后税费（折扣后）- 单个商品
-              var bundleDiscountedTaxPerItem = getProductItemTax(_objectSpread(_objectSpread({}, bundleItem), {}, {
-                total: bundleDiscountedUnitPrice.toNumber(),
-                quantity: 1
-              }), state, {
-                tax_rate: tax_rate,
-                is_price_include_tax: is_price_include_tax
-              });
-
-              // bundle商品折后单价
-              // bundleItem.bundle_payment_price = bundleDiscountedUnitPrice;
-              // 保存到bundle商品上（单个商品的税费，保留两位小数）
-              bundleItem.original_tax_fee = new Decimal(bundleOriginalTaxPerItem).toNumber();
-              bundleItem.tax_fee = new Decimal(bundleDiscountedTaxPerItem).toNumber();
-
-              // 累加bundle税费（需要乘以bundle数量和主商品数量）
-              bundleTotalOriginTax = bundleTotalOriginTax.plus(bundleOriginalTaxPerItem.times(bundleQuantity));
-              bundleTotalTax = bundleTotalTax.plus(bundleDiscountedTaxPerItem.times(bundleQuantity));
-            }
-          }
-        } catch (err) {
-          _iterator7.e(err);
-        } finally {
-          _iterator7.f();
-        }
-      }
-      var original_tax_fee = originalTaxPerItem.add(bundleTotalOriginTax);
-      var tax_fee = maxDiscountedTaxPerItem.add(bundleTotalTax);
-      item._extend.original_tax_fee = original_tax_fee.toNumber();
-      item._extend.tax_fee = tax_fee.toNumber();
-
       // 累加到总税费（乘以数量）
-      originTax = originTax.plus(original_tax_fee.times(quantity)).plus(addTimeTotalTax);
-      tax = tax.plus(tax_fee.times(quantity)).plus(addTimeTotalTax);
+      originTax = originTax.plus(originalTaxPerItem.times(quantity)).plus(addTimeTotalTax);
+      tax = tax.plus(discountedTaxPerItem.times(quantity)).plus(addTimeTotalTax);
     }
   } catch (err) {
-    _iterator5.e(err);
+    _iterator4.e(err);
   } finally {
-    _iterator5.f();
+    _iterator4.f();
   }
   return {
     originTax: originTax,
@@ -505,9 +361,10 @@ var isProductMatchSurchargeCondition = function isProductMatchSurchargeCondition
   var surchargeConfig = options.surchargeConfig,
     _options$scheduleById = options.scheduleById,
     scheduleById = _options$scheduleById === void 0 ? {} : _options$scheduleById;
-  var startDate = item.startDate,
-    product_id = item.product_id,
-    isCustomItem = item.isCustomItem;
+  var _item$_extend = item._extend,
+    startDate = _item$_extend.startDate,
+    other = _item$_extend.other,
+    isCustomItem = _item$_extend.isCustomItem;
   var _surchargeConfig$open = surchargeConfig.open_product,
     open_product = _surchargeConfig$open === void 0 ? 0 : _surchargeConfig$open,
     _surchargeConfig$is_a = surchargeConfig.is_all,
@@ -538,6 +395,7 @@ var isProductMatchSurchargeCondition = function isProductMatchSurchargeCondition
         isProductMatch = false;
       } else {
         // 普通商品：检查是否在指定商品列表中
+        var product_id = other === null || other === void 0 ? void 0 : other.product_id;
         isProductMatch = available_product_ids.includes(product_id);
       }
     }
@@ -576,148 +434,6 @@ var isProductMatchSurchargeCondition = function isProductMatchSurchargeCondition
   return isProductMatch && isScheduleMatch;
 };
 
-// bundle商品是否是原价
-var getBundleItemIsOriginalPrice = function getBundleItemIsOriginalPrice(item) {
-  return (item === null || item === void 0 ? void 0 : item.price_type) === 'markup' && (item === null || item === void 0 ? void 0 : item.price_type_ext) === 'product_price';
-};
-
-// bundle商品是否是加价
-var getBundleItemIsMarkupPrice = function getBundleItemIsMarkupPrice(item) {
-  return (item === null || item === void 0 ? void 0 : item.price_type) === 'markup' && ((item === null || item === void 0 ? void 0 : item.price_type_ext) === '' || !(item !== null && item !== void 0 && item.price_type_ext));
-};
-
-// bundle商品是否是减价
-var getBundleItemIsDiscountPrice = function getBundleItemIsDiscountPrice(item) {
-  return (item === null || item === void 0 ? void 0 : item.price_type) === 'markdown' && ((item === null || item === void 0 ? void 0 : item.price_type_ext) === '' || !(item !== null && item !== void 0 && item.price_type_ext));
-};
-
-// bundle商品是否是加价或减价
-var getBundleItemIsMarkupOrDiscountPrice = function getBundleItemIsMarkupOrDiscountPrice(item) {
-  return getBundleItemIsMarkupPrice(item) || getBundleItemIsDiscountPrice(item);
-};
-var getDiscountAmount = function getDiscountAmount(discounts) {
-  return (discounts || []).reduce(function (total, discount) {
-    return total.add(new Decimal(discount.amount || 0));
-  }, new Decimal(0)).toNumber();
-};
-
-/**
- * 获取主商品加价减价后的总价 (主商品价格 + 子商品加价减价)
- */
-var getMainProductTotal = function getMainProductTotal(item) {
-  var _ref3, _ref4, _item$_extend$main_pr, _item$_extend3, _item$metadata, _item$_extend$other2, _item$_extend$other3, _item$_extend$other5;
-  var total = new Decimal((_ref3 = (_ref4 = (_item$_extend$main_pr = (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.main_product_selling_price) !== null && _item$_extend$main_pr !== void 0 ? _item$_extend$main_pr : item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.main_product_selling_price) !== null && _ref4 !== void 0 ? _ref4 : item._extend.price) !== null && _ref3 !== void 0 ? _ref3 : 0);
-
-  // 单规格 
-  if ((_item$_extend$other2 = item._extend.other) !== null && _item$_extend$other2 !== void 0 && _item$_extend$other2.option && Array.isArray((_item$_extend$other3 = item._extend.other) === null || _item$_extend$other3 === void 0 ? void 0 : _item$_extend$other3.option)) {
-    var _item$_extend$other4;
-    total = total.add((_item$_extend$other4 = item._extend.other) === null || _item$_extend$other4 === void 0 ? void 0 : _item$_extend$other4.option.reduce(function (t, option) {
-      return t.add(new Decimal(option.price || 0).mul(option.num || 1));
-    }, new Decimal(0)));
-  }
-  var _iterator8 = _createForOfIteratorHelper(((_item$_extend$other5 = item._extend.other) === null || _item$_extend$other5 === void 0 ? void 0 : _item$_extend$other5.bundle) || []),
-    _step8;
-  try {
-    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-      var bundleItem = _step8.value;
-      if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
-        var _ref5, _bundleItem$bundle_se2;
-        // 子商品折扣金额
-        var discountAmount = getDiscountAmount(bundleItem.discount_list);
-        // 子商品价格
-        var bundleItemPrice = new Decimal((_ref5 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref5 !== void 0 ? _ref5 : 0);
-        // todo: 套餐子商品后不需要处理 子商品价格 - 子商品折扣金额
-        var bundleItemTotal = bundleItemPrice.minus(discountAmount);
-        total = total.add(bundleItemTotal);
-      }
-    }
-  } catch (err) {
-    _iterator8.e(err);
-  } finally {
-    _iterator8.f();
-  }
-  return total.toNumber();
-};
-
-/**
- * 清除附加费
- */
-var clearSurchargeFee = function clearSurchargeFee(state) {
-  var service = state.service,
-    addons = state.addons;
-  if (Array.isArray(service === null || service === void 0 ? void 0 : service.value)) {
-    var _iterator9 = _createForOfIteratorHelper(service.value),
-      _step9;
-    try {
-      for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-        var _item$_extend$other6;
-        var item = _step9.value;
-        item._extend.surcharge_fee = 0;
-        item._extend.relation_surcharge_ids = [];
-        var _iterator10 = _createForOfIteratorHelper(((_item$_extend$other6 = item._extend.other) === null || _item$_extend$other6 === void 0 ? void 0 : _item$_extend$other6.bundle) || []),
-          _step10;
-        try {
-          for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-            var bundleItem = _step10.value;
-            bundleItem.surcharge_fee = 0;
-            bundleItem.relation_surcharge_ids = [];
-          }
-        } catch (err) {
-          _iterator10.e(err);
-        } finally {
-          _iterator10.f();
-        }
-        var _iterator11 = _createForOfIteratorHelper(item._extend.relation_details || []),
-          _step11;
-        try {
-          for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
-            var relationDetail = _step11.value;
-            relationDetail.surcharge_fee = 0;
-            relationDetail.relation_surcharge_ids = [];
-          }
-        } catch (err) {
-          _iterator11.e(err);
-        } finally {
-          _iterator11.f();
-        }
-      }
-    } catch (err) {
-      _iterator9.e(err);
-    } finally {
-      _iterator9.f();
-    }
-  }
-  if (Array.isArray(addons === null || addons === void 0 ? void 0 : addons.value)) {
-    var _iterator12 = _createForOfIteratorHelper(addons.value),
-      _step12;
-    try {
-      for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-        var _item2$_extend$other;
-        var _item2 = _step12.value;
-        _item2._extend.surcharge_fee = 0;
-        _item2._extend.relation_surcharge_ids = [];
-        var _iterator13 = _createForOfIteratorHelper(((_item2$_extend$other = _item2._extend.other) === null || _item2$_extend$other === void 0 ? void 0 : _item2$_extend$other.bundle) || []),
-          _step13;
-        try {
-          for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-            var _bundleItem = _step13.value;
-            _bundleItem.surcharge_fee = 0;
-            _bundleItem.relation_surcharge_ids = [];
-          }
-        } catch (err) {
-          _iterator13.e(err);
-        } finally {
-          _iterator13.f();
-        }
-      }
-    } catch (err) {
-      _iterator12.e(err);
-    } finally {
-      _iterator12.f();
-    }
-  }
-};
-
 /**
  * 订单附加费各项信息
  * @param state
@@ -754,8 +470,6 @@ var getSurcharge = function getSurcharge(state, options) {
     }
     return [];
   }
-  // 清除附加费
-  clearSurchargeFee(state);
 
   // 新增状态
   var service = state.service,
@@ -775,252 +489,93 @@ var getSurcharge = function getSurcharge(state, options) {
       fixed = _surchargeConfig$fixe === void 0 ? '0' : _surchargeConfig$fixe,
       id = surchargeConfig.id,
       type = surchargeConfig.type,
-      description = surchargeConfig.description,
-      open_product = surchargeConfig.open_product;
+      description = surchargeConfig.description;
 
     // 收集所有符合条件的商品
     var matchedItems = [];
 
     // 检查service中符合条件的商品
     if (Array.isArray(service === null || service === void 0 ? void 0 : service.value)) {
-      var _iterator14 = _createForOfIteratorHelper(service.value),
-        _step14;
+      var _iterator6 = _createForOfIteratorHelper(service.value),
+        _step6;
       try {
-        for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
-          var _item$_extend$other7;
-          var item = _step14.value;
-          // 主商品符合附加费条件
-          if (isProductMatchSurchargeCondition({
-            isCustomItem: item.isCustomItem,
-            startDate: item._extend.startDate,
-            product_id: item.product_id
-          }, {
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+          var item = _step6.value;
+          if (isProductMatchSurchargeCondition(item, {
             surchargeConfig: surchargeConfig,
             scheduleById: scheduleById || {},
             ScheduleModule: ScheduleModule
           })) {
-            // 主商品加价减价后的总价
-            var total = getMainProductTotal(item);
-            var mainQuantity = item._extend.quantity || 1;
             matchedItems.push({
-              total: total,
-              // addTimeTotal: getRelationDetailsTotal(
-              //   item._extend.relation_details || []
-              // ),
-              isMain: true,
-              quantity: mainQuantity,
-              item: item,
-              mainQuantity: mainQuantity // 主商品的mainQuantity等于自己的quantity
+              total: Number(item._extend.total),
+              addTimeTotal: getRelationDetailsTotal(item._extend.relation_details || []),
+              quantity: item._extend.quantity || 1
             });
           }
-          // 遍历子商品 原价商品符合附加费条件
-          var _iterator15 = _createForOfIteratorHelper(((_item$_extend$other7 = item._extend.other) === null || _item$_extend$other7 === void 0 ? void 0 : _item$_extend$other7.bundle) || []),
-            _step15;
-          try {
-            for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
-              var bundleItem = _step15.value;
-              // bundle商品是原价且符合附加费条件
-              if (getBundleItemIsOriginalPrice(bundleItem) && isProductMatchSurchargeCondition({
-                isCustomItem: false,
-                startDate: item._extend.startDate,
-                product_id: bundleItem._bundle_product_id
-              }, {
-                surchargeConfig: surchargeConfig,
-                scheduleById: scheduleById || {},
-                ScheduleModule: ScheduleModule
-              })) {
-                var _ref6, _bundleItem$bundle_se3;
-                var _mainQuantity = item._extend.quantity || 1;
-                matchedItems.push({
-                  isMain: false,
-                  total: Number((_ref6 = (_bundleItem$bundle_se3 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se3 !== void 0 ? _bundleItem$bundle_se3 : bundleItem.price) !== null && _ref6 !== void 0 ? _ref6 : 0),
-                  quantity: bundleItem.num || bundleItem.quantity || 1,
-                  item: bundleItem,
-                  mainQuantity: _mainQuantity // 子商品的mainQuantity是所属主商品的quantity
-                });
-              }
-            }
-
-            // 加时商品符合附加费条件
-          } catch (err) {
-            _iterator15.e(err);
-          } finally {
-            _iterator15.f();
-          }
-          var _iterator16 = _createForOfIteratorHelper(item._extend.relation_details || []),
-            _step16;
-          try {
-            for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
-              var relationDetail = _step16.value;
-              if (isProductMatchSurchargeCondition({
-                isCustomItem: false,
-                startDate: item._extend.startDate,
-                product_id: relationDetail.product_id
-              }, {
-                surchargeConfig: surchargeConfig,
-                scheduleById: scheduleById || {},
-                ScheduleModule: ScheduleModule
-              })) {
-                var _relationDetail$metad;
-                matchedItems.push({
-                  isMain: false,
-                  total: Number((relationDetail === null || relationDetail === void 0 ? void 0 : relationDetail.price) || (relationDetail === null || relationDetail === void 0 || (_relationDetail$metad = relationDetail.metadata) === null || _relationDetail$metad === void 0 ? void 0 : _relationDetail$metad.main_product_attached_bundle_selling_price)),
-                  quantity: relationDetail.num || relationDetail.quantity || 1,
-                  item: relationDetail,
-                  mainQuantity: 1 // 加时商品不受主商品数量影响
-                });
-              }
-            }
-          } catch (err) {
-            _iterator16.e(err);
-          } finally {
-            _iterator16.f();
-          }
         }
       } catch (err) {
-        _iterator14.e(err);
+        _iterator6.e(err);
       } finally {
-        _iterator14.f();
+        _iterator6.f();
       }
     }
 
     // 检查addons中符合条件的商品
     if (Array.isArray(addons === null || addons === void 0 ? void 0 : addons.value)) {
-      var _iterator17 = _createForOfIteratorHelper(addons.value),
-        _step17;
+      var _iterator7 = _createForOfIteratorHelper(addons.value),
+        _step7;
       try {
-        for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
-          var _item3 = _step17.value;
-          if (isProductMatchSurchargeCondition(_item3, {
+        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+          var _item2 = _step7.value;
+          if (isProductMatchSurchargeCondition(_item2, {
             surchargeConfig: surchargeConfig,
             scheduleById: scheduleById || {},
             ScheduleModule: ScheduleModule
           })) {
             matchedItems.push({
-              isMain: true,
-              total: Number(_item3._extend.total),
-              quantity: _item3._extend.quantity || 1,
-              item: _item3,
-              mainQuantity: 1 // addons独立商品，mainQuantity为1
+              total: Number(_item2._extend.total),
+              quantity: _item2._extend.quantity || 1
             });
           }
         }
       } catch (err) {
-        _iterator17.e(err);
+        _iterator7.e(err);
       } finally {
-        _iterator17.f();
+        _iterator7.f();
       }
     }
     var finalAmount = 0;
-
-    // 计算商品总数：主商品和addons按quantity计算，子商品（bundle item）需要乘以主商品数量
-    var productCount = matchedItems.reduce(function (total, item) {
-      if (item.isMain) {
-        // 主商品和addons商品
-        return total + (item.quantity || 1);
-      } else {
-        // 子商品（bundle item）和加时商品
-        // 加时商品的 mainQuantity = 1，所以不受影响
-        // bundle item 的 mainQuantity = 主商品数量，需要乘以实际数量
-        return total + (item.quantity || 1) * (item.mainQuantity || 1);
-      }
-    }, 0);
-
-    // 追加进入的固定附加费总值
-    var fixedTotal = new Decimal(0);
-    // 追加到商品的附加费总值 用于追加抹平字段
-    var productTotalSurcharge = new Decimal(0);
     if (matchedItems.length > 0) {
       // 基于每个商品计算附加费：max(0, 商品价格) * rate + fixed
       var configTotal = new Decimal(0);
 
-      // 计算固定附加费 - 只加一次
-      if (fixed && new Decimal(fixed).gt(0)) {
-        configTotal = configTotal.plus(fixed);
-      }
-
       // 计算百分比附加费 - 对每个商品单独计算
-      if (percentage && new Decimal(percentage).gt(0) || fixed) {
+      if (percentage && new Decimal(percentage).gt(0)) {
         var percentageRate = new Decimal(percentage);
-        var _iterator18 = _createForOfIteratorHelper(matchedItems.entries()),
-          _step18;
+        var _iterator8 = _createForOfIteratorHelper(matchedItems),
+          _step8;
         try {
-          for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
-            var _step18$value = _slicedToArray(_step18.value, 2),
-              index = _step18$value[0],
-              _item4 = _step18$value[1];
-            var isLast = index === matchedItems.length - 1;
+          for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+            var _item3 = _step8.value;
             // 对每个商品：max(0, 价格) * 数量 * 费率
-            var itemPrice = new Decimal(Math.max(0, _item4.total || 0));
-            var itemQuantity = new Decimal(_item4.isMain ? _item4.quantity || 1 : _item4.quantity * _item4.mainQuantity || 1);
-            var addTimeTotal = new Decimal(_item4.addTimeTotal || 0);
-            // 单个商品总附加费
-            var itemTotalSurcharge = itemPrice.times(itemQuantity).plus(addTimeTotal).times(percentageRate);
-            configTotal = configTotal.plus(itemTotalSurcharge);
-
-            // 单个商品单数量附加费
-            var itemSurcharge = itemPrice.times(percentageRate);
-
-            // 固定附加费 = 1 / 商品数量 * 固定附加费（向下取整保留两位小数）
-            var fixedSurcharge = new Decimal(1).div(productCount).times(fixed).times(100).floor().div(100).toFixed(2);
-            var quantity = _item4.isMain ? _item4.quantity : _item4.quantity * _item4.mainQuantity;
-            fixedTotal = fixedTotal.plus(new Decimal(fixedSurcharge).times(quantity).toNumber());
-
-            // 如果是最后一个商品 判断fixed - fixedTotal 是否有剩余小数 如果有的话，追加抹平字段
-            if (isLast && fixedTotal.gt(0)) {
-              var remaining = new Decimal(fixed).minus(fixedTotal).toNumber();
-              if (remaining > 0) {
-                productTotalSurcharge = productTotalSurcharge.plus(remaining);
-                if (_item4.isMain) {
-                  _item4.item._extend.surcharge_rounding_remainder = remaining;
-                } else {
-                  _item4.item.surcharge_rounding_remainder = remaining;
-                }
-              }
-            }
-            // 只有当 open_product !== 0 时，才将附加费追加到商品身上
-            // open_product === 0 表示商品未开启该附加费，只在订单级别累加
-            if (open_product !== 0) {
-              if (_item4.isMain) {
-                var _item4$item$_extend;
-                var originSurchargeFee = new Decimal(_item4.item._extend.surcharge_fee || 0);
-                // 保留两位小数
-                var surchargeFee = originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
-                productTotalSurcharge = productTotalSurcharge.plus(new Decimal(surchargeFee).times(itemQuantity).toNumber());
-                _item4.item._extend.surcharge_fee = surchargeFee;
-                _item4.item._extend.relation_surcharge_ids = [].concat(_toConsumableArray(((_item4$item$_extend = _item4.item._extend) === null || _item4$item$_extend === void 0 ? void 0 : _item4$item$_extend.relation_surcharge_ids) || []), [id]);
-              } else {
-                var _item4$item;
-                var _originSurchargeFee = new Decimal(_item4.item.surcharge_fee || 0);
-                // 保留两位小数
-                var _surchargeFee = _originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
-                productTotalSurcharge = productTotalSurcharge.plus(new Decimal(_surchargeFee).times(itemQuantity).toNumber());
-                _item4.item.surcharge_fee = _surchargeFee;
-                _item4.item.relation_surcharge_ids = [].concat(_toConsumableArray(((_item4$item = _item4.item) === null || _item4$item === void 0 ? void 0 : _item4$item.relation_surcharge_ids) || []), [id]);
-              }
-            }
-            // 最后一个商品 判断configTotal - productTotalSurcharge 是否有剩余小数 如果有的话，追加抹平字段
-            if (isLast && configTotal.minus(productTotalSurcharge).gt(0)) {
-              // 四舍五入configTotal
-              var configTotalRounded = configTotal.toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
-              if (_item4.isMain) {
-                var newRoundingRemainder = new Decimal(_item4.item._extend.surcharge_rounding_remainder || 0);
-                newRoundingRemainder = newRoundingRemainder.plus(configTotalRounded.minus(productTotalSurcharge));
-                _item4.item._extend.surcharge_rounding_remainder = newRoundingRemainder.toNumber();
-              } else {
-                var _newRoundingRemainder = new Decimal(_item4.item.surcharge_rounding_remainder || 0);
-                _newRoundingRemainder = _newRoundingRemainder.plus(configTotalRounded.minus(productTotalSurcharge));
-                _item4.item.surcharge_rounding_remainder = _newRoundingRemainder.toNumber();
-              }
-            }
+            var itemPrice = new Decimal(Math.max(0, _item3.total || 0));
+            var itemQuantity = new Decimal(_item3.quantity || 1);
+            var addTimeTotal = new Decimal(_item3.addTimeTotal || 0);
+            var itemSurcharge = itemPrice.times(itemQuantity).plus(addTimeTotal).times(percentageRate);
+            configTotal = configTotal.plus(itemSurcharge);
           }
         } catch (err) {
-          _iterator18.e(err);
+          _iterator8.e(err);
         } finally {
-          _iterator18.f();
+          _iterator8.f();
         }
       }
 
+      // 计算固定附加费 - 只加一次
+      if (fixed && new Decimal(fixed).gt(0)) {
+        configTotal = configTotal.plus(fixed);
+      }
+
       // 如果该配置有金额，则添加到结果中
       finalAmount = configTotal.toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
     }
@@ -1039,10 +594,7 @@ var getSurcharge = function getSurcharge(state, options) {
       type: 'default',
       fixed: fixed,
       amount: finalAmount,
-      percentage: percentage,
-      metadata: {
-        open_product: open_product
-      }
+      percentage: percentage
     });
   }
   return surchargeWithAmount;
@@ -1113,13 +665,13 @@ export var getIsPriceIncludeTax = function getIsPriceIncludeTax(state) {
   var _state$bookingDetail$, _state$bookingDetail6;
   return (_state$bookingDetail$ = (_state$bookingDetail6 = state.bookingDetail) === null || _state$bookingDetail6 === void 0 ? void 0 : _state$bookingDetail6.is_price_include_tax) !== null && _state$bookingDetail$ !== void 0 ? _state$bookingDetail$ : 0;
 };
-var getExpectAmount = function getExpectAmount(_ref7) {
-  var price = _ref7.price,
-    tax = _ref7.tax,
-    surchargeAmount = _ref7.surchargeAmount,
-    shopDiscount = _ref7.shopDiscount,
-    state = _ref7.state,
-    options = _ref7.options;
+var getExpectAmount = function getExpectAmount(_ref2) {
+  var price = _ref2.price,
+    tax = _ref2.tax,
+    surchargeAmount = _ref2.surchargeAmount,
+    shopDiscount = _ref2.shopDiscount,
+    state = _ref2.state,
+    options = _ref2.options;
   var _tax = tax;
   // 如果价格含税, 则将税费改为0
   if (getIsPriceIncludeTax(state) || options !== null && options !== void 0 && options.is_price_include_tax) {
@@ -1141,9 +693,9 @@ var getRoundingAmount = function getRoundingAmount(state) {
   var _state$bookingDetail9;
   return Number(state === null || state === void 0 || (_state$bookingDetail9 = state.bookingDetail) === null || _state$bookingDetail9 === void 0 ? void 0 : _state$bookingDetail9.rounding_amount) || 0;
 };
-var getSumTotalAmount = function getSumTotalAmount(_ref8) {
-  var expectAmount = _ref8.expectAmount,
-    roundingAmount = _ref8.roundingAmount;
+var getSumTotalAmount = function getSumTotalAmount(_ref3) {
+  var expectAmount = _ref3.expectAmount,
+    roundingAmount = _ref3.roundingAmount;
   return expectAmount + roundingAmount;
 };
 
@@ -1215,20 +767,6 @@ export var getSumTotal = function getSumTotal(state, options) {
     options: options
   });
 
-  // 商品原价 不包含折扣
-  var _getProductExpectAmou2 = getProductExpectAmount(state, options.isEdit, true),
-    productExpectAmountWithoutDiscount = _getProductExpectAmou2.productExpectAmount;
-
-  // 订单原价 不包含整单折扣 不包含商品券折扣卡抵扣
-  var originExpectAmountWithoutDiscount = getExpectAmount({
-    price: productExpectAmountWithoutDiscount,
-    tax: originTax,
-    surchargeAmount: surchargeAmount,
-    shopDiscount: 0,
-    state: state,
-    options: options
-  });
-
   // 总支付金额  总计
   var sumTotalAmount = getSumTotalAmount({
     expectAmount: expectAmount,
@@ -1265,8 +803,6 @@ export var getSumTotal = function getSumTotal(state, options) {
     totalRefundAmount: totalRefundAmount,
     dueAmount: dueAmount,
     roundingAmount: roundingAmount,
-    originExpectAmount: originExpectAmount,
-    // 订单原价 不包含整单折扣 不包含商品券折扣卡抵扣
-    originExpectAmountWithoutDiscount: originExpectAmountWithoutDiscount
+    originExpectAmount: originExpectAmount
   };
 };