@pisell/private-materials 6.6.43 → 6.6.45

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

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

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

@@ -4,5 +4,5 @@ interface AuthWrapProps {
     falseRender?: React.ReactNode;
     show: boolean;
 }
-declare const AuthWrap: (props: AuthWrapProps) => JSX.Element;
+declare const AuthWrap: (props: AuthWrapProps) => React.JSX.Element;
 export default AuthWrap;

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

@@ -11,5 +11,5 @@ interface BrowserSelectProps extends React.DetailedHTMLProps<React.SelectHTMLAtt
  * @Author: zhiwei.Wang
  * @Date: 2024-01-30 16:43
  */
-declare const BrowserSelect: (props: BrowserSelectProps) => JSX.Element;
+declare const BrowserSelect: (props: BrowserSelectProps) => React.JSX.Element;
 export default BrowserSelect;

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

@@ -1 +1,2 @@
-export declare const renderBundles: (item: any, amountSymbol: string) => JSX.Element;
+import React from "react";
+export declare const renderBundles: (item: any, amountSymbol: string) => React.JSX.Element;

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

@@ -15,5 +15,5 @@ export interface PisellDrawerProps extends DrawerProps {
  * @Author: zhiwei.Wang
  * @Date: 2024-01-30 16:51
  */
-declare const Drawer: (props: PisellDrawerProps) => JSX.Element;
+declare const Drawer: (props: PisellDrawerProps) => React.JSX.Element;
 export default Drawer;

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

@@ -1,3 +1,4 @@
+import React from "react";
 /**
  * @title: 空状态
  * @description:
@@ -8,5 +9,5 @@
  */
 declare const EmptyBooking: ({ description }: {
     description?: string | undefined;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default EmptyBooking;

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

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

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

@@ -322,7 +322,7 @@ var processItemsTax = (items, state, options) => {
       }
     }
   }
-  return { originTax: expectedOriginTax, tax: expectedTax };
+  return { originTax: expectedOriginTax, tax: expectedTax, taxDecimal: preciseTax };
 };
 var clearTaxFee = (state) => {
   var _a, _b;
@@ -375,7 +375,7 @@ var getTax = (state, options) => {
         computed
       });
       totalOriginTax = totalOriginTax.plus(serviceResult.originTax);
-      totalTax = totalTax.plus(serviceResult.tax);
+      totalTax = totalTax.plus(serviceResult.taxDecimal);
     }
     if ((_c = state == null ? void 0 : state.addons) == null ? void 0 : _c.value) {
       const addonsResult = processItemsTax(state.addons.value, state, {
@@ -384,7 +384,7 @@ var getTax = (state, options) => {
         computed
       });
       totalOriginTax = totalOriginTax.plus(addonsResult.originTax);
-      totalTax = totalTax.plus(addonsResult.tax);
+      totalTax = totalTax.plus(addonsResult.taxDecimal);
     }
   }
   return {

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

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
 /**
  * @title: 底部
@@ -7,5 +8,5 @@ import './index.less';
  * @Author: zhiwei.Wang
  * @Date: 2024-01-30 16:51
  */
-declare const Footer: (props: any) => JSX.Element;
+declare const Footer: (props: any) => React.JSX.Element;
 export default Footer;

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

@@ -1356,7 +1356,7 @@ var Footer = (props) => {
     dispatch({
       type: "setService",
       payload: {
-        value: state.service.value.map((item) => ({ ...item, edit: true, booking_id: "checkout_edit", discount_list: item.discount_list.map((d) => ({ ...d, id: d.discount.resource_id })) }))
+        value: state.service.value.map((item) => ({ ...item, edit: true, booking_id: "0", discount_list: item.discount_list.map((d) => ({ ...d, id: d.discount.resource_id })) }))
       }
     });
     dispatch({

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

@@ -110,13 +110,14 @@ var formatProductBundle = (bundle) => {
   } catch (error) {
   }
   return bundle.map((d) => {
+    var _a;
     const option = formatProductOption(d.option);
     const option_price = option.reduce((temp, item) => {
       return temp + Number(item.num) * item.custom_add_price;
     }, 0);
     const product_discount_difference = ((d == null ? void 0 : d.discount_list) || []).reduce((pre, cur) => {
-      var _a;
-      return pre + (((_a = cur == null ? void 0 : cur.metadata) == null ? void 0 : _a.product_discount_difference) || 0);
+      var _a2;
+      return pre + (((_a2 = cur == null ? void 0 : cur.metadata) == null ? void 0 : _a2.product_discount_difference) || 0);
     }, 0);
     return {
       "is_charge_tax": d.is_charge_tax,
@@ -137,7 +138,7 @@ var formatProductBundle = (bundle) => {
       "bundle_selling_price": Math.abs(d == null ? void 0 : d.price),
       // "bundle_sum_price": d?.original_price || d?.original_total,
       "metadata": {
-        custom_product_bundle_map_id: d._id,
+        custom_product_bundle_map_id: ((_a = d == null ? void 0 : d.metadata) == null ? void 0 : _a.custom_product_bundle_map_id) || d._id,
         // 子商品单数量附加费
         "surcharge_fee": d.surcharge_fee,
         // 可选，附加费均摊舍入金额
@@ -366,7 +367,7 @@ var getMainProductSellingPrice = (item) => {
   }
   return new import_decimal.default((_f = item._extend) == null ? void 0 : _f.main_product_selling_price).add(optionPrice).toNumber();
 };
-var formatProducts = (item, quantity) => {
+var formatProducts = (item, quantity, options) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const total = Number(item._extend.total);
   const origin_total = Number(item._extend.origin_total);
@@ -380,6 +381,9 @@ var formatProducts = (item, quantity) => {
       ...d.metadata,
       unique_identification_number: `${item._extend.unique_identification_number}_${d.discount.resource_id}`
     };
+    if ((options == null ? void 0 : options.isServiceEdit) && (options == null ? void 0 : options.isMultiDay)) {
+      delete d.id;
+    }
   });
   const notManualDiscount = discount_list.filter(
     (item2) => item2.type !== "product"
@@ -520,7 +524,10 @@ var formatBookings = (data, values) => {
       item._extend.unique_identification_number = unique_identification_number;
     }
     const booking = {
-      product: formatProducts(item),
+      product: formatProducts(item, void 0, {
+        isServiceEdit: data.service.edit,
+        isMultiDay
+      }),
       relation_products: formatRelationDetails(item._extend.relation_details),
       id: item.booking_id || 0,
       relation_id: item._extend.relation_id || 0,

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

@@ -1,2 +1,3 @@
-declare const FormItemChildrenWrap: (props: any) => JSX.Element;
+import React from "react";
+declare const FormItemChildrenWrap: (props: any) => React.JSX.Element;
 export default FormItemChildrenWrap;

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

@@ -6,5 +6,5 @@ interface MenuButtonProps {
     menuWrapStyle?: React.CSSProperties;
     dropdownProps?: DropdownProps;
 }
-declare const MenuButton: ({ menuWrapClassName, menuWrapStyle, dropdownProps, }: MenuButtonProps) => JSX.Element;
+declare const MenuButton: ({ menuWrapClassName, menuWrapStyle, dropdownProps, }: MenuButtonProps) => React.JSX.Element;
 export default MenuButton;

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

@@ -1,8 +1,9 @@
+import React from 'react';
 import './index.less';
 interface IProps {
     modal: any;
     onReload: () => Promise<any>;
     onCancel: () => void;
 }
-declare const ReloadResourceModal: ({ modal, onReload, onCancel }: IProps) => JSX.Element;
+declare const ReloadResourceModal: ({ modal, onReload, onCancel }: IProps) => React.JSX.Element;
 export default ReloadResourceModal;

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

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
-declare const VoucherCard: (props: any) => JSX.Element | null;
+declare const VoucherCard: (props: any) => React.JSX.Element | null;
 export default VoucherCard;

package/lib/components/booking/components/voucher/index.js

@@ -111,7 +111,7 @@ var VoucherCard = (props) => {
     const val = (_a2 = state.service.value || []) == null ? void 0 : _a2.map((value) => {
       var _a3, _b2, _c2;
       return {
-        booking_id: value.booking_id,
+        // booking_id: value.booking_id,
         id: value.id,
         price: value.price,
         total: (_a3 = value == null ? void 0 : value._extend) == null ? void 0 : _a3.total,

package/lib/components/booking/deposit/ClientItem/index.d.ts

@@ -14,5 +14,5 @@ declare type ClientItemProps = {
     className?: string;
     walkInName?: string;
 };
-declare const ClientItem: (props: ClientItemProps) => JSX.Element;
+declare const ClientItem: (props: ClientItemProps) => React.JSX.Element;
 export default ClientItem;

package/lib/components/booking/deposit/DepositItem/index.d.ts

@@ -21,5 +21,5 @@ declare type DepositItemProps = {
     isBookingCancelled: boolean;
     hideOrderDetail?: boolean;
 };
-declare const DepositItem: (props: DepositItemProps) => JSX.Element;
+declare const DepositItem: (props: DepositItemProps) => React.JSX.Element;
 export default DepositItem;

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

@@ -1,2 +1,3 @@
-declare const Deposit: (props: any) => JSX.Element;
+import React from 'react';
+declare const Deposit: (props: any) => React.JSX.Element;
 export default Deposit;

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

@@ -1,6 +1,7 @@
+import React from 'react';
 interface FooterProps {
     state: any;
     reload: () => void;
 }
-declare const Footer: ({ state, reload }: FooterProps) => JSX.Element | null;
+declare const Footer: ({ state, reload }: FooterProps) => React.JSX.Element | null;
 export default Footer;

package/lib/components/booking/forms/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+import { FormState } from "../model";
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/booking/forms/single/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
 /**
  * @title: 表单选择器
@@ -6,5 +7,5 @@ import './index.less';
  * @Author: zhiwei.Wang
  * @Date: 2024-01-30 17:06
  */
-declare const Single: ({ value, onChange, form, mode, optionRender, loading, customSelectProps, onAdd, addButtonProps, modalOpen, watch, drawerProps, }: any) => JSX.Element;
+declare const Single: ({ value, onChange, form, mode, optionRender, loading, customSelectProps, onAdd, addButtonProps, modalOpen, watch, drawerProps, }: any) => React.JSX.Element;
 export default Single;

package/lib/components/booking/forms/table/index.d.ts

@@ -1,3 +1,4 @@
+import React from "react";
 import "./index.less";
-declare const Table: ({ value, onChange, field, mode, onAdd }: any) => JSX.Element;
+declare const Table: ({ value, onChange, field, mode, onAdd }: any) => React.JSX.Element;
 export default Table;

package/lib/components/booking/hooks/useClearCart.d.ts

@@ -1,2 +1,3 @@
-declare const useClearCart: (state: any, dispatch: any) => false | JSX.Element;
+import React from 'react';
+declare const useClearCart: (state: any, dispatch: any) => false | React.JSX.Element;
 export default useClearCart;

package/lib/components/booking/hooks/useQuotation.d.ts

@@ -1,5 +1,6 @@
+import React from 'react';
 export declare const calculateTotalPrice: (data: any) => number;
 declare const useQuotation: (state: any, dispatch: any) => {
-    dom: JSX.Element;
+    dom: React.JSX.Element;
 };
 export default useQuotation;

package/lib/components/booking/info/addServiceVariant/index.d.ts

@@ -1,6 +1,7 @@
+import React from 'react';
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const AddServiceVariant: (props: AddServiceVariantProps) => JSX.Element;
+declare const AddServiceVariant: (props: AddServiceVariantProps) => React.JSX.Element;
 export default AddServiceVariant;

package/lib/components/booking/info/client/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import './index.less';
-declare const _default: React.MemoExoticComponent<() => JSX.Element>;
+declare const _default: React.MemoExoticComponent<() => React.JSX.Element>;
 export default _default;

package/lib/components/booking/info/clientVariant/hooks/useClientFn.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { FormState } from '../../../model';
 interface useClientFnParams {
     state: any;
@@ -35,7 +36,7 @@ declare const useClientFn: (_params: useClientFnParams) => {
     };
     searchChange: (search: string) => void;
     loading: boolean;
-    loadMore: JSX.Element | null;
+    loadMore: React.JSX.Element | null;
     handleOpenClientModal: (val?: string) => void;
     getNickname: (item: any) => any;
     franchiseeLoading: number;

package/lib/components/booking/info/date/index.d.ts

@@ -1,4 +1,5 @@
+import React from "react";
 import "./index.less";
 export declare const updateServiceDate: (services: any[], date: any, isTime: boolean) => any[];
-declare const DateCom: () => JSX.Element;
+declare const DateCom: () => React.JSX.Element;
 export default DateCom;

package/lib/components/booking/info/dateRange/index.d.ts

@@ -1,4 +1,5 @@
+import React from 'react';
 import './index.less';
 export declare const disabledDate: (current: any, position: any, currentDate: any) => any;
-declare const DateRange: ({ state, dispatch, key }: any) => JSX.Element;
+declare const DateRange: ({ state, dispatch, key }: any) => React.JSX.Element;
 export default DateRange;

package/lib/components/booking/info/header/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
-declare const header: ({ state, dispatch }: any) => JSX.Element;
+declare const header: ({ state, dispatch }: any) => React.JSX.Element;
 export default header;

package/lib/components/booking/info/hooks/useGetHolderList.d.ts

@@ -1,2 +1,2 @@
-declare const useGetHolderList: (state: any, dispatch: any) => () => Promise<void>;
+declare const useGetHolderList: (state: any, dispatch: any) => (this: unknown) => Promise<void>;
 export default useGetHolderList;

package/lib/components/booking/info/hooks/useInfoHolder.d.ts

@@ -1,9 +1,9 @@
 import { EditServiceRef } from "../service/editService";
 declare const useInfoHolder: (state: any, dispatch: any) => {
     detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;
-    handleEdit: (cacheItem: any, type?: string) => void;
+    handleEdit: (this: unknown, cacheItem: any, type?: string | undefined) => void;
     dispatchService: (type: string, payload: any) => void;
-    handleAction: (dataSource: any) => void;
+    handleAction: (this: unknown, dataSource: any) => void;
     showAddTimeModal: boolean;
     editNormalServiceRef: import("react").MutableRefObject<any>;
 };

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

@@ -1,3 +1,4 @@
+import React from 'react';
 import { InfoProps } from './main';
-declare const APP: (props: InfoProps) => JSX.Element;
+declare const APP: (props: InfoProps) => React.JSX.Element;
 export default APP;

package/lib/components/booking/info/model.d.ts

@@ -1,5 +1,14 @@
+/// <reference types="react" />
+import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/booking/info/notes/index.d.ts

@@ -1,2 +1,3 @@
-declare const Notes: () => JSX.Element | null;
+import React from "react";
+declare const Notes: () => React.JSX.Element | null;
 export default Notes;

package/lib/components/booking/info/pet/index.d.ts

@@ -10,5 +10,5 @@ interface PetProps {
     clientChangeNotSetPet?: boolean;
     previewItemTitleRender?: (item: any, index: number, values: any[]) => React.ReactNode;
 }
-declare const Pet: (props: PetProps) => JSX.Element;
+declare const Pet: (props: PetProps) => React.JSX.Element;
 export default Pet;

package/lib/components/booking/info/service/Lists.d.ts

@@ -1,2 +1,3 @@
-declare const Lists: ({ onEdit, onChange, onAction, isParallelResource, isShowDelete, isShowAmountFooter }: any) => JSX.Element;
+import React from 'react';
+declare const Lists: ({ onEdit, onChange, onAction, isParallelResource, isShowDelete, isShowAmountFooter }: any) => React.JSX.Element;
 export default Lists;

package/lib/components/booking/info/service/actions/index.d.ts

@@ -1,5 +1,6 @@
+import React from "react";
 import "./index.less";
 declare const Actions: ({ currentService }: {
     currentService: any;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default Actions;

package/lib/components/booking/info/service/addService/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { PisellDrawerProps } from '../../../components/drawer';
 import './index.less';
 interface AddServiceProps {
@@ -7,5 +8,5 @@ interface AddServiceProps {
     drawerProps?: PisellDrawerProps;
     renderMode?: 'current' | 'drawer';
 }
-declare const Info: (props: AddServiceProps) => JSX.Element;
+declare const Info: (props: AddServiceProps) => React.JSX.Element;
 export default Info;

package/lib/components/booking/info/service/addTimeModal/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
-declare const AddTimeModal: () => JSX.Element;
+declare const AddTimeModal: () => React.JSX.Element;
 export default AddTimeModal;

package/lib/components/booking/info/service/editService/BookingList/index.d.ts

@@ -1,4 +1,5 @@
+import React from 'react';
 declare const BookingList: ({ items }: {
     items: any[];
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default BookingList;

package/lib/components/booking/info/service/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import './index.less';
-declare const _default: React.MemoExoticComponent<() => JSX.Element>;
+declare const _default: React.MemoExoticComponent<() => React.JSX.Element>;
 export default _default;

package/lib/components/booking/info/service/like/index.d.ts

@@ -1,8 +1,9 @@
+import React from "react";
 import "./index.less";
 declare const Like: ({ status, onChange, className, style, }: {
     style?: any;
     status: string;
     onChange?: any;
     className?: string | undefined;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default Like;

package/lib/components/booking/info/service/serviceItem/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
-declare const ServiceItem: ({ d, handleEditService, state, handleLike, resourceItem, errorMessage, handleDeleteService, }: any) => JSX.Element;
+declare const ServiceItem: ({ d, handleEditService, state, handleLike, resourceItem, errorMessage, handleDeleteService, }: any) => React.JSX.Element;
 export default ServiceItem;

package/lib/components/booking/info/service/serviceList/index.d.ts

@@ -1,5 +1,6 @@
+import React from 'react';
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default ServiceList;

package/lib/components/booking/info/service2/Lists.d.ts

@@ -1,2 +1,3 @@
-declare const Lists: ({ onEdit, onChange }: any) => JSX.Element;
+import React from 'react';
+declare const Lists: ({ onEdit, onChange }: any) => React.JSX.Element;
 export default Lists;

package/lib/components/booking/info/service2/index.d.ts

@@ -3,4 +3,4 @@ export declare const Service2Context: React.Context<any>;
 export declare const Service2Cart: ({ hideAdd, hideEdit, }: {
     hideAdd?: boolean | undefined;
     hideEdit?: boolean | undefined;
-}) => JSX.Element;
+}) => React.JSX.Element;

package/lib/components/booking/info2/service/actions/index.d.ts

@@ -1,5 +1,6 @@
+import React from 'react';
 import '../../../info/service/actions/index.less';
 declare const Actions: ({ currentService }: {
     currentService: any;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default Actions;

package/lib/components/booking/info2/service/addService/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { PisellDrawerProps } from '../../../components/drawer';
 import '../../../info/service/addService/index.less';
 interface AddServiceProps {
@@ -7,5 +8,5 @@ interface AddServiceProps {
     drawerProps?: PisellDrawerProps;
     renderMode?: 'current' | 'drawer';
 }
-declare const Info: (props: AddServiceProps) => JSX.Element;
+declare const Info: (props: AddServiceProps) => React.JSX.Element;
 export default Info;

package/lib/components/booking/info2/service/addTimeModal/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import '../../../info/service/addTimeModal/index.less';
-declare const _default: React.MemoExoticComponent<() => JSX.Element>;
+declare const _default: React.MemoExoticComponent<() => React.JSX.Element>;
 export default _default;

package/lib/components/booking/info2/service/contactInfoMode/index.d.ts

@@ -1,2 +1,3 @@
-declare const ContactInfoMode: () => JSX.Element;
+import React from 'react';
+declare const ContactInfoMode: () => React.JSX.Element;
 export default ContactInfoMode;

package/lib/components/booking/info2/service/editService/index.js

@@ -316,10 +316,6 @@ var Info = (_, ref) => {
     let _id = _item == null ? void 0 : _item._id;
     let groupId = (_j2 = _item == null ? void 0 : _item._extend) == null ? void 0 : _j2.groupId;
     const origin_total = (_n2 = (_m2 = (_l2 = (_k2 = _item._extend) == null ? void 0 : _k2.items) == null ? void 0 : _l2[0]) == null ? void 0 : _m2._extend) == null ? void 0 : _n2.origin_total;
-    _item = (0, import_utils8.setProductPrice)(_item, {
-      newTotal: values.total,
-      origin_total: origin_total ?? ((_o2 = _item._extend) == null ? void 0 : _o2.origin_total)
-    });
     if (groupId) {
       if (isChangeTotal.current) {
         _item = deleteDiscountList(_item);
@@ -330,6 +326,10 @@ var Info = (_, ref) => {
       });
       _list = _list.concat((0, import_utils9.createBookingItemsByGroup)(_item, true));
     } else {
+      _item = (0, import_utils8.setProductPrice)(_item, {
+        newTotal: values.total,
+        origin_total: origin_total ?? ((_o2 = _item._extend) == null ? void 0 : _o2.origin_total)
+      });
       if (!_list.some((d) => d._id === _id)) {
         const detail = (0, import_utils3.addService)(_list, _item, state);
         _list = detail.list;
@@ -528,6 +528,7 @@ var Info = (_, ref) => {
         customer_id: (_e2 = (_d2 = state.client) == null ? void 0 : _d2.value) == null ? void 0 : _e2.id,
         value: {
           ...item._extend.other,
+          bundle: (0, import_utils8.mergeBundles)(item._extend.other),
           ...sessionValue,
           quantity: values.quantity || item._extend.quantity
         }
@@ -1023,6 +1024,8 @@ var Info = (_, ref) => {
     var _a2, _b2, _c2;
     delete cacheItem.discount_list;
     (_c2 = (_b2 = (_a2 = cacheItem._extend.other) == null ? void 0 : _a2.bundle) == null ? void 0 : _b2.forEach) == null ? void 0 : _c2.call(_b2, (bundle) => {
+      var _a3;
+      (_a3 = bundle == null ? void 0 : bundle.metadata) == null ? true : delete _a3.custom_product_bundle_map_id;
       bundle == null ? true : delete bundle.discount_list;
       bundle == null ? true : delete bundle.booking_id;
       bundle == null ? true : delete bundle.bundle_selling_price;

package/lib/components/booking/info2/service/editService/utils.d.ts

@@ -32,6 +32,7 @@ export declare const setProductPrice: (cacheItem: any, { newTotal, origin_total
  * @returns 折扣列表
  */
 export declare const getProductAllDiscountList: (cacheItem: any) => any;
+export declare const mergeBundles: (other: any) => any[];
 /**
  * 合并 bundle 数据，基于 id 和 product_id 匹配，price 优先使用 originalOther 中的值
  * @param other - callback 返回的新数据

package/lib/components/booking/info2/service/editService/utils.js

@@ -32,6 +32,7 @@ __export(utils_exports, {
   getAutoAllocationStorage: () => getAutoAllocationStorage,
   getProductAllDiscountList: () => getProductAllDiscountList,
   mergeBundleWithOriginalPrice: () => mergeBundleWithOriginalPrice,
+  mergeBundles: () => mergeBundles,
   setAutoAllocationStorage: () => setAutoAllocationStorage,
   setProductPrice: () => setProductPrice
 });
@@ -96,6 +97,20 @@ var getProductAllDiscountList = (cacheItem) => {
   discountList.push(...bundleDiscountList);
   return discountList;
 };
+var mergeBundles = (other) => {
+  const bundle = (other == null ? void 0 : other.bundle) || [];
+  const newBundle = [];
+  bundle.forEach((item) => {
+    const newItem = newBundle.find((newItem2) => newItem2.id === item.id);
+    if (newItem) {
+      newItem.num += item.num || 1;
+      newItem.quantity += item.quantity || 1;
+    } else {
+      newBundle.push({ ...item });
+    }
+  });
+  return newBundle;
+};
 var mergeBundleWithOriginalPrice = (other, originalOther) => {
   var _a, _b;
   if (!((_a = other == null ? void 0 : other.bundle) == null ? void 0 : _a.length) || !((_b = originalOther == null ? void 0 : originalOther.bundle) == null ? void 0 : _b.length)) return other;
@@ -115,6 +130,7 @@ var mergeBundleWithOriginalPrice = (other, originalOther) => {
   getAutoAllocationStorage,
   getProductAllDiscountList,
   mergeBundleWithOriginalPrice,
+  mergeBundles,
   setAutoAllocationStorage,
   setProductPrice
 });

package/lib/components/booking/info2/service/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import '../../info/service/index.less';
-declare const _default: React.MemoExoticComponent<() => JSX.Element>;
+declare const _default: React.MemoExoticComponent<() => React.JSX.Element>;
 export default _default;

package/lib/components/booking/info2/service/serviceItem/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
-declare const ServiceItem: ({ d, handleEditService, state, handleLike, errorMessage, handleDeleteService, }: any) => JSX.Element;
+declare const ServiceItem: ({ d, handleEditService, state, handleLike, errorMessage, handleDeleteService, }: any) => React.JSX.Element;
 export default ServiceItem;