@pisell/private-materials 6.4.4 → 6.4.6

package/es/components/ticketBooking/components/ticketBooking/index.js

@@ -25,8 +25,8 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { locales } from '@pisell/utils';
 import { message } from 'antd';
-import { Iconfont } from '@pisell/materials';
-import { getOrderInfoByCode, getBookingDetail, getEventBookingDetail, getBookingConfig, getServices, voidAppointment } from "../../serve";
+import { Iconfont, PisellModal } from '@pisell/materials';
+import { getOrderInfoByCode, getBookingDetail, getEventBookingDetail, getBookingConfig, getServices } from "../../serve";
 import * as apis from "../../serve";
 import dayjs from 'dayjs';
 import useEngineContext from "../../../../hooks/useEngineContext";
@@ -247,6 +247,10 @@ var TicketBooking = function TicketBooking() {
     _useState2 = _slicedToArray(_useState, 2),
     activeBookingId = _useState2[0],
     setActiveBookingId = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    showTerminalUpgradeModal = _useState4[0],
+    setShowTerminalUpgradeModal = _useState4[1];
   var pisellFloatingPanelRef = useRef(null);
   var closeRef = useRef(null);
   var bookingTicket = useBookingTicket();
@@ -261,6 +265,26 @@ var TicketBooking = function TicketBooking() {
       changeCustomerToGlobalState: changeCustomerToGlobalState
     }),
     selectCustomer = _useCustomer.selectCustomer;
+
+  // 检测Terminal版本并显示升级提示
+  var checkTerminalVersion = useMemoizedFn(function () {
+    if (isTerminal()) {
+      var userAgent = navigator.userAgent;
+      if (userAgent.includes('terminal')) {
+        // 匹配 terminal/x.x.x(xxx) 格式，支持多位数
+        var terminalVersionMatch = userAgent.match(/terminal\/[\d.]+\((\d+)\)/i);
+        if (terminalVersionMatch && terminalVersionMatch[1]) {
+          var buildNumberStr = terminalVersionMatch[1];
+          var buildNumber = parseInt(buildNumberStr, 10);
+
+          // 确保解析成功且是有效数字
+          if (!isNaN(buildNumber) && buildNumber > 0 && buildNumber < 766) {
+            setShowTerminalUpgradeModal(true);
+          }
+        }
+      }
+    }
+  });
   useMemo(function () {
     openScan(function (data) {
       handleScan(data);
@@ -336,6 +360,9 @@ var TicketBooking = function TicketBooking() {
     });
     _setShopOpeningHours();
     _setIntervalTime(true);
+
+    // 检测Terminal版本
+    checkTerminalVersion();
     interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || _interaction$utils.mountFunction('bookingTicket', 'clearAllCart', function (type, orderId) {
       console.log('bookingTicket.clearAllCart');
       // 支付成功后清空状态
@@ -349,8 +376,9 @@ var TicketBooking = function TicketBooking() {
 
     // 作废预约
     interaction === null || interaction === void 0 || (_interaction$utils2 = interaction.utils) === null || _interaction$utils2 === void 0 || _interaction$utils2.mountFunction('booking', 'voidBooking', function (orderId) {
-      voidAppointment(orderId);
-      enableAllScanListeners();
+      // checkout2.0 结账时不生成订单 所以不需要作废订单
+      // voidAppointment(orderId);
+      // enableAllScanListeners();
     });
     return function () {
       off === null || off === void 0 || off();
@@ -387,6 +415,7 @@ var TicketBooking = function TicketBooking() {
       intervalSetTime: isInterval
     });
   };
+  useEffect(function () {}, []);
   var getDataFromHost = function getDataFromHost() {
     try {
       var is_price_include_tax = getData('is_price_include_tax');
@@ -1210,6 +1239,19 @@ var TicketBooking = function TicketBooking() {
     ref: pisellFloatingPanelRef,
     currentDate: currentDate,
     onBookingClick: handleBookingClick
+  }), /*#__PURE__*/React.createElement(PisellModal.Information, {
+    open: showTerminalUpgradeModal,
+    title: locales.getText('pisell2.ticket-booking.terminal-upgrade-title'),
+    describe: locales.getText('pisell2.ticket-booking.terminal-upgrade-description'),
+    okText: locales.getText('pisell2.ticket-booking.terminal-upgrade-ok'),
+    cancelText: locales.getText('pisell2.ticket-booking.terminal-upgrade-cancel'),
+    closable: true,
+    onOk: function onOk() {
+      return setShowTerminalUpgradeModal(false);
+    },
+    onCancel: function onCancel() {
+      return setShowTerminalUpgradeModal(false);
+    }
   }));
 };
 export default TicketBooking;

package/es/components/ticketBooking/components/timeBar/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import type { Dayjs } from 'dayjs';
 import './index.less';
 interface ITimeBarProps {

package/es/components/ticketBooking/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface TicketBookingProps {
     productExtensionType: string[];

package/es/components/ticketBooking/locales.d.ts

@@ -57,6 +57,10 @@ declare const _default: {
         'pisell2.product.card.minute': (val: number) => string;
         'pisell2.ticket-booking.reload': string;
         'pisell2.text.scan-global-failed': string;
+        'pisell2.ticket-booking.terminal-upgrade-title': string;
+        'pisell2.ticket-booking.terminal-upgrade-description': string;
+        'pisell2.ticket-booking.terminal-upgrade-ok': string;
+        'pisell2.ticket-booking.terminal-upgrade-cancel': string;
     };
     'zh-CN': {
         'pisell2.ticket-booking.info': string;
@@ -116,6 +120,10 @@ declare const _default: {
         'pisell2.product.card.minute': (val: number) => string;
         'pisell2.ticket-booking.reload': string;
         'pisell2.text.scan-global-failed': string;
+        'pisell2.ticket-booking.terminal-upgrade-title': string;
+        'pisell2.ticket-booking.terminal-upgrade-description': string;
+        'pisell2.ticket-booking.terminal-upgrade-ok': string;
+        'pisell2.ticket-booking.terminal-upgrade-cancel': string;
     };
     'zh-HK': {
         'pisell2.ticket-booking.info': string;
@@ -175,6 +183,10 @@ declare const _default: {
         'pisell2.product.card.minute': (val: number) => string;
         'pisell2.ticket-booking.reload': string;
         'pisell2.text.scan-global-failed': string;
+        'pisell2.ticket-booking.terminal-upgrade-title': string;
+        'pisell2.ticket-booking.terminal-upgrade-description': string;
+        'pisell2.ticket-booking.terminal-upgrade-ok': string;
+        'pisell2.ticket-booking.terminal-upgrade-cancel': string;
     };
 };
 export default _default;

package/es/components/ticketBooking/locales.js

@@ -69,7 +69,11 @@ export default {
       return "".concat(val > 1 ? ' minutes' : ' minute');
     },
     'pisell2.ticket-booking.reload': 'Reload',
-    'pisell2.text.scan-global-failed': 'No matching results'
+    'pisell2.text.scan-global-failed': 'No matching results',
+    'pisell2.ticket-booking.terminal-upgrade-title': 'Terminal Version Reminder',
+    'pisell2.ticket-booking.terminal-upgrade-description': 'Your Terminal version is outdated. Please upgrade Terminal to use all features.',
+    'pisell2.ticket-booking.terminal-upgrade-ok': 'I understand',
+    'pisell2.ticket-booking.terminal-upgrade-cancel': 'Cancel'
   },
   'zh-CN': {
     'pisell2.ticket-booking.info': '信息',
@@ -141,7 +145,11 @@ export default {
       return '分钟';
     },
     'pisell2.ticket-booking.reload': '重新加载',
-    'pisell2.text.scan-global-failed': '无搜索结果'
+    'pisell2.text.scan-global-failed': '无搜索结果',
+    'pisell2.ticket-booking.terminal-upgrade-title': 'Terminal版本提醒',
+    'pisell2.ticket-booking.terminal-upgrade-description': '检测到您的Terminal版本较低，请升级Terminal以使用完整功能',
+    'pisell2.ticket-booking.terminal-upgrade-ok': '我知道了',
+    'pisell2.ticket-booking.terminal-upgrade-cancel': '取消'
   },
   'zh-HK': {
     'pisell2.ticket-booking.info': '資訊',
@@ -213,6 +221,10 @@ export default {
       return '分鐘';
     },
     'pisell2.ticket-booking.reload': '重新載入',
-    'pisell2.text.scan-global-failed': '無搜索結果'
+    'pisell2.text.scan-global-failed': '無搜索結果',
+    'pisell2.ticket-booking.terminal-upgrade-title': 'Terminal版本提醒',
+    'pisell2.ticket-booking.terminal-upgrade-description': '檢測到您的Terminal版本較低，請升級Terminal以使用完整功能',
+    'pisell2.ticket-booking.terminal-upgrade-ok': '我知道了',
+    'pisell2.ticket-booking.terminal-upgrade-cancel': '取消'
   }
 };

package/es/components/wallet/hooks/useWalletCard.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { IWalletListItemProps } from '../serve';
 /**
  * 钱包卡片Hook的参数

package/es/components/workSpaceList/components/Modal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Modal as AntModal, ModalFuncProps as AntModalFuncProps, ModalProps as AntModalProps } from 'antd';
 import './index.less';
 interface ModalProps extends AntModalProps {

package/es/hooks/usePaymentLogger.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface LogData {
     key: string;
     value: any;

package/es/plus/clientName/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 import { IClientNameProps } from './type';
 declare const ClientName: ({ className, dataSource, style }: IClientNameProps) => JSX.Element | null;

package/es/plus/clinetSearch/Add/BirthdayField/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const DateSectionCom: ({ value, onChange, showTime, className, style, useSpace, format, itemStyle, }: any) => JSX.Element;
 export default DateSectionCom;

package/es/plus/clinetSearch/Add/GenderField/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const GenderField: (props: any) => JSX.Element;
 export default GenderField;

package/es/plus/clinetSearch/Add/PhoneField/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const PhoneField: ({ value, onChange }: any) => JSX.Element;
 export default PhoneField;

package/es/plus/noteModal/AddTempModal.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const AddTempModal: ({ open, onCancel, onConfirm, }: {
     open: boolean;

package/es/plus/saasCreateOrganization/components/Header.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SCOProps } from '../types';
 import '../index.less';
 export declare const Header: (props: SCOProps) => JSX.Element;

package/es/plus/saasCreateOrganization/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SCOProps } from './types';
 import './index.less';
 declare const SaasCreateOrganization: (props: SCOProps) => JSX.Element;

package/es/plus/saasRegister/components/EntryEmail.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FormInstance } from 'antd';
 import { SRProps } from '../types';
 import '../index.less';

package/es/plus/saasRegister/components/EntryInfo.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FormInstance } from 'antd';
 import { SRProps } from '../types';
 import '../index.less';

package/es/plus/saasRegister/components/GoLogin.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SRProps } from '../types';
 import '../index.less';
 declare const GoLogin: (props: SRProps) => JSX.Element;

package/es/plus/saasRegister/components/Header.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SRProps } from '../types';
 import '../index.less';
 export declare const Header: (props: SRProps) => JSX.Element;

package/es/plus/saasRegister/components/VerifyError.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SRStepStatus } from '../types';
 import '../index.less';
 declare const VerifyError: (props: {

package/es/plus/saasRegister/components/VerifyingLink.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import '../index.less';
 declare const VerifyingEmailLink: (props: {
     onVerifyLink: () => Promise<void>;

package/es/plus/saasRegister/components/VertifyEmail.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import '../index.less';
 declare const VertifyEmail: (props: {
     email: string;

package/es/pro/pisellPhoneKeyboard/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PopoverProps } from 'antd';
 import './index.less';
 interface PisellPhoneKeyboardProps {

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

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

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

@@ -30,7 +30,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组

package/lib/components/appointmentBooking/components/Cart/Item/Total.d.ts

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

package/lib/components/appointmentBooking/components/Cart/index.d.ts

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

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 export declare const DepositContent: (props: {
     isAgreeDepositPolicy: boolean;

package/lib/components/appointmentBooking/components/Footer/index.d.ts

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

package/lib/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts

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

package/lib/components/appointmentBooking/components/Header/index.d.ts

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

package/lib/components/appointmentBooking/components/Voucher/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import '../../../booking/components/voucher/index.less';
 import './index.less';
 declare const VoucherCard: (props: any) => JSX.Element;

package/lib/components/appointmentBooking/deposit/index.d.ts

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

package/lib/components/booking/addons/index.d.ts

@@ -0,0 +1,17 @@
+/**
+ * @title: 添加额外商品
+ * @description:
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-01-30 16:33
+ */
+import './index.less';
+export interface InfoProps {
+    title?: string;
+    style?: any;
+    globalState: any;
+    setGlobalState: any;
+}
+export declare const formatProducts: (values: any) => any;
+declare const Addons: any;
+export default Addons;

package/lib/components/booking/components/TabProduct/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 interface TabProductProps {
     list: any[];

package/lib/components/booking/components/TabProduct/productItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItem;

package/lib/components/booking/components/TabProduct/selectProductItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const SelectProductItem: ({ item, onClick, onChangeQuantity, amountSymbol, style, className, disabled, }: any) => JSX.Element;
 export default SelectProductItem;

package/lib/components/booking/components/collapsibleList/utils.d.ts

@@ -1 +1,2 @@
+/// <reference types="react" />
 export declare const renderBundles: (item: any, amountSymbol: string) => JSX.Element;

package/lib/components/booking/components/emptyBooking/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 /**
  * @title: 空状态
  * @description:

package/lib/components/booking/components/footer/FooterMenus/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const FooterMenus: ({ state, menuChange, items }: any) => JSX.Element | null;
 export default FooterMenus;

package/lib/components/booking/components/footer/amount.d.ts

@@ -3,10 +3,14 @@ export declare const getIsPriceIncludeTax: (state: any) => any;
 /**
  * 总金额
  * @param state
- * @param options
+ * @param options isEdit: 预约信息是否发生变动
  * @returns
  */
-export declare const getSumTotal: (state: any, { isEdit, ScheduleModule, ...rest }: any) => {
+export declare const getSumTotal: (state: any, options: {
+    [key: string]: any;
+    isEdit: boolean;
+    ScheduleModule: any;
+}) => {
     productAmount: number;
     duration: string;
     tax: number;

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

@@ -64,7 +64,9 @@ var getProductExpectAmount = (state, isEdit) => {
           } else {
             const quantity = item._extend.quantity || 1;
             price += Number(item._extend.total) * Number(quantity);
-            price += getRelationDetailsTotal(item._extend.relation_details || []);
+            price += getRelationDetailsTotal(
+              item._extend.relation_details || []
+            );
             duration += import_utils.flexibleObj.getValue(item._extend.duration);
           }
         }
@@ -137,7 +139,6 @@ var processItemsTax = (items, state, options) => {
       {
         ...item,
         total: unitPrice.toNumber(),
-        price: item._extend.total,
         quantity: 1
       },
       state,
@@ -160,8 +161,33 @@ var processItemsTax = (items, state, options) => {
     );
     item._extend.original_tax_fee = originalTaxPerItem.toNumber();
     item._extend.tax_fee = discountedTaxPerItem.toNumber();
-    originTax = originTax.plus(originalTaxPerItem.times(quantity));
-    tax = tax.plus(discountedTaxPerItem.times(quantity));
+    let addTimeTotalTax = new import_decimal.default(0);
+    if (Array.isArray(item._extend.relation_details)) {
+      for (let atItem of item._extend.relation_details) {
+        const _originTotal = new import_decimal.default(
+          atItem.selling_price || atItem.price || 0
+        );
+        let _discountedTotal = _originTotal;
+        if (productExpectAmount > 0) {
+          _discountedTotal = _originTotal.minus(
+            _originTotal.dividedBy(productExpectAmount).times(shopDiscount)
+          );
+        }
+        const addTimeTaxPerItem = getProductItemTax(
+          {
+            ...atItem,
+            total: _discountedTotal,
+            // 可能包含原有数据，或前端临时数据
+            quantity: atItem.product_quantity || atItem.num || 1
+          },
+          state,
+          { tax_rate, is_price_include_tax }
+        );
+        addTimeTotalTax = addTimeTotalTax.plus(addTimeTaxPerItem);
+      }
+    }
+    originTax = originTax.plus(originalTaxPerItem.times(quantity)).plus(addTimeTotalTax);
+    tax = tax.plus(discountedTaxPerItem.times(quantity)).plus(addTimeTotalTax);
   }
   return { originTax, tax };
 };
@@ -175,20 +201,20 @@ var getTax = (state, options) => {
   let totalTax = new import_decimal.default(0);
   if ((state == null ? void 0 : state.service) || (state == null ? void 0 : state.addons)) {
     if ((_b = state == null ? void 0 : state.service) == null ? void 0 : _b.value) {
-      const serviceResult = processItemsTax(
-        state.service.value,
-        state,
-        { tax_rate, is_price_include_tax, computed }
-      );
+      const serviceResult = processItemsTax(state.service.value, state, {
+        tax_rate,
+        is_price_include_tax,
+        computed
+      });
       totalOriginTax = totalOriginTax.plus(serviceResult.originTax);
       totalTax = totalTax.plus(serviceResult.tax);
     }
     if ((_c = state == null ? void 0 : state.addons) == null ? void 0 : _c.value) {
-      const addonsResult = processItemsTax(
-        state.addons.value,
-        state,
-        { tax_rate, is_price_include_tax, computed }
-      );
+      const addonsResult = processItemsTax(state.addons.value, state, {
+        tax_rate,
+        is_price_include_tax,
+        computed
+      });
       totalOriginTax = totalOriginTax.plus(addonsResult.originTax);
       totalTax = totalTax.plus(addonsResult.tax);
     }
@@ -276,9 +302,9 @@ var isProductMatchSurchargeCondition = (item, options) => {
 };
 var getSurcharge = (state, options) => {
   var _a;
-  const { ScheduleModule, surcharge_list, scheduleById } = options;
+  const { isEdit, ScheduleModule, surcharge_list, scheduleById } = options;
   const { bookingDetail, bookingId } = state;
-  if (bookingId) {
+  if (!isEdit && bookingId) {
     if (Array.isArray(bookingDetail == null ? void 0 : bookingDetail.surcharge)) {
       return (((_a = state.bookingDetail) == null ? void 0 : _a.surcharge) || []).map(
         (d, index) => {
@@ -321,8 +347,10 @@ var getSurcharge = (state, options) => {
           ScheduleModule
         })) {
           matchedItems.push({
-            total: Number(item._extend.price),
-            // 附加费不参与折扣，需要使用商品原价计算
+            total: Number(item._extend.total),
+            addTimeTotal: getRelationDetailsTotal(
+              item._extend.relation_details || []
+            ),
             quantity: item._extend.quantity || 1
           });
         }
@@ -336,7 +364,7 @@ var getSurcharge = (state, options) => {
           ScheduleModule
         })) {
           matchedItems.push({
-            total: Number(item._extend.price),
+            total: Number(item._extend.total),
             quantity: item._extend.quantity || 1
           });
         }
@@ -350,7 +378,8 @@ var getSurcharge = (state, options) => {
         for (let item of matchedItems) {
           const itemPrice = new import_decimal.default(Math.max(0, item.total || 0));
           const itemQuantity = new import_decimal.default(item.quantity || 1);
-          const itemSurcharge = itemPrice.times(itemQuantity).times(percentageRate);
+          const addTimeTotal = new import_decimal.default(item.addTimeTotal || 0);
+          const itemSurcharge = itemPrice.times(itemQuantity).plus(addTimeTotal).times(percentageRate);
           configTotal = configTotal.plus(itemSurcharge);
         }
       }
@@ -376,10 +405,13 @@ var getSurcharge = (state, options) => {
   }
   return surchargeWithAmount;
 };
-var getSurchargeAmount = (state, surcharge) => {
+var getSurchargeAmount = (state, surcharge, options) => {
   const { bookingDetail, bookingId } = state;
-  if (bookingDetail && bookingId) {
-    return Number(bookingDetail.surcharge_fee);
+  const { isEdit } = options;
+  if (!isEdit) {
+    if (bookingDetail && bookingId) {
+      return Number(bookingDetail.surcharge_fee);
+    }
   }
   if (!Array.isArray(surcharge)) return 0;
   return surcharge.reduce((total, item) => {
@@ -434,26 +466,25 @@ var getSumTotalAmount = ({
 }) => {
   return expectAmount + roundingAmount;
 };
-var getSumTotal = (state, { isEdit, ScheduleModule, ...rest }) => {
+var getSumTotal = (state, options) => {
   const { productExpectAmount, duration } = getProductExpectAmount(
     state,
-    isEdit
+    options.isEdit
   );
   const shopDiscount = getShopDiscount(state);
   const roundingAmount = getRoundingAmount(state);
   const paySurchargeFee = getPaySurchargeFee(state);
-  const surcharge = getSurcharge(state, { ScheduleModule, ...rest });
-  const surchargeAmount = getSurchargeAmount(state, surcharge);
+  const surcharge = getSurcharge(state, options);
+  const surchargeAmount = getSurchargeAmount(state, surcharge, options);
   const computed = {
     productExpectAmount,
     shopDiscount
   };
   const { tax, originTax } = getTax(state, {
-    isEdit,
     computed,
-    ...rest
+    ...options
   });
-  const taxInfo = getTaxInfo(state, rest);
+  const taxInfo = getTaxInfo(state, options);
   const paidAmount = getPaidAmount(state);
   const orderPaidAmount = getOrderPaidAmount(state);
   const totalRefundAmount = getTotalRefundAmount(state);
@@ -463,10 +494,7 @@ var getSumTotal = (state, { isEdit, ScheduleModule, ...rest }) => {
     surchargeAmount,
     shopDiscount,
     state,
-    options: {
-      isEdit,
-      ...rest
-    }
+    options
   });
   const originExpectAmount = getExpectAmount({
     price: productExpectAmount,
@@ -474,10 +502,7 @@ var getSumTotal = (state, { isEdit, ScheduleModule, ...rest }) => {
     surchargeAmount,
     shopDiscount: 0,
     state,
-    options: {
-      isEdit,
-      ...rest
-    }
+    options
   });
   const sumTotalAmount = getSumTotalAmount({ expectAmount, roundingAmount });
   const notPaidAmount = Number((0, import_utils2.formatAmount)(sumTotalAmount, 2, "")) - orderPaidAmount;