@pisell/pisellos 0.0.400 → 0.0.401

package/dist/modules/Summary/index.js

@@ -114,8 +114,8 @@ export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
           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) || {};
-              scheduleModule = this.core.getModule('appointmentBooking_schedule');
-              summary = calculatePriceDetails(shopInfo, cartItems, scheduleModule, this.store.surchargeList);
+              scheduleModule = this.core.getModule('appointmentBooking_schedule'); //@ts-ignore
+              summary = calculatePriceDetails(shopInfo, cartItems, scheduleModule === null || scheduleModule === void 0 ? void 0 : scheduleModule.isInScheduleByDate, this.store.surchargeList);
               this.store.summary = summary;
               return _context3.abrupt("return", this.store.summary);
             case 5:

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

@@ -16,6 +16,10 @@ export interface ISummaryState {
         isPriceIncludeTax?: 0 | 1;
         /** 附加费金额 */
         surchargeAmount?: string | number;
+        /** 附加费列表 */
+        surcharge?: any[];
+        /** 税率 */
+        taxRate?: string | number;
         /** 定金 */
         deposit?: {
             /** 定金总价 */

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

@@ -1,8 +1,7 @@
 import Decimal from 'decimal.js';
 import { CartItem } from '../Cart/types';
 import { ISummaryState } from './types';
-import { ScheduleModule } from '../Schedule';
-export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[], scheduleModule: ScheduleModule, surchargeList: any[]) => ISummaryState['summary'];
+export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[], isInScheduleByDate: any, surchargeList: any[]) => ISummaryState['summary'];
 /**
  * 获取子商品折扣信息
  * @param item
@@ -55,7 +54,7 @@ export declare const getSurcharge: ({ service, addons, bookingDetail, bookingId
     bookingId?: number | undefined;
 }, options: {
     isEdit: boolean;
-    ScheduleModule: any;
+    isInScheduleByDate: any;
     surcharge_list?: any[];
     scheduleById?: Record<string, any>;
 } & Record<string, any>) => any;

package/dist/modules/Summary/utils.js

@@ -1,7 +1,13 @@
+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 _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; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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 _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."); }
@@ -10,10 +16,18 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import Decimal from 'decimal.js';
-export var calculatePriceDetails = function calculatePriceDetails(shopInfo, items, scheduleModule, surchargeList) {
+export var calculatePriceDetails = function calculatePriceDetails(shopInfo, items, isInScheduleByDate, surchargeList) {
   var subtotal = new Decimal(calculateSubtotal(items));
   var subOriginTotal = new Decimal(calculateOriginSubtotal(items));
   var totalTaxFee = new Decimal(calculateTaxFee(shopInfo, items));
+  // 税费
+  // const { tax, originTax } = getTax({ service: items, bookingDetail: null, bookingId: undefined }, {
+  //   computed: {
+  //     productExpectAmount: subtotal.toNumber(),
+  //     shopDiscount: 0,
+  //   },
+  //   isEdit: false,
+  // });
   // 订单附加费列表
   var surcharge = getSurcharge({
     service: items,
@@ -22,7 +36,7 @@ export var calculatePriceDetails = function calculatePriceDetails(shopInfo, item
     bookingId: undefined
   }, {
     isEdit: false,
-    ScheduleModule: scheduleModule,
+    isInScheduleByDate: isInScheduleByDate,
     surcharge_list: surchargeList,
     scheduleById: {}
   });
@@ -47,8 +61,10 @@ export var calculatePriceDetails = function calculatePriceDetails(shopInfo, item
     total: total.toFixed(2),
     originTotal: originTotal.toFixed(2),
     taxTitle: shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.tax_title,
+    taxRate: shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.tax_rate,
     totalTaxFee: totalTaxFee.toFixed(2),
     isPriceIncludeTax: shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.is_price_include_tax,
+    surcharge: surcharge,
     surchargeAmount: surchargeAmount.toFixed(2),
     deposit: deposit
   };
@@ -82,6 +98,395 @@ var getProductDiscountProductDiscountDifference = function getProductDiscountPro
   }, 0);
 };
 
+/**
+ * 税费
+ * @param state
+ * @param options 包含 isEdit、computed 和其他税费计算所需参数
+ * @returns
+ */
+var getTax = function getTax(_ref, options) {
+  var service = _ref.service,
+    addons = _ref.addons,
+    bookingDetail = _ref.bookingDetail,
+    bookingId = _ref.bookingId;
+  var isEdit = options.isEdit,
+    computed = options.computed,
+    tax_rate = options.tax_rate,
+    is_price_include_tax = options.is_price_include_tax;
+
+  // 详情时未编辑的状态下, 取后端的值
+  if (!isEdit) {
+    return {
+      tax: Number(bookingDetail === null || bookingDetail === void 0 ? void 0 : bookingDetail.tax_fee) || 0
+    };
+  }
+  var totalOriginTax = new Decimal(0);
+  var totalTax = new Decimal(0);
+  if (service || addons) {
+    // 处理服务商品
+    if (service !== null && service !== void 0 && service.length) {
+      var serviceResult = processItemsTax(service, {
+        bookingDetail: bookingDetail,
+        bookingId: bookingId
+      }, {
+        tax_rate: tax_rate,
+        is_price_include_tax: is_price_include_tax,
+        computed: computed
+      });
+      totalOriginTax = totalOriginTax.plus(serviceResult.originTax);
+      totalTax = totalTax.plus(serviceResult.tax);
+    }
+
+    // 处理附加商品
+    if (addons !== null && addons !== void 0 && addons.length) {
+      var addonsResult = processItemsTax(addons, {
+        bookingDetail: bookingDetail,
+        bookingId: bookingId
+      }, {
+        tax_rate: tax_rate,
+        is_price_include_tax: is_price_include_tax,
+        computed: computed
+      });
+      totalOriginTax = totalOriginTax.plus(addonsResult.originTax);
+      totalTax = totalTax.plus(addonsResult.tax);
+    }
+  }
+  return {
+    originTax: totalOriginTax.toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber(),
+    tax: totalTax.toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber()
+  };
+};
+
+/**
+ * 处理商品税费计算（折扣前后）
+ * 支持税费舍入差值追加到最后一个含税商品的 tax_fee_rounding_remainder / original_tax_fee_rounding_remainder 字段
+ * @param items 商品数组
+ * @param state 状态
+ * @param options 选项
+ * @param computed 计算结果
+ * @returns 累积的税费信息
+ */
+var processItemsTax = function processItemsTax(items, _ref2, options) {
+  var bookingDetail = _ref2.bookingDetail,
+    bookingId = _ref2.bookingId;
+  var tax_rate = options.tax_rate,
+    is_price_include_tax = options.is_price_include_tax,
+    computed = options.computed;
+  var shopDiscount = computed.shopDiscount,
+    productExpectAmount = computed.productExpectAmount;
+
+  // 精确税费累加（不四舍五入）
+  var preciseOriginTax = new Decimal(0);
+  var preciseTax = new Decimal(0);
+  // 四舍五入后的税费累加
+  var roundedOriginTax = new Decimal(0);
+  var roundedTax = new Decimal(0);
+
+  /**
+   * 最后一个含税商品的引用（按物理位置）
+   * 用于追加税费舍入差值
+   */
+  var lastTaxableItem = null;
+  var _iterator = _createForOfIteratorHelper(items),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var _item$_extend$other;
+      var item = _step.value;
+      var quantity = new Decimal(item.num || 1);
+      var unitPrice = new Decimal(item.total || 0);
+      var mainProductPrice = new Decimal(getMainProductTotal(item) || 0);
+
+      // 计算原始税费（折扣前）- 单个商品（精确值）
+      var originalTaxPerItemPrecise = getProductItemTax(_objectSpread(_objectSpread({}, item), {}, {
+        total: mainProductPrice.add((item === null || item === void 0 ? void 0 : item.surcharge_fee) || 0).toNumber(),
+        quantity: 1
+      }), {
+        bookingDetail: bookingDetail,
+        bookingId: bookingId
+      }, {
+        tax_rate: tax_rate,
+        is_price_include_tax: is_price_include_tax
+      });
+
+      // 计算平摊到该商品的折扣
+      var itemDiscount = new Decimal(0);
+      if (productExpectAmount > 0) {
+        itemDiscount = unitPrice.dividedBy(productExpectAmount).times(shopDiscount);
+      }
+
+      // 按比例计算主商品应分摊的折扣
+      var mainItemDiscount = new Decimal(0);
+      if (unitPrice.greaterThan(0)) {
+        mainItemDiscount = mainProductPrice.dividedBy(productExpectAmount).times(shopDiscount);
+      }
+      var mainItemDiscountedUnitPrice = mainProductPrice.minus(mainItemDiscount).add((item === null || item === void 0 ? void 0 : item.surcharge_fee) || 0);
+
+      // 计算折后税费（折扣后）- 主商品的税费（精确值）
+      var maxDiscountedTaxPerItemPrecise = getProductItemTax(_objectSpread(_objectSpread({}, item), {}, {
+        total: mainItemDiscountedUnitPrice.toNumber(),
+        price: item.total,
+        quantity: 1
+      }), {
+        bookingDetail: bookingDetail,
+        bookingId: bookingId
+      }, {
+        tax_rate: tax_rate,
+        is_price_include_tax: is_price_include_tax
+      });
+
+      // 四舍五入后的值
+      var maxDiscountedTaxPerItemRounded = maxDiscountedTaxPerItemPrecise.toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
+
+      // 保存到商品扩展信息中（保留两位小数）
+      item.main_product_attached_bundle_tax_fee = maxDiscountedTaxPerItemRounded.toNumber();
+
+      // 如果主商品有税费，记录为最后一个含税商品
+      if (maxDiscountedTaxPerItemPrecise.gt(0)) {
+        lastTaxableItem = {
+          type: 'main',
+          item: item
+        };
+      }
+
+      // 注意：加时商品独立计算，不考虑主商品数量
+      var addTimePreciseTax = new Decimal(0);
+      var addTimeRoundedTax = new Decimal(0);
+      if (Array.isArray(item.relation_details)) {
+        var _iterator2 = _createForOfIteratorHelper(item.relation_details),
+          _step2;
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var atItem = _step2.value;
+            // 计算单件加时商品折扣后价格
+            var _originTotal = new Decimal(atItem.selling_price || atItem.price || 0);
+            var _discountedTotal = _originTotal;
+            if (productExpectAmount > 0) {
+              _discountedTotal = _originTotal.minus(_originTotal.dividedBy(productExpectAmount).times(shopDiscount));
+            }
+            var addTimeTaxPerItemPrecise = getProductItemTax(_objectSpread(_objectSpread({}, atItem), {}, {
+              total: _discountedTotal.add((atItem === null || atItem === void 0 ? void 0 : atItem.surcharge_fee) || 0).toNumber(),
+              quantity: atItem.product_quantity || atItem.num || 1
+            }), {
+              bookingDetail: bookingDetail,
+              bookingId: bookingId
+            }, {
+              tax_rate: tax_rate,
+              is_price_include_tax: is_price_include_tax
+            });
+            var addTimeTaxPerItemRounded = addTimeTaxPerItemPrecise.toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
+
+            // 保存到加时商品上（四舍五入后的值）
+            atItem.tax_fee = addTimeTaxPerItemRounded.toNumber();
+            addTimePreciseTax = addTimePreciseTax.plus(addTimeTaxPerItemPrecise);
+            addTimeRoundedTax = addTimeRoundedTax.plus(addTimeTaxPerItemRounded);
+
+            // 如果加时商品有税费，记录为最后一个含税商品
+            if (addTimeTaxPerItemPrecise.gt(0)) {
+              lastTaxableItem = {
+                type: 'addTime',
+                item: atItem
+              };
+            }
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
+        }
+      }
+
+      // 处理 bundle 子商品（仅原价子商品）
+      var bundlePreciseOriginTax = new Decimal(0);
+      var bundlePreciseTax = new Decimal(0);
+      var bundleRoundedOriginTax = new Decimal(0);
+      var bundleRoundedTax = 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 _iterator3 = _createForOfIteratorHelper(item._extend.other.bundle),
+          _step3;
+        try {
+          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+            var bundleItem = _step3.value;
+            // 只处理原价的子商品
+            if (getBundleItemIsOriginalPrice(bundleItem)) {
+              var _ref3, _bundleItem$bundle_se;
+              var bundleQuantity = new Decimal(bundleItem.quantity || 1);
+              var bundleUnitPrice = new Decimal((_ref3 = (_bundleItem$bundle_se = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se !== void 0 ? _bundleItem$bundle_se : bundleItem.price) !== null && _ref3 !== void 0 ? _ref3 : 0);
+
+              // 计算原始税费（折扣前）- 单个商品（精确值）
+              var bundleOriginalTaxPerItemPrecise = getProductItemTax(_objectSpread(_objectSpread({}, bundleItem), {}, {
+                total: bundleUnitPrice.add((bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.surcharge_fee) || 0).toNumber(),
+                quantity: 1
+              }), {
+                bookingDetail: bookingDetail,
+                bookingId: bookingId
+              }, {
+                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 bundleDiscountedTaxPerItemPrecise = getProductItemTax(_objectSpread(_objectSpread({}, bundleItem), {}, {
+                total: bundleDiscountedUnitPrice.toNumber(),
+                quantity: 1
+              }), {
+                bookingDetail: bookingDetail,
+                bookingId: bookingId
+              }, {
+                tax_rate: tax_rate,
+                is_price_include_tax: is_price_include_tax
+              });
+
+              // 四舍五入后的值
+              var bundleOriginalTaxPerItemRounded = bundleOriginalTaxPerItemPrecise.toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
+              var bundleDiscountedTaxPerItemRounded = bundleDiscountedTaxPerItemPrecise.toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
+
+              // 保存到bundle商品上（单个商品的税费，四舍五入后）
+              bundleItem.original_tax_fee = bundleOriginalTaxPerItemRounded.toNumber();
+              bundleItem.tax_fee = bundleDiscountedTaxPerItemRounded.toNumber();
+
+              // 累加bundle税费（需要乘以bundle数量）
+              bundlePreciseOriginTax = bundlePreciseOriginTax.plus(bundleOriginalTaxPerItemPrecise.times(bundleQuantity));
+              bundlePreciseTax = bundlePreciseTax.plus(bundleDiscountedTaxPerItemPrecise.times(bundleQuantity));
+              bundleRoundedOriginTax = bundleRoundedOriginTax.plus(bundleOriginalTaxPerItemRounded.times(bundleQuantity));
+              bundleRoundedTax = bundleRoundedTax.plus(bundleDiscountedTaxPerItemRounded.times(bundleQuantity));
+
+              // 如果bundle商品有税费，记录为最后一个含税商品
+              if (bundleDiscountedTaxPerItemPrecise.gt(0)) {
+                lastTaxableItem = {
+                  type: 'bundle',
+                  item: bundleItem
+                };
+              }
+            }
+          }
+        } catch (err) {
+          _iterator3.e(err);
+        } finally {
+          _iterator3.f();
+        }
+      }
+
+      // 主商品的原始税费和折后税费（精确值）
+      var originalTaxFeePrecise = originalTaxPerItemPrecise.plus(bundlePreciseOriginTax);
+      var taxFeePrecise = maxDiscountedTaxPerItemPrecise.plus(bundlePreciseTax);
+
+      // 主商品的原始税费和折后税费（四舍五入后）
+      var originalTaxFeeRounded = originalTaxPerItemPrecise.toDecimalPlaces(2, Decimal.ROUND_HALF_UP).plus(bundleRoundedOriginTax);
+      var taxFeeRounded = maxDiscountedTaxPerItemRounded.plus(bundleRoundedTax);
+
+      // 保存到商品扩展信息中（四舍五入后的值）
+      item.original_tax_fee = originalTaxFeeRounded.toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
+      item.tax_fee = taxFeeRounded.toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
+
+      // 累加到总税费（乘以数量）
+      preciseOriginTax = preciseOriginTax.plus(originalTaxFeePrecise.times(quantity)).plus(addTimePreciseTax);
+      preciseTax = preciseTax.plus(taxFeePrecise.times(quantity)).plus(addTimePreciseTax);
+      roundedOriginTax = roundedOriginTax.plus(originalTaxFeeRounded.times(quantity)).plus(addTimeRoundedTax);
+      roundedTax = roundedTax.plus(taxFeeRounded.times(quantity)).plus(addTimeRoundedTax);
+    }
+
+    // 计算期望的总税费（精确累加后四舍五入）
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  var expectedOriginTax = preciseOriginTax.toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
+  var expectedTax = preciseTax.toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
+
+  // 计算舍入差值
+  var originTaxRemainder = expectedOriginTax.minus(roundedOriginTax).toNumber();
+  var taxRemainder = expectedTax.minus(roundedTax).toNumber();
+
+  // 将差值追加到最后一个含税商品
+  if (lastTaxableItem) {
+    if (originTaxRemainder !== 0) {
+      if (lastTaxableItem.type === 'main') {
+        lastTaxableItem.item.original_tax_fee_rounding_remainder = originTaxRemainder;
+      } else {
+        lastTaxableItem.item.original_tax_fee_rounding_remainder = originTaxRemainder;
+      }
+    }
+    if (taxRemainder !== 0) {
+      if (lastTaxableItem.type === 'main') {
+        lastTaxableItem.item._extend.tax_fee_rounding_remainder = taxRemainder;
+      } else {
+        lastTaxableItem.item.tax_fee_rounding_remainder = taxRemainder;
+      }
+    }
+  }
+  return {
+    originTax: expectedOriginTax,
+    tax: expectedTax
+  };
+};
+
+/**
+ * 计算单个商品的税费（返回精确值，不四舍五入）
+ * @param item 商品信息
+ * @param state 状态
+ * @param options 选项
+ * @returns 精确的税费值（Decimal类型）
+ */
+var getProductItemTax = function getProductItemTax(item, state, options) {
+  var _bookingDetail$tax_ra, _ref4, _bookingDetail$is_pri;
+  var bookingDetail = state.bookingDetail;
+  var tax_rate = options.tax_rate,
+    is_price_include_tax = options.is_price_include_tax;
+
+  // 折扣后的金额 = 商品金额 - 商品折扣
+  var productDiscountPrice = new Decimal(item.total || 0);
+  var quantity = new Decimal(item.num || 1);
+
+  // 如果商品金额小于或等于0，不计算税费
+  if (productDiscountPrice.lte(0)) {
+    return new Decimal(0);
+  }
+
+  // 优先从 bookingDetail 取税率和是否含税设置，取不到则从 options 中取（兼容新增模式）
+  // 注意：bookingDetail中的tax_rate不需要除以100，options 中的tax_rate需要除以100
+  var currentTaxRate = new Decimal((_bookingDetail$tax_ra = bookingDetail === null || bookingDetail === void 0 ? void 0 : bookingDetail.tax_rate) !== null && _bookingDetail$tax_ra !== void 0 ? _bookingDetail$tax_ra : tax_rate ? tax_rate / 100 : 0);
+  var currentIsPriceIncludeTax = (_ref4 = (_bookingDetail$is_pri = bookingDetail === null || bookingDetail === void 0 ? void 0 : bookingDetail.is_price_include_tax) !== null && _bookingDetail$is_pri !== void 0 ? _bookingDetail$is_pri : is_price_include_tax) !== null && _ref4 !== void 0 ? _ref4 : 0;
+  var singleItemTax = new Decimal(0);
+
+  // 计算单个商品税费, 一次性商品 is_charge_tax 可能为空
+  if (item.is_charge_tax === 0 || !item.is_charge_tax) {
+    // 该商品不需要收税
+    singleItemTax = new Decimal(0);
+  } else {
+    // 该商品需要收税
+    if (currentIsPriceIncludeTax === 0) {
+      // 价格不含税：管理端填写的单价是不含税的价格
+      singleItemTax = productDiscountPrice.times(currentTaxRate);
+    } else {
+      // 价格含税：管理端填写的单价是含税的价格
+      // 含税总价 = 不含税价 + (不含税价 * 税率) = 不含税价 * (1 + 税率)
+      // 商品不含税价 = 含税总价 / (1 + 税率)
+      // 税 = 不含税价 * 税率
+      var divisor = new Decimal(1).plus(currentTaxRate);
+      if (divisor.lte(0)) {
+        // 如果 (1 + 税率) <= 0，说明税率异常，不计算税费
+        singleItemTax = new Decimal(0);
+      } else {
+        singleItemTax = productDiscountPrice.dividedBy(divisor).times(currentTaxRate);
+      }
+    }
+  }
+
+  // 结果 = 单个商品税费 × 数量（返回精确值，不四舍五入）
+  return singleItemTax.times(quantity);
+};
+
 /**
  * 计算商品小计（不含其他费用）
  * @param items - 购物车商品数组
@@ -127,9 +532,9 @@ export var calculateTaxFee = function calculateTaxFee(shopInfo, items) {
   if (!(items !== null && items !== void 0 && items.length)) {
     return '0.00';
   }
-  var _ref = shopInfo || {},
-    is_price_include_tax = _ref.is_price_include_tax,
-    tax_rate = _ref.tax_rate;
+  var _ref5 = shopInfo || {},
+    is_price_include_tax = _ref5.is_price_include_tax,
+    tax_rate = _ref5.tax_rate;
   var totalTaxFee = items.reduce(function (sum, item) {
     var cartItemTotalPrice = new Decimal(item.summaryTotal || 0);
     var taxRate = new Decimal(tax_rate || 0).div(100);
@@ -178,9 +583,9 @@ export var calculateDeposit = function calculateDeposit(items) {
 };
 
 // 订单附加费
-export var getSurchargeAmount = function getSurchargeAmount(_ref2, surcharge, options) {
-  var bookingDetail = _ref2.bookingDetail,
-    bookingId = _ref2.bookingId;
+export var getSurchargeAmount = function getSurchargeAmount(_ref6, surcharge, options) {
+  var bookingDetail = _ref6.bookingDetail,
+    bookingId = _ref6.bookingId;
   var isEdit = options.isEdit;
   // 订单未变更过
   if (!isEdit) {
@@ -225,8 +630,8 @@ var getDiscountAmount = function getDiscountAmount(discounts) {
  * 获取主商品加价减价后的总价 (主商品价格 + 子商品加价减价)
  */
 var getMainProductTotal = function getMainProductTotal(item) {
-  var _ref3, _ref4, _item$main_product_se, _item$metadata;
-  var total = new Decimal((_ref3 = (_ref4 = (_item$main_product_se = item === null || item === void 0 ? void 0 : item.main_product_selling_price) !== null && _item$main_product_se !== void 0 ? _item$main_product_se : 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.price) !== null && _ref3 !== void 0 ? _ref3 : 0);
+  var _ref7, _ref8, _item$main_product_se, _item$metadata;
+  var total = new Decimal((_ref7 = (_ref8 = (_item$main_product_se = item === null || item === void 0 ? void 0 : item.main_product_selling_price) !== null && _item$main_product_se !== void 0 ? _item$main_product_se : item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.main_product_selling_price) !== null && _ref8 !== void 0 ? _ref8 : item.price) !== null && _ref7 !== void 0 ? _ref7 : 0);
 
   // 单规格
   if (item !== null && item !== void 0 && item.option && Array.isArray(item === null || item === void 0 ? void 0 : item.option)) {
@@ -234,26 +639,26 @@ var getMainProductTotal = function getMainProductTotal(item) {
       return t.add(new Decimal(option.price || 0).mul(option.num || 1));
     }, new Decimal(0)));
   }
-  var _iterator = _createForOfIteratorHelper((item === null || item === void 0 ? void 0 : item.bundle) || []),
-    _step;
+  var _iterator4 = _createForOfIteratorHelper((item === null || item === void 0 ? void 0 : item.bundle) || []),
+    _step4;
   try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var bundleItem = _step.value;
+    for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+      var bundleItem = _step4.value;
       if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
-        var _ref5, _bundleItem$bundle_se;
+        var _ref9, _bundleItem$bundle_se2;
         // 子商品折扣金额
         var discountAmount = getDiscountAmount(bundleItem.discount_list);
         // 子商品价格
-        var bundleItemPrice = new Decimal((_ref5 = (_bundleItem$bundle_se = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se !== void 0 ? _bundleItem$bundle_se : bundleItem.price) !== null && _ref5 !== void 0 ? _ref5 : 0);
+        var bundleItemPrice = new Decimal((_ref9 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref9 !== void 0 ? _ref9 : 0);
         // todo: 套餐子商品后不需要处理 子商品价格 - 子商品折扣金额
         var bundleItemTotal = bundleItemPrice.minus(discountAmount);
         total = total.add(bundleItemTotal);
       }
     }
   } catch (err) {
-    _iterator.e(err);
+    _iterator4.e(err);
   } finally {
-    _iterator.f();
+    _iterator4.f();
   }
   return total.toNumber();
 };
@@ -262,13 +667,7 @@ var getMainProductTotal = function getMainProductTotal(item) {
  * 判断商品是否符合附加费条件
  */
 var isProductMatchSurchargeCondition = function isProductMatchSurchargeCondition(item, options) {
-  var _options$ScheduleModu;
-  if (!options.ScheduleModule) {
-    console.warn('ScheduleModule not found!');
-    return false;
-  }
-  //@ts-ignore
-  var isInScheduleByDate = (_options$ScheduleModu = options.ScheduleModule) === null || _options$ScheduleModu === void 0 ? void 0 : _options$ScheduleModu.isInScheduleByDate;
+  var isInScheduleByDate = options === null || options === void 0 ? void 0 : options.isInScheduleByDate;
   var surchargeConfig = options.surchargeConfig,
     _options$scheduleById = options.scheduleById,
     scheduleById = _options$scheduleById === void 0 ? {} : _options$scheduleById;
@@ -349,13 +748,13 @@ var isProductMatchSurchargeCondition = function isProductMatchSurchargeCondition
  * @param state
  * @param options 包含 ScheduleModule 和其他附加费计算所需参数
  */
-export var getSurcharge = function getSurcharge(_ref6, options) {
-  var service = _ref6.service,
-    addons = _ref6.addons,
-    bookingDetail = _ref6.bookingDetail,
-    bookingId = _ref6.bookingId;
+export var getSurcharge = function getSurcharge(_ref10, options) {
+  var service = _ref10.service,
+    addons = _ref10.addons,
+    bookingDetail = _ref10.bookingDetail,
+    bookingId = _ref10.bookingId;
   var isEdit = options.isEdit,
-    ScheduleModule = options.ScheduleModule,
+    isInScheduleByDate = options.isInScheduleByDate,
     surcharge_list = options.surcharge_list,
     scheduleById = options.scheduleById;
   // 编辑状态, 且未修改商品时直接从详情取出
@@ -408,11 +807,11 @@ export var getSurcharge = function getSurcharge(_ref6, options) {
 
     // 检查service中符合条件的商品
     if (Array.isArray(service)) {
-      var _iterator2 = _createForOfIteratorHelper(service),
-        _step2;
+      var _iterator5 = _createForOfIteratorHelper(service),
+        _step5;
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var item = _step2.value;
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+          var item = _step5.value;
           // 主商品符合附加费条件
           if (isProductMatchSurchargeCondition({
             isCustomItem: item.isCustomItem,
@@ -421,7 +820,7 @@ export var getSurcharge = function getSurcharge(_ref6, options) {
           }, {
             surchargeConfig: surchargeConfig,
             scheduleById: scheduleById || {},
-            ScheduleModule: ScheduleModule
+            isInScheduleByDate: isInScheduleByDate
           })) {
             // 主商品加价减价后的总价
             var total = getMainProductTotal(item);
@@ -438,11 +837,11 @@ export var getSurcharge = function getSurcharge(_ref6, options) {
             });
           }
           // 遍历子商品 原价商品符合附加费条件
-          var _iterator3 = _createForOfIteratorHelper((item === null || item === void 0 ? void 0 : item.bundle) || []),
-            _step3;
+          var _iterator6 = _createForOfIteratorHelper((item === null || item === void 0 ? void 0 : item.bundle) || []),
+            _step6;
           try {
-            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-              var bundleItem = _step3.value;
+            for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+              var bundleItem = _step6.value;
               // bundle商品是原价且符合附加费条件
               if (getBundleItemIsOriginalPrice(bundleItem) && isProductMatchSurchargeCondition({
                 isCustomItem: false,
@@ -451,13 +850,13 @@ export var getSurcharge = function getSurcharge(_ref6, options) {
               }, {
                 surchargeConfig: surchargeConfig,
                 scheduleById: scheduleById || {},
-                ScheduleModule: ScheduleModule
+                isInScheduleByDate: isInScheduleByDate
               })) {
-                var _ref7, _bundleItem$bundle_se2;
+                var _ref11, _bundleItem$bundle_se3;
                 var _mainQuantity = item.num || 1;
                 matchedItems.push({
                   isMain: false,
-                  total: Number((_ref7 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref7 !== void 0 ? _ref7 : 0),
+                  total: Number((_ref11 = (_bundleItem$bundle_se3 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se3 !== void 0 ? _bundleItem$bundle_se3 : bundleItem.price) !== null && _ref11 !== void 0 ? _ref11 : 0),
                   quantity: bundleItem.num || bundleItem.quantity || 1,
                   item: bundleItem,
                   mainQuantity: _mainQuantity // 子商品的mainQuantity是所属主商品的quantity
@@ -467,15 +866,15 @@ export var getSurcharge = function getSurcharge(_ref6, options) {
 
             // 加时商品符合附加费条件
           } catch (err) {
-            _iterator3.e(err);
+            _iterator6.e(err);
           } finally {
-            _iterator3.f();
+            _iterator6.f();
           }
-          var _iterator4 = _createForOfIteratorHelper(item.relation_details || []),
-            _step4;
+          var _iterator7 = _createForOfIteratorHelper(item.relation_details || []),
+            _step7;
           try {
-            for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-              var relationDetail = _step4.value;
+            for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+              var relationDetail = _step7.value;
               if (isProductMatchSurchargeCondition({
                 isCustomItem: false,
                 startDate: item.startDate,
@@ -483,7 +882,7 @@ export var getSurcharge = function getSurcharge(_ref6, options) {
               }, {
                 surchargeConfig: surchargeConfig,
                 scheduleById: scheduleById || {},
-                ScheduleModule: ScheduleModule
+                isInScheduleByDate: isInScheduleByDate
               })) {
                 var _relationDetail$metad;
                 matchedItems.push({
@@ -496,29 +895,29 @@ export var getSurcharge = function getSurcharge(_ref6, options) {
               }
             }
           } catch (err) {
-            _iterator4.e(err);
+            _iterator7.e(err);
           } finally {
-            _iterator4.f();
+            _iterator7.f();
           }
         }
       } catch (err) {
-        _iterator2.e(err);
+        _iterator5.e(err);
       } finally {
-        _iterator2.f();
+        _iterator5.f();
       }
     }
 
     // 检查addons中符合条件的商品
     if (Array.isArray(addons === null || addons === void 0 ? void 0 : addons.value)) {
-      var _iterator5 = _createForOfIteratorHelper(addons.value),
-        _step5;
+      var _iterator8 = _createForOfIteratorHelper(addons.value),
+        _step8;
       try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var _item = _step5.value;
+        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+          var _item = _step8.value;
           if (isProductMatchSurchargeCondition(_item, {
             surchargeConfig: surchargeConfig,
             scheduleById: scheduleById || {},
-            ScheduleModule: ScheduleModule
+            isInScheduleByDate: isInScheduleByDate
           })) {
             matchedItems.push({
               isMain: true,
@@ -530,9 +929,9 @@ export var getSurcharge = function getSurcharge(_ref6, options) {
           }
         }
       } catch (err) {
-        _iterator5.e(err);
+        _iterator8.e(err);
       } finally {
-        _iterator5.f();
+        _iterator8.f();
       }
     }
     var finalAmount = 0;
@@ -566,13 +965,13 @@ export var getSurcharge = function getSurcharge(_ref6, options) {
       // 计算百分比附加费 - 对每个商品单独计算
       if (percentage && new Decimal(percentage).gt(0) || fixed) {
         var percentageRate = new Decimal(percentage);
-        var _iterator6 = _createForOfIteratorHelper(matchedItems.entries()),
-          _step6;
+        var _iterator9 = _createForOfIteratorHelper(matchedItems.entries()),
+          _step9;
         try {
-          for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-            var _step6$value = _slicedToArray(_step6.value, 2),
-              index = _step6$value[0],
-              _item2 = _step6$value[1];
+          for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+            var _step9$value = _slicedToArray(_step9.value, 2),
+              index = _step9$value[0],
+              _item2 = _step9$value[1];
             var isLast = index === matchedItems.length - 1;
             // 对每个商品：max(0, 价格) * 数量 * 费率
             var itemPrice = new Decimal(Math.max(0, _item2.total || 0));
@@ -639,9 +1038,9 @@ export var getSurcharge = function getSurcharge(_ref6, options) {
             }
           }
         } catch (err) {
-          _iterator6.e(err);
+          _iterator9.e(err);
         } finally {
-          _iterator6.f();
+          _iterator9.f();
         }
       }
 

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

@@ -149,6 +149,8 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         totalTaxFee?: string | number | undefined;
         isPriceIncludeTax?: 0 | 1 | undefined;
         surchargeAmount?: string | number | undefined;
+        surcharge?: any[] | undefined;
+        taxRate?: string | number | undefined;
         deposit?: {
             total?: string | number | undefined;
             policies?: import("../../modules/Summary/types").IProtocol[] | undefined;

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

@@ -123,7 +123,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/modules/Summary/index.js

@@ -65,7 +65,7 @@ var SummaryModule = class extends import_BaseModule.BaseModule {
     var _a, _b;
     const shopInfo = ((_b = (_a = this.shopStore.get("core")) == null ? void 0 : _a.core) == null ? void 0 : _b.shop) || {};
     const scheduleModule = this.core.getModule("appointmentBooking_schedule");
-    const summary = (0, import_utils.calculatePriceDetails)(shopInfo, cartItems, scheduleModule, this.store.surchargeList);
+    const summary = (0, import_utils.calculatePriceDetails)(shopInfo, cartItems, scheduleModule == null ? void 0 : scheduleModule.isInScheduleByDate, this.store.surchargeList);
     this.store.summary = summary;
     return this.store.summary;
   }

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

@@ -16,6 +16,10 @@ export interface ISummaryState {
         isPriceIncludeTax?: 0 | 1;
         /** 附加费金额 */
         surchargeAmount?: string | number;
+        /** 附加费列表 */
+        surcharge?: any[];
+        /** 税率 */
+        taxRate?: string | number;
         /** 定金 */
         deposit?: {
             /** 定金总价 */

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

@@ -1,8 +1,7 @@
 import Decimal from 'decimal.js';
 import { CartItem } from '../Cart/types';
 import { ISummaryState } from './types';
-import { ScheduleModule } from '../Schedule';
-export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[], scheduleModule: ScheduleModule, surchargeList: any[]) => ISummaryState['summary'];
+export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[], isInScheduleByDate: any, surchargeList: any[]) => ISummaryState['summary'];
 /**
  * 获取子商品折扣信息
  * @param item
@@ -55,7 +54,7 @@ export declare const getSurcharge: ({ service, addons, bookingDetail, bookingId
     bookingId?: number | undefined;
 }, options: {
     isEdit: boolean;
-    ScheduleModule: any;
+    isInScheduleByDate: any;
     surcharge_list?: any[];
     scheduleById?: Record<string, any>;
 } & Record<string, any>) => any;

package/lib/modules/Summary/utils.js

@@ -40,11 +40,11 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 var import_decimal = __toESM(require("decimal.js"));
-var calculatePriceDetails = (shopInfo, items, scheduleModule, surchargeList) => {
+var calculatePriceDetails = (shopInfo, items, isInScheduleByDate, surchargeList) => {
   const subtotal = new import_decimal.default(calculateSubtotal(items));
   const subOriginTotal = new import_decimal.default(calculateOriginSubtotal(items));
   const totalTaxFee = new import_decimal.default(calculateTaxFee(shopInfo, items));
-  const surcharge = getSurcharge({ service: items, addons: [], bookingDetail: null, bookingId: void 0 }, { isEdit: false, ScheduleModule: scheduleModule, surcharge_list: surchargeList, scheduleById: {} });
+  const surcharge = getSurcharge({ service: items, addons: [], bookingDetail: null, bookingId: void 0 }, { isEdit: false, isInScheduleByDate, surcharge_list: surchargeList, scheduleById: {} });
   const surchargeAmount = new import_decimal.default(getSurchargeAmount({ bookingDetail: null, bookingId: void 0 }, surcharge, { isEdit: false }));
   const total = (shopInfo == null ? void 0 : shopInfo.is_price_include_tax) ? subtotal : subtotal.plus(totalTaxFee).plus(surchargeAmount);
   const originTotal = (shopInfo == null ? void 0 : shopInfo.is_price_include_tax) ? subOriginTotal : subOriginTotal.plus(totalTaxFee);
@@ -54,8 +54,10 @@ var calculatePriceDetails = (shopInfo, items, scheduleModule, surchargeList) =>
     total: total.toFixed(2),
     originTotal: originTotal.toFixed(2),
     taxTitle: shopInfo == null ? void 0 : shopInfo.tax_title,
+    taxRate: shopInfo == null ? void 0 : shopInfo.tax_rate,
     totalTaxFee: totalTaxFee.toFixed(2),
     isPriceIncludeTax: shopInfo == null ? void 0 : shopInfo.is_price_include_tax,
+    surcharge,
     surchargeAmount: surchargeAmount.toFixed(2),
     deposit
   };
@@ -189,12 +191,7 @@ var getMainProductTotal = (item) => {
   return total.toNumber();
 };
 var isProductMatchSurchargeCondition = (item, options) => {
-  var _a;
-  if (!options.ScheduleModule) {
-    console.warn("ScheduleModule not found!");
-    return false;
-  }
-  const isInScheduleByDate = (_a = options.ScheduleModule) == null ? void 0 : _a.isInScheduleByDate;
+  const isInScheduleByDate = options == null ? void 0 : options.isInScheduleByDate;
   const { surchargeConfig, scheduleById = {} } = options;
   const { startDate, product_id, isCustomItem } = item;
   const {
@@ -252,7 +249,7 @@ var isProductMatchSurchargeCondition = (item, options) => {
 };
 var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
   var _a, _b, _c;
-  const { isEdit, ScheduleModule, surcharge_list, scheduleById } = options;
+  const { isEdit, isInScheduleByDate, surcharge_list, scheduleById } = options;
   if (!isEdit && bookingId) {
     if (Array.isArray(bookingDetail == null ? void 0 : bookingDetail.surcharge)) {
       return ((bookingDetail == null ? void 0 : bookingDetail.surcharge) || []).filter((d) => Number(d.amount) > 0).map(
@@ -304,7 +301,7 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
           {
             surchargeConfig,
             scheduleById: scheduleById || {},
-            ScheduleModule
+            isInScheduleByDate
           }
         )) {
           const total = getMainProductTotal(item);
@@ -331,7 +328,7 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
             {
               surchargeConfig,
               scheduleById: scheduleById || {},
-              ScheduleModule
+              isInScheduleByDate
             }
           )) {
             const mainQuantity = item.num || 1;
@@ -357,7 +354,7 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
             {
               surchargeConfig,
               scheduleById: scheduleById || {},
-              ScheduleModule
+              isInScheduleByDate
             }
           )) {
             matchedItems.push({
@@ -379,7 +376,7 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
         if (isProductMatchSurchargeCondition(item, {
           surchargeConfig,
           scheduleById: scheduleById || {},
-          ScheduleModule
+          isInScheduleByDate
         })) {
           matchedItems.push({
             isMain: true,

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

@@ -149,6 +149,8 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         totalTaxFee?: string | number | undefined;
         isPriceIncludeTax?: 0 | 1 | undefined;
         surchargeAmount?: string | number | undefined;
+        surcharge?: any[] | undefined;
+        taxRate?: string | number | undefined;
         deposit?: {
             total?: string | number | undefined;
             policies?: import("../../modules/Summary/types").IProtocol[] | undefined;

package/lib/solution/BookingTicket/index.d.ts

@@ -123,7 +123,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.400",
+  "version": "0.0.401",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",