@pisell/private-materials 3.3.30 → 3.3.32

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/appointmentBooking/components/Cart/Item/index.d.ts

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

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/Header/index.d.ts

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,3 +1,4 @@
+export declare const getRelationDetailsTotal: (relation_details: any) => number;
 export declare const is_price_include_tax: (state: any) => any;
 /**
  * 总金额

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

@@ -10,7 +10,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 import { getDiscountTime, flexibleObj } from "../../utils";
 import { formatAmount } from '@pisell/utils';
 import { isDayBooking, isDayBookingProduct } from "../../info/service2/utils";
-var getRelationDetailsTotal = function getRelationDetailsTotal(relation_details) {
+export var getRelationDetailsTotal = function getRelationDetailsTotal(relation_details) {
   var total = 0;
   var _iterator = _createForOfIteratorHelper(relation_details),
     _step;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 /**
  * @title: 底部

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

@@ -255,10 +255,16 @@ var Footer = function Footer(props) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (!(isTerminal !== null && isTerminal !== void 0 && isTerminal())) {
+            if (order_id) {
               _context.next = 2;
               break;
             }
+            return _context.abrupt("return");
+          case 2:
+            if (!(isTerminal !== null && isTerminal !== void 0 && isTerminal())) {
+              _context.next = 4;
+              break;
+            }
             return _context.abrupt("return", interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$po = _interaction$utils.postMessageToApp) === null || _interaction$utils$po === void 0 ? void 0 : _interaction$utils$po.call(_interaction$utils, {
               module: 'booking',
               key: 'booking_checkout',
@@ -267,7 +273,7 @@ var Footer = function Footer(props) {
                 callbackType: 'pisell2'
               }
             }));
-          case 2:
+          case 4:
             state.action({
               type: 'pisell1.handlePayment',
               data: {
@@ -277,7 +283,7 @@ var Footer = function Footer(props) {
                 state === null || state === void 0 || state.callback();
               }
             });
-          case 3:
+          case 5:
           case "end":
             return _context.stop();
         }

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

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

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

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

package/es/components/booking/forms/forms.js

@@ -59,7 +59,8 @@ var Forms = Provider(function (props) {
           case 0:
             _data = {
               formDataConfig: isMinorAndWaiver ? _objectSpread(_objectSpread({}, waiverForm), {}, {
-                customer_id: client === null || client === void 0 ? void 0 : client.id
+                customer_id: client === null || client === void 0 ? void 0 : client.id,
+                is_franchisor: formDataConfig.is_franchisor
               }) : _objectSpread({}, formDataConfig)
             };
             if (formDataConfig.data_range === 'customer' && !isWalkIn(client === null || client === void 0 ? void 0 : client.id)) {

package/es/components/booking/forms/sendModal/useSendModal.d.ts

@@ -4,6 +4,6 @@ declare const useSendModal: (bookingId?: number) => {
     setOpen: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     handleOpen: () => void;
     handleValuesChange: (val: any) => void;
-    handleOk: (values: SendModalValues) => Promise<boolean | undefined>;
+    handleOk: (values: SendModalValues) => Promise<any>;
 };
 export default useSendModal;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 /**
  * @title: 表单选择器

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

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

package/es/components/booking/hooks/useQuotation.js

@@ -18,6 +18,7 @@ import { getProductTotalPrice } from "../utils";
 import useEngineContext from "../../../../es/hooks/useEngineContext";
 import { locales } from "@pisell/utils";
 import { PisellModal } from "@pisell/materials";
+import { getProductPrice } from "../info/service/serve";
 var formatBundleItemMap = function formatBundleItemMap(product) {
   return product.bundle_group.reduce(function (pre, cur) {
     var curObj = {};
@@ -134,22 +135,12 @@ var useQuotation = function useQuotation(state, dispatch) {
             return _context.abrupt("return");
           case 2:
             _context.next = 4;
-            return state.apis.getServices({
-              skip: 1,
-              num: 500,
-              extension_type: state.renderType === 'eventBooking' ? undefined : ['product_appointment', 'appointment_ticket', 'service_product', 'session_product', 'session_ticket'],
-              with: ['category', 'resourceRelation'],
+            return getProductPrice({
               ids: cartValueRef.current.map(function (item) {
                 return item.product_id;
               }),
-              open_quotation: 1,
-              with_schedule: 1,
-              with_count: ['bundleGroup', 'optionGroup'],
-              order_by_string: 'sort:desc',
-              status: 'published',
               schedule_date: params === null || params === void 0 ? void 0 : params.schedule_date,
-              customer_id: params === null || params === void 0 ? void 0 : params.customer_id,
-              open_bundle: 1
+              customer_id: params === null || params === void 0 ? void 0 : params.customer_id
             });
           case 4:
             data = _context.sent;
@@ -177,13 +168,13 @@ var useQuotation = function useQuotation(state, dispatch) {
             return getCartQuotation(params);
           case 2:
             data = _context2.sent;
-            if (data) {
+            if (data !== null && data !== void 0 && data.data) {
               _context2.next = 5;
               break;
             }
             return _context2.abrupt("return");
           case 5:
-            _setNewCartValue = setNewCartValue(cartValueRef.current, data.list), isChange = _setNewCartValue.isChange, newCartValue = _setNewCartValue.value, isNotFoundBundle = _setNewCartValue.isNotFoundBundle, notFoundProducts = _setNewCartValue.notFoundProducts;
+            _setNewCartValue = setNewCartValue(cartValueRef.current, data.data), isChange = _setNewCartValue.isChange, newCartValue = _setNewCartValue.value, isNotFoundBundle = _setNewCartValue.isNotFoundBundle, notFoundProducts = _setNewCartValue.notFoundProducts;
             if (!isNotFoundBundle) {
               _context2.next = 10;
               break;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { FormState } from '../../../model';
 interface useClientFnParams {
     state: any;

package/es/components/booking/info/clientVariant/hooks/useIsLowSpeedNetwork.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const useIsLowSpeedNetwork: () => import("react").MutableRefObject<boolean>;
 export default useIsLowSpeedNetwork;

package/es/components/booking/info/clientVariant/vertical/index.js

@@ -156,11 +156,12 @@ var VerticalClient = /*#__PURE__*/forwardRef(function (props, ref) {
     handleOpenClientModal();
   });
   var handleAddPet = function handleAddPet(_client, cb) {
-    var _state$pet$formData;
+    var _state$pet$formData, _state$pet$formData2;
     var _data = {
       formDataConfig: isMinorAndWaiver ? _objectSpread(_objectSpread({}, waiverForm), {}, {
-        customer_id: _client.id
-      }) : _objectSpread({}, ((_state$pet$formData = state.pet.formData) === null || _state$pet$formData === void 0 ? void 0 : _state$pet$formData[0]) || {})
+        customer_id: _client.id,
+        is_franchisor: (_state$pet$formData = state.pet.formData) === null || _state$pet$formData === void 0 || (_state$pet$formData = _state$pet$formData[0]) === null || _state$pet$formData === void 0 ? void 0 : _state$pet$formData.is_franchisor
+      }) : _objectSpread({}, ((_state$pet$formData2 = state.pet.formData) === null || _state$pet$formData2 === void 0 ? void 0 : _state$pet$formData2[0]) || {})
     };
     _data.customerId = _client.id;
     state.action({
@@ -194,7 +195,7 @@ var VerticalClient = /*#__PURE__*/forwardRef(function (props, ref) {
     });
   };
   var previewItemTitleRender = useMemoizedFn(function (value, index, values) {
-    var _value$customer, _value$customer2, _value$customer3, _value$customer4, _state$pet$formData2;
+    var _value$customer, _value$customer2, _value$customer3, _value$customer4, _state$pet$formData3;
     var title = getNickname(value.customer) || (value === null || value === void 0 || (_value$customer = value.customer) === null || _value$customer === void 0 ? void 0 : _value$customer.email) || (value === null || value === void 0 || (_value$customer2 = value.customer) === null || _value$customer2 === void 0 ? void 0 : _value$customer2.phone) || '';
     if ((value === null || value === void 0 || (_value$customer3 = value.customer) === null || _value$customer3 === void 0 ? void 0 : _value$customer3.id) === prevCustomerId.current) {
       if (values.length === index + 1) {
@@ -208,7 +209,7 @@ var VerticalClient = /*#__PURE__*/forwardRef(function (props, ref) {
     }
     return /*#__PURE__*/React.createElement("div", {
       className: "pisell-lowcode__booking-pet-title"
-    }, title, " ' ", ((_state$pet$formData2 = state.pet.formData) === null || _state$pet$formData2 === void 0 || (_state$pet$formData2 = _state$pet$formData2[0]) === null || _state$pet$formData2 === void 0 ? void 0 : _state$pet$formData2.title) || '');
+    }, title, " ' ", ((_state$pet$formData3 = state.pet.formData) === null || _state$pet$formData3 === void 0 || (_state$pet$formData3 = _state$pet$formData3[0]) === null || _state$pet$formData3 === void 0 ? void 0 : _state$pet$formData3.title) || '');
   });
   var isShowAddBtn = useMemo(function () {
     var _state$pet, _state$pet2;

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

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

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

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

package/es/components/booking/info/hooks/useAddHolder.js

@@ -85,7 +85,8 @@ var useAddHolder = function useAddHolder(state, dispatch) {
     var _state$client, _state$client2;
     var _data = {
       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
+        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
       }) : _objectSpread({}, formDataConfig)
     };
     var isWalkInBol = isWalkIn((_state$client2 = state.client) === null || _state$client2 === void 0 || (_state$client2 = _state$client2.value) === null || _state$client2 === void 0 ? void 0 : _state$client2.id);

package/es/components/booking/info/hooks/useGetHolderList.js

@@ -9,7 +9,7 @@ var useGetHolderList = function useGetHolderList(state, dispatch) {
     holder = _useHolderConfig.holder,
     appointment_subject = _useHolderConfig.appointment_subject;
   var getHolders = useMemoizedFn( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var _state$client, _state$client2;
+    var _state$client, _holder$form, _state$client2;
     var params, data;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -22,7 +22,7 @@ var useGetHolderList = function useGetHolderList(state, dispatch) {
         case 2:
           params = {
             form_id: appointment_subject.form_id,
-            source_shop_customer: holder === null || holder === void 0 ? void 0 : holder.is_franchisor,
+            source_shop_customer: holder === null || holder === void 0 || (_holder$form = holder.form) === null || _holder$form === void 0 ? void 0 : _holder$form.is_franchisor,
             customer_id: holder.data_range === 'customer' ? (_state$client2 = state.client) === null || _state$client2 === void 0 || (_state$client2 = _state$client2.value) === null || _state$client2 === void 0 ? void 0 : _state$client2.id : undefined,
             skip: 1,
             num: 100

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { EditServiceRef } from "../service/editService";
 declare const useInfoHolder: (state: any, dispatch: any) => {
     detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;

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

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

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

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

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const Actions: ({ currentService }: {
     currentService: any;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PisellDrawerProps } from '../../../components/drawer';
 import './index.less';
 interface AddServiceProps {

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const Like: ({ status, onChange, className, style, }: {
     style?: any;

package/es/components/booking/info/service/serve.d.ts

@@ -9,3 +9,12 @@ export declare const getProductDetail: (id: string, params: any) => Promise<any>
  * @Date: 2024-12-23 17:06
  */
 export declare const postMultiDay: (id: string, params: any) => Promise<any>;
+/**
+ * 批量查询指定商品的最新价格
+ * @param params
+ */
+export declare const getProductPrice: (params: {
+    ids: number[];
+    customer_id: number;
+    schedule_date: string;
+}) => Promise<any>;

package/es/components/booking/info/service/serve.js

@@ -46,4 +46,25 @@ export var postMultiDay = /*#__PURE__*/function () {
   return function postMultiDay(_x3, _x4) {
     return _ref2.apply(this, arguments);
   };
+}();
+
+/**
+ * 批量查询指定商品的最新价格
+ * @param params
+ */
+export var getProductPrice = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          return _context3.abrupt("return", request.getRequest().post("/shop/product/query/price", params));
+        case 1:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
+  return function getProductPrice(_x5) {
+    return _ref3.apply(this, arguments);
+  };
 }();

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;

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

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

package/es/components/booking/info/service2/utils.d.ts

@@ -69,8 +69,8 @@ export declare const formatProducts: (lists: any[], state: any, isRenderGroup?:
     _id: any;
     name: any;
     price: any;
-    total: any;
-    origin_total: any;
+    total: number;
+    origin_total: number;
     num: any;
     image: any;
     isShowNote: boolean;
@@ -90,6 +90,7 @@ export declare const formatProducts: (lists: any[], state: any, isRenderGroup?:
     isNormalProduct: boolean;
     locale: any;
     symbol: any;
+    relation_products: any;
     items: any[];
 }[];
 /**

package/es/components/booking/info/service2/utils.js

@@ -30,6 +30,7 @@ import { isShowAddTime } from "../utils";
 import { formatResources } from "../service/addService/utils";
 import { getProductExtend } from "../../info2/service/addService/utils";
 import { getErrorList as getErrorListInfo2 } from "../../info2/utilsByBooking";
+import { getRelationDetailsTotal } from "../../components/footer/amount";
 locales.init(localeTexts, localStorage.getItem('umi_locale') || 'en');
 export var formatActiveKey = function formatActiveKey(lists, platform, isEdit) {
   if (!(lists !== null && lists !== void 0 && lists.length)) return [];
@@ -598,6 +599,9 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
     end_date: (item === null || item === void 0 || (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.endDate) || (item === null || item === void 0 || (_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.end_date)
   }, parallelResourceOtherParams);
 };
+var calcAddTimeTotalPrice = function calcAddTimeTotalPrice(total, addTimeProducts) {
+  return (Number(total) || 0) + getRelationDetailsTotal(addTimeProducts || []);
+};
 
 /**
  * @title: 格式化商品数据
@@ -615,7 +619,7 @@ export var formatProducts = function formatProducts(lists, state) {
   var normalList = [];
   var groupList = [];
   var formItem = function formItem(item) {
-    var _item$_extend9, _item$_extend10, _item$_extend11, _item$_extend13, _item$_extend14, _item$_extend15, _item$_extend16, _item$_extend17, _item$_extend18, _item$_extend19, _resourceItem, _item$_extend20, _item$_extend21, _item$_extend22, _item$_extend23;
+    var _item$_extend9, _item$_extend10, _item$_extend11, _item$_extend13, _item$_extend14, _item$_extend15, _item$_extend16, _item$_extend17, _item$_extend18, _item$_extend19, _item$_extend20, _item$_extend21, _resourceItem, _item$_extend22, _item$_extend23, _item$_extend24, _item$_extend25, _item$_extend26;
     var _isDayBookingProduct = isDayBookingProduct(item, state);
     var clientTitle = getHolderName(state, item === null || item === void 0 || (_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.holder_id);
     var options = formatOptions(item === null || item === void 0 || (_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 || (_item$_extend10 = _item$_extend10.other) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.option);
@@ -635,28 +639,29 @@ export var formatProducts = function formatProducts(lists, state) {
       _id: item === null || item === void 0 ? void 0 : item._id,
       name: item === null || item === void 0 ? void 0 : item.title,
       price: item === null || item === void 0 || (_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.price,
-      total: item === null || item === void 0 || (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.total,
-      origin_total: item === null || item === void 0 || (_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.origin_total,
+      total: calcAddTimeTotalPrice(item === null || item === void 0 || (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.total, item === null || item === void 0 || (_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.relation_details),
+      origin_total: calcAddTimeTotalPrice(item === null || item === void 0 || (_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.origin_total, item === null || item === void 0 || (_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.relation_details),
       num: item === null || item === void 0 ? void 0 : item._extend.quantity,
       image: item === null || item === void 0 ? void 0 : item.cover,
       isShowNote: true,
       note: item === null || item === void 0 ? void 0 : item.note,
-      like_status: item === null || item === void 0 || (_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.like_status,
+      like_status: item === null || item === void 0 || (_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.like_status,
       bundle: bundle,
       options: options,
       errorMessage: errorMessage,
-      product_option_string: item === null || item === void 0 || (_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 || (_item$_extend17 = _item$_extend17.other) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.product_option_string,
-      discount_reason: item === null || item === void 0 || (_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.discount_reason,
-      resource_id: isNormalProduct ? 0 : item === null || item === void 0 || (_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.resource,
+      product_option_string: item === null || item === void 0 || (_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 || (_item$_extend19 = _item$_extend19.other) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.product_option_string,
+      discount_reason: item === null || item === void 0 || (_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.discount_reason,
+      resource_id: isNormalProduct ? 0 : item === null || item === void 0 || (_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.resource,
       relation_form_name: isNormalProduct ? '' : ((_resourceItem = resourceItem) === null || _resourceItem === void 0 ? void 0 : _resourceItem.labelText) || item.relation_form_name,
       holder_title: clientTitle,
-      start_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.start_date : '',
-      end_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.end_date : '',
-      holder_id: (item === null || item === void 0 || (_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.holder_id) || 0,
+      start_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.start_date : '',
+      end_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.end_date : '',
+      holder_id: (item === null || item === void 0 || (_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.holder_id) || 0,
       isNormalProduct: isNormalProduct,
       locale: state.locale,
       symbol: state.amountSymbol,
-      items: isEventBooking(state) ? [] : formItems((item === null || item === void 0 || (_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.items) || [])
+      relation_products: (item === null || item === void 0 || (_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.relation_details) || [],
+      items: isEventBooking(state) ? [] : formItems((item === null || item === void 0 || (_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.items) || [])
     }, generalParams), {}, {
       _origin: item
     });
@@ -664,8 +669,8 @@ export var formatProducts = function formatProducts(lists, state) {
 
   // 将商品分为组商品和非组商品
   lists.forEach(function (item) {
-    var _item$_extend24;
-    if (!(item !== null && item !== void 0 && (_item$_extend24 = item._extend) !== null && _item$_extend24 !== void 0 && _item$_extend24.groupId)) {
+    var _item$_extend27;
+    if (!(item !== null && item !== void 0 && (_item$_extend27 = item._extend) !== null && _item$_extend27 !== void 0 && _item$_extend27.groupId)) {
       normalList.push(formItem(item));
     } else {
       groupList.push(item);
@@ -674,8 +679,8 @@ export var formatProducts = function formatProducts(lists, state) {
 
   // 根据item._extend.groupId 进行分组
   var groups = groupList.reduce(function (prev, item) {
-    var _item$_extend25;
-    var groupId = item === null || item === void 0 || (_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.groupId;
+    var _item$_extend28;
+    var groupId = item === null || item === void 0 || (_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.groupId;
     if (!prev[groupId]) {
       prev[groupId] = [];
     }
@@ -845,8 +850,8 @@ export var isHasDayAppointmentProduct = function isHasDayAppointmentProduct(stat
       // 如果该购物车中没选择任何商品，则不需要验证，所以直接用1来填充
       // services: !holderProducts?.length ? [1] : holderProducts?.filter((d: any) => appointmentTypes.includes(d.extension_type))
       services: services.filter(function (item) {
-        var _item$_extend26;
-        return ((_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.holder_id) == d.form_record_id && checkType(item.extension_type);
+        var _item$_extend29;
+        return ((_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.holder_id) == d.form_record_id && checkType(item.extension_type);
       })
     });
   });

package/es/components/booking/info/utils.js

@@ -95,7 +95,7 @@ export var isBooking4Shop = function isBooking4Shop(shopId, renderType) {
   if (renderType === 'eventBooking') {
     return false;
   }
-  var booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 6813, 8609, 8610, 8782];
+  var booking4Shops = [8390, 1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 6813, 8609, 8610, 8782, 1285];
   return booking4Shops.includes(shopId);
 };
 function generateDateRange(start, end) {

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import '../../../info/service/actions/index.less';
 declare const Actions: ({ currentService }: {
     currentService: any;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PisellDrawerProps } from '../../../components/drawer';
 import '../../../info/service/addService/index.less';
 interface AddServiceProps {

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

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

package/es/components/booking/info2/service/serviceList/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare type ContactType = {
     country_calling_code: string;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface DurationProps extends SelectProps {
     locale?: string;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface HolderProps extends SelectProps {
     selectProps?: SelectProps;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from "antd";
 interface StartTimeProps extends SelectProps {
     locale?: string;

package/es/components/booking/notes/NoteBlock/NoteItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 export interface InfoProps {
     isEdit: boolean;

package/es/components/booking/notes/NoteBlock/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 export interface InfoProps {
     title?: string;

package/es/components/booking/notes/addNote/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const AddNote: ({ value, onChange, wait, title, placeholder }: any) => JSX.Element;
 export default AddNote;