@pisell/private-materials 6.6.70 → 6.6.71

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

@@ -128,7 +128,7 @@ var VoucherCard = function VoucherCard(props) {
     var val = (_ref = state.service.value || []) === null || _ref === void 0 ? void 0 : _ref.map(function (value) {
       var _value$_extend, _value$_extend2, _value$_extend3;
       return {
-        booking_id: value.booking_id,
+        // booking_id: value.booking_id,
         id: value.id,
         price: value.price,
         total: value === null || value === void 0 || (_value$_extend = value._extend) === null || _value$_extend === void 0 ? void 0 : _value$_extend.total,

package/es/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/es/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/es/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/es/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/es/components/booking/forms/model.d.ts

@@ -1,10 +1 @@
-/// <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;
-}>;
+export declare const Provider: any, Context: any;

package/es/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/es/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/es/components/booking/hooks/useClearCart.d.ts

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

package/es/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/es/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/es/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/es/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/es/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/es/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/es/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/es/components/booking/info/hooks/useAddHolder.js

@@ -84,6 +84,7 @@ var useAddHolder = function useAddHolder(state, dispatch) {
   var handleAddHolder = function handleAddHolder(products, currentItem) {
     var _state$client, _state$client2;
     var _data = {
+      zIndex: 1300,
       formDataConfig: isMinorAndWaiver ? _objectSpread(_objectSpread({}, waiverForm), {}, {
         customer_id: (_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id,
         is_franchisor: formDataConfig.is_franchisor

package/es/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/es/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/es/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/es/components/booking/info/main.js

@@ -27,6 +27,7 @@ import Notes from "./notes";
 import { Service2Cart } from "./service2";
 import { isDayBooking, isEventBooking, isTerminalDayBooking } from "./service2/utils";
 import ContactInfoMode from "../info2/service/contactInfoMode";
+import { HolderAssignmentConfirmModal } from "../utils/holderAssignmentConfirmModal";
 var defaultModules = {
   client: 1,
   date: 1,
@@ -127,7 +128,7 @@ var Info = Provider(function (props) {
     // <AddNote value={modal.state?.notes?.orderNote} onChange={addNote} />
     null;
   }, [modules.note, globalState === null || globalState === void 0 ? void 0 : globalState.bookingId, globalState.render, (_modal$state3 = modal.state) === null || _modal$state3 === void 0 || (_modal$state3 = _modal$state3.notes) === null || _modal$state3 === void 0 ? void 0 : _modal$state3.orderNote]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, !!modal.state.setGlobalState ? /*#__PURE__*/React.createElement(TabPane, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(HolderAssignmentConfirmModal, null), !!modal.state.setGlobalState ? /*#__PURE__*/React.createElement(TabPane, {
     style: _objectSpread(_objectSpread({}, style), {}, {
       height: '100%'
     }),

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

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

package/es/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/es/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/es/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/es/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/es/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/es/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/es/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/es/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/es/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/es/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/es/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/es/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/es/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/es/components/booking/info2/index.js

@@ -36,6 +36,7 @@ import { useDebounceEffect } from 'ahooks';
 import CartClientCard from "./cartClientCard";
 import { Iconfont, useToast } from '@pisell/materials';
 import ContactInfoMode from "./service/contactInfoMode";
+import { HolderAssignmentConfirmModal } from "../utils/holderAssignmentConfirmModal";
 var defaultModules = {
   client: 1,
   date: 1,
@@ -291,7 +292,7 @@ var Info = Provider(function (props) {
   }, [currentDate], {
     wait: 300
   });
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ReloadResourceModal, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(HolderAssignmentConfirmModal, null), /*#__PURE__*/React.createElement(ReloadResourceModal, {
     modal: modal,
     onReload: getResourcesData,
     onCancel: function onCancel() {

package/es/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/es/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/es/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/es/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/es/components/booking/info2/service/editService/index.js

@@ -19,7 +19,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import Delete_wght300_24px from '@pisell/icon/es/Delete_wght300_24px';
-import { formatAmount, getUniqueId, locales } from '@pisell/utils';
+import { formatAmount, getUniqueId, locales, sendWarningLog } from '@pisell/utils';
 import React, { forwardRef, useContext, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import Drawer from "../../../components/drawer";
 import { Context } from "../../../info/model";
@@ -41,7 +41,7 @@ import { editSessionProduct } from "../../../info/utils";
 import { deleteCacheParams, getDays, getProductOriginTotalPrice, getProductTotalPrice, getServiceTimes, isSessionProduct, isWalkIn } from "../../../utils";
 import { getErrorList, getIsNoSpecAndPackage } from "../../utilsByBooking";
 import { formatResources, getDurationProps, getFlexibleOption, getMultiDay, getTimeObj, setDefaultCapacitys } from "../addService/utils";
-import { getProductAllDiscountList, mergeBundleWithOriginalPrice, setProductPrice } from "./utils";
+import { getProductAllDiscountList, mergeBundles, setProductPrice, mergeBundleWithOriginalPrice } from "./utils";
 import NoteModal from "../../../../../plus/noteModal";
 import { DiscountKeyboard } from "../../../../../pro/priceKeyboard";
 import EditTabs from "../../../info/service/editService/EditTabs";
@@ -51,6 +51,7 @@ import { createBookingItemsByGroup, getGroupTotalPrice } from "../../../info/ser
 import { useShopDiscountModule } from "../../../../ticketBooking/hooks/pisellos/useShopDiscountModule";
 import DiscountChangeModal from "./DiscountChangeModal";
 import Decimal from "decimal.js";
+import useEngineContext from "../../../../../hooks/useEngineContext";
 var submitLock = false;
 var Info = function Info(_, ref) {
   var _state$service4, _state$bookingConfig2, _state$bookingConfig3, _state$service$cacheI5, _state$service$cacheI7, _state$service6, _window$BaseMaterials, _state$service8, _state$service$cacheI12, _state$bookingConfig5, _state$service$cacheI13, _state$service$cacheI14, _state$service9, _state$service$resour2, _state$service$cacheI16, _state$service$cacheI17, _state$client2;
@@ -71,6 +72,7 @@ var Info = function Info(_, ref) {
     _useState2 = _slicedToArray(_useState, 2),
     discountChangeModalOpen = _useState2[0],
     setDiscountChangeModalOpen = _useState2[1];
+  var context = useEngineContext();
   var _useContext = useContext(Context),
     state = _useContext.state,
     dispatch = _useContext.dispatch;
@@ -663,13 +665,19 @@ var Info = function Info(_, ref) {
     var values = form.getFieldsValue();
     var isSession = isSessionProduct(item);
     var sessionValue = {};
+    var oldSession = {};
     if (isSession) {
-      var _item$_extend7, _item$_extend8, _item$_extend9;
+      var _item$_extend7, _item$_extend8, _item$_extend9, _item$_extend10, _item$_extend11, _item$_extend12;
       sessionValue.startEndTime = {
         startDate: item === null || item === void 0 || (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.start_date,
         endDate: item === null || item === void 0 || (_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.end_date,
         duration: item === null || item === void 0 || (_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.duration
       };
+      oldSession = {
+        start_date: dayjs(item === null || item === void 0 || (_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.start_date).format('YYYY-MM-DD'),
+        end_date: dayjs(item === null || item === void 0 || (_item$_extend11 = item._extend) === null || _item$_extend11 === void 0 ? void 0 : _item$_extend11.end_date).format('YYYY-MM-DD'),
+        duration: item === null || item === void 0 || (_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.duration
+      };
     }
 
     // 打开商品详情弹窗
@@ -687,7 +695,9 @@ var Info = function Info(_, ref) {
         },
         isOS: isSession,
         customer_id: (_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id,
-        value: _objectSpread(_objectSpread(_objectSpread({}, item._extend.other), sessionValue), {}, {
+        value: _objectSpread(_objectSpread(_objectSpread({}, item._extend.other), {}, {
+          bundle: mergeBundles(item._extend.other)
+        }, sessionValue), {}, {
           quantity: values.quantity || item._extend.quantity
         })
       },
@@ -700,8 +710,8 @@ var Info = function Info(_, ref) {
 
         // 手动折扣时 合并 bundle price，优先使用编辑前的价格
         if (item.discount_amount) {
-          var _item$_extend10;
-          other = mergeBundleWithOriginalPrice(other, ((_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.other) || {});
+          var _item$_extend13;
+          other = mergeBundleWithOriginalPrice(other, ((_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.other) || {});
         }
         other.session = e.session;
 
@@ -736,6 +746,37 @@ var Info = function Info(_, ref) {
           });
         } catch (err) {}
         var sessionDetail = editSessionProduct(cacheItem, e.session);
+        try {
+          var _e$session, _e$session2, _e$session3, _e$session4, _e$session5, _context$appHelper, _context$appHelper$ge;
+          sendWarningLog({
+            title: '修改商品数据',
+            content: [{
+              key: 'productId',
+              value: item.id
+            }, {
+              key: "isSession",
+              value: isSession
+            }, {
+              key: 'oldSession',
+              value: JSON.stringify(oldSession)
+            }, {
+              key: 'sessionValue',
+              value: JSON.stringify({
+                startTime: (_e$session = e.session) === null || _e$session === void 0 ? void 0 : _e$session.start_time,
+                endTime: (_e$session2 = e.session) === null || _e$session2 === void 0 ? void 0 : _e$session2.end_time,
+                startDate: dayjs((_e$session3 = e.session) === null || _e$session3 === void 0 ? void 0 : _e$session3.start_at).format('YYYY-MM-DD'),
+                endDate: dayjs((_e$session4 = e.session) === null || _e$session4 === void 0 ? void 0 : _e$session4.end_at).format('YYYY-MM-DD'),
+                duration: (_e$session5 = e.session) === null || _e$session5 === void 0 ? void 0 : _e$session5.duration
+              })
+            }, {
+              key: '日期',
+              value: dayjs().format('YYYY-MM-DD HH:mm')
+            }, {
+              key: '店铺id',
+              value: (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.store) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getState) === null || _context$appHelper$ge === void 0 || (_context$appHelper$ge = _context$appHelper$ge.call(_context$appHelper)) === null || _context$appHelper$ge === void 0 || (_context$appHelper$ge = _context$appHelper$ge.global) === null || _context$appHelper$ge === void 0 || (_context$appHelper$ge = _context$appHelper$ge.globalConfig) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.id
+            }]
+          });
+        } catch (err) {}
         if (sessionDetail) {
           setTimeout(function () {
             form.setFieldsValue({
@@ -746,10 +787,10 @@ var Info = function Info(_, ref) {
         }
         var origin_total = _total;
         if (item.discount_amount) {
-          var _item$_extend11, _item$_extend12;
+          var _item$_extend14, _item$_extend15;
           origin_total = getProductOriginTotalPrice(cacheItem);
-          var previousOriginTotal = Number((item === null || item === void 0 || (_item$_extend11 = item._extend) === null || _item$_extend11 === void 0 ? void 0 : _item$_extend11.origin_total) || 0);
-          var previousTotal = Number((item === null || item === void 0 || (_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.total) || 0);
+          var previousOriginTotal = Number((item === null || item === void 0 || (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.origin_total) || 0);
+          var previousTotal = Number((item === null || item === void 0 || (_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.total) || 0);
           var productAllDiscountList = getProductAllDiscountList(item);
           var hasNonManualDiscount = productAllDiscountList.some(function (discountItem) {
             return (discountItem === null || discountItem === void 0 ? void 0 : discountItem.type) !== 'product';

package/es/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/es/components/booking/info2/service/editService/utils.js

@@ -149,6 +149,22 @@ export var getProductAllDiscountList = function getProductAllDiscountList(cacheI
   (_discountList = discountList).push.apply(_discountList, _toConsumableArray(bundleDiscountList));
   return discountList;
 };
+export var mergeBundles = function mergeBundles(other) {
+  var bundle = (other === null || other === void 0 ? void 0 : other.bundle) || [];
+  var newBundle = [];
+  bundle.forEach(function (item) {
+    var newItem = newBundle.find(function (newItem) {
+      return newItem.id === item.id;
+    });
+    if (newItem) {
+      newItem.num += item.num || 1;
+      newItem.quantity += item.quantity || 1;
+    } else {
+      newBundle.push(_objectSpread({}, item));
+    }
+  });
+  return newBundle;
+};
 
 /**
  * 合并 bundle 数据，基于 id 和 product_id 匹配，price 优先使用 originalOther 中的值

package/es/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/es/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;

package/es/components/booking/info2/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/es/components/booking/materiels/contacts/index.d.ts

@@ -1,3 +1,4 @@
+import React from "react";
 import "./index.less";
 declare type ContactType = {
     country_calling_code: string;
@@ -11,5 +12,5 @@ declare type ContactsPropsType = {
     value: ContactType[];
     onChange: (value: ContactType[]) => void;
 };
-declare const Contacts: (props: ContactsPropsType) => JSX.Element;
+declare const Contacts: (props: ContactsPropsType) => React.JSX.Element;
 export default Contacts;

package/es/components/booking/materiels/duration/index.d.ts

@@ -1,4 +1,5 @@
 import { SelectProps } from 'antd';
+import React from 'react';
 interface DurationProps extends SelectProps {
     locale?: string;
     slice?: number;
@@ -9,5 +10,5 @@ interface DurationProps extends SelectProps {
     startDate?: any;
     timeObj?: any;
 }
-declare const Duration: (props: DurationProps) => JSX.Element;
+declare const Duration: (props: DurationProps) => React.JSX.Element;
 export default Duration;

package/es/components/booking/materiels/holder/index.d.ts

@@ -1,6 +1,7 @@
 import { SelectProps } from 'antd';
+import React from 'react';
 interface HolderProps extends SelectProps {
     selectProps?: SelectProps;
 }
-declare const Holder: (props: HolderProps) => JSX.Element;
+declare const Holder: (props: HolderProps) => React.JSX.Element;
 export default Holder;

package/es/components/booking/materiels/startTime/index.d.ts

@@ -1,9 +1,10 @@
 import { SelectProps } from "antd";
+import React from "react";
 interface StartTimeProps extends SelectProps {
     locale?: string;
     slice?: number;
     selectProps?: SelectProps;
     timeObjChange?: any;
 }
-declare const StartTime: (props: StartTimeProps) => JSX.Element;
+declare const StartTime: (props: StartTimeProps) => React.JSX.Element;
 export default StartTime;