@pisell/private-materials 6.6.2 → 6.7.2

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

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

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

@@ -62,7 +62,6 @@ var VoucherCard = (props) => {
   const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
   services = state.service;
   const changeCustomerToGlobalState = (0, import_ahooks.useMemoizedFn)((value) => {
-    var _a2, _b2;
     dispatch({
       type: "setClient",
       payload: {
@@ -70,14 +69,6 @@ var VoucherCard = (props) => {
         edit: true
       }
     });
-    if ((_b2 = (_a2 = state == null ? void 0 : state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length) {
-      dispatch({
-        type: "setService",
-        payload: {
-          value: state.service.value.map((item) => ({ ...item, _extend: { ...item._extend, holder_id: [] } }))
-        }
-      });
-    }
   });
   const { selectCustomer } = (0, import_pisellos.useCustomer)({
     changeCustomerToGlobalState
@@ -172,7 +163,7 @@ var VoucherCard = (props) => {
         productListToValue(val.productList);
       }
     },
-    { wait: 500 }
+    { wait: 1e3 }
   );
   (0, import_react.useEffect)(() => {
     run();

package/lib/components/booking/dashboard/serve.js

@@ -24,7 +24,12 @@ __export(serve_exports, {
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../utils");
 var getBookingList = async (params) => {
-  let { data } = await import_utils.request.getRequest().get(`/shop/schedule/booking`, params);
+  let { data } = await import_utils.request.getRequest().get(`/shop/schedule/booking`, params, {
+    cache: {
+      mode: "remote_local",
+      type: "indexDB"
+    }
+  });
   return data;
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/components/booking/forms/serve.js

@@ -24,8 +24,18 @@ __export(serve_exports, {
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../utils");
-var getFormData = async (params) => import_utils.request.getRequest().get(`/shop/form/data/v1`, params);
-var sendFormReminder = async (params) => import_utils.request.getRequest().post(`/shop/form/form-reminder`, params);
+var getFormData = async (params) => import_utils.request.getRequest().get(`/shop/form/data/v1`, params, {
+  cache: {
+    mode: "remote_local",
+    type: "indexDB"
+  }
+});
+var sendFormReminder = async (params) => import_utils.request.getRequest().post(`/shop/form/form-reminder`, params, {
+  cache: {
+    mode: "remote_local",
+    type: "indexDB"
+  }
+});
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getFormData,

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

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

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

@@ -40,7 +40,6 @@ var import_utils2 = require("@pisell/utils");
 var import_materials = require("@pisell/materials");
 var import_serve = require("../info/service/serve");
 var import_decimal = __toESM(require("decimal.js"));
-var import_dayjs = __toESM(require("dayjs"));
 var formatBundleItemMap = (product) => {
   return product.bundle_group.reduce((pre, cur) => {
     const curObj = {};
@@ -71,19 +70,15 @@ var setNewCartValue = (cartValue, newProducts) => {
   let isBundleChange = false;
   let isNotFoundBundle = false;
   const notFoundProducts = [];
-  const multiDayPricesCache = /* @__PURE__ */ new Map();
   const value = cartValue.map((item) => {
-    var _a, _b, _c, _d, _e, _f;
-    const itemScheduleDate = ((_a = item._extend) == null ? void 0 : _a.startDate) ? (0, import_dayjs.default)(item._extend.startDate).format("YYYY-MM-DD") : "";
-    const newProduct = newProducts.find(
-      (newItem2) => newItem2.id === item.product_id && newItem2.schedule_date === itemScheduleDate
-    );
+    var _a, _b, _c, _d;
+    const newProduct = newProducts.find((newItem2) => newItem2.id === item.product_id);
     if (!newProduct) {
       return item;
     }
     let isChangePrice = newProduct.price != item.price;
     const bundleItemMap = formatBundleItemMap(newProduct);
-    const newBundle = (((_c = (_b = item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.bundle) || []).map((bundle) => {
+    const newBundle = (((_b = (_a = item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) || []).map((bundle) => {
       if (!bundleItemMap[bundle.id]) {
         isNotFoundBundle = true;
         if (!notFoundProducts.some((p) => p._id === bundle._id)) {
@@ -107,24 +102,6 @@ var setNewCartValue = (cartValue, newProducts) => {
         // product_price: bundleItemMap[item.id].product_price,
       };
     });
-    if ((_d = item._extend) == null ? void 0 : _d.groupId) {
-      if (!multiDayPricesCache.has(item._extend.groupId)) {
-        const productPrices = newProducts.filter((p) => p.id === item.product_id);
-        const multiDayPrices = {};
-        productPrices.forEach((priceItem) => {
-          multiDayPrices[priceItem.schedule_date] = {
-            total: Number(priceItem.price),
-            origin_total: Number(priceItem.price),
-            num: 1,
-            quotation_id: priceItem.quotation_id || 0,
-            start_date: priceItem.schedule_date,
-            end_date: (0, import_dayjs.default)(priceItem.schedule_date).add(1, "day").format("YYYY-MM-DD")
-          };
-        });
-        multiDayPricesCache.set(item._extend.groupId, multiDayPrices);
-      }
-      item._extend.multiDayPrices = multiDayPricesCache.get(item._extend.groupId);
-    }
     if (!isChangePrice) {
       return item;
     } else {
@@ -142,7 +119,7 @@ var setNewCartValue = (cartValue, newProducts) => {
         bundle_edit: isBundleChange ? 1 : item._extend.bundle_edit,
         other: {
           ...item._extend.other,
-          option: (_f = (_e = item._extend) == null ? void 0 : _e.other) == null ? void 0 : _f.option,
+          option: (_d = (_c = item._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.option,
           bundle: newBundle
         }
       }
@@ -168,31 +145,22 @@ var useQuotation = (state, dispatch) => {
   cartValueRef.current = state.service.value;
   const getCartQuotation = async (params) => {
     if (!cartValueRef.current.length) return;
-    if (!(params == null ? void 0 : params.customer_id)) {
-      return;
-    }
-    const queryData = cartValueRef.current.filter((item) => !item.isCustomItem).map((item) => {
-      var _a2;
-      return {
-        product_id: item.product_id,
-        schedule_date: ((_a2 = item._extend) == null ? void 0 : _a2.startDate) ? (0, import_dayjs.default)(item._extend.startDate).format("YYYY-MM-DD") : params == null ? void 0 : params.schedule_date
-        // 如果没有商品日期，使用传入的默认日期
-      };
-    });
-    if (!queryData.length) return;
-    const data = await (0, import_serve.getNormalAndMultiDayProductPrice)({
-      customer_id: params == null ? void 0 : params.customer_id,
-      data: queryData
+    const ids = cartValueRef.current.filter((item) => !item.isCustomItem).map((item) => item.product_id);
+    if (!ids.length) return;
+    const data = await (0, import_serve.getProductPrice)({
+      ids,
+      schedule_date: params == null ? void 0 : params.schedule_date,
+      customer_id: params == null ? void 0 : params.customer_id
     });
-    return data.data;
+    return data;
   };
   const currentDate = (0, import_react.useMemo)(() => {
     return state.date.value.format("YYYY-MM-DD");
   }, [state.date.value]);
   const updateCartQuotation = async (params) => {
     const data = await getCartQuotation(params);
-    if (!data || !data.length) return;
-    const { isChange, value: newCartValue, isNotFoundBundle, notFoundProducts } = setNewCartValue(cartValueRef.current, data);
+    if (!(data == null ? void 0 : data.data)) return;
+    const { isChange, value: newCartValue, isNotFoundBundle, notFoundProducts } = setNewCartValue(cartValueRef.current, data.data);
     if (isNotFoundBundle) {
       setProducts(notFoundProducts);
       setOpen(true);

package/lib/components/booking/info/client/serve.js

@@ -25,11 +25,22 @@ __export(serve_exports, {
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../utils");
 var getFranchiseeCustomerInfo = async (params) => {
-  let { data } = await import_utils.request.getRequest().get(`/shop/franchisee/customer/id`, params);
+  let { data } = await import_utils.request.getRequest().get(`/shop/franchisee/customer/id`, params, {
+    cache: {
+      mode: "remote_local",
+      type: "indexDB"
+    }
+  });
   return data;
 };
 var getFranchiseeCustomerList = async (params) => {
-  let { data } = await import_utils.request.getRequest().get(`/shop/franchisee/customer/select-list`, params, { abort: true });
+  let { data } = await import_utils.request.getRequest().get(`/shop/franchisee/customer/select-list`, params, {
+    abort: true,
+    cache: {
+      mode: "remote_local",
+      type: "indexDB"
+    }
+  });
   return data;
 };
 // Annotate the CommonJS export names for ESM import in node:

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

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

package/lib/components/booking/info/hooks/useHolderConfig.d.ts

@@ -5,6 +5,5 @@ declare const useHolderConfig: (state: any) => {
     isCustomerSubject: boolean;
     isWalkInBol: boolean;
     isShowChangeHolder: boolean;
-    holderType: any;
 };
 export default useHolderConfig;

package/lib/components/booking/info/hooks/useHolderConfig.js

@@ -25,7 +25,7 @@ module.exports = __toCommonJS(useHolderConfig_exports);
 var import_react = require("react");
 var import_utils = require("../../utils");
 var useHolderConfig = (state) => {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f;
   const appointment_subject = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2;
     return ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.basic) == null ? void 0 : _c2.appointment_subject) || {};
@@ -37,14 +37,10 @@ var useHolderConfig = (state) => {
   const isFormSubject = (0, import_react.useMemo)(() => {
     return appointment_subject.type === "form";
   }, [appointment_subject.type]);
-  const holderType = (0, import_react.useMemo)(() => {
-    var _a2, _b2, _c2;
-    return ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.holder) == null ? void 0 : _b2.form) == null ? void 0 : _c2.formType) || "minors";
-  }, [(_e = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _e.holder]);
   const isWalkInBol = (0, import_react.useMemo)(() => {
     var _a2, _b2;
     return (0, import_utils.isWalkIn)((_b2 = (_a2 = state == null ? void 0 : state.client) == null ? void 0 : _a2.value) == null ? void 0 : _b2.id);
-  }, [(_g = (_f = state == null ? void 0 : state.client) == null ? void 0 : _f.value) == null ? void 0 : _g.id]);
+  }, [(_f = (_e = state == null ? void 0 : state.client) == null ? void 0 : _e.value) == null ? void 0 : _f.id]);
   const isCustomerSubject = (0, import_react.useMemo)(() => {
     return appointment_subject.type === "customer";
   }, [appointment_subject.type]);
@@ -57,8 +53,7 @@ var useHolderConfig = (state) => {
     isFormSubject,
     isCustomerSubject,
     isWalkInBol,
-    isShowChangeHolder,
-    holderType
+    isShowChangeHolder
   };
 };
 var useHolderConfig_default = useHolderConfig;

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

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

package/lib/components/booking/info/pet/serve.js

@@ -24,7 +24,12 @@ __export(serve_exports, {
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../utils");
 var getFormDetail = async (id) => {
-  let { data } = await import_utils.request.getRequest().get(`/shop/form/${id}`);
+  let { data } = await import_utils.request.getRequest().get(`/shop/form/${id}`, {
+    cache: {
+      mode: "remote_local",
+      type: "indexDB"
+    }
+  });
   return data;
 };
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -1,2 +1,2 @@
-declare const Lists: ({ onEdit, onChange, onAction, isParallelResource, isShowDelete, isShowAmountFooter }: any) => JSX.Element;
+declare const Lists: ({ onEdit, onChange, onAction, isParallelResource }: any) => JSX.Element;
 export default Lists;

package/lib/components/booking/info/service/Lists.js

@@ -41,7 +41,7 @@ var import_useHolderConfig = __toESM(require("../hooks/useHolderConfig"));
 var import_ahooks = require("ahooks");
 var import_utils2 = require("../../info2/service/addService/utils");
 var import_useAddHolder = __toESM(require("../hooks/useAddHolder"));
-var Lists = ({ onEdit, onChange, onAction, isParallelResource, isShowDelete = true, isShowAmountFooter = true }) => {
+var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
   var _a;
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const { isShowChangeHolder } = (0, import_useHolderConfig.default)(state);
@@ -60,7 +60,7 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource, isShowDelete = tr
       if (type === "view" || type === "edit_product") {
         let product = currentItem._origin;
         let cacheItem = { ...product, new: 0 };
-        if (isParallelResource) {
+        if (isParallelResource && !(0, import_utils.isNormalProductByDurationSchedule)(product)) {
           cacheItem = (0, import_utils2.getProductExtend)({
             cacheItem,
             state
@@ -85,8 +85,6 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource, isShowDelete = tr
     return {
       hideAddBtn: state.isTerminalDayBookingPage || state.isBookingCreatePage,
       isShowNote: state.isBookingTicket2 ? true : (0, import_utils.isEventBooking)(state),
-      isShowDelete,
-      isShowAmountFooter,
       isShowPackageNote: false,
       accounts: [],
       isEdit: !!(state == null ? void 0 : state.bookingId),
@@ -111,7 +109,7 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource, isShowDelete = tr
     const p = (0, import_utils.formatProducts)(
       ((_a2 = state == null ? void 0 : state.service) == null ? void 0 : _a2.value) || [],
       state,
-      true,
+      false,
       true,
       isParallelResource
     );

package/lib/components/booking/info/service/addTimeModal/serve.js

@@ -25,7 +25,13 @@ __export(serve_exports, {
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../../utils");
 var getAddTimeProducts = async (params, config) => {
-  let { data } = await import_utils.request.getRequest().post(`/shop/product/query`, params, config);
+  let { data } = await import_utils.request.getRequest().post(`/shop/product/query`, params, {
+    ...config,
+    cache: {
+      mode: "remote_local",
+      type: "indexDB"
+    }
+  });
   return data;
 };
 var saveAddTimeProduct = async ({ orderId, params }) => {

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

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

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

@@ -18,17 +18,3 @@ export declare const getProductPrice: (params: {
     customer_id: number;
     schedule_date: string;
 }) => Promise<any>;
-declare type MultiDayProductPriceParams = {
-    customer_id: number;
-    data: {
-        product_id: number;
-        schedule_date: string;
-    }[];
-};
-/**
- * 获取普通商品和跨日预约的价格
- * @param params
- * @returns
- */
-export declare const getNormalAndMultiDayProductPrice: (params: MultiDayProductPriceParams) => Promise<any>;
-export {};

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

@@ -19,24 +19,33 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/booking/info/service/serve.ts
 var serve_exports = {};
 __export(serve_exports, {
-  getNormalAndMultiDayProductPrice: () => getNormalAndMultiDayProductPrice,
   getProductDetail: () => getProductDetail,
   getProductPrice: () => getProductPrice,
   postMultiDay: () => postMultiDay
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../utils");
-var getProductDetail = async (id, params) => import_utils.request.getRequest().get(`/shop/product/query/${id}`, params);
+var getProductDetail = async (id, params) => import_utils.request.getRequest().get(`/shop/product/query/${id}`, params, {
+  cache: {
+    mode: "remote_local",
+    type: "indexDB"
+  }
+});
 var postMultiDay = async (id, params) => import_utils.request.getRequest().post(`/shop/product/multi-day/detail/${id}`, params, {
-  useCache: true
+  useCache: true,
+  cache: {
+    mode: "remote_local",
+    type: "indexDB"
+  }
+});
+var getProductPrice = async (params) => import_utils.request.getRequest().post(`/shop/product/query/price`, params, {
+  cache: {
+    mode: "remote_local",
+    type: "indexDB"
+  }
 });
-var getProductPrice = async (params) => import_utils.request.getRequest().post(`/shop/product/query/price`, params);
-var getNormalAndMultiDayProductPrice = async (params) => {
-  return import_utils.request.getRequest().post(`/shop/product/query/shelf/price`, params);
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getNormalAndMultiDayProductPrice,
   getProductDetail,
   getProductPrice,
   postMultiDay

package/lib/components/booking/info/service2/Group/utils.js

@@ -31,7 +31,6 @@ module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@pisell/utils");
 var import_utils2 = require("../../../utils");
 var import_distributeDiscount = require("../../service/serviceManager/distributeDiscount");
-var import_utils3 = require("../../../../ticketBooking/utils");
 var getGroupTotalPrice = (items) => {
   return items.reduce((prev, next) => {
     prev.duration += next._extend.duration;
@@ -99,7 +98,6 @@ var createBookingItemsByGroup = (item, isBatchEdit) => {
     cacheItem._extend.total = totalPrice;
     cacheItem._extend.origin_total = totalPrice;
     cacheItem._extend.items = void 0;
-    cacheItem._serviceKey = (0, import_utils3.genServiceKey)(cacheItem);
     bookings.push(cacheItem);
   }
   if (isBatchEdit) {

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

@@ -67,7 +67,39 @@ export declare const genRowKey: (key: string) => string;
  * @Author: WangHan
  * @Date: 2024-11-29 17:36
  */
-export declare const formatProducts: (lists: any[], state: any, isRenderGroup?: boolean, isGeneral?: boolean, isParallelResource?: boolean) => any[];
+export declare const formatProducts: (lists: any[], state: any, isRenderGroup?: boolean, isGeneral?: boolean, isParallelResource?: boolean) => {
+    _origin: any;
+    id: any;
+    _id: any;
+    name: any;
+    title: any;
+    price: any;
+    total: number;
+    origin_total: number;
+    num: any;
+    image: any;
+    isShowNote: boolean;
+    note: any;
+    like_status: any;
+    bundle: any;
+    options: any;
+    errorMessage: string;
+    product_option_string: any;
+    discount_reason: any;
+    resource_id: any;
+    relation_form_name: any;
+    holder_title: any;
+    start_date: any;
+    end_date: any;
+    holder_id: any;
+    isNormalProduct: boolean;
+    isCustomItem: any;
+    vouchersApplicable: any;
+    locale: any;
+    symbol: any;
+    relation_products: any;
+    items: any[];
+}[];
 /**
  * @title: 禁用日期
  * @description:

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

@@ -469,16 +469,19 @@ var genRowKey = (key) => {
   return `rowKey-${key}`;
 };
 var getGeneralParams = (item, state, isParallelResource) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const { pet, service } = state;
   const { holders = [], formData } = pet || {};
   const parallelResourceOtherParams = {};
   let multiResources;
   if (isParallelResource) {
-    const hasDataItem = (0, import_utils6.getProductExtend)({
-      cacheItem: { ...item, new: 0 },
-      state
-    });
+    let hasDataItem = item;
+    if (!isNormalProductByDurationSchedule(hasDataItem) && !hasDataItem._data) {
+      hasDataItem = (0, import_utils6.getProductExtend)({
+        cacheItem: { ...item, new: 0 },
+        state
+      });
+    }
     const { resourceMaps, resources } = hasDataItem._data || {};
     parallelResourceOtherParams.errorMessage = getErrorMessageInfo2(getAllErrorList(hasDataItem));
     multiResources = resources.map((resource) => {
@@ -518,11 +521,10 @@ var getGeneralParams = (item, state, isParallelResource) => {
     ];
   }
   const isNormalProduct = isNormalProductByDurationSchedule(item);
-  const isMultiDay = (0, import_utils6.isMultiDayProduct)(item);
   return {
     format: ["HH:mm", "HH:mm"],
     show_time: true,
-    duration_type: isMultiDay ? "days" : "minutes",
+    duration_type: "minutes",
     // 当前可选择holder列表
     holders: formatHolders(holders),
     isShowChangeHolder: !isNormalProduct,
@@ -530,17 +532,15 @@ var getGeneralParams = (item, state, isParallelResource) => {
     actionText: import_utils2.locales.getText("page.booking.text.add-time"),
     actionIcon: "pisell2-clock-plus",
     isMultipleResource: true,
-    isFormSubject: ((_e = (_d = (_c = (_b = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _b.config) == null ? void 0 : _c.basic) == null ? void 0 : _d.appointment_subject) == null ? void 0 : _e.type) === "form",
-    holderType: ((_h = (_g = (_f = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _f.holder) == null ? void 0 : _g.form) == null ? void 0 : _h.form_type) || "minors",
     multiResources,
     holderMaxCount: item == null ? void 0 : item._extend.quantity,
     holderMode: (item == null ? void 0 : item._extend.quantity) > 1 ? "multiple" : void 0,
     isErrorHolder: getIsSubjectRequire(state),
-    addHolderButtonText: ((_j = (_i = formData == null ? void 0 : formData[0]) == null ? void 0 : _i.form) == null ? void 0 : _j.title) || "",
-    holder_id: (_k = item == null ? void 0 : item._extend) == null ? void 0 : _k.holder_id,
-    start_date: !isNormalProduct ? (_l = item == null ? void 0 : item._extend) == null ? void 0 : _l.startDate : "",
-    end_date: !isNormalProduct ? ((_m = item == null ? void 0 : item._extend) == null ? void 0 : _m.endDate) || ((_n = item == null ? void 0 : item._extend) == null ? void 0 : _n.end_date) : "",
-    rowKey: genRowKey((_p = (_o = item == null ? void 0 : item._extend) == null ? void 0 : _o.other) == null ? void 0 : _p.rowKey),
+    addHolderButtonText: ((_c = (_b = formData == null ? void 0 : formData[0]) == null ? void 0 : _b.form) == null ? void 0 : _c.title) || "",
+    holder_id: (_d = item == null ? void 0 : item._extend) == null ? void 0 : _d.holder_id,
+    start_date: !isNormalProduct ? (_e = item == null ? void 0 : item._extend) == null ? void 0 : _e.startDate : "",
+    end_date: !isNormalProduct ? ((_f = item == null ? void 0 : item._extend) == null ? void 0 : _f.endDate) || ((_g = item == null ? void 0 : item._extend) == null ? void 0 : _g.end_date) : "",
+    rowKey: genRowKey((_i = (_h = item == null ? void 0 : item._extend) == null ? void 0 : _h.other) == null ? void 0 : _i.rowKey),
     ...parallelResourceOtherParams
   };
 };
@@ -549,6 +549,8 @@ var calcAddTimeTotalPrice = (total, addTimeProducts) => {
 };
 var formatProducts = (lists, state, isRenderGroup = true, isGeneral, isParallelResource) => {
   if (!(lists == null ? void 0 : lists.length)) return [];
+  const normalList = [];
+  const groupList = [];
   const formItem = (item) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v;
     const _isDayBookingProduct = isDayBookingProduct(item, state);
@@ -556,13 +558,17 @@ var formatProducts = (lists, state, isRenderGroup = true, isGeneral, isParallelR
     const options = formatOptions((_c = (_b = item == null ? void 0 : item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.option);
     const bundle = formatBundle((_e = (_d = item == null ? void 0 : item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.bundle);
     const isNormalProduct = !import_status.appointmentTypes.includes(item == null ? void 0 : item.extension_type) || (state == null ? void 0 : state.renderType) === "eventBooking";
+    const isNormalProductByDurationScheduleVal = isNormalProductByDurationSchedule(item);
     let resourceItem = {};
     let errorMessage = "";
-    if (_isDayBookingProduct || isGeneral) {
+    if ((_isDayBookingProduct || isGeneral) && !isNormalProductByDurationScheduleVal) {
       resourceItem = getResourceItem((_f = item == null ? void 0 : item._extend) == null ? void 0 : _f.resource, state);
       errorMessage = getErrorMessage(item, resourceItem, isDayBooking(state));
     }
-    const generalParams = isGeneral ? getGeneralParams(item, state, !!isParallelResource) : {};
+    let generalParams = {};
+    if (isGeneral && !isNormalProductByDurationScheduleVal) {
+      generalParams = getGeneralParams(item, state, !!isParallelResource);
+    }
     return {
       id: item == null ? void 0 : item.id,
       _id: item == null ? void 0 : item._id,
@@ -601,23 +607,17 @@ var formatProducts = (lists, state, isRenderGroup = true, isGeneral, isParallelR
       _origin: item
     };
   };
+  console.log(normalList, "normalList");
   if (isRenderGroup) {
-    const normalItemsWithIndex = [];
-    const groupItemsWithIndex = [];
-    const groupFirstIndexMap = {};
-    lists.forEach((item, index) => {
-      var _a, _b;
+    lists.forEach((item) => {
+      var _a;
       if (!((_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.groupId)) {
-        normalItemsWithIndex.push({ item, index });
+        normalList.push(formItem(item));
       } else {
-        const groupId = (_b = item == null ? void 0 : item._extend) == null ? void 0 : _b.groupId;
-        groupItemsWithIndex.push({ item, index });
-        if (groupFirstIndexMap[groupId] === void 0) {
-          groupFirstIndexMap[groupId] = index;
-        }
+        groupList.push(item);
       }
     });
-    const groups = groupItemsWithIndex.reduce((prev, { item }) => {
+    let groups = groupList.reduce((prev, item) => {
       var _a;
       const groupId = (_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.groupId;
       if (!prev[groupId]) {
@@ -626,16 +626,7 @@ var formatProducts = (lists, state, isRenderGroup = true, isGeneral, isParallelR
       prev[groupId].push(item);
       return prev;
     }, {});
-    const mergedGroupItems = Object.entries(groups).map(([groupId, items]) => ({
-      item: formItem((0, import_utils3.concatBookings)(items)),
-      index: groupFirstIndexMap[groupId]
-    }));
-    const formattedNormalItems = normalItemsWithIndex.map(({ item, index }) => ({
-      item: formItem(item),
-      index
-    }));
-    const allItems = [...mergedGroupItems, ...formattedNormalItems].sort((a, b) => a.index - b.index);
-    return allItems.map(({ item }) => item);
+    return Object.values(groups).map((d) => formItem((0, import_utils3.concatBookings)(d))).concat(normalList);
   } else {
     return lists == null ? void 0 : lists.map((item) => formItem(item));
   }

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

@@ -45,7 +45,6 @@ module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_utils = require("../utils");
 var import_utils2 = require("../info2/service/addTimeModal/utils");
-var import_utils3 = require("../info2/service/addService/utils");
 var getIsBundleOrCombination = (productDetail) => {
   var _a;
   if ((_a = productDetail == null ? void 0 : productDetail.bundle_group) == null ? void 0 : _a.length) {
@@ -196,9 +195,6 @@ var isOpenAddTime = (state) => {
   return true;
 };
 var isShowAddTime = (state, currentService) => {
-  if ((0, import_utils3.isMultiDayProduct)(currentService)) {
-    return false;
-  }
   if (!isOpenAddTime(state)) {
     return false;
   }