@pisell/private-materials 6.5.13 → 6.5.15

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

@@ -26,14 +26,15 @@ import { getProductExtend } from "../../../booking/info2/service/addService/util
 import { holderId, isDaysBooking, isNormalProductByDurationSchedule } from "../../../booking/info/service2/utils";
 import { isBooking4Shop } from "../../../booking/info/utils";
 import { useService } from "../../../booking/info/service/serviceManager";
-import ProductSelect from "../../../../plus/productSelect";
+import ProductDisplayAdapter, { resolveProductDisplayConfig } from "../ProductDisplayAdapter";
 import "./index.less";
-import { addService, addServiceScroll, createSimpleCacheItem, 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";
 var productListLayout = {
   grid: true,
   config: '12:12'
@@ -53,11 +54,14 @@ var AddSerivce = function AddSerivce(props) {
     dispatch = props.dispatch,
     _props$renderMode = props.renderMode,
     renderMode = _props$renderMode === void 0 ? 'current' : _props$renderMode,
-    onPrerenderComplete = props.onPrerenderComplete;
+    onPrerenderComplete = props.onPrerenderComplete,
+    onGetProductsReady = props.onGetProductsReady,
+    productDisplayConfig = props.productDisplayConfig;
   var context = useEngineContext();
   var notAvailableRef = useRef(null);
   var isLoadedServiceRef = useRef(false);
   request.setRequest(context.appHelper.utils.request);
+  var isActive = useIsActive();
   var Toast = useToast();
   var _useService = useService({
       renderMode: renderMode,
@@ -72,6 +76,10 @@ var AddSerivce = function AddSerivce(props) {
     _useState2 = _slicedToArray(_useState, 2),
     currentProduct = _useState2[0],
     setCurrentProduct = _useState2[1];
+  var _useState3 = useState(true),
+    _useState4 = _slicedToArray(_useState3, 2),
+    firstLoading = _useState4[0],
+    setFirstLoading = _useState4[1];
   var stateRef = useRef(state);
   stateRef.current = state;
   var prerenderCompletedRef = useRef(false);
@@ -102,7 +110,22 @@ var AddSerivce = function AddSerivce(props) {
   var _useProducts = useProducts(),
     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);
+    }, 300);
+    return function () {
+      clearTimeout(timer);
+    };
+  }, []);
+
   // 组件卸载时清理所有定时器
   useEffect(function () {
     return function () {
@@ -147,22 +170,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.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: {
@@ -172,8 +203,10 @@ var AddSerivce = function AddSerivce(props) {
     });
   });
   useMemo(function () {
-    setHandleSetService(scanAddService);
-  }, []);
+    if (isActive) {
+      setHandleSetService(scanAddService);
+    }
+  }, [isActive]);
 
   /*
   const removeNotAvailableService = (list: any) => {
@@ -298,9 +331,9 @@ var AddSerivce = function AddSerivce(props) {
       executeCacheValues(productId, cacheValues, item, callback);
     }, 0);
   });
-  var handleSelectProduct = useMemoizedFn(function (item) {
-    var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'select';
-    console.log('handleSelectProduct');
+
+  // 检查资源可用性
+  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) {
@@ -310,225 +343,331 @@ var AddSerivce = function AddSerivce(props) {
             reloadResourceModal: true
           })
         });
-        return;
+        return false;
       }
     }
-    var isSession = isSessionProduct(item);
-    // 是否有单规格 组合规格 套餐, 或者session商品 如果没有不需要打开弹窗
-    var isEject = getIsEject(item, type);
-    var isOnlySession = getIsOnlySession(item);
-    var lock = false;
-    // 对于不需要打开弹窗的商品, 直接模拟数据, 不走弹窗
-    var cacheValues = null;
-    if (isEject) {
-      setCurrentProduct(item);
+    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');
+    }
+    cacheItem = 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) {
+    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 {
-      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 // 保存原始商品信息
+      // 第一次点击，初始化数据
+      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]);
+    }
+
+    // 创建新的防抖定时器
+    debounceTimersRef.current[productKey] = setTimeout(function () {
+      executeServiceDispatch(productKey);
+    }, 300); // 300ms 防抖时间
+  });
+
+  // 执行实际的 dispatch 操作
+  var executeServiceDispatch = useMemoizedFn(function (productKey) {
+    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
+      })
+    });
+
+    // 使用 stateRef 获取最新的 service.value，避免竞态条件
+    var _addService2 = addService(_toConsumableArray(stateRef.current.service.value || []), finalCacheItem, stateRef.current),
+      _list = _addService2.list,
+      quantity = _addService2.quantity;
+    window.dispatchEvent(new CustomEvent('onAddNewService', {
+      detail: {
+        cacheItem: finalCacheItem
+      }
+    }));
+
+    // 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
+      }
+    });
+
+    // 清理缓存数据
+    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:
+            _context.next = 2;
+            return createBookingData({
+              product: _objectSpread(_objectSpread({}, detail || item), {}, {
+                _params: params
+              })
+            });
+          case 2:
+            data = _context.sent;
+            createBooking({
+              booking: data
+            });
+          case 4:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function (_x, _x2, _x3) {
+      return _ref.apply(this, arguments);
+    };
+  }());
+
+  // 处理 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 callback = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(e, extension_type, detail, notShowToast) {
-        var data, _currentItem, _detail, other, cacheItem, _total, _isEdit, _state$service$cacheI, val, _addService2, _list, quantity, _context$appHelper$ut4, _context$appHelper$ut5, _val, sendData, _window$openBookingEd, _window;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              setCurrentProduct(null);
-              // 防止选择商品弹窗多次触发callback
-              // if (lock) {
-              //   return;
-              // }
+  });
 
-              lock = true;
+  // 直接添加商品（不打开弹窗）
+  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:
+            console.log(item, 'handleSelectProduct33', '_list_list');
+            if (isBooking4) {
+              _context2.next = 5;
+              break;
+            }
+            _context2.next = 4;
+            return handleBookingCreation(item, item.cartDetailValue);
+          case 4:
+            return _context2.abrupt("return");
+          case 5:
+            cacheItem = createCacheItemFromParams(item, item.cartDetailValue);
+            if (cacheItem.autoClose) {
+              // 使用带防抖的处理函数
+              processAutoCloseService(cacheItem, item, item, false);
+            } else {
+              processManualEditService(cacheItem);
+            }
+          case 7:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function (_x4) {
+      return _ref2.apply(this, arguments);
+    };
+  }());
 
-              // 2秒后解除
-              setTimeout(function () {
-                lock = false;
-              }, 2000);
+  // 创建产品弹窗回调
+  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:
+              setCurrentProduct(null);
               if (isBooking4) {
-                _context.next = 9;
+                _context3.next = 5;
                 break;
               }
-              _context.next = 6;
-              return createBookingData({
-                product: _objectSpread(_objectSpread({}, detail || item), {}, {
-                  _params: e
-                })
-              });
+              _context3.next = 4;
+              return handleBookingCreation(item, e, detail);
+            case 4:
+              return _context3.abrupt("return");
+            case 5:
+              handleBooking4Service(item, e, detail, notShowToast);
             case 6:
-              data = _context.sent;
-              // 创建预约
-              createBooking({
-                booking: data
-              });
-              return _context.abrupt("return");
-            case 9:
-              _currentItem = detail || item; // info2 addService 逻辑
-              _detail = _currentItem;
-              other = JSON.parse(JSON.stringify(e));
-              other.session = e.session;
-              cacheItem = _objectSpread(_objectSpread({}, _detail), {}, {
-                product_id: _currentItem.id,
-                _id: getUniqueId(),
-                _key: e.key,
-                _extend: {
-                  start_date: state.date.value,
-                  quantity: (e === null || e === void 0 ? void 0 : e.quantity) || 1,
-                  price: _detail.price,
-                  product_name: _currentItem.title,
-                  other: other
-                },
-                new: 1
-              });
-              _total = getProductTotalPrice(cacheItem); // 用于折扣 可修改
-              cacheItem._extend.total = _total;
-              // 用于储存原价
-              cacheItem._extend.origin_total = _total;
-              _isEdit = !!state.service.cacheItem;
-              if (_isEdit) {
-                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._extend.resource = 0;
-                cacheItem.currentDefaultTime = state.date.value.format('HH:mm');
-              }
-              cacheItem = getProductExtend({
-                cacheItem: cacheItem,
-                state: state,
-                isDisabledTime: true
-              });
-              if (state.renderType === 'eventBooking') {
-                cacheItem.autoClose = false;
-              }
-              if (cacheItem.autoClose) {
-                cacheItem.autoClose = false;
-                cacheItem._serviceKey = genServiceKey(cacheItem);
-                val = getCurrentServiceValue();
-                _addService2 = addService(_toConsumableArray(val), cacheItem, state), _list = _addService2.list, quantity = _addService2.quantity; // 更新ref以确保后续快速操作时使用最新值
-                latestServiceValueRef.current = _list;
-                lastOperationTimeRef.current = Date.now();
-                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: _currentItem === null || _currentItem === void 0 ? void 0 : _currentItem.id,
-                      detailId: _detail === null || _detail === void 0 ? void 0 : _detail.id,
-                      detailProductId: _detail === null || _detail === void 0 ? void 0 : _detail.product_id,
-                      product_name: _currentItem === null || _currentItem === void 0 ? void 0 : _currentItem.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
-                  }
-                });
-              } else {
-                (_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);
-              }
-            case 23:
             case "end":
-              return _context.stop();
+              return _context3.stop();
           }
-        }, _callee);
+        }, _callee3);
       }));
-      return function callback(_x, _x2, _x3, _x4) {
-        return _ref.apply(this, arguments);
+      return function (_x5, _x6, _x7, _x8) {
+        return _ref3.apply(this, arguments);
       };
     }();
+  });
 
-    // 如果不需要打开弹窗, 直接添加数据
-    if (cacheValues) {
-      var _state$service$value, _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 = (_state$service$value = state.service.value) === null || _state$service$value === void 0 ? void 0 : _state$service$value.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,
@@ -544,9 +683,298 @@ 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.log(item, 'handleSelectProduct');
+            // 检查资源可用性
+            if (checkResourceAvailability(item)) {
+              _context4.next = 4;
+              break;
+            }
+            return _context4.abrupt("return");
+          case 4:
+            if (item.isOpenDetailModal) {
+              _context4.next = 8;
+              break;
+            }
+            _context4.next = 7;
+            return handleDirectAddService(item);
+          case 7:
+            return _context4.abrupt("return");
+          case 8:
+            // 打开产品选择弹窗
+            openProductModal(item, type);
+          case 9:
+          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 || [];
 
@@ -575,22 +1003,42 @@ var AddSerivce = function AddSerivce(props) {
         menu_list_ids: menuList,
         schedule_datetime: currentDatetime
       });
+      getScheduleTimePoints({
+        menu_list_ids: menuList
+      });
+    }
+  }, [renderMode, customerId, menuList]);
+
+  // 产品展示配置，支持字符串预设或完整配置对象
+  var finalDisplayConfig = useMemo(function () {
+    // 解析配置（支持字符串或对象）
+    var resolvedConfig = resolveProductDisplayConfig(productDisplayConfig);
+
+    // 如果是 ProductSelect 模式，合并默认的 layout 和 setting
+    if (resolvedConfig.displayMode === 'product-select') {
+      var _resolvedConfig$produ, _resolvedConfig$produ2;
+      return _objectSpread(_objectSpread({}, resolvedConfig), {}, {
+        productSelectConfig: _objectSpread(_objectSpread({}, resolvedConfig.productSelectConfig), {}, {
+          layout: ((_resolvedConfig$produ = resolvedConfig.productSelectConfig) === null || _resolvedConfig$produ === void 0 ? void 0 : _resolvedConfig$produ.layout) || productListLayout,
+          productListSetting: ((_resolvedConfig$produ2 = resolvedConfig.productSelectConfig) === null || _resolvedConfig$produ2 === void 0 ? void 0 : _resolvedConfig$produ2.productListSetting) || productListSetting
+        })
+      });
     }
-  }, [renderMode, currentDate, customerId, menuList, currentDatetime]);
+    return resolvedConfig;
+  }, [productDisplayConfig]);
   return useMemo(function () {
     if (renderMode === 'current') {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ProductSelect, {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ProductDisplayAdapter, {
+        config: finalDisplayConfig,
         dataSource: renderList,
-        layout: productListLayout,
-        onChange: handleSelectProduct,
-        value: currentProduct === null || currentProduct === void 0 ? void 0 : currentProduct.id,
-        loading: !renderList.length && loading,
-        productListSetting: productListSetting
+        loading: !renderList.length && loading || firstLoading,
+        currentProductId: currentProduct === null || currentProduct === void 0 ? void 0 : currentProduct.id,
+        onSelectProduct: handleSelectProduct
       }), /*#__PURE__*/React.createElement(NotAvailable, {
         ref: notAvailableRef
       }));
     }
     return null;
-  }, [state.service.addModal, locales, renderList, state.amountSymbol, state.renderType, state === null || state === void 0 ? void 0 : state.activeCartId, holderId(state), loading, currentProduct, isBooking4]);
+  }, [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;