@pisell/private-materials 6.6.1 → 6.7.1

package/es/components/ticketBooking/components/addServiceVariant/addService.js

@@ -20,24 +20,21 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { getUniqueId, locales, sendWarningLog } from '@pisell/utils';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useMemoizedFn } from 'ahooks';
-import useEngineContext from "../../../../hooks/useEngineContext";
-import { isSessionProduct, request, getProductTotalPrice, getIsEject, getIsOnlySession, isWalkIn } from "../../../booking/utils";
-import { getMultiDay, getProductExtend, isMultiDayProduct } from "../../../booking/info2/service/addService/utils";
-import { holderId, isNormalProductByDurationSchedule } from "../../../booking/info/service2/utils";
+import useEngineContext, { usePlatform } from "../../../../hooks/useEngineContext";
+import { isSessionProduct, request, getProductTotalPrice, getIsEject, getIsOnlySession } from "../../../booking/utils";
+import { getProductExtend } from "../../../booking/info2/service/addService/utils";
+import { holderId, isDaysBooking, isNormalProductByDurationSchedule } from "../../../booking/info/service2/utils";
 import { isBooking4Shop } from "../../../booking/info/utils";
 import { useService } from "../../../booking/info/service/serviceManager";
 import ProductDisplayAdapter, { resolveProductDisplayConfig } from "../ProductDisplayAdapter";
 import "./index.less";
-import { addService, addServiceScroll, createSimpleCacheItem, genHolderKey, genServiceKey, getIsShowNumber, isSameProduct } from "../../utils";
+import { addService, addServiceScroll, genServiceKey, getIsShowNumber, isSameProduct } from "../../utils";
 import NotAvailable from "../notAvailable";
 import dayjs from 'dayjs';
 import { useProducts } from "../../hooks/pisellos";
 import { createCacheItem, genValues, isBundle, isOption, setHandleSetService } from "./utils";
 import { useToast } from '@pisell/materials';
 import { useIsActive } from "../../context/IsActiveContext";
-import { concatBookings, createBookingItemsByGroup } from "../../../booking/info/service2/Group/utils";
-import MultiDayTimeSelectModal from "./MultiDayTimeSelectModal";
-import { selectHolderModal, SelectHolderModal } from "../../../booking/utils/selectHolderModal";
 var productListLayout = {
   grid: true,
   config: '12:12'
@@ -51,15 +48,19 @@ var productListSetting = {
   isStock: 0
 };
 var AddSerivce = function AddSerivce(props) {
-  var _context$appHelper, _context$appHelper$ge, _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _state$bookingConfig2, _state$client2;
+  var _context$appHelper, _context$appHelper$ge, _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _state$service, _state$bookingConfig2, _state$client2;
   var onEdit = props.onEdit,
     state = props.state,
     dispatch = props.dispatch,
     _props$renderMode = props.renderMode,
     renderMode = _props$renderMode === void 0 ? 'current' : _props$renderMode,
+    onPrerenderComplete = props.onPrerenderComplete,
+    onGetProductsReady = props.onGetProductsReady,
     productDisplayConfig = props.productDisplayConfig;
   var context = useEngineContext();
+  var platform = usePlatform();
   var notAvailableRef = useRef(null);
+  var isLoadedServiceRef = useRef(false);
   request.setRequest(context.appHelper.utils.request);
   var isActive = useIsActive();
   var Toast = useToast();
@@ -80,24 +81,43 @@ var AddSerivce = function AddSerivce(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     firstLoading = _useState4[0],
     setFirstLoading = _useState4[1];
-  var _useState5 = useState(false),
-    _useState6 = _slicedToArray(_useState5, 2),
-    multiDayModalOpen = _useState6[0],
-    setMultiDayModalOpen = _useState6[1];
-  var _useState7 = useState(false),
-    _useState8 = _slicedToArray(_useState7, 2),
-    multiDayModalLoading = _useState8[0],
-    setMultiDayModalLoading = _useState8[1];
-  var _useState9 = useState(null),
-    _useState10 = _slicedToArray(_useState9, 2),
-    pendingMultiDayData = _useState10[0],
-    setPendingMultiDayData = _useState10[1];
   var stateRef = useRef(state);
   stateRef.current = state;
+  var prerenderCompletedRef = useRef(false);
+  var latestServiceValueRef = useRef((state === null || state === void 0 || (_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || []);
+  var lastOperationTimeRef = useRef(0);
+  var isInFastClickMode = function isInFastClickMode() {
+    var now = Date.now();
+    return now - lastOperationTimeRef.current < 2000;
+  };
+  var getCurrentServiceValue = function getCurrentServiceValue() {
+    if (isInFastClickMode()) {
+      var _stateRef$current;
+      return latestServiceValueRef.current || ((_stateRef$current = stateRef.current) === null || _stateRef$current === void 0 || (_stateRef$current = _stateRef$current.service) === null || _stateRef$current === void 0 ? void 0 : _stateRef$current.value) || [];
+    } else {
+      var _state$service2;
+      var stateValue = (state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value) || [];
+      latestServiceValueRef.current = null;
+      return stateValue;
+    }
+  };
+
+  // useEffect(() => {
+  //   if (!isInFastClickMode()) {
+  //     latestServiceValueRef.current = null;
+  //   }
+  // }, [state?.service?.value]);
+
   var _useProducts = useProducts(notAvailableRef),
     getProducts = _useProducts.getProducts,
     products = _useProducts.products,
-    loading = _useProducts.loading;
+    loading = _useProducts.loading,
+    getScheduleTimePoints = _useProducts.getScheduleTimePoints;
+  useEffect(function () {
+    if (onGetProductsReady && getProducts) {
+      onGetProductsReady(getProducts);
+    }
+  }, []);
   useEffect(function () {
     var timer = setTimeout(function () {
       setFirstLoading(false);
@@ -116,6 +136,12 @@ var AddSerivce = function AddSerivce(props) {
       debounceTimersRef.current = {};
     };
   }, []);
+  useEffect(function () {
+    if (!loading && !prerenderCompletedRef.current) {
+      onPrerenderComplete === null || onPrerenderComplete === void 0 || onPrerenderComplete();
+      prerenderCompletedRef.current = true;
+    }
+  }, [loading]);
 
   // 处理商品添加后的列表归位
   useEffect(function () {
@@ -145,23 +171,30 @@ var AddSerivce = function AddSerivce(props) {
     return ((_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id) || undefined;
   }, [(_state$client2 = state.client) === null || _state$client2 === void 0 || (_state$client2 = _state$client2.value) === null || _state$client2 === void 0 ? void 0 : _state$client2.id]);
   var scanAddService = useMemoizedFn(function (list, code) {
-    var newService = _toConsumableArray(state.service.value);
+    // 使用 stateRef 获取最新状态
+    var newService = _toConsumableArray(stateRef.current.service.value || []);
     list.forEach(function (item) {
       if (isBundle(item) || isOption(item)) {
         handleSelectProduct(item);
         return;
       }
       var values = genValues(item, code);
-      var cacheItem = createCacheItem(item, values, state);
+      var cacheItem = createCacheItem(item, values, stateRef.current);
       cacheItem._serviceKey = genServiceKey(cacheItem);
-      cacheItem._holderKey = genHolderKey(cacheItem);
       cacheItem.autoClose = false;
-      var _addService = addService(_toConsumableArray(newService), cacheItem, state),
+      var _addService = addService(_toConsumableArray(newService), cacheItem, stateRef.current),
         _list = _addService.list,
         quantity = _addService.quantity;
       handleAddToast(cacheItem.title, quantity);
       newService = _list;
     });
+
+    // 立即更新 stateRef
+    stateRef.current = _objectSpread(_objectSpread({}, stateRef.current), {}, {
+      service: _objectSpread(_objectSpread({}, stateRef.current.service), {}, {
+        value: newService
+      })
+    });
     dispatch({
       type: 'setService',
       payload: {
@@ -175,6 +208,90 @@ var AddSerivce = function AddSerivce(props) {
       setHandleSetService(scanAddService);
     }
   }, [isActive]);
+
+  /*
+  const removeNotAvailableService = (list: any) => {
+    if (!stateRef.current?.service?.value?.length) return;
+    const listMap = list.reduce((acc: any, cur: any) => {
+      acc[cur.id] = cur;
+      return acc;
+    }, {});
+    const newValue = (stateRef.current?.service?.value || []).filter(
+      (item: any) => listMap[item.product_id]
+    );
+    dispatch({
+      type: 'setService',
+      payload: {
+        value: newValue,
+        edit: true,
+      },
+    });
+  };
+   const getServices = async (params?: any) => {
+    setLoading(true);
+    // 活动预约如果没有绑定商品id不查询
+    if (
+      state.renderType === 'eventBooking' &&
+      !state.eventOtherParams?.productIds?.length
+    ) {
+      dispatch({
+        type: 'setService',
+        payload: {
+          services: [],
+        },
+      });
+      setLoading(false);
+      return;
+    }
+     let data = await getProductList({
+      skip: 1,
+      num: 500,
+      // extension_type: state.productExtensionType,
+      exclude_extension_type: [
+        'product_party',
+        'product_event',
+        'product_series_event',
+        'product_package_ticket',
+        'ticket',
+        'event_item',
+      ],
+      with: ['category'],
+      open_quotation: 1,
+      with_schedule: 1,
+      with_count: ['bundleGroup', 'optionGroup'],
+      order_by_string: 'sort:desc',
+      status: 'published',
+      schedule_date: params?.schedule_date,
+      schedule_datetime: params?.schedule_datetime,
+      customer_id: params?.customer_id,
+      menu_list_ids: params?.menu_list_ids,
+      _config: {
+        fullResult: true,
+        customResponse: true,
+      },
+    });
+     setLoading(false);
+     if (data?.code === 607100) {
+      // 第一次加载时，或者之前有数据
+      if (!isLoadedServiceRef.current || state.service?.services?.length) {
+        notAvailableRef.current?.open();
+      }
+    }
+     // 只有自动获取列表的时候才设置商品, 手动点击添加按钮的时候不设置
+    if (!state.service.addModal) {
+      setDefaultService(data?.data?.list);
+    }
+     removeNotAvailableService(data?.data?.list);
+     isLoadedServiceRef.current = true;
+     dispatch({
+      type: 'setService',
+      payload: {
+        services: data?.data?.list || [],
+      },
+    });
+  };
+  */
+
   var handleAddToast = function handleAddToast(title, quantity) {
     var _Toast$success;
     Toast === null || Toast === void 0 || (_Toast$success = Toast.success) === null || _Toast$success === void 0 || _Toast$success.call(Toast, /*#__PURE__*/React.createElement("div", {
@@ -200,6 +317,7 @@ var AddSerivce = function AddSerivce(props) {
 
     // 执行原始的回调函数
     originalCallback(finalCacheValues, '', item, true);
+    lastOperationTimeRef.current = Date.now();
   });
 
   // 为每个商品单独创建防抖函数
@@ -209,426 +327,375 @@ var AddSerivce = function AddSerivce(props) {
       clearTimeout(debounceTimersRef.current[productId]);
     }
 
+    // 从 localStorage 获取防抖时间配置，默认为 0
+    var debounceTime = Number(localStorage.getItem('pisell_service_add_debounce_time')) || 0;
+
     // 创建新的防抖定时器
     debounceTimersRef.current[productId] = setTimeout(function () {
       executeCacheValues(productId, cacheValues, item, callback);
-    }, 0);
+    }, debounceTime);
   });
 
-  // 处理添加服务的逻辑（提取为独立函数，方便跨日商品确认后调用）
-  var processAddService = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item, _detail, e, notShowToast, startDate, endDate) {
-      var _state$client3, _state$bookingConfig3;
-      var other, cacheItem, _total, _isEdit, _stateRef$current$ser, isMultiDay, getMultiDayCacheItem, res, _state$bookingConfig4, _addService2, _list, quantity, _context$appHelper$ut4, _context$appHelper$ut5, val, sendData, _window$openBookingEd, _window;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+  // 检查资源可用性
+  var checkResourceAvailability = useMemoizedFn(function (item) {
+    if (!isNormalProductByDurationSchedule(item)) {
+      var _state$service3;
+      if (!Array.isArray((_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : _state$service3.resourcesOrigin) || !state.service.resourcesOrigin.length) {
+        dispatch({
+          type: 'setService',
+          payload: _objectSpread(_objectSpread({}, stateRef.current.service), {}, {
+            reloadResourceModal: true
+          })
+        });
+        return false;
+      }
+    }
+    return true;
+  });
+
+  // 创建缓存项
+  var createCacheItemFromParams = useMemoizedFn(function (item, params, detail) {
+    var _detail = detail || item;
+    var other = JSON.parse(JSON.stringify(params));
+    other.session = params.session;
+    var cacheItem = _objectSpread(_objectSpread({}, _detail), {}, {
+      product_id: item.id,
+      _id: getUniqueId(),
+      _key: params.key,
+      _extend: {
+        start_date: state.date.value,
+        quantity: (params === null || params === void 0 ? void 0 : params.quantity) || 1,
+        price: _detail.price,
+        product_name: item.title,
+        other: other
+      },
+      new: 1
+    });
+    var _total = getProductTotalPrice(cacheItem);
+    cacheItem._extend.total = _total;
+    cacheItem._extend.origin_total = _total;
+    var _isEdit = !!state.service.cacheItem;
+    if (_isEdit) {
+      var _state$service$cacheI;
+      cacheItem._id = (_state$service$cacheI = state.service.cacheItem) === null || _state$service$cacheI === void 0 ? void 0 : _state$service$cacheI._id;
+      cacheItem.new = 0;
+    }
+    if (renderMode === 'current') {
+      cacheItem.currentDefaultTime = state.date.value.format('HH:mm');
+    }
+    var isNormalProduct = isNormalProductByDurationSchedule(item);
+    cacheItem = isNormalProduct ? _objectSpread(_objectSpread({}, cacheItem), {}, {
+      autoClose: true
+    }) : getProductExtend({
+      cacheItem: cacheItem,
+      state: state,
+      isDisabledTime: true
+    });
+    if (state.renderType === 'eventBooking') {
+      cacheItem.autoClose = false;
+    }
+    return cacheItem;
+  });
+
+  // 生成商品唯一标识
+  var getProductKey = useMemoizedFn(function (item, cacheItem) {
+    // 使用 _serviceKey 来区分同一商品的不同规格/选项
+    return cacheItem._serviceKey || "".concat(item.id, "_").concat(cacheItem._key);
+  });
+
+  // 获取当前服务列表中的商品数量
+  var getServiceQuantity = useMemoizedFn(function (cacheItem) {
+    var _stateRef$current$ser, _existingService$_ext;
+    // 使用 stateRef 获取最新的 service.value
+    var existingService = (_stateRef$current$ser = stateRef.current.service.value) === null || _stateRef$current$ser === void 0 ? void 0 : _stateRef$current$ser.find(function (val) {
+      return isSameProduct(val, cacheItem);
+    });
+    return (existingService === null || existingService === void 0 || (_existingService$_ext = existingService._extend) === null || _existingService$_ext === void 0 ? void 0 : _existingService$_ext.quantity) || 0;
+  });
+
+  // 处理自动关闭的服务添加（带防抖）
+  var processAutoCloseService = useMemoizedFn(function (cacheItem, item, detail, notShowToast) {
+    console.time('processAutoCloseService2');
+    cacheItem.autoClose = false;
+    cacheItem._serviceKey = genServiceKey(cacheItem);
+    var productKey = getProductKey(item, cacheItem);
+
+    // 如果已经有待处理的同商品，增加点击次数
+    if (pendingCacheValuesRef.current[productKey]) {
+      clickCountRef.current[productKey] = (clickCountRef.current[productKey] || 1) + 1;
+    } else {
+      // 第一次点击，初始化数据
+      pendingCacheValuesRef.current[productKey] = {
+        cacheItem: cacheItem,
+        item: item,
+        detail: detail,
+        notShowToast: notShowToast
+      };
+      clickCountRef.current[productKey] = 1;
+    }
+
+    // 立即显示 toast
+    // 显示：购物车中已有数量 + 当前累积点击次数
+    if (!notShowToast) {
+      var originalQuantity = getServiceQuantity(cacheItem);
+      var currentClickCount = clickCountRef.current[productKey] || 1;
+      var totalQuantity = originalQuantity + currentClickCount;
+      handleAddToast(cacheItem.title, totalQuantity);
+    }
+
+    // 清除旧的防抖定时器
+    if (debounceTimersRef.current[productKey]) {
+      clearTimeout(debounceTimersRef.current[productKey]);
+    }
+
+    // 从 localStorage 获取防抖时间配置，默认为 0
+    var debounceTime = Number(localStorage.getItem('pisell_service_add_debounce_time')) || 0;
+
+    // 创建新的防抖定时器
+    debounceTimersRef.current[productKey] = setTimeout(function () {
+      executeServiceDispatch(productKey);
+    }, debounceTime);
+    console.timeEnd('processAutoCloseService2');
+    // 5ms
+  });
+
+  // 执行实际的 dispatch 操作
+  var executeServiceDispatch = useMemoizedFn(function (productKey) {
+    console.time('executeServiceDispatch');
+    console.time('executeServiceDispatch1');
+    var pendingData = pendingCacheValuesRef.current[productKey];
+    if (!pendingData) return;
+    var cacheItem = pendingData.cacheItem,
+      item = pendingData.item,
+      detail = pendingData.detail;
+    var clickCount = clickCountRef.current[productKey] || 1;
+
+    // 更新 quantity 为累积的点击次数
+    var finalCacheItem = _objectSpread(_objectSpread({}, cacheItem), {}, {
+      _extend: _objectSpread(_objectSpread({}, cacheItem._extend), {}, {
+        quantity: clickCount
+      })
+    });
+    console.timeEnd('executeServiceDispatch1');
+    console.time('executeServiceDispatch addService');
+    // 使用 stateRef 获取最新的 service.value，避免竞态条件
+    var _addService2 = addService(_toConsumableArray(stateRef.current.service.value || []), finalCacheItem, stateRef.current),
+      _list = _addService2.list,
+      quantity = _addService2.quantity;
+    console.timeEnd('executeServiceDispatch addService');
+    console.time('executeServiceDispatch2');
+    window.dispatchEvent(new CustomEvent('onAddNewService', {
+      detail: {
+        cacheItem: finalCacheItem
+      }
+    }));
+    console.timeEnd('executeServiceDispatch2');
+    console.time('executeServiceDispatch3');
+    // 2155 日志记录
+    logServiceForSpecificShop(item, detail, _list);
+
+    // 立即更新 stateRef，减少竞态窗口
+    stateRef.current = _objectSpread(_objectSpread({}, stateRef.current), {}, {
+      service: _objectSpread(_objectSpread({}, stateRef.current.service), {}, {
+        value: _list
+      })
+    });
+    dispatch({
+      type: 'setService',
+      payload: {
+        addModal: false,
+        value: _list,
+        edit: true,
+        changeService: false
+      }
+    });
+    console.timeEnd('executeServiceDispatch3');
+    console.timeEnd('executeServiceDispatch');
+
+    // 清理缓存数据
+    delete pendingCacheValuesRef.current[productKey];
+    delete clickCountRef.current[productKey];
+    delete debounceTimersRef.current[productKey];
+  });
+
+  // 处理手动编辑的服务
+  var processManualEditService = useMemoizedFn(function (cacheItem) {
+    var _window$openBookingEd, _window;
+    (_window$openBookingEd = (_window = window).openBookingEditModal) === null || _window$openBookingEd === void 0 || _window$openBookingEd.call(_window);
+    dispatch({
+      type: 'setService',
+      payload: {
+        editModal: true,
+        cacheItem: cacheItem,
+        addModal: !cacheItem.autoClose,
+        changeService: false
+      }
+    });
+    onEdit === null || onEdit === void 0 || onEdit(cacheItem);
+  });
+
+  // 特定商店的日志记录
+  var logServiceForSpecificShop = useMemoizedFn(function (item, detail, _list) {
+    try {
+      var _context$appHelper$ut4, _context$appHelper$ut5;
+      if (((_context$appHelper$ut4 = context.appHelper.utils.store) === null || _context$appHelper$ut4 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut4.getState) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.call(_context$appHelper$ut4)) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.global) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.globalConfig) === null || _context$appHelper$ut5 === void 0 ? void 0 : _context$appHelper$ut5.id) === 2155) {
+        var val = _list === null || _list === void 0 ? void 0 : _list.map(function (s) {
+          return {
+            product_id: s === null || s === void 0 ? void 0 : s.product_id,
+            detailId: s === null || s === void 0 ? void 0 : s.id,
+            detailProductId: s === null || s === void 0 ? void 0 : s.product_id,
+            product_name: s === null || s === void 0 ? void 0 : s.title,
+            price: s === null || s === void 0 ? void 0 : s.price,
+            _id: s === null || s === void 0 ? void 0 : s._id,
+            _key: s === null || s === void 0 ? void 0 : s._key,
+            _serviceKey: s === null || s === void 0 ? void 0 : s._serviceKey
+          };
+        });
+        var sendData = {
+          product_id: item === null || item === void 0 ? void 0 : item.id,
+          detailId: detail === null || detail === void 0 ? void 0 : detail.id,
+          detailProductId: detail === null || detail === void 0 ? void 0 : detail.product_id,
+          product_name: item === null || item === void 0 ? void 0 : item.title,
+          price: detail === null || detail === void 0 ? void 0 : detail.price,
+          serviceVal: val
+        };
+        sendWarningLog({
+          title: 'addService',
+          content: [{
+            key: '添加数据',
+            value: JSON.stringify(sendData)
+          }, {
+            key: '日期',
+            value: dayjs().format('YYYY-MM-DD HH:mm:ss')
+          }]
+        });
+      }
+    } catch (error) {}
+  });
+
+  // 处理非 booking4 的预约创建
+  var handleBookingCreation = useMemoizedFn( /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(item, params, detail) {
+      var data;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
           case 0:
-            other = JSON.parse(JSON.stringify(e));
-            other.session = e.session;
-            cacheItem = _objectSpread(_objectSpread({}, _detail), {}, {
-              product_id: item.id,
-              _id: getUniqueId(),
-              _key: e.key,
-              _extend: {
-                start_date: startDate,
-                quantity: (e === null || e === void 0 ? void 0 : e.quantity) || 1,
-                price: _detail.price,
-                product_name: item.title,
-                other: other,
-                end_date: endDate
-              },
-              new: 1
-            });
-            _total = getProductTotalPrice(cacheItem); // 用于折扣 可修改
-            cacheItem._extend.total = _total;
-            // 用于储存原价
-            cacheItem._extend.origin_total = _total;
-            _isEdit = !!stateRef.current.service.cacheItem;
-            if (_isEdit) {
-              cacheItem._id = (_stateRef$current$ser = stateRef.current.service.cacheItem) === null || _stateRef$current$ser === void 0 ? void 0 : _stateRef$current$ser._id;
-              cacheItem.new = 0;
-            }
-            // 渲染到当前位置模式时，默认无资源 时间默认取顶部设置的时间
-            if (renderMode === 'current') {
-              // cacheItem._extend.resource = 0;
-              cacheItem.currentDefaultTime = stateRef.current.date.value.format('HH:mm');
-            }
-            cacheItem = getProductExtend({
-              cacheItem: cacheItem,
-              state: stateRef.current,
-              isDisabledTime: true
+            _context.next = 2;
+            return createBookingData({
+              product: _objectSpread(_objectSpread({}, detail || item), {}, {
+                _params: params
+              })
             });
-            isMultiDay = isMultiDayProduct(cacheItem);
-            getMultiDayCacheItem = /*#__PURE__*/function () {
-              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(isConcatBookings) {
-                return _regeneratorRuntime().wrap(function _callee$(_context) {
-                  while (1) switch (_context.prev = _context.next) {
-                    case 0:
-                      _context.next = 2;
-                      return getMultiDay({
-                        start_date: cacheItem._extend.start_date,
-                        end_date: cacheItem._extend.end_date,
-                        state: stateRef.current,
-                        cacheItem: cacheItem
-                      });
-                    case 2:
-                      cacheItem = _context.sent;
-                      cacheItem = createBookingItemsByGroup(cacheItem);
-                      if (isConcatBookings) {
-                        cacheItem = concatBookings(cacheItem);
-                      }
-                    case 5:
-                    case "end":
-                      return _context.stop();
-                  }
-                }, _callee);
-              }));
-              return function getMultiDayCacheItem(_x7) {
-                return _ref2.apply(this, arguments);
-              };
-            }(); // 如果没有 holder 数据，且此时要求选择 holder，则弹出 holder 弹窗
-            if (!(!isNormalProductByDurationSchedule(cacheItem) && (!cacheItem._extend.holder_id || !cacheItem._extend.holder_id.length) && !isWalkIn((_state$client3 = state.client) === null || _state$client3 === void 0 || (_state$client3 = _state$client3.value) === null || _state$client3 === void 0 ? void 0 : _state$client3.id) && (state === null || state === void 0 || (_state$bookingConfig3 = state.bookingConfig) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.config) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.basic) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.appointment_subject) === null || _state$bookingConfig3 === void 0 ? void 0 : _state$bookingConfig3.show_hold_on_add_cart) !== 0)) {
-              _context2.next = 22;
-              break;
-            }
-            _context2.next = 15;
-            return handleAddHolder(cacheItem);
-          case 15:
-            res = _context2.sent;
-            if (!(res && res.length > 0)) {
-              _context2.next = 20;
-              break;
-            }
-            cacheItem._extend.holder_id = res;
-            _context2.next = 22;
-            break;
-          case 20:
-            if (!((state === null || state === void 0 || (_state$bookingConfig4 = state.bookingConfig) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.config) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.basic) === null || _state$bookingConfig4 === void 0 ? void 0 : _state$bookingConfig4.subject_require) === 'require')) {
-              _context2.next = 22;
-              break;
-            }
-            return _context2.abrupt("return");
-          case 22:
-            if (stateRef.current.renderType === 'eventBooking') {
-              cacheItem.autoClose = false;
-            }
-            if (!cacheItem.autoClose) {
-              _context2.next = 36;
-              break;
-            }
-            cacheItem.autoClose = false;
-            cacheItem._serviceKey = genServiceKey(cacheItem);
-            if (!isMultiDay) {
-              _context2.next = 29;
-              break;
-            }
-            _context2.next = 29;
-            return getMultiDayCacheItem();
-          case 29:
-            _addService2 = addService(_toConsumableArray(stateRef.current.service.value), cacheItem, stateRef.current, isMultiDay), _list = _addService2.list, quantity = _addService2.quantity;
-            if (!notShowToast) {
-              handleAddToast(cacheItem.title, quantity || 1);
-            }
-            window.dispatchEvent(new CustomEvent('onAddNewService', {
-              detail: {
-                cacheItem: cacheItem
-              }
-            }));
-            try {
-              if (((_context$appHelper$ut4 = context.appHelper.utils.store) === null || _context$appHelper$ut4 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut4.getState) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.call(_context$appHelper$ut4)) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.global) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.globalConfig) === null || _context$appHelper$ut5 === void 0 ? void 0 : _context$appHelper$ut5.id) === 2155) {
-                val = _list === null || _list === void 0 ? void 0 : _list.map(function (s) {
-                  return {
-                    product_id: s === null || s === void 0 ? void 0 : s.product_id,
-                    detailId: s === null || s === void 0 ? void 0 : s.id,
-                    detailProductId: s === null || s === void 0 ? void 0 : s.product_id,
-                    product_name: s === null || s === void 0 ? void 0 : s.title,
-                    price: s === null || s === void 0 ? void 0 : s.price,
-                    _id: s === null || s === void 0 ? void 0 : s._id,
-                    _key: s === null || s === void 0 ? void 0 : s._key,
-                    _serviceKey: s === null || s === void 0 ? void 0 : s._serviceKey
-                  };
-                });
-                sendData = {
-                  product_id: item === null || item === void 0 ? void 0 : item.id,
-                  detailId: _detail === null || _detail === void 0 ? void 0 : _detail.id,
-                  detailProductId: _detail === null || _detail === void 0 ? void 0 : _detail.product_id,
-                  product_name: item === null || item === void 0 ? void 0 : item.title,
-                  price: _detail === null || _detail === void 0 ? void 0 : _detail.price,
-                  serviceVal: val
-                };
-                sendWarningLog({
-                  title: 'addService',
-                  content: [{
-                    key: '添加数据',
-                    value: JSON.stringify(sendData)
-                  }, {
-                    key: '日期',
-                    value: dayjs().format('YYYY-MM-DD HH:mm:ss')
-                  }]
-                });
-              }
-            } catch (error) {}
-            dispatch({
-              type: 'setService',
-              payload: {
-                addModal: false,
-                value: _list,
-                edit: true,
-                changeService: false
-              }
-            });
-            _context2.next = 42;
-            break;
-          case 36:
-            (_window$openBookingEd = (_window = window).openBookingEditModal) === null || _window$openBookingEd === void 0 || _window$openBookingEd.call(_window);
-            if (!isMultiDay) {
-              _context2.next = 40;
-              break;
-            }
-            _context2.next = 40;
-            return getMultiDayCacheItem(true);
-          case 40:
-            dispatch({
-              type: 'setService',
-              payload: {
-                editModal: true,
-                cacheItem: cacheItem,
-                addModal: !cacheItem.autoClose,
-                changeService: false
-              }
+          case 2:
+            data = _context.sent;
+            createBooking({
+              booking: data
             });
-            onEdit === null || onEdit === void 0 || onEdit(cacheItem);
-          case 42:
+          case 4:
           case "end":
-            return _context2.stop();
+            return _context.stop();
         }
-      }, _callee2);
+      }, _callee);
     }));
-    return function (_x, _x2, _x3, _x4, _x5, _x6) {
+    return function (_x, _x2, _x3) {
       return _ref.apply(this, arguments);
     };
   }());
 
-  // 处理跨日商品时间选择确认
-  var handleMultiDayConfirm = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(startDate, endDate, duration) {
-      var item, detail, e, notShowToast;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+  // 处理 booking4 的服务添加
+  var handleBooking4Service = useMemoizedFn(function (item, params, detail, notShowToast) {
+    var cacheItem = createCacheItemFromParams(item, params, detail);
+    if (cacheItem.autoClose) {
+      processAutoCloseService(cacheItem, item, detail, notShowToast);
+    } else {
+      processManualEditService(cacheItem);
+    }
+  });
+
+  // 直接添加商品（不打开弹窗）
+  var handleDirectAddService = useMemoizedFn( /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
+      var cacheItem;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            if (pendingMultiDayData) {
-              _context3.next = 2;
+            console.log(item, 'handleSelectProduct33', '_list_list');
+            if (isBooking4) {
+              _context2.next = 5;
               break;
             }
-            return _context3.abrupt("return");
-          case 2:
-            setMultiDayModalLoading(true);
-            _context3.prev = 3;
-            item = pendingMultiDayData.item, detail = pendingMultiDayData.detail, e = pendingMultiDayData.e, notShowToast = pendingMultiDayData.notShowToast; // 使用选择的时间继续处理添加服务逻辑
-            _context3.next = 7;
-            return processAddService(item, detail, e, notShowToast, startDate, endDate);
-          case 7:
-            setPendingMultiDayData(null);
-            setMultiDayModalOpen(false);
-            _context3.next = 14;
-            break;
-          case 11:
-            _context3.prev = 11;
-            _context3.t0 = _context3["catch"](3);
-            console.error('添加跨日商品失败:', _context3.t0);
-          case 14:
-            _context3.prev = 14;
-            setMultiDayModalLoading(false);
-            return _context3.finish(14);
-          case 17:
-          case "end":
-            return _context3.stop();
-        }
-      }, _callee3, null, [[3, 11, 14, 17]]);
-    }));
-    return function (_x8, _x9, _x10) {
-      return _ref3.apply(this, arguments);
-    };
-  }());
-
-  // 处理跨日商品时间选择取消
-  var handleMultiDayCancel = useMemoizedFn(function () {
-    setMultiDayModalOpen(false);
-    setPendingMultiDayData(null);
-  });
-  // 处理添加 holder 的函数
-  var handleAddHolder = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(cacheItem) {
-      var _stateRef$current, _cacheItem$_extend;
-      var holderConfig, currentMaxSelectedCount, result;
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
-          case 0:
-            // 获取 maxSelectedCount
-            holderConfig = ((_stateRef$current = stateRef.current) === null || _stateRef$current === void 0 || (_stateRef$current = _stateRef$current.bookingConfig) === null || _stateRef$current === void 0 ? void 0 : _stateRef$current.holder) || {};
-            currentMaxSelectedCount = (holderConfig === null || holderConfig === void 0 ? void 0 : holderConfig.maxSelectedCount) || (cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.quantity) || 1; // 调用 selectHolderModal，所有逻辑都在内部处理
-            _context4.next = 4;
-            return selectHolderModal({
-              state: stateRef.current,
-              dispatch: dispatch,
-              maxSelectedCount: currentMaxSelectedCount
-            });
+            _context2.next = 4;
+            return handleBookingCreation(item, item.cartDetailValue);
           case 4:
-            result = _context4.sent;
-            return _context4.abrupt("return", result);
-          case 6:
+            return _context2.abrupt("return");
+          case 5:
+            console.time('createCacheItemFromParams');
+            cacheItem = createCacheItemFromParams(item, item.cartDetailValue);
+            console.timeEnd('createCacheItemFromParams');
+            // 5ms
+
+            if (cacheItem.autoClose) {
+              // 使用带防抖的处理函数
+              console.time('processAutoCloseService');
+              processAutoCloseService(cacheItem, item, item, false);
+              console.timeEnd('processAutoCloseService');
+              // 5ms
+            } else {
+              processManualEditService(cacheItem);
+            }
+          case 9:
           case "end":
-            return _context4.stop();
+            return _context2.stop();
         }
-      }, _callee4);
+      }, _callee2);
     }));
-    return function (_x11) {
-      return _ref4.apply(this, arguments);
+    return function (_x4) {
+      return _ref2.apply(this, arguments);
     };
   }());
-  var handleSelectProduct = useMemoizedFn(function (item) {
-    var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'select';
-    if (!isNormalProductByDurationSchedule(item)) {
-      var _state$service;
-      if (!Array.isArray((_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.resourcesOrigin) || !state.service.resourcesOrigin.length) {
-        dispatch({
-          type: 'setService',
-          payload: _objectSpread(_objectSpread({}, stateRef.current.service), {}, {
-            reloadResourceModal: true
-          })
-        });
-        return;
-      }
-    }
-    var isSession = isSessionProduct(item);
-    // 是否有单规格 组合规格 套餐, 或者session商品 如果没有不需要打开弹窗
-    var isEject = getIsEject(item, type);
-    var isOnlySession = getIsOnlySession(item);
-    var lock = false;
-    // 对于不需要打开弹窗的商品, 直接模拟数据, 不走弹窗
-    var cacheValues = null;
-    if (isEject) {
-      setCurrentProduct(item);
-    } else {
-      setCurrentProduct(null);
-      if ((item === null || item === void 0 ? void 0 : item.extension_type) === 'normal') {
-        cacheValues = {
-          bundle: [],
-          key: item.id,
-          option: [],
-          product_id: item.id,
-          product_variant_id: 0,
-          quantity: 1,
-          rowKey: item.id,
-          session: null,
-          unique: '08974625397',
-          _originalItem: item // 保存原始商品信息
-        };
-      }
-    }
-    var callback = /*#__PURE__*/function () {
-      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(e, extension_type, detail, notShowToast) {
-        var data, _detail, isMultiDay;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+
+  // 创建产品弹窗回调
+  var createProductModalCallback = useMemoizedFn(function (item) {
+    return /*#__PURE__*/function () {
+      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(e, extension_type, detail, notShowToast) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              debugger;
               setCurrentProduct(null);
-              // 防止选择商品弹窗多次触发callback
-              if (!lock) {
-                _context5.next = 4;
-                break;
-              }
-              return _context5.abrupt("return");
-            case 4:
-              lock = true;
-
-              // 2秒后解除
-              setTimeout(function () {
-                lock = false;
-              }, 2000);
               if (isBooking4) {
-                _context5.next = 12;
+                _context3.next = 5;
                 break;
               }
-              _context5.next = 9;
-              return createBookingData({
-                product: _objectSpread(_objectSpread({}, detail || item), {}, {
-                  _params: e
-                })
-              });
-            case 9:
-              data = _context5.sent;
-              // 创建预约
-              createBooking({
-                booking: data
-              });
-              return _context5.abrupt("return");
-            case 12:
-              // info2 addService 逻辑
-              _detail = detail || item; // 判断是否是跨日商品，如果是，先打开时间选择弹窗
-              isMultiDay = isMultiDayProduct(_detail || item);
-              if (!isMultiDay) {
-                _context5.next = 18;
-                break;
-              }
-              // 保存待处理的数据
-              setPendingMultiDayData({
-                item: item,
-                detail: _detail,
-                e: e,
-                notShowToast: notShowToast
-              });
-              // 打开时间选择弹窗
-              setMultiDayModalOpen(true);
-              return _context5.abrupt("return");
-            case 18:
-              _context5.next = 20;
-              return processAddService(item, _detail, e, notShowToast, state.date.value);
-            case 20:
+              _context3.next = 4;
+              return handleBookingCreation(item, e, detail);
+            case 4:
+              return _context3.abrupt("return");
+            case 5:
+              handleBooking4Service(item, e, detail, notShowToast);
+            case 6:
             case "end":
-              return _context5.stop();
+              return _context3.stop();
           }
-        }, _callee5);
+        }, _callee3);
       }));
-      return function callback(_x12, _x13, _x14, _x15) {
-        return _ref5.apply(this, arguments);
+      return function (_x5, _x6, _x7, _x8) {
+        return _ref3.apply(this, arguments);
       };
     }();
+  });
 
-    // 如果不需要打开弹窗, 直接添加数据
-    if (cacheValues) {
-      var _stateRef$current$ser2, _detail$_extend, _Toast$success2;
-      var productId = item.id.toString();
-
-      // 如果已经有pending的同商品，增加点击次数
-      if (pendingCacheValuesRef.current[productId]) {
-        clickCountRef.current[productId] = (clickCountRef.current[productId] || 1) + 1;
-      } else {
-        // 第一次点击，初始化数据
-        pendingCacheValuesRef.current[productId] = cacheValues;
-        clickCountRef.current[productId] = 1;
-      }
-      var cacheItem = createSimpleCacheItem(item, cacheValues, state);
-      var detail = (_stateRef$current$ser2 = stateRef.current.service.value) === null || _stateRef$current$ser2 === void 0 ? void 0 : _stateRef$current$ser2.find(function (val) {
-        return isSameProduct(val, cacheItem);
-      });
-      var originalQuantity = (detail === null || detail === void 0 || (_detail$_extend = detail._extend) === null || _detail$_extend === void 0 ? void 0 : _detail$_extend.quantity) || 0;
-      Toast === null || Toast === void 0 || (_Toast$success2 = Toast.success) === null || _Toast$success2 === void 0 || _Toast$success2.call(Toast, /*#__PURE__*/React.createElement("div", {
-        className: "add-toast-wrap"
-      }, /*#__PURE__*/React.createElement("div", {
-        className: "add-toast-title"
-      }, item.title), /*#__PURE__*/React.createElement("div", {
-        className: "add-toast-quantity"
-      }, locales.getText('pisell2.ticket-booking.in-cart')((clickCountRef.current[productId] || 1) + originalQuantity))));
-      debouncedExecuteCacheValues(productId, cacheValues, item, callback);
-      return;
-    }
+  // 打开产品选择弹窗
+  var openProductModal = useMemoizedFn(function (item) {
+    var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'select';
+    var isSession = isSessionProduct(item);
+    var isOnlySession = getIsOnlySession(item);
+    var isEject = getIsEject(item, type);
     state.action({
       type: 'pisell1.handleOpenProductModal',
       data: {
         id: item.id,
         date: state.date.value.format('YYYY-MM-DD'),
+        productDetail: item,
         showConfig: {
           option: true,
           session: isSession,
@@ -644,11 +711,315 @@ var AddSerivce = function AddSerivce(props) {
       onCancel: function onCancel() {
         setCurrentProduct(null);
       },
-      callback: callback
+      callback: createProductModalCallback(item)
     });
   });
+
+  // 处理产品选择
+  var handleSelectProduct = useMemoizedFn( /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(item) {
+      var type,
+        _args4 = arguments;
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            type = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : 'select';
+            console.time("handleSelectProduct2");
+            console.log(item, 'handleSelectProduct');
+            // 检查资源可用性
+            console.time("checkResourceAvailability");
+            if (checkResourceAvailability(item)) {
+              _context4.next = 6;
+              break;
+            }
+            return _context4.abrupt("return");
+          case 6:
+            console.timeEnd("checkResourceAvailability");
+            // 0ms
+            // 如果不需要打开详情弹窗，直接添加服务
+            if (!(!item.isOpenDetailModal && item.cartDetailValue)) {
+              _context4.next = 11;
+              break;
+            }
+            _context4.next = 10;
+            return handleDirectAddService(item);
+          case 10:
+            return _context4.abrupt("return");
+          case 11:
+            // 打开产品选择弹窗
+            openProductModal(item, type);
+          case 12:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4);
+    }));
+    return function (_x9) {
+      return _ref4.apply(this, arguments);
+    };
+  }());
+  /**
+  const handleSelectProduct = useMemoizedFn(
+    (item: any, type: 'select' | 'detail' = 'select') => {
+      console.log(item, 'handleSelectProduct');
+      if (!isNormalProductByDurationSchedule(item)) {
+        if (
+          !Array.isArray(state.service?.resourcesOrigin) ||
+          !state.service.resourcesOrigin.length
+        ) {
+          dispatch({
+            type: 'setService',
+            payload: {
+              ...stateRef.current.service,
+              reloadResourceModal: true,
+            },
+          });
+          return;
+        }
+      }
+      const isSession = isSessionProduct(item);
+      // 是否有单规格 组合规格 套餐, 或者session商品 如果没有不需要打开弹窗
+      const isEject = getIsEject(item, type);
+      const isOnlySession = getIsOnlySession(item);
+      let lock = false;
+      // 对于不需要打开弹窗的商品, 直接模拟数据, 不走弹窗
+      let cacheValues = null;
+      if (isEject) {
+        setCurrentProduct(item);
+      } else {
+        setCurrentProduct(null);
+        if (item?.extension_type === 'normal') {
+          cacheValues = {
+            bundle: [],
+            key: item.id,
+            option: [],
+            product_id: item.id,
+            product_variant_id: 0,
+            quantity: 1,
+            rowKey: item.id,
+            session: null,
+            unique: '08974625397',
+            _originalItem: item, // 保存原始商品信息
+          };
+        }
+      }
+       const callback = async (
+        e: any,
+        extension_type: any,
+        detail: any,
+        notShowToast: boolean
+      ) => {
+        setCurrentProduct(null);
+        // 防止选择商品弹窗多次触发callback
+        // if (lock) {
+        //   return;
+        // }
+         lock = true;
+         // 2秒后解除
+        setTimeout(() => {
+          lock = false;
+        }, 2000);
+        if (!isBooking4) {
+          // info1 addService 逻辑
+          //  预生成预约数据
+          const data = await createBookingData({
+            product: { ...(detail || item), _params: e },
+          });
+          // 创建预约
+          createBooking({ booking: data });
+          return;
+        }
+        const _currentItem = detail || item;
+        // info2 addService 逻辑
+        const _detail = _currentItem;
+        const other = JSON.parse(JSON.stringify(e));
+         other.session = e.session;
+         let cacheItem: any = {
+          ..._detail,
+          product_id: _currentItem.id,
+          _id: getUniqueId(),
+          _key: e.key,
+          _extend: {
+            start_date: state.date.value,
+            quantity: e?.quantity || 1,
+            price: _detail.price,
+            product_name: _currentItem.title,
+            other,
+          },
+          new: 1,
+        };
+        let _total = getProductTotalPrice(cacheItem);
+        // 用于折扣 可修改
+        cacheItem._extend.total = _total;
+        // 用于储存原价
+        cacheItem._extend.origin_total = _total;
+        const _isEdit = !!state.service.cacheItem;
+        if (_isEdit) {
+          cacheItem._id = state.service.cacheItem?._id;
+          cacheItem.new = 0;
+        }
+        // 渲染到当前位置模式时，默认无资源 时间默认取顶部设置的时间
+        if (renderMode === 'current') {
+          // cacheItem._extend.resource = 0;
+          cacheItem.currentDefaultTime = state.date.value.format('HH:mm');
+        }
+         cacheItem = getProductExtend({
+          cacheItem,
+          state,
+          isDisabledTime: true,
+        });
+         if (state.renderType === 'eventBooking') {
+          cacheItem.autoClose = false;
+        }
+        if (cacheItem.autoClose) {
+          cacheItem.autoClose = false;
+           cacheItem._serviceKey = genServiceKey(cacheItem);
+           const val = getCurrentServiceValue();
+          let { list: _list, quantity } = addService(
+            [...val],
+            cacheItem,
+            stateRef.current
+          );
+           // 更新ref以确保后续快速操作时使用最新值
+          latestServiceValueRef.current = _list;
+           lastOperationTimeRef.current = Date.now();
+           if (!notShowToast) {
+            handleAddToast(cacheItem.title, quantity || 1);
+          }
+           window.dispatchEvent(
+            new CustomEvent('onAddNewService', {
+              detail: {
+                cacheItem,
+              },
+            })
+          );
+           try {
+            if (
+              context.appHelper.utils.store?.getState?.()?.global?.globalConfig
+                ?.id === 2155
+            ) {
+              const val = _list?.map((s) => {
+                return {
+                  product_id: s?.product_id,
+                  detailId: s?.id,
+                  detailProductId: s?.product_id,
+                  product_name: s?.title,
+                  price: s?.price,
+                  _id: s?._id,
+                  _key: s?._key,
+                  _serviceKey: s?._serviceKey,
+                };
+              });
+              const sendData = {
+                product_id: _currentItem?.id,
+                detailId: _detail?.id,
+                detailProductId: _detail?.product_id,
+                product_name: _currentItem?.title,
+                price: _detail?.price,
+                serviceVal: val,
+              };
+              sendWarningLog({
+                title: 'addService',
+                content: [
+                  { key: '添加数据', value: JSON.stringify(sendData) },
+                  {
+                    key: '日期',
+                    value: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+                  },
+                ],
+              });
+            }
+          } catch (error) {}
+           dispatch({
+            type: 'setService',
+            payload: {
+              addModal: false,
+              value: _list,
+              edit: true,
+              changeService: false,
+            },
+          });
+        } else {
+          window.openBookingEditModal?.();
+          dispatch({
+            type: 'setService',
+            payload: {
+              editModal: true,
+              cacheItem: cacheItem,
+              addModal: !cacheItem.autoClose,
+              changeService: false,
+            },
+          });
+           onEdit?.(cacheItem);
+        }
+      };
+       // 如果不需要打开弹窗, 直接添加数据
+      if (cacheValues) {
+        const productId = item.id.toString();
+         // 如果已经有pending的同商品，增加点击次数
+        if (pendingCacheValuesRef.current[productId]) {
+          clickCountRef.current[productId] =
+            (clickCountRef.current[productId] || 1) + 1;
+        } else {
+          // 第一次点击，初始化数据
+          pendingCacheValuesRef.current[productId] = cacheValues;
+          clickCountRef.current[productId] = 1;
+        }
+        const cacheItem = createSimpleCacheItem(item, cacheValues, stateRef.current);
+         const detail = stateRef.current.service.value?.find((val: any) =>
+          isSameProduct(val, cacheItem)
+        );
+         const originalQuantity = detail?._extend?.quantity || 0;
+         Toast?.success?.(
+          <div className="add-toast-wrap">
+            <div className="add-toast-title">{item.title}</div>
+            <div className="add-toast-quantity">
+              {locales.getText('pisell2.ticket-booking.in-cart')(
+                (clickCountRef.current[productId] || 1) + originalQuantity
+              )}
+            </div>
+          </div>
+        );
+         debouncedExecuteCacheValues(productId, cacheValues, item, callback);
+         return;
+      }
+      state.action({
+        type: 'pisell1.handleOpenProductModal',
+        data: {
+          id: item.id,
+          date: state.date.value.format('YYYY-MM-DD'),
+          showConfig: {
+            option: true,
+            session: isSession,
+            variant: true,
+            package: true,
+            number: getIsShowNumber(item, state),
+          },
+          isOnlySession,
+          is_eject: isEject ? 1 : 0,
+          customer_id: customerId,
+          isOS: isSession,
+        },
+        onCancel: () => {
+          setCurrentProduct(null);
+        },
+        callback,
+      });
+    }
+  );
+  */
   var renderList = useMemo(function () {
     var _list = products || [];
+
+    // 跨日预约
+    if (isDaysBooking(state)) {
+      // 公共购物车下过滤掉预约商品
+      if (!holderId(state)) {
+        _list = _list.filter(function (item) {
+          return isNormalProductByDurationSchedule(item);
+        });
+      }
+    }
     return _list;
   }, [products, state === null || state === void 0 ? void 0 : state.activeCartId]);
   var currentDate = useMemo(function () {
@@ -658,7 +1029,20 @@ var AddSerivce = function AddSerivce(props) {
     return state.date.value.format('YYYY-MM-DD HH:mm:ss');
   }, [state.date.value]);
   useEffect(function () {
-    if (renderMode === 'current' && state.bookingConfig) {
+    if (renderMode === 'current' && state.bookingConfig && platform !== 'shop') {
+      getProducts({
+        schedule_date: currentDate,
+        customer_id: customerId,
+        menu_list_ids: menuList,
+        schedule_datetime: currentDatetime
+      });
+      getScheduleTimePoints({
+        menu_list_ids: menuList
+      });
+    }
+  }, [renderMode, customerId, menuList]);
+  useEffect(function () {
+    if (renderMode === 'current' && state.bookingConfig && platform === 'shop') {
       getProducts({
         schedule_date: currentDate,
         customer_id: customerId,
@@ -687,7 +1071,6 @@ var AddSerivce = function AddSerivce(props) {
   }, [productDisplayConfig]);
   return useMemo(function () {
     if (renderMode === 'current') {
-      var _pendingMultiDayData$;
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ProductDisplayAdapter, {
         config: finalDisplayConfig,
         dataSource: renderList,
@@ -696,17 +1079,9 @@ var AddSerivce = function AddSerivce(props) {
         onSelectProduct: handleSelectProduct
       }), /*#__PURE__*/React.createElement(NotAvailable, {
         ref: notAvailableRef
-      }), /*#__PURE__*/React.createElement(MultiDayTimeSelectModal, {
-        open: multiDayModalOpen,
-        productName: pendingMultiDayData === null || pendingMultiDayData === void 0 || (_pendingMultiDayData$ = pendingMultiDayData.item) === null || _pendingMultiDayData$ === void 0 ? void 0 : _pendingMultiDayData$.title,
-        locale: state === null || state === void 0 ? void 0 : state.locale,
-        defaultStartDate: state.date.value,
-        loading: multiDayModalLoading,
-        onConfirm: handleMultiDayConfirm,
-        onCancel: handleMultiDayCancel
-      }), /*#__PURE__*/React.createElement(SelectHolderModal, null));
+      }));
     }
     return null;
-  }, [firstLoading, state.service.addModal, locales, renderList, state.amountSymbol, state.renderType, state === null || state === void 0 ? void 0 : state.activeCartId, holderId(state), loading, currentProduct, isBooking4, finalDisplayConfig, multiDayModalOpen, pendingMultiDayData, multiDayModalLoading]);
+  }, [firstLoading, state.service.addModal, locales, renderList, state.amountSymbol, state.renderType, state === null || state === void 0 ? void 0 : state.activeCartId, holderId(state), loading, currentProduct, isBooking4, finalDisplayConfig]);
 };
 export default AddSerivce;