@pisell/private-materials 6.4.70 → 6.4.72

package/lib/components/ticketBooking/components/addServiceVariant/MultiDayTimeSelectModal.js

@@ -0,0 +1,118 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/ticketBooking/components/addServiceVariant/MultiDayTimeSelectModal.tsx
+var MultiDayTimeSelectModal_exports = {};
+__export(MultiDayTimeSelectModal_exports, {
+  default: () => MultiDayTimeSelectModal_default
+});
+module.exports = __toCommonJS(MultiDayTimeSelectModal_exports);
+var import_react = __toESM(require("react"));
+var import_dayjs = __toESM(require("dayjs"));
+var import_materials = require("@pisell/materials");
+var import_utils = require("@pisell/utils");
+var import_multiDayTimeSelect = __toESM(require("../../../../pro/multiDayTimeSelect"));
+var import_MultiDayTimeSelectModal = require("./MultiDayTimeSelectModal.less");
+var MultiDayTimeSelectModal = ({
+  open,
+  productName,
+  locale = "en",
+  defaultStartDate,
+  loading = false,
+  maxDays = 30,
+  separateStartEnd = false,
+  onConfirm,
+  onCancel
+}) => {
+  const [value, setValue] = (0, import_react.useState)(null);
+  const formRef = (0, import_react.useRef)(null);
+  (0, import_react.useEffect)(() => {
+    if (open) {
+      const startDate = defaultStartDate || (0, import_dayjs.default)();
+      const endDate = startDate.add(1, "day");
+      const initialValue = {
+        startDate,
+        endDate,
+        duration: 1
+      };
+      setValue(initialValue);
+    }
+  }, [open, defaultStartDate]);
+  const handleChange = (newValue) => {
+    setValue(newValue);
+  };
+  const handleConfirm = async () => {
+    var _a;
+    try {
+      await ((_a = formRef.current) == null ? void 0 : _a.validate());
+      if (value) {
+        onConfirm(value.startDate, value.endDate, value.duration);
+      }
+    } catch (error) {
+    }
+  };
+  const handleCancel = () => {
+    if (loading) return;
+    onCancel();
+  };
+  return /* @__PURE__ */ import_react.default.createElement(
+    import_materials.PisellModal,
+    {
+      open,
+      title: productName || import_utils.locales.getText("pisell2.text.product_name"),
+      onCancel: handleCancel,
+      onOk: handleConfirm,
+      okText: import_utils.locales.getText("pisell2.text.confirm"),
+      cancelText: import_utils.locales.getText("pisell2.text.cancel"),
+      width: 600,
+      destroyOnClose: true,
+      confirmLoading: loading,
+      closable: !loading,
+      maskClosable: !loading,
+      headerDivider: false,
+      footerDivider: false,
+      cancelButtonProps: {
+        disabled: loading
+      }
+    },
+    /* @__PURE__ */ import_react.default.createElement(
+      import_multiDayTimeSelect.default,
+      {
+        ref: formRef,
+        maxDays,
+        defaultStartDate,
+        separateStartEnd,
+        value: value || void 0,
+        onChange: handleChange,
+        locale,
+        disabled: loading
+      }
+    )
+  );
+};
+var MultiDayTimeSelectModal_default = MultiDayTimeSelectModal;

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

@@ -50,6 +50,8 @@ var import_pisellos = require("../../hooks/pisellos");
 var import_utils7 = require("./utils");
 var import_materials = require("@pisell/materials");
 var import_IsActiveContext = require("../../context/IsActiveContext");
+var import_utils8 = require("../../../booking/info/service2/Group/utils");
+var import_MultiDayTimeSelectModal = __toESM(require("./MultiDayTimeSelectModal"));
 var productListLayout = {
   grid: true,
   config: "12:12"
@@ -89,6 +91,9 @@ var AddSerivce = (props) => {
   );
   const [currentProduct, setCurrentProduct] = (0, import_react.useState)(null);
   const [firstLoading, setFirstLoading] = (0, import_react.useState)(true);
+  const [multiDayModalOpen, setMultiDayModalOpen] = (0, import_react.useState)(false);
+  const [multiDayModalLoading, setMultiDayModalLoading] = (0, import_react.useState)(false);
+  const [pendingMultiDayData, setPendingMultiDayData] = (0, import_react.useState)(null);
   const stateRef = (0, import_react.useRef)(state);
   stateRef.current = state;
   const { getProducts, products, loading } = (0, import_pisellos.useProducts)(notAvailableRef);
@@ -194,10 +199,161 @@ var AddSerivce = (props) => {
       }, 0);
     }
   );
+  const processAddService = (0, import_ahooks.useMemoizedFn)(async (item, _detail, e, notShowToast, startDate, endDate) => {
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2;
+    const other = JSON.parse(JSON.stringify(e));
+    other.session = e.session;
+    let cacheItem = {
+      ..._detail,
+      product_id: item.id,
+      _id: (0, import_utils.getUniqueId)(),
+      _key: e.key,
+      _extend: {
+        start_date: startDate,
+        quantity: (e == null ? void 0 : e.quantity) || 1,
+        price: _detail.price,
+        product_name: item.title,
+        other,
+        end_date: endDate
+      },
+      new: 1
+    };
+    let _total = (0, import_utils2.getProductTotalPrice)(cacheItem);
+    cacheItem._extend.total = _total;
+    cacheItem._extend.origin_total = _total;
+    const _isEdit = !!stateRef.current.service.cacheItem;
+    if (_isEdit) {
+      cacheItem._id = (_a2 = stateRef.current.service.cacheItem) == null ? void 0 : _a2._id;
+      cacheItem.new = 0;
+    }
+    if (renderMode === "current") {
+      cacheItem.currentDefaultTime = stateRef.current.date.value.format("HH:mm");
+    }
+    cacheItem = (0, import_utils3.getProductExtend)({
+      cacheItem,
+      state: stateRef.current,
+      isDisabledTime: true
+    });
+    const isMultiDay = (0, import_utils3.isMultiDayProduct)(cacheItem);
+    const getMultiDayCacheItem = async (isConcatBookings) => {
+      cacheItem = await (0, import_utils3.getMultiDay)({
+        start_date: cacheItem._extend.start_date,
+        end_date: cacheItem._extend.end_date,
+        state: stateRef.current,
+        cacheItem
+      });
+      cacheItem = (0, import_utils8.createBookingItemsByGroup)(cacheItem);
+      if (isConcatBookings) {
+        cacheItem = (0, import_utils8.concatBookings)(cacheItem);
+      }
+    };
+    if (stateRef.current.renderType === "eventBooking") {
+      cacheItem.autoClose = false;
+    }
+    if (cacheItem.autoClose) {
+      cacheItem.autoClose = false;
+      cacheItem._serviceKey = (0, import_utils6.genServiceKey)(cacheItem);
+      if (isMultiDay) {
+        await getMultiDayCacheItem();
+      }
+      let { list: _list, quantity } = (0, import_utils6.addService)(
+        [...stateRef.current.service.value],
+        cacheItem,
+        stateRef.current,
+        isMultiDay
+      );
+      if (!notShowToast) {
+        handleAddToast(cacheItem.title, quantity || 1);
+      }
+      window.dispatchEvent(
+        new CustomEvent("onAddNewService", {
+          detail: {
+            cacheItem
+          }
+        })
+      );
+      try {
+        if (((_f2 = (_e2 = (_d2 = (_c2 = (_b2 = context.appHelper.utils.store) == null ? void 0 : _b2.getState) == null ? void 0 : _c2.call(_b2)) == null ? void 0 : _d2.global) == null ? void 0 : _e2.globalConfig) == null ? void 0 : _f2.id) === 2155) {
+          const val = _list == null ? void 0 : _list.map((s) => {
+            return {
+              product_id: s == null ? void 0 : s.product_id,
+              detailId: s == null ? void 0 : s.id,
+              detailProductId: s == null ? void 0 : s.product_id,
+              product_name: s == null ? void 0 : s.title,
+              price: s == null ? void 0 : s.price,
+              _id: s == null ? void 0 : s._id,
+              _key: s == null ? void 0 : s._key,
+              _serviceKey: s == null ? void 0 : s._serviceKey
+            };
+          });
+          const sendData = {
+            product_id: item == null ? void 0 : item.id,
+            detailId: _detail == null ? void 0 : _detail.id,
+            detailProductId: _detail == null ? void 0 : _detail.product_id,
+            product_name: item == null ? void 0 : item.title,
+            price: _detail == null ? void 0 : _detail.price,
+            serviceVal: val
+          };
+          (0, import_utils.sendWarningLog)({
+            title: "addService",
+            content: [
+              { key: "添加数据", value: JSON.stringify(sendData) },
+              {
+                key: "日期",
+                value: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss")
+              }
+            ]
+          });
+        }
+      } catch (error) {
+      }
+      dispatch({
+        type: "setService",
+        payload: {
+          addModal: false,
+          value: _list,
+          edit: true,
+          changeService: false
+        }
+      });
+    } else {
+      (_g2 = window.openBookingEditModal) == null ? void 0 : _g2.call(window);
+      if (isMultiDay) {
+        await getMultiDayCacheItem(true);
+      }
+      dispatch({
+        type: "setService",
+        payload: {
+          editModal: true,
+          cacheItem,
+          addModal: !cacheItem.autoClose,
+          changeService: false
+        }
+      });
+      onEdit == null ? void 0 : onEdit(cacheItem);
+    }
+  });
+  const handleMultiDayConfirm = (0, import_ahooks.useMemoizedFn)(async (startDate, endDate, duration) => {
+    if (!pendingMultiDayData) return;
+    setMultiDayModalLoading(true);
+    try {
+      const { item, detail, e, notShowToast } = pendingMultiDayData;
+      await processAddService(item, detail, e, notShowToast, startDate, endDate);
+      setPendingMultiDayData(null);
+      setMultiDayModalOpen(false);
+    } catch (error) {
+      console.error("添加跨日商品失败:", error);
+    } finally {
+      setMultiDayModalLoading(false);
+    }
+  });
+  const handleMultiDayCancel = (0, import_ahooks.useMemoizedFn)(() => {
+    setMultiDayModalOpen(false);
+    setPendingMultiDayData(null);
+  });
   const handleSelectProduct = (0, import_ahooks.useMemoizedFn)(
     (item, type = "select") => {
       var _a2, _b2, _c2, _d2;
-      console.log("handleSelectProduct");
       if (!(0, import_utils4.isNormalProductByDurationSchedule)(item)) {
         if (!Array.isArray((_a2 = state.service) == null ? void 0 : _a2.resourcesOrigin) || !state.service.resourcesOrigin.length) {
           dispatch({
@@ -236,7 +392,7 @@ var AddSerivce = (props) => {
         }
       }
       const callback = async (e, extension_type, detail, notShowToast) => {
-        var _a3, _b3, _c3, _d3, _e2, _f2, _g2;
+        debugger;
         setCurrentProduct(null);
         if (lock) {
           return;
@@ -253,116 +409,18 @@ var AddSerivce = (props) => {
           return;
         }
         const _detail = detail || item;
-        const other = JSON.parse(JSON.stringify(e));
-        other.session = e.session;
-        let cacheItem = {
-          ..._detail,
-          product_id: item.id,
-          _id: (0, import_utils.getUniqueId)(),
-          _key: e.key,
-          _extend: {
-            start_date: state.date.value,
-            quantity: (e == null ? void 0 : e.quantity) || 1,
-            price: _detail.price,
-            product_name: item.title,
-            other
-          },
-          new: 1
-        };
-        let _total = (0, import_utils2.getProductTotalPrice)(cacheItem);
-        cacheItem._extend.total = _total;
-        cacheItem._extend.origin_total = _total;
-        const _isEdit = !!state.service.cacheItem;
-        if (_isEdit) {
-          cacheItem._id = (_a3 = state.service.cacheItem) == null ? void 0 : _a3._id;
-          cacheItem.new = 0;
-        }
-        if (renderMode === "current") {
-          cacheItem.currentDefaultTime = state.date.value.format("HH:mm");
-        }
-        cacheItem = (0, import_utils3.getProductExtend)({
-          cacheItem,
-          state,
-          isDisabledTime: true
-        });
-        if (state.renderType === "eventBooking") {
-          cacheItem.autoClose = false;
-        }
-        if (cacheItem.autoClose) {
-          cacheItem.autoClose = false;
-          cacheItem._serviceKey = (0, import_utils6.genServiceKey)(cacheItem);
-          let { list: _list, quantity } = (0, import_utils6.addService)(
-            [...stateRef.current.service.value],
-            cacheItem,
-            state
-          );
-          if (!notShowToast) {
-            handleAddToast(cacheItem.title, quantity || 1);
-          }
-          window.dispatchEvent(
-            new CustomEvent("onAddNewService", {
-              detail: {
-                cacheItem
-              }
-            })
-          );
-          try {
-            if (((_f2 = (_e2 = (_d3 = (_c3 = (_b3 = context.appHelper.utils.store) == null ? void 0 : _b3.getState) == null ? void 0 : _c3.call(_b3)) == null ? void 0 : _d3.global) == null ? void 0 : _e2.globalConfig) == null ? void 0 : _f2.id) === 2155) {
-              const val = _list == null ? void 0 : _list.map((s) => {
-                return {
-                  product_id: s == null ? void 0 : s.product_id,
-                  detailId: s == null ? void 0 : s.id,
-                  detailProductId: s == null ? void 0 : s.product_id,
-                  product_name: s == null ? void 0 : s.title,
-                  price: s == null ? void 0 : s.price,
-                  _id: s == null ? void 0 : s._id,
-                  _key: s == null ? void 0 : s._key,
-                  _serviceKey: s == null ? void 0 : s._serviceKey
-                };
-              });
-              const sendData = {
-                product_id: item == null ? void 0 : item.id,
-                detailId: _detail == null ? void 0 : _detail.id,
-                detailProductId: _detail == null ? void 0 : _detail.product_id,
-                product_name: item == null ? void 0 : item.title,
-                price: _detail == null ? void 0 : _detail.price,
-                serviceVal: val
-              };
-              (0, import_utils.sendWarningLog)({
-                title: "addService",
-                content: [
-                  { key: "添加数据", value: JSON.stringify(sendData) },
-                  {
-                    key: "日期",
-                    value: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss")
-                  }
-                ]
-              });
-            }
-          } catch (error) {
-          }
-          dispatch({
-            type: "setService",
-            payload: {
-              addModal: false,
-              value: _list,
-              edit: true,
-              changeService: false
-            }
-          });
-        } else {
-          (_g2 = window.openBookingEditModal) == null ? void 0 : _g2.call(window);
-          dispatch({
-            type: "setService",
-            payload: {
-              editModal: true,
-              cacheItem,
-              addModal: !cacheItem.autoClose,
-              changeService: false
-            }
+        const isMultiDay = (0, import_utils3.isMultiDayProduct)(_detail || item);
+        if (isMultiDay) {
+          setPendingMultiDayData({
+            item,
+            detail: _detail,
+            e,
+            notShowToast
           });
-          onEdit == null ? void 0 : onEdit(cacheItem);
+          setMultiDayModalOpen(true);
+          return;
         }
+        await processAddService(item, _detail, e, notShowToast, state.date.value);
       };
       if (cacheValues) {
         const productId = item.id.toString();
@@ -412,13 +470,6 @@ var AddSerivce = (props) => {
   );
   const renderList = (0, import_react.useMemo)(() => {
     let _list = products || [];
-    if ((0, import_utils4.isDaysBooking)(state)) {
-      if (!(0, import_utils4.holderId)(state)) {
-        _list = _list.filter(
-          (item) => (0, import_utils4.isNormalProductByDurationSchedule)(item)
-        );
-      }
-    }
     return _list;
   }, [products, state == null ? void 0 : state.activeCartId]);
   const currentDate = (0, import_react.useMemo)(() => {
@@ -453,6 +504,7 @@ var AddSerivce = (props) => {
     return resolvedConfig;
   }, [productDisplayConfig]);
   return (0, import_react.useMemo)(() => {
+    var _a2;
     if (renderMode === "current") {
       return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
         import_ProductDisplayAdapter.default,
@@ -463,7 +515,18 @@ var AddSerivce = (props) => {
           currentProductId: currentProduct == null ? void 0 : currentProduct.id,
           onSelectProduct: handleSelectProduct
         }
-      ), /* @__PURE__ */ import_react.default.createElement(import_notAvailable.default, { ref: notAvailableRef }));
+      ), /* @__PURE__ */ import_react.default.createElement(import_notAvailable.default, { ref: notAvailableRef }), /* @__PURE__ */ import_react.default.createElement(
+        import_MultiDayTimeSelectModal.default,
+        {
+          open: multiDayModalOpen,
+          productName: (_a2 = pendingMultiDayData == null ? void 0 : pendingMultiDayData.item) == null ? void 0 : _a2.title,
+          locale: state == null ? void 0 : state.locale,
+          defaultStartDate: state.date.value,
+          loading: multiDayModalLoading,
+          onConfirm: handleMultiDayConfirm,
+          onCancel: handleMultiDayCancel
+        }
+      ));
     }
     return null;
   }, [
@@ -478,7 +541,10 @@ var AddSerivce = (props) => {
     loading,
     currentProduct,
     isBooking4,
-    finalDisplayConfig
+    finalDisplayConfig,
+    multiDayModalOpen,
+    pendingMultiDayData,
+    multiDayModalLoading
   ]);
 };
 var addService_default = AddSerivce;

package/lib/components/ticketBooking/components/ticketBooking/index.js

@@ -642,22 +642,6 @@ var TicketBooking = (props) => {
       }
     });
     setTimeout(() => {
-      var _a2, _b2, _c2, _d2, _e2;
-      if ((_b2 = (_a2 = state.modalState.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length) {
-        let _list = (_e2 = (_c2 = state.bookingFunctions) == null ? void 0 : _c2.updateServiceDate) == null ? void 0 : _e2.call(
-          _c2,
-          (_d2 = state.modalState.service) == null ? void 0 : _d2.value,
-          date,
-          false
-        );
-        _setModalState({
-          service: {
-            ...state.modalState.service,
-            value: _list,
-            edit: true
-          }
-        });
-      }
     }, 100);
   };
   const _setShopOpeningHours = () => {

package/lib/components/ticketBooking/hooks/pisellos/useProducts.js

@@ -27,18 +27,24 @@ var import_bookingTicket = require("./bookingTicket");
 var import_react = require("react");
 var import_OsKeyContext = require("../../context/OsKeyContext");
 var import_productCache = require("../../utils/productCache");
+var import_hooks = require("../../../../hooks");
+var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 var useProducts = (notAvailableRef) => {
+  var _a;
   const bookingTicket = (0, import_bookingTicket.useBookingTicket)();
   const osKey = (0, import_OsKeyContext.useOsKey)();
   const [products, setProducts] = (0, import_react.useState)([]);
   const [loading, setLoading] = (0, import_react.useState)(true);
   const isFirstLoadRef = (0, import_react.useRef)(true);
   const isFirstLoadDataRef = (0, import_react.useRef)(true);
+  const context = (0, import_hooks.useEngineContext)();
+  const { getApp } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
+  const app = getApp();
   const getProducts = (0, import_ahooks.useMemoizedFn)(async (params) => {
-    var _a;
+    var _a2, _b, _c, _d, _e;
     if (isFirstLoadRef.current && osKey) {
       const cachedProducts = (0, import_productCache.getProductCache)(osKey);
-      if (cachedProducts) {
+      if (cachedProducts && cachedProducts.length > 0) {
         setProducts(cachedProducts);
         setLoading(false);
       }
@@ -46,23 +52,62 @@ var useProducts = (notAvailableRef) => {
     } else {
       setLoading(true);
     }
-    try {
-      const freshProducts = await bookingTicket.loadProducts(params);
+    const maxRetries = 3;
+    let lastError = null;
+    let freshProducts = [];
+    for (let attempt = 1; attempt <= maxRetries; attempt++) {
+      try {
+        console.log(`[ProductCache] 尝试加载数据，第 ${attempt}/${maxRetries} 次`);
+        freshProducts = await bookingTicket.loadProducts(params);
+        if (freshProducts && freshProducts.length > 0) {
+          console.log(`[ProductCache] 第 ${attempt} 次尝试成功，获取到 ${freshProducts.length} 条数据`);
+          break;
+        }
+        console.log(`[ProductCache] 第 ${attempt} 次尝试返回空数据`);
+        if (attempt < maxRetries) {
+          console.log(`[ProductCache] 等待 1 秒后重试...`);
+          await sleep(1e3);
+        }
+      } catch (error) {
+        lastError = error;
+        console.log(`[ProductCache] 第 ${attempt} 次尝试失败:`, error);
+        (_b = (_a2 = app == null ? void 0 : app.logger) == null ? void 0 : _a2.addLog) == null ? void 0 : _b.call(_a2, {
+          type: "info",
+          title: `[getProduct] bookingTicket.loadProducts error (attempt ${attempt}/${maxRetries})`,
+          metadata: {
+            error,
+            attempt
+          }
+        });
+        if (attempt < maxRetries) {
+          console.log(`[ProductCache] 等待 1 秒后重试...`);
+          await sleep(1e3);
+        }
+      }
+    }
+    if (freshProducts && freshProducts.length > 0) {
       isFirstLoadDataRef.current = false;
       setProducts(freshProducts);
       if (osKey) {
         (0, import_productCache.setProductCache)(osKey, freshProducts);
         console.log("[ProductCache] 已更新缓存");
       }
-    } catch (error) {
-      if ((error == null ? void 0 : error.code) === 607100 && (isFirstLoadDataRef.current || products.length > 0)) {
-        (_a = notAvailableRef.current) == null ? void 0 : _a.open();
+      setLoading(false);
+    } else {
+      console.log("[ProductCache] 3次尝试后仍未获取到数据");
+      (_d = (_c = app == null ? void 0 : app.logger) == null ? void 0 : _c.addLog) == null ? void 0 : _d.call(_c, {
+        type: "error",
+        title: "[getProduct] 3次尝试后仍未获取到数据",
+        metadata: {
+          error: lastError
+        }
+      });
+      if ((lastError == null ? void 0 : lastError.code) === 607100 && (isFirstLoadDataRef.current || products.length > 0)) {
+        (_e = notAvailableRef.current) == null ? void 0 : _e.open();
       }
       setLoading(false);
       setProducts([]);
       isFirstLoadDataRef.current = false;
-    } finally {
-      setLoading(false);
     }
   });
   return {

package/lib/components/ticketBooking/utils/index.d.ts

@@ -15,9 +15,14 @@ export declare const restoreProductOtherData: (data: any) => {
     quantity: number;
 } | undefined;
 export declare const isSameProduct: (a: any, b: any) => boolean;
-export declare const addService: (list: any[], addItem: any, state: any) => {
+export declare const addService: (list: any[], addItem: any, state: any, isMultiDay?: boolean) => {
+    list: any[];
+    count: number;
+    quantity?: undefined;
+} | {
     list: any[];
     quantity: any;
+    count?: undefined;
 };
 export declare const addServiceScroll: (rowKey: string, cacheItem: any) => void;
 export declare const getCartProductOverlay: (state: any) => any;

package/lib/components/ticketBooking/utils/index.js

@@ -68,6 +68,7 @@ module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_utils = require("../../booking/info/service2/utils");
 var import_utils2 = require("@pisell/utils");
+var import_utils3 = require("../../booking/info2/service/addService/utils");
 var import_productCache = require("./productCache");
 var formatDateToStr = (date) => {
   const format = (val) => {
@@ -170,9 +171,15 @@ var isSameProduct = (a, b) => {
   }
   return ((_f = (_e = a._extend) == null ? void 0 : _e.other) == null ? void 0 : _f.rowKey) === ((_h = (_g = b._extend) == null ? void 0 : _g.other) == null ? void 0 : _h.rowKey) && a._serviceKey === b._serviceKey;
 };
-var addService = (list, addItem, state) => {
+var addService = (list, addItem, state, isMultiDay) => {
   let value = list;
   let count;
+  if (isMultiDay && (0, import_utils2.isArr)(addItem)) {
+    return {
+      list: [...addItem, ...value],
+      count: 1
+    };
+  }
   if (!(0, import_utils.isNormalProductByDurationSchedule)(addItem) && !getIsOverlayProduct(addItem, state)) {
     value.unshift(addItem);
     count = addItem._extend.quantity;
@@ -248,6 +255,9 @@ var getIsOverlayProduct = (item, state) => {
 };
 var getIsShowNumber = (item, state) => {
   const isBookingTicket2 = state.isBookingTicket2;
+  if ((0, import_utils3.isMultiDayProduct)(item)) {
+    return false;
+  }
   return (0, import_utils.isNormalProductByDurationSchedule)(item) || isBookingTicket2 && getIsOverlayProduct(item, state);
 };
 var genServiceKey = (item) => {

package/lib/components/wallet/Detail/model.d.ts

@@ -1,13 +1 @@
-/// <reference types="react" />
-interface RechargeState {
-    addWalletCard: any;
-}
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    walletDetailState: RechargeState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
-export {};
+export declare const Provider: any, Context: any;