@pisell/private-materials 6.3.78 → 6.3.80

package/es/businessModel/SalesModel/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const SalesModel: ({ children, hooks, config }: any) => JSX.Element;
 export * from './Sales';
 export default SalesModel;

package/es/components/Sales/Cart/index.d.ts

@@ -13,7 +13,7 @@ interface CartContextType {
     createCartItemFromEvent: (eventItem: any) => CartItem;
     createCartItemFromHolder: (holderItem: any) => CartItem;
     addToCart: () => void;
-    updateCartItem: (cartItem: CartItem) => CartItem;
+    updateCartItem: (cartItem: CartItem, updateType?: 'deposit') => CartItem;
     deleteCartItem: (cartItem: CartItem) => void;
     clickCartItem: (cartItem: CartItem) => void;
     updateCurrentCartItem: (cartItem: Partial<CartItem>) => void;

package/es/components/Sales/Cart/index.js

@@ -342,6 +342,7 @@ export var CartProvider = function CartProvider(_ref) {
           },
           event_unique_identifier: _id // 传递给接口用于商品可用性检测的比对
         }),
+        _eventDetail: eventDetail,
         _productDetail: eventDetail.productDetail,
         _productOrigin: transformProduct((eventDetail === null || eventDetail === void 0 || (_eventDetail$productD3 = eventDetail.productDetail) === null || _eventDetail$productD3 === void 0 ? void 0 : _eventDetail$productD3.origin) || bookingOptionData),
         _productInit: transformProduct((eventDetail === null || eventDetail === void 0 || (_eventDetail$productD4 = eventDetail.productDetail) === null || _eventDetail$productD4 === void 0 ? void 0 : _eventDetail$productD4.origin) || bookingOptionData)
@@ -378,9 +379,23 @@ export var CartProvider = function CartProvider(_ref) {
       });
     }
   };
-  var updateCartItem = function updateCartItem(cartItem) {
-    var newCartItems = getCurrentData().cartData.cartItems.map(function (item) {
-      return item._id === cartItem._id ? cartItem : item;
+  var updateCartItem = function updateCartItem(cartItem, updateType) {
+    var _getCurrentData2;
+    var newCartItems = (_getCurrentData2 = getCurrentData()) === null || _getCurrentData2 === void 0 || (_getCurrentData2 = _getCurrentData2.cartData) === null || _getCurrentData2 === void 0 || (_getCurrentData2 = _getCurrentData2.cartItems) === null || _getCurrentData2 === void 0 ? void 0 : _getCurrentData2.map(function (item) {
+      if (item._id === cartItem._id) {
+        var _tempCartItem = _objectSpread({}, cartItem || {});
+        // 更新定金信息
+        if (updateType === 'deposit') {
+          var eventDetail = _tempCartItem === null || _tempCartItem === void 0 ? void 0 : _tempCartItem._eventDetail;
+          if (eventDetail) {
+            var num = (_tempCartItem === null || _tempCartItem === void 0 ? void 0 : _tempCartItem.num) || 1;
+            var deposit = handleProductDeposit(_tempCartItem, eventDetail, num);
+            _tempCartItem.deposit = deposit;
+          }
+        }
+        return _tempCartItem;
+      }
+      return item;
     });
     setCartData({
       cartItems: newCartItems

package/es/components/Sales/Cart/utils.d.ts

@@ -0,0 +1,68 @@
+import Decimal from 'decimal.js';
+import { ICalculatePriceParams } from './types';
+export declare const handleProductInfo: (eventDetail: any, num: number) => {
+    price: number;
+    totalPrice: number;
+    originTotal: any;
+    is_charge_tax: any;
+};
+/**
+ * 获取商品价格
+ */
+export declare const getPrice: (params: ICalculatePriceParams) => number;
+/**
+ * 获取商品总价
+ * @description 当前总价计算基于商品数量为1
+ * @param item 商品
+ * @returns 商品总价
+ */
+export declare const getTotalPrice: (params: ICalculatePriceParams) => number;
+/**
+ * 获取商品原始总价
+ * @description 当前总价计算基于商品数量为1
+ * @param item 商品
+ * @returns 商品原始总价
+ */
+export declare const getOriginTotalPrice: (params: ICalculatePriceParams) => number | undefined;
+export declare const handleCartItemOrigin: (cartItem: any, eventDetail: any) => any;
+export declare const formatBundleToOrigin: (bundle: any) => any;
+export declare const formatOptionsToOrigin: (options: any) => any;
+export declare const handleProductDeposit: (cartItem: any, eventDetail: any, num: number) => {
+    total: number;
+    protocols: any;
+} | null;
+/**
+ * 获取商品定金
+ * @description 定金基于商品售价来算，最终乘商品数量
+ * 1、如果套餐主商品有定金规则，则定金为：（套餐商品总售价 * 定金百分比 + 定金固定金额）* 商品数量
+ * 2、如果套餐主商品没有定金规则，子商品有定金规则，则定金为：（套餐子商品售价 * 套餐子商品定金百分比 + 套餐子商品定金固定金额）* 商品数量，最终将所有子商品定金相加
+ * 3、普通商品/单规格商品/组合规则商品，定金规则：（商品总售价 * 定金百分比 + 定金固定金额）* 商品数量
+ * @param params 参数
+ * @returns 商品定金
+ */
+export declare const getProductDeposit: (params: {
+    cartItem: any;
+    product: any;
+    bundle?: any;
+    options?: any;
+    num?: number;
+}) => {
+    total: number;
+    protocols: any;
+} | null;
+/**
+ * 计算商品定金
+ * @param params 参数
+ * @returns 商品定金
+ */
+export declare const calculateProductDeposit: (params: {
+    depositData: {
+        deposit_fixed?: string;
+        deposit_percentage?: string;
+    };
+    total: string | number;
+    num: number;
+}) => {
+    result: boolean;
+    depositTotal: Decimal;
+};

package/es/components/Sales/Checkout/utils.d.ts

@@ -0,0 +1,41 @@
+/**
+ * @title: 套餐单规格信息
+ * @description:
+ * @param {any} option
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-02-19 09:26
+ */
+export declare const formatProductOption: (option: any) => any;
+/**
+ * @title: 套餐信息
+ * @description:
+ * @param {any} bundle
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-02-19 09:26
+ */
+export declare const formatProductBundle: (bundle: any) => any;
+/**
+ * @title: 格式化下单接口数据
+ * @description:
+ * @param {any} state saledModel数据源
+ * @param {boolean} excludeDisabled 是否需要排除购物车中失效商品
+ * @Author: xiangfeng.xue
+ * @Date: 2025-01-21 17:57
+ */
+export declare const formatValues: (params: {
+    state: any;
+    platform: 'h5' | 'pc';
+    excludeDisabled?: boolean;
+    extra?: Record<string, any>;
+    otherValue?: Record<string, any>;
+}) => any;
+/**
+ * @title: 获取拉开表单弹窗参数
+ * @param state
+ */
+export declare const getFormParams: (state: any) => {
+    product_id: any;
+    appointment_type: string;
+};

package/es/components/Sales/Checkout/utils.js

@@ -1,9 +1,16 @@
 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 _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 _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 _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 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); }
+import Decimal from 'decimal.js';
 /**
  * @title: 套餐单规格信息
  * @description:
@@ -71,10 +78,59 @@ var getSubType = function getSubType(item) {
 var formatBookings = function formatBookings(list) {
   var bookings = [];
   bookings = list.map(function (item) {
-    return item._originData;
+    var _product$product_bund;
+    var newOriginData = _objectSpread({}, item._originData || {});
+    var product = (newOriginData === null || newOriginData === void 0 ? void 0 : newOriginData.product) || {};
+    // 处理discount相关逻辑
+    var discount_list = product === null || product === void 0 ? void 0 : product.discount_list;
+    // 筛选出主商品的折扣
+    var main_product_discount = discount_list === null || discount_list === void 0 ? void 0 : discount_list.filter(function (d) {
+      var _d$metadata;
+      return !((_d$metadata = d.metadata) !== null && _d$metadata !== void 0 && _d$metadata.custom_product_bundle_map_id);
+    });
+    if (main_product_discount !== null && main_product_discount !== void 0 && main_product_discount.length) {
+      product.metadata = {
+        product_discount_difference: handleProductDiscountDifference([main_product_discount])
+      };
+    }
+    console.log('main_product_discount', main_product_discount);
+    if (product !== null && product !== void 0 && (_product$product_bund = product.product_bundle) !== null && _product$product_bund !== void 0 && _product$product_bund.length) {
+      var _product$product_bund2, _product$product_bund3;
+      // 处理套餐商品的折扣
+      product.product_bundle = product === null || product === void 0 || (_product$product_bund2 = product.product_bundle) === null || _product$product_bund2 === void 0 || (_product$product_bund3 = _product$product_bund2.map) === null || _product$product_bund3 === void 0 ? void 0 : _product$product_bund3.call(_product$product_bund2, function (v) {
+        var _item$selectedBundle, _item$selectedBundle$;
+        // 获取套餐商品的折扣
+        var bundle_item_discount = [];
+        item === null || item === void 0 || (_item$selectedBundle = item.selectedBundle) === null || _item$selectedBundle === void 0 || (_item$selectedBundle$ = _item$selectedBundle.forEach) === null || _item$selectedBundle$ === void 0 || _item$selectedBundle$.call(_item$selectedBundle, function (s) {
+          if ((s === null || s === void 0 ? void 0 : s.id) === (v === null || v === void 0 ? void 0 : v.bundle_id) && (s === null || s === void 0 ? void 0 : s.group_id) === (v === null || v === void 0 ? void 0 : v.bundle_group_id) && (s === null || s === void 0 ? void 0 : s._bundle_product_id) === (v === null || v === void 0 ? void 0 : v.bundle_product_id)) {
+            bundle_item_discount.push.apply(bundle_item_discount, _toConsumableArray((s === null || s === void 0 ? void 0 : s.discount_list) || []));
+          }
+        });
+        console.log('bundle_item_discount', bundle_item_discount);
+        var newBundleItem = _objectSpread({}, v || {});
+        if (bundle_item_discount !== null && bundle_item_discount !== void 0 && bundle_item_discount.length) {
+          var _bundle_item_discount;
+          newBundleItem.metadata = {
+            custom_product_bundle_map_id: bundle_item_discount === null || bundle_item_discount === void 0 || (_bundle_item_discount = bundle_item_discount[0]) === null || _bundle_item_discount === void 0 || (_bundle_item_discount = _bundle_item_discount.metadata) === null || _bundle_item_discount === void 0 ? void 0 : _bundle_item_discount.custom_product_bundle_map_id,
+            product_discount_difference: handleProductDiscountDifference(bundle_item_discount)
+          };
+        }
+        return newBundleItem;
+      });
+    }
+    newOriginData.product = product;
+    return newOriginData;
   });
+  console.log('bookings>>>>', bookings);
   return bookings;
 };
+var handleProductDiscountDifference = function handleProductDiscountDifference(discount_list) {
+  var product_discount_difference = discount_list === null || discount_list === void 0 ? void 0 : discount_list.reduce(function (pre, cur) {
+    var _cur$metadata;
+    return pre.plus(new Decimal((cur === null || cur === void 0 || (_cur$metadata = cur.metadata) === null || _cur$metadata === void 0 ? void 0 : _cur$metadata.product_discount_difference) || 0));
+  }, new Decimal(0));
+  return product_discount_difference.toNumber();
+};
 
 /**
  * @title: 格式化下单接口数据

package/es/components/Sales/Summary/index.d.ts

@@ -7,6 +7,8 @@ interface SummaryContextType {
     taxTitle?: string;
     totalTaxFee?: string;
     isPriceIncludeTax?: 0 | 1;
+    taxRate?: number;
+    surcharge?: any;
     deposit?: {
         total: string;
         protocols: any[];

package/es/components/Sales/Summary/index.js

@@ -9,6 +9,7 @@ import { useCart } from "../Cart";
 import { calculatePriceDetails } from "./utils";
 import { useInit } from "../Init";
 import { getDepositProtocolApi } from "./serve";
+import { usePisellOS } from "../../../hooks/useEngineContext";
 
 // 定义上下文接口
 
@@ -19,6 +20,7 @@ var defaultState = {};
 export var SummaryContext = /*#__PURE__*/createContext(undefined);
 export var SummaryProvider = function SummaryProvider(_ref) {
   var children = _ref.children;
+  var pisellos = usePisellOS();
   var _useCart = useCart(),
     cartData = _useCart.cartData;
   var _useInit = useInit(),
@@ -27,9 +29,10 @@ export var SummaryProvider = function SummaryProvider(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     isAgreeDepositPolicy = _useState2[0],
     setIsAgreeDepositPolicy = _useState2[1];
+  var summaryModule = pisellos.getModule('summary');
   var summaryData = useMemo(function () {
-    return calculatePriceDetails((initData === null || initData === void 0 ? void 0 : initData.shop) || {}, cartData.cartItems);
-  }, [cartData.cartItems, initData === null || initData === void 0 ? void 0 : initData.shop]);
+    return calculatePriceDetails((initData === null || initData === void 0 ? void 0 : initData.shop) || {}, cartData.cartItems, summaryModule);
+  }, [cartData.cartItems, initData === null || initData === void 0 ? void 0 : initData.shop, summaryModule]);
   var contextValue = {
     // 商品总价
     subtotal: summaryData.subtotal,
@@ -38,6 +41,8 @@ export var SummaryProvider = function SummaryProvider(_ref) {
     taxTitle: summaryData.taxTitle,
     totalTaxFee: summaryData.totalTaxFee,
     isPriceIncludeTax: summaryData.isPriceIncludeTax,
+    taxRate: summaryData.taxRate,
+    surcharge: summaryData.surcharge,
     deposit: summaryData.deposit,
     isAgreeDepositPolicy: isAgreeDepositPolicy,
     setIsAgreeDepositPolicy: setIsAgreeDepositPolicy,

package/es/components/Sales/Summary/utils.d.ts

@@ -0,0 +1,58 @@
+interface CartItem {
+    price: number | string;
+    quantity?: number;
+    [k: string]: any;
+}
+interface PriceDetail {
+    subtotal: string;
+    total: string;
+    taxTitle?: string;
+    totalTaxFee?: string;
+    isPriceIncludeTax?: 0 | 1;
+    taxRate?: number;
+    surcharge?: any;
+    deposit?: {
+        total: string;
+        protocols: any[];
+        hasDeposit: boolean;
+    };
+}
+/**
+ * 计算商品小计（不含其他费用）
+ * @param items - 购物车商品数组
+ * @returns 商品总价字符串，保留2位小数
+ */
+export declare const calculateSubtotal: (items: CartItem[]) => string;
+/**
+ * @description: 将购物车数据格式化成summaryModule需要的格式
+ * @param {any} items 购物车数据
+ * @return {*}
+ */
+export declare const formatCartsToSummaryModule: (items: any[]) => any[];
+/**
+ * @title: 单个商品的税费
+ * @description:
+ * 单个商品的税费 = 商品销售单价（折扣后） * 税率 * is_charge_tax /( 1+ 税率 * is_price_include_tax)
+ * $taxFee = $price * $taxRate * $isChargeTax / (1 + $taxRate * $isPriceIncludeTax);
+ * @return {*}
+ * @Author: xiangfeng.xue
+ */
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[], summaryModule: any) => any;
+/**
+ * 计算所有价格明细
+ * @param items - 购物车商品数组
+ * @param options - 其他费用配置
+ * @returns 价格明细对象
+ */
+export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[], summaryModule: any) => PriceDetail;
+/**
+ * @title: 计算定金
+ * @param items - 购物车商品数组
+ * @returns 定金字符串，保留2位小数
+ */
+export declare const calculateDeposit: (items: CartItem[]) => {
+    total: string;
+    protocols: any[];
+    hasDeposit: never;
+} | undefined;
+export {};

package/es/components/Sales/Summary/utils.js

@@ -1,3 +1,12 @@
+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); }
+var _excluded = ["selectedBundle", "selectedOptions"];
+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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import Decimal from 'decimal.js';
 /**
  * 计算商品小计（不含其他费用）
@@ -17,6 +26,24 @@ export var calculateSubtotal = function calculateSubtotal(items) {
   return subtotal.toFixed(2);
 };
 
+/**
+ * @description: 将购物车数据格式化成summaryModule需要的格式
+ * @param {any} items 购物车数据
+ * @return {*}
+ */
+export var formatCartsToSummaryModule = function formatCartsToSummaryModule(items) {
+  if (!Array.isArray(items) || !(items !== null && items !== void 0 && items.length)) return [];
+  return items.map(function (item) {
+    var selectedBundle = item.selectedBundle,
+      selectedOptions = item.selectedOptions,
+      rest = _objectWithoutProperties(item, _excluded);
+    return _objectSpread(_objectSpread({}, rest), {}, {
+      bundle: selectedBundle || [],
+      option: selectedOptions || []
+    });
+  });
+};
+
 /**
  * @title: 单个商品的税费
  * @description:
@@ -25,7 +52,7 @@ export var calculateSubtotal = function calculateSubtotal(items) {
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export var calculateTaxFee = function calculateTaxFee(shopInfo, items) {
+export var calculateTaxFee = function calculateTaxFee(shopInfo, items, summaryModule) {
   if (!(items !== null && items !== void 0 && items.length)) {
     return '0.00';
   }
@@ -33,12 +60,22 @@ export var calculateTaxFee = function calculateTaxFee(shopInfo, items) {
     is_price_include_tax = _ref.is_price_include_tax,
     tax_rate = _ref.tax_rate;
   console.log('shopInfo>>>', is_price_include_tax, tax_rate);
-  var totalTaxFee = items.reduce(function (sum, item) {
-    var price = new Decimal(item.total || 0);
-    var taxRate = new Decimal(tax_rate || 0).div(100);
-    var productTaxRate = price.times(taxRate).times((item === null || item === void 0 ? void 0 : item.is_charge_tax) || 0).div(taxRate.times(is_price_include_tax || 0).plus(1));
-    return sum.plus(productTaxRate);
-  }, new Decimal(0));
+  // const totalTaxFee = items.reduce((sum, item) => {
+  //   const price = new Decimal(item.price || 0);
+  //   const taxRate = new Decimal(tax_rate || 0).div(100);
+  //   const productTaxRate = price
+  //     .times(taxRate)
+  //     .times(item?.is_charge_tax || 0)
+  //     .div(taxRate.times(is_price_include_tax || 0).plus(1));
+
+  //   return sum.plus(productTaxRate);
+  // }, new Decimal(0));
+  var subtotal = new Decimal(calculateSubtotal(items));
+  var totalTax = summaryModule.getTaxforUtils(items, {
+    tax_rate: Number(tax_rate),
+    is_price_include_tax: Number(is_price_include_tax || 0)
+  }, subtotal);
+  var totalTaxFee = totalTax === null || totalTax === void 0 ? void 0 : totalTax.tax;
   return totalTaxFee;
 };
 
@@ -48,13 +85,21 @@ export var calculateTaxFee = function calculateTaxFee(shopInfo, items) {
  * @param options - 其他费用配置
  * @returns 价格明细对象
  */
-export var calculatePriceDetails = function calculatePriceDetails(shopInfo, items) {
+export var calculatePriceDetails = function calculatePriceDetails(shopInfo, items, summaryModule) {
+  // 小计
   var subtotal = new Decimal(calculateSubtotal(items));
-  var totalTaxFee = new Decimal(calculateTaxFee(shopInfo, items));
-  console.log('totalTaxFee', totalTaxFee.toFixed(2));
+  var _carts = formatCartsToSummaryModule(items);
+  // 附加费
+  var surcharge = summaryModule.getSurchargeforUtils(_carts);
+  var surchargeFee = new Decimal((surcharge === null || surcharge === void 0 ? void 0 : surcharge.surchargeAmount) || 0);
+  // 税费
+  var totalTaxFee = new Decimal(calculateTaxFee(shopInfo, _carts, summaryModule));
+  // 税率
+  var taxRate = new Decimal((shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.tax_rate) || 0).div(100);
 
   // 计算总价
   var total = shopInfo !== null && shopInfo !== void 0 && shopInfo.is_price_include_tax ? subtotal : subtotal.plus(totalTaxFee);
+  total = total.plus(surchargeFee);
 
   // 计算定金
   var deposit = calculateDeposit(items);
@@ -64,6 +109,8 @@ export var calculatePriceDetails = function calculatePriceDetails(shopInfo, item
     taxTitle: shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.tax_title,
     totalTaxFee: totalTaxFee.toFixed(2),
     isPriceIncludeTax: shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.is_price_include_tax,
+    taxRate: taxRate.toNumber(),
+    surcharge: surcharge,
     deposit: deposit
   };
 };

package/es/components/appointmentBooking/components/Cart/Item/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const CartItem: ({ onNext, renderContactInfo }: any) => JSX.Element;
 export default CartItem;

package/es/components/appointmentBooking/components/Cart/Item/index.js

@@ -1,4 +1,10 @@
 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 _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 _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 _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); }); }; }
@@ -11,12 +17,12 @@ import React, { useMemo } from 'react';
 import { isMobile, locales } from '@pisell/utils';
 import ShoppingCart from "../../../../shoppingCart";
 import ContinueButton from "../ContinueButton";
+import { SubTotal } from "../../../../../index";
 import { useAppointmentBooking } from "../../../hooks";
 import { useAppointmentBookingContext } from "../../../context";
 import { useAppointmentBookingAccount, useAppointmentBookingResource, useAppointmentBookingSetting, useAppointmentBookingLogin, contextUtils } from "../../../hooks";
 import { formatHolder, formatCurrentUser, openForm, getMultiResources, updateCartResources } from "../../../utils";
 import VoucherCard from "../../Voucher";
-import Total from "./Total";
 import Deposit from "../../Deposit";
 import { handleAddHolder } from "../utils";
 import "./index.less";
@@ -48,8 +54,13 @@ var CartItem = function CartItem(_ref) {
   var _useAppointmentBookin4 = useAppointmentBookingLogin(),
     isLogin = _useAppointmentBookin4.isLogin;
   var utils = contextUtils();
-  var businessUtils = utils.businessUtils;
-  var deposit = summary.deposit;
+  var businessUtils = utils.businessUtils,
+    translation = utils.translation;
+  var taxTitle = summary.taxTitle,
+    totalTaxFee = summary.totalTaxFee,
+    isPriceIncludeTax = summary.isPriceIncludeTax,
+    total = summary.total,
+    deposit = summary.deposit;
 
   /**
    * @title: 当前客户
@@ -223,6 +234,45 @@ var CartItem = function CartItem(_ref) {
       return carts;
     }
   }, [carts, currentSelectedResources, currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.key, isErrorHolder]);
+
+  /**
+   * @description: 结算列表数据
+   * @param {*} useMemo
+   * @return {*}
+   */
+  var subTotalList = useMemo(function () {
+    var hideDeposit = (carts === null || carts === void 0 ? void 0 : carts.length) === 0 || !(deposit !== null && deposit !== void 0 && deposit.hasDeposit);
+    var surcharge = ((summary === null || summary === void 0 ? void 0 : summary.surcharge) || []).map(function (d, index) {
+      return {
+        key: "custom_surcharge_".concat(index),
+        label: translation(d === null || d === void 0 ? void 0 : d.name),
+        value: d.amount
+      };
+    });
+    return [{
+      key: 'deposit',
+      value: deposit === null || deposit === void 0 ? void 0 : deposit.total,
+      label: locales.getText('pisell2.appointment.deposit'),
+      hidden: hideDeposit
+    }, {
+      key: 'sub_total',
+      value: summary === null || summary === void 0 ? void 0 : summary.subtotal
+    }].concat(_toConsumableArray(surcharge), [{
+      key: 'tax',
+      value: totalTaxFee,
+      hidden: Number(totalTaxFee) <= 0,
+      tax: {
+        rate: Number((summary === null || summary === void 0 ? void 0 : summary.taxRate) / 100),
+        is_price_include_tax: isPriceIncludeTax,
+        title: taxTitle
+      }
+    }, {
+      key: 'custom_total',
+      value: total,
+      label: locales.getText('pisell2.event.total'),
+      bold: !!hideDeposit
+    }]);
+  }, [total, summary, carts === null || carts === void 0 ? void 0 : carts.length]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "appointment-cart-item-wrap ".concat(isMobile() ? 'appointment-cart-mobile-item-wrap' : '')
   }, /*#__PURE__*/React.createElement("div", {
@@ -256,7 +306,15 @@ var CartItem = function CartItem(_ref) {
   }, hasGoodPassApp || hasDiscountCardApp ? /*#__PURE__*/React.createElement(VoucherCard, {
     currentUser: currentUser,
     products: carts
-  }) : null, /*#__PURE__*/React.createElement(Total, null), (carts === null || carts === void 0 ? void 0 : carts.length) > 0 && deposit !== null && deposit !== void 0 && deposit.hasDeposit ? /*#__PURE__*/React.createElement(Deposit, null) : null, /*#__PURE__*/React.createElement(ContinueButton, {
+  }) : null, /*#__PURE__*/React.createElement(SubTotal, {
+    list: subTotalList,
+    style: {
+      padding: 0
+    },
+    children: !!((carts === null || carts === void 0 ? void 0 : carts.length) > 0 && deposit !== null && deposit !== void 0 && deposit.hasDeposit) ? /*#__PURE__*/React.createElement(Deposit, {
+      showTitle: false
+    }) : null
+  }), /*#__PURE__*/React.createElement(ContinueButton, {
     onNext: onNext
   }))));
 };

package/es/components/appointmentBooking/components/Content/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Layout: () => JSX.Element;
 export default Layout;

package/es/components/appointmentBooking/components/Deposit/index.d.ts

@@ -1,9 +1,13 @@
 import './index.less';
+interface DepositProps {
+    showTitle?: boolean;
+}
 export declare const DepositContent: (props: {
     isAgreeDepositPolicy: boolean;
     setIsAgreeDepositPolicy: (value: boolean) => void;
     deposit: any;
     depositProtocolRequest?: any;
+    showTitle?: boolean | undefined;
 }) => JSX.Element;
-declare const Deposit: () => JSX.Element;
+declare const Deposit: (props: DepositProps) => JSX.Element;
 export default Deposit;