@pisell/private-materials 3.2.39 → 3.3.0

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

@@ -67,6 +67,10 @@ var import_status = require("./status");
 var import_serve = require("../service/serve");
 var import_locales = __toESM(require("../../locales"));
 var import_utils3 = require("./Group/utils");
+var import_utils4 = require("../utils");
+var import_utils5 = require("../service/addService/utils");
+var import_utils6 = require("../../info2/service/addService/utils");
+var import_utilsByBooking = require("../../info2/utilsByBooking");
 import_utils2.locales.init(import_locales.default, localStorage.getItem("umi_locale") || "en");
 var formatActiveKey = (lists, platform, isEdit) => {
   var _a;
@@ -151,9 +155,128 @@ var isBookingProduct = (extension_type, bol) => {
 var isDayBookingProduct = (item, state) => {
   return isBookingProduct(item == null ? void 0 : item.extension_type) && state.renderType === "dayBooking";
 };
-var updateServices = (state, currentItem, type, other) => {
-  var _a;
-  let products = ((_a = state == null ? void 0 : state.service) == null ? void 0 : _a.value) || [];
+var currentResource = (state, useResource, cacheItem) => {
+  const resourcesOrigin = state.service.resourcesOrigin;
+  const resources = (0, import_utils5.formatResources)({
+    cacheItem,
+    resourcesOrigin,
+    isDay: false
+  });
+  let item = resources.find((d) => d.form_record_id == useResource) || {};
+  return item;
+};
+var handleChangeHolder = (products, currentItem, other) => {
+  return products.map((item) => {
+    if (item._id === currentItem._id) {
+      return {
+        ...item,
+        _extend: {
+          ...item._extend,
+          holder_id: other.id
+        }
+      };
+    }
+    return item;
+  });
+};
+var handleLike = (products, currentItem, other) => {
+  return products.map((item) => {
+    var _a, _b;
+    if (currentItem.isParallelResource) {
+      if (item._id === currentItem.serviceId) {
+        return {
+          ...item,
+          _extend: {
+            ...item._extend,
+            resource: {
+              ...(_a = item._extend) == null ? void 0 : _a.resource,
+              [currentItem.resourceId]: (_b = item._extend) == null ? void 0 : _b.resource[currentItem.resourceId].map((item2) => ({
+                ...item2,
+                like_status: other.like_status
+              }))
+            }
+          }
+        };
+      }
+      return item;
+    } else {
+      if (item._id === currentItem._id) {
+        return {
+          ...item,
+          _extend: {
+            ...item._extend,
+            like_status: other.like_status
+          }
+        };
+      }
+      return item;
+    }
+  });
+};
+var handleChangeResource = (products, currentItem, other, state) => {
+  return products.map((item) => {
+    var _a;
+    const { props, value } = other || {};
+    const { isParallelResource, resourceId } = props || {};
+    if (isParallelResource) {
+      if (item._id === currentItem._id) {
+        const hasDataItem = (0, import_utils6.getProductExtend)({
+          cacheItem: { ...item, new: 0 },
+          state
+        });
+        const maps = hasDataItem._extend.resource[resourceId] ? hasDataItem._extend.resource[resourceId].reduce((pre, cur) => {
+          pre[cur.relation_id] = cur;
+          return pre;
+        }, {}) : {};
+        item._extend.resource[resourceId] = value.map((d) => {
+          var _a2, _b, _c, _d, _e, _f, _g, _h, _i;
+          const currentForm = ((_a2 = hasDataItem._data.resourceMaps) == null ? void 0 : _a2[resourceId]) || {};
+          return (
+            // maps[d] 为真时, 说明是之前已选择, 否则为新增的值,补充数据
+            maps[d] || {
+              relation_type: ((_c = (_b = currentForm.renderListMaps[d]) == null ? void 0 : _b.usable) == null ? void 0 : _c.relation_type) || "form",
+              form_id: resourceId,
+              relation_id: d,
+              like_status: "common",
+              // 新添加的数据补充错误信息
+              errors: (0, import_utilsByBooking.getErrorList)(
+                (_d = currentForm.renderListMaps) == null ? void 0 : _d[d],
+                hasDataItem
+              ),
+              children: (_f = (_e = currentForm.renderListMaps) == null ? void 0 : _e[d]) == null ? void 0 : _f.children,
+              metadata: {
+                ...(_h = (_g = currentForm.renderListMaps) == null ? void 0 : _g[d]) == null ? void 0 : _h.metadata,
+                form_name: currentForm.title,
+                resource_name: (_i = currentForm.renderListMaps[d]) == null ? void 0 : _i.main_field
+              }
+            }
+          );
+        });
+      }
+      return item;
+    } else {
+      if (item._id === currentItem._id) {
+        const resourceItem = currentResource(state, other.id, item);
+        const { relation_type, item_id, schedule_id } = ((_a = resourceItem == null ? void 0 : resourceItem._extend) == null ? void 0 : _a.usableTime) || {};
+        return {
+          ...item,
+          _extend: {
+            ...item._extend,
+            resource: item_id || (resourceItem == null ? void 0 : resourceItem.form_record_id) || 0,
+            relation_type: relation_type || "form",
+            relation_id: item_id || (resourceItem == null ? void 0 : resourceItem.form_record_id) || 0,
+            schedule_id: schedule_id || 0
+          }
+        };
+      }
+      return item;
+    }
+  });
+};
+var updateServices = (state, currentItem, type, other, actions) => {
+  var _a, _b;
+  if (!((_a = state == null ? void 0 : state.service) == null ? void 0 : _a.value)) return [];
+  let products = ((_b = state == null ? void 0 : state.service) == null ? void 0 : _b.value) || [];
   const isGroup = (0, import_utils3.isGroupBooking)(currentItem._id);
   if (type === "delete") {
     let deleteIds = [];
@@ -165,10 +288,26 @@ var updateServices = (state, currentItem, type, other) => {
     products = products == null ? void 0 : products.filter((item) => !deleteIds.includes(item == null ? void 0 : item._id));
   }
   if (type === "delete_holders") {
-    products = products == null ? void 0 : products.filter((item) => {
-      var _a2;
-      return ((_a2 = item == null ? void 0 : item._extend) == null ? void 0 : _a2.holder_id) !== other;
-    });
+    products = products == null ? void 0 : products.filter(
+      (item) => {
+        var _a2;
+        return ((_a2 = item == null ? void 0 : item._extend) == null ? void 0 : _a2.holder_id) !== other;
+      }
+    );
+  }
+  if (type === "change_holder") {
+    products = handleChangeHolder(products, currentItem, other);
+  }
+  if (type === "add_holder") {
+    actions == null ? void 0 : actions.handleAddHolder();
+    return products;
+  }
+  if (type === "like") {
+    products = handleLike(products, currentItem, other);
+  }
+  if (type === "change_resource") {
+    products = handleChangeResource(products, currentItem, other, state);
+    return products;
   }
   if (type === "update_holders") {
     products = products == null ? void 0 : products.map((item) => {
@@ -177,7 +316,9 @@ var updateServices = (state, currentItem, type, other) => {
       if (ids == null ? void 0 : ids.includes(item == null ? void 0 : item._id)) {
         let _extend = item._extend || {};
         if (Array.isArray(other)) {
-          _extend.holder_id = (_a2 = other.find((other2) => (other2 == null ? void 0 : other2._id) === (item == null ? void 0 : item._id))) == null ? void 0 : _a2.holder_id;
+          _extend.holder_id = (_a2 = other.find(
+            (other2) => (other2 == null ? void 0 : other2._id) === (item == null ? void 0 : item._id)
+          )) == null ? void 0 : _a2.holder_id;
         } else {
           _extend.holder_id = other;
         }
@@ -251,7 +392,111 @@ var formItems = (items) => {
     };
   });
 };
-var formatProducts = (lists, state, isRenderGroup = true) => {
+var formatHolders = (items) => {
+  return items.map((d) => {
+    return {
+      id: d == null ? void 0 : d.form_record_id,
+      label: d == null ? void 0 : d.main_field
+    };
+  });
+};
+var getErrorMessageInfo2 = (errorList) => {
+  let errorMessage = "";
+  if (errorList == null ? void 0 : errorList.length) {
+    if (errorList.length === 1) {
+      errorMessage = errorList[0].label + " " + errorTypes[errorList[0].type];
+    } else {
+      errorMessage = `${errorList.length} ${import_utils2.locales.getText(
+        "pisell2.text.warnings"
+      )}`;
+    }
+  }
+  return errorMessage;
+};
+var getAllErrorList = (item) => {
+  const { resourceMaps } = item._data || {};
+  const { resource } = item._extend || {};
+  const errorList = [];
+  Object.entries(resource).forEach(([key, value]) => {
+    value.forEach((val) => {
+      var _a;
+      const list = (0, import_utilsByBooking.getErrorList)((_a = resourceMaps[key]) == null ? void 0 : _a.renderListMaps[val.relation_id], item);
+      errorList.push(...list);
+      console.log(list, "list");
+    });
+  });
+  return errorList;
+};
+var mapListItems = (items) => items.map((item) => ({
+  id: item.id || item.form_record_id,
+  label: item.labelText,
+  isError: !item.usable
+}));
+var getGeneralParams = (item, state, isParallelResource) => {
+  var _a, _b, _c, _d, _e;
+  const { pet, service } = state;
+  const { holders = [] } = pet || {};
+  const parallelResourceOtherParams = {};
+  let multiResources;
+  if (isParallelResource) {
+    const hasDataItem = (0, import_utils6.getProductExtend)({
+      cacheItem: { ...item, new: 0 },
+      state
+    });
+    const { resourceMaps, resources } = hasDataItem._data || {};
+    parallelResourceOtherParams.errorMessage = getErrorMessageInfo2(getAllErrorList(hasDataItem));
+    multiResources = resources.map((resource) => {
+      var _a2, _b2;
+      const key = resource.form_id;
+      const detail = resourceMaps == null ? void 0 : resourceMaps[key];
+      const isMultiple = ((_a2 = detail == null ? void 0 : detail.select_type) == null ? void 0 : _a2.type) === "multiple";
+      const value = item._extend.resource[key];
+      return {
+        is_hide_like: isMultiple,
+        isParallelResource: true,
+        maxLength: isMultiple && detail.select_type.max,
+        resourceMode: isMultiple ? "multiple" : void 0,
+        serviceId: item._id,
+        resourceId: key,
+        _id: key,
+        id: (value || []).map((val) => val.relation_id),
+        status: ((_b2 = value == null ? void 0 : value[0]) == null ? void 0 : _b2.like_status) || "common",
+        lists: (detail == null ? void 0 : detail.renderList) ? mapListItems(detail == null ? void 0 : detail.renderList) : []
+      };
+    });
+  } else {
+    const { resourcesOrigin } = service || {};
+    const resource = (0, import_utils5.formatResources)({
+      cacheItem: item,
+      resourcesOrigin,
+      isDay: false
+    });
+    multiResources = [
+      {
+        _id: item._id,
+        id: item._extend.resource,
+        status: ((_a = item._extend) == null ? void 0 : _a.like_status) || "common",
+        lists: mapListItems(resource)
+      }
+    ];
+  }
+  return {
+    format: ["HH:mm", "HH:mm"],
+    show_time: true,
+    duration_type: "minutes",
+    // 当前可选择holder列表
+    holders: formatHolders(holders),
+    isShowAction: (0, import_utils4.isShowAddTime)(state, item),
+    actionText: import_utils2.locales.getText("page.booking.text.add-time"),
+    isMultipleResource: true,
+    multiResources,
+    holder_id: (_b = item == null ? void 0 : item._extend) == null ? void 0 : _b.holder_id,
+    start_date: (_c = item == null ? void 0 : item._extend) == null ? void 0 : _c.startDate,
+    end_date: ((_d = item == null ? void 0 : item._extend) == null ? void 0 : _d.endDate) || ((_e = item == null ? void 0 : item._extend) == null ? void 0 : _e.end_date),
+    ...parallelResourceOtherParams
+  };
+};
+var formatProducts = (lists, state, isRenderGroup = true, isGeneral, isParallelResource) => {
   if (!(lists == null ? void 0 : lists.length)) return [];
   const normalList = [];
   const groupList = [];
@@ -264,10 +509,11 @@ var formatProducts = (lists, state, isRenderGroup = true) => {
     const isNormalProduct = !import_status.appointmentTypes.includes(item == null ? void 0 : item.extension_type) || (state == null ? void 0 : state.renderType) === "eventBooking";
     let resourceItem = {};
     let errorMessage = "";
-    if (_isDayBookingProduct) {
+    if (_isDayBookingProduct || isGeneral) {
       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) : {};
     return {
       id: item == null ? void 0 : item.id,
       _id: item == null ? void 0 : item._id,
@@ -295,6 +541,7 @@ var formatProducts = (lists, state, isRenderGroup = true) => {
       locale: state.locale,
       symbol: state.amountSymbol,
       items: isEventBooking(state) ? [] : formItems(((_r = item == null ? void 0 : item._extend) == null ? void 0 : _r.items) || []),
+      ...generalParams,
       _origin: item
     };
   };
@@ -315,6 +562,7 @@ var formatProducts = (lists, state, isRenderGroup = true) => {
     prev[groupId].push(item);
     return prev;
   }, {});
+  console.log(normalList, "normalList");
   if (isRenderGroup) {
     return Object.values(groups).map((d) => formItem((0, import_utils3.concatBookings)(d))).concat(normalList);
   } else {
@@ -363,7 +611,10 @@ var formatDayTime = ({ startDate, endDate }) => {
   const result = {
     startDateTime: (0, import_dayjs.default)(`${start_date}T${shopOpeningTime}:00`),
     // 结束日期根据营业日时间减去一分钟
-    endDateTime: (0, import_dayjs.default)(`${end_date}T${shopOpeningTime}:00`).subtract(1, "minute")
+    endDateTime: (0, import_dayjs.default)(`${end_date}T${shopOpeningTime}:00`).subtract(
+      1,
+      "minute"
+    )
   };
   return result;
 };
@@ -395,17 +646,21 @@ var isHasDayAppointmentProduct = (state) => {
     }
     return import_status.appointmentTypes.includes(extension_type);
   };
-  const appointmentServices = services.filter((d) => checkType(d.extension_type));
+  const appointmentServices = services.filter(
+    (d) => checkType(d.extension_type)
+  );
   if (!appointmentServices.length) return true;
   let _pets = pets == null ? void 0 : pets.map((d) => {
     return {
       ...d,
       // 如果该购物车中没选择任何商品，则不需要验证，所以直接用1来填充
       // services: !holderProducts?.length ? [1] : holderProducts?.filter((d: any) => appointmentTypes.includes(d.extension_type))
-      services: services.filter((item) => {
-        var _a2;
-        return ((_a2 = item._extend) == null ? void 0 : _a2.holder_id) == d.form_record_id && checkType(item.extension_type);
-      })
+      services: services.filter(
+        (item) => {
+          var _a2;
+          return ((_a2 = item._extend) == null ? void 0 : _a2.holder_id) == d.form_record_id && checkType(item.extension_type);
+        }
+      )
     };
   });
   _pets = _pets.filter((d) => !d.services.length);
@@ -414,12 +669,16 @@ var isHasDayAppointmentProduct = (state) => {
 var getDayProducts = (holderId2, lists, isTerminal) => {
   let _lists = lists || [];
   if (!holderId2 && !isTerminal) {
-    _lists = _lists.filter((item) => !import_status.appointmentTypes.includes(item == null ? void 0 : item.extension_type));
+    _lists = _lists.filter(
+      (item) => !import_status.appointmentTypes.includes(item == null ? void 0 : item.extension_type)
+    );
   } else {
-    _lists = _lists.filter((item) => {
-      var _a;
-      return !import_status.appointmentTypes.includes(item == null ? void 0 : item.extension_type) || import_status.appointmentTypes.includes(item == null ? void 0 : item.extension_type) && ((_a = item.duration) == null ? void 0 : _a.type) === "days";
-    });
+    _lists = _lists.filter(
+      (item) => {
+        var _a;
+        return !import_status.appointmentTypes.includes(item == null ? void 0 : item.extension_type) || import_status.appointmentTypes.includes(item == null ? void 0 : item.extension_type) && ((_a = item.duration) == null ? void 0 : _a.type) === "days";
+      }
+    );
   }
   return _lists;
 };
@@ -432,7 +691,9 @@ var getPets = (state) => {
 var getAppointmentService = (state) => {
   var _a;
   const services = ((_a = state.service) == null ? void 0 : _a.value) || [];
-  let lists = services.filter((item) => import_status.appointmentTypes.includes(item.extension_type));
+  let lists = services.filter(
+    (item) => import_status.appointmentTypes.includes(item.extension_type)
+  );
   return lists;
 };
 var isOpenDeletePet = (state, newVal) => {
@@ -440,15 +701,21 @@ var isOpenDeletePet = (state, newVal) => {
   const form_id = ((_d = (_c = (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.appointment_subject) == null ? void 0 : _d.form_id) || 0;
   const oldPets = ((_f = (_e = state == null ? void 0 : state.pet) == null ? void 0 : _e.value) == null ? void 0 : _f[form_id]) || [];
   const newPets = (newVal == null ? void 0 : newVal[form_id]) || [];
-  const deletePets = oldPets.filter((item) => !newPets.some((newItem) => newItem.form_record_id === item.form_record_id));
+  const deletePets = oldPets.filter(
+    (item) => !newPets.some(
+      (newItem) => newItem.form_record_id === item.form_record_id
+    )
+  );
   const servicePets = deletePets.map((item) => {
     var _a2, _b2;
     return {
       ...item,
-      services: (_b2 = (_a2 = state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.filter((d) => {
-        var _a3;
-        return ((_a3 = d._extend) == null ? void 0 : _a3.holder_id) == item.form_record_id;
-      })
+      services: (_b2 = (_a2 = state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.filter(
+        (d) => {
+          var _a3;
+          return ((_a3 = d._extend) == null ? void 0 : _a3.holder_id) == item.form_record_id;
+        }
+      )
     };
   });
   const lists = servicePets.filter((item) => {
@@ -573,14 +840,19 @@ var normalServicePrice = async (ids, state) => {
       const other = (_extend == null ? void 0 : _extend.other) || {};
       if (product) {
         if (((_a2 = product == null ? void 0 : product.variant) == null ? void 0 : _a2.length) && (other == null ? void 0 : other.product_variant_id)) {
-          const _variant = (_b2 = product == null ? void 0 : product.variant) == null ? void 0 : _b2.find((v) => v.id === (other == null ? void 0 : other.product_variant_id));
+          const _variant = (_b2 = product == null ? void 0 : product.variant) == null ? void 0 : _b2.find(
+            (v) => v.id === (other == null ? void 0 : other.product_variant_id)
+          );
           obj._extend.price = Number(_variant == null ? void 0 : _variant.price);
           obj._extend.other.price = Number(_variant == null ? void 0 : _variant.price);
         } else {
           obj._extend.price = Number(product == null ? void 0 : product.price);
         }
         if (((_c2 = other == null ? void 0 : other.bundle) == null ? void 0 : _c2.length) && ((_d2 = product == null ? void 0 : product.bundle_group) == null ? void 0 : _d2.length)) {
-          let _bundle = updateNormalBundlePrice(other.bundle, product == null ? void 0 : product.bundle_group);
+          let _bundle = updateNormalBundlePrice(
+            other.bundle,
+            product == null ? void 0 : product.bundle_group
+          );
           obj._extend.other = {
             ...other,
             bundle: _bundle
@@ -646,7 +918,9 @@ var updateServicePrice = (state) => {
   let normalServices = services == null ? void 0 : services.filter(
     (item) => isEventBooking(state) ? true : !import_status.appointmentTypes.includes(item.extension_type)
   );
-  let newNormalIds = normalServices == null ? void 0 : normalServices.map((item) => (item == null ? void 0 : item.product_id) || (item == null ? void 0 : item.id));
+  let newNormalIds = normalServices == null ? void 0 : normalServices.map(
+    (item) => (item == null ? void 0 : item.product_id) || (item == null ? void 0 : item.id)
+  );
   newNormalIds = [...new Set(newNormalIds)];
   if (newNormalIds == null ? void 0 : newNormalIds.length) {
     return normalServicePrice(newNormalIds, state);

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

@@ -41,4 +41,6 @@ export declare const getMultiDayPrices: (data: DataEntry[]) => ResultStructure;
  * @Date: 2024-11-29 11:19
  */
 export declare const isDayBooking: (shopId: number) => boolean;
+export declare const isOpenAddTime: (state: any) => boolean;
+export declare const isShowAddTime: (state: any, currentService: any) => boolean;
 export {};

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

@@ -35,11 +35,15 @@ __export(utils_exports, {
   isBooking4Shop: () => isBooking4Shop,
   isDayBooking: () => isDayBooking,
   isInterval: () => isInterval,
+  isOpenAddTime: () => isOpenAddTime,
+  isShowAddTime: () => isShowAddTime,
   moveItemToFront: () => moveItemToFront,
   uniqueByField: () => uniqueByField
 });
 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 getIsBundleOrCombination = (productDetail) => {
   var _a;
   if ((_a = productDetail == null ? void 0 : productDetail.bundle_group) == null ? void 0 : _a.length) {
@@ -99,7 +103,7 @@ var isBooking4Shop = (shopId, renderType) => {
   if (renderType === "eventBooking") {
     return false;
   }
-  const booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581];
+  const booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9];
   return booking4Shops.includes(shopId);
 };
 function generateDateRange(start, end) {
@@ -125,6 +129,39 @@ var isDayBooking = (shopId) => {
   const dayBookingShops = [9];
   return dayBookingShops.includes(shopId);
 };
+var getAddTimeProducts = (state, currentService) => {
+  return (state.addTimeProducts || []).some(
+    (item) => (0, import_utils2.isUsableProduct)(item.add_time, currentService)
+  );
+};
+var isOpenAddTime = (state) => {
+  var _a, _b, _c;
+  const appointment_card = ((_c = (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.information_tab) == null ? void 0 : _c.appointment_card) || {
+    quick_time: 1
+  };
+  if ((state == null ? void 0 : state.renderType) === "eventBooking") {
+    return false;
+  }
+  if (state == null ? void 0 : state.disabledEdit) {
+    return false;
+  }
+  if (appointment_card.quick_time !== 1) {
+    return false;
+  }
+  return true;
+};
+var isShowAddTime = (state, currentService) => {
+  if (!isOpenAddTime(state)) {
+    return false;
+  }
+  if ((0, import_utils.getIsEdit)(state)) {
+    return false;
+  }
+  if (!getAddTimeProducts(state, currentService)) {
+    return false;
+  }
+  return true;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   formatServiceListByTime,
@@ -133,6 +170,8 @@ var isDayBooking = (shopId) => {
   isBooking4Shop,
   isDayBooking,
   isInterval,
+  isOpenAddTime,
+  isShowAddTime,
   moveItemToFront,
   uniqueByField
 });

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

@@ -74,6 +74,8 @@ var Info = (0, import_model.Provider)((props) => {
     var _a2, _b2, _c2, _d2;
     return ((_d2 = (_c2 = (_b2 = (_a2 = modal.state) == null ? void 0 : _a2.bookingConfig) == null ? void 0 : _b2.config) == null ? void 0 : _c2.basic) == null ? void 0 : _d2.appointment_subject) || {};
   }, [(_d = (_c = (_b = (_a = modal.state) == null ? void 0 : _a.bookingConfig) == null ? void 0 : _b.config) == null ? void 0 : _c.basic) == null ? void 0 : _d.appointment_subject]);
+  const stateRef = (0, import_react.useRef)(globalState);
+  stateRef.current = globalState;
   const { createHeader, isBookingCreatePage, isBookingCreatePageCreateMode } = (0, import_useCreateBookingPageHeader.default)(globalState);
   (0, import_react.useEffect)(() => {
     document.body.id = "body";
@@ -153,6 +155,7 @@ var Info = (0, import_model.Provider)((props) => {
         modal.dispatch({
           type: "setService",
           payload: {
+            ...stateRef.current.service,
             resourcesOrigin: bookingResourceList.list || [],
             resourcesOriginMap: bookingResourceList.listMap
           }
@@ -161,14 +164,16 @@ var Info = (0, import_model.Provider)((props) => {
     }
     try {
       setTimeout(async () => {
+        var _a2;
         let data = await (0, import_serve.getResourceList)({
           date: currentDate
-        });
+        }, (_a2 = stateRef == null ? void 0 : stateRef.current) == null ? void 0 : _a2.bookingId);
         data.date = currentDate;
         localStorage.setItem("bookingResourceList", JSON.stringify(data));
         modal.dispatch({
           type: "setService",
           payload: {
+            ...stateRef.current.service,
             resourcesOrigin: data.list || [],
             resourcesOriginMap: data.listMap
           }

package/lib/components/booking/info2/serve.d.ts

@@ -1,5 +1,5 @@
-export declare const getResourceList: (params: any) => Promise<{
-    list: any;
+export declare const getResourceList: (params: any, bookingId?: number) => Promise<{
+    list: any[];
     listMap: any;
 }>;
 export declare const createBookings: (params: any) => Promise<any>;

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

@@ -25,17 +25,10 @@ __export(serve_exports, {
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../utils");
-var import_mock = require("../mock");
-var getResourceList = async (params) => {
+var import_utils2 = require("./utils");
+var getResourceList = async (params, bookingId) => {
   let { data } = await import_utils.request.getRequest().get(`/shop/schedule/resource/list`, params);
-  const resourceList = (data || {}).concat([(0, import_mock.getNoResource2)({})]);
-  return {
-    list: resourceList,
-    listMap: resourceList.reduce((prev, item) => {
-      prev[item.id] = item;
-      return prev;
-    }, {})
-  };
+  return (0, import_utils2.getFormatResourceListAndMap)(data, bookingId);
 };
 var createBookings = async (params) => {
   let { data } = await import_utils.request.getRequest().post(`/shop/v1.1/order/appointment`, params);

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

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

package/lib/components/booking/info2/service/addService/index.js

@@ -138,8 +138,8 @@ var Info = (props) => {
     let data = await state.apis.getServices({
       skip: 1,
       num: 500,
-      extension_type: state.renderType === "eventBooking" ? void 0 : ["product_appointment", "appointment_ticket", "service_product"],
-      with: ["category"],
+      extension_type: state.renderType === "eventBooking" ? void 0 : ["product_appointment", "appointment_ticket", "service_product", "session_product", "session_ticket"],
+      with: ["category", "resourceRelation"],
       ids: state.renderType === "eventBooking" ? (_c2 = state.eventOtherParams) == null ? void 0 : _c2.productIds : void 0,
       open_quotation: 1,
       with_schedule: 1,
@@ -178,7 +178,8 @@ var Info = (props) => {
     }
   };
   const handleSelectProduct = (item, type) => {
-    const isEject = type === "detail" || item.bundle_group_count > 0;
+    const isSession = (0, import_utils3.isSessionProduct)(item);
+    const isEject = type === "detail" || item.bundle_group_count > 0 || isSession;
     let lock = false;
     state.action({
       type: "pisell1.handleOpenProductModal",
@@ -187,11 +188,12 @@ var Info = (props) => {
         date: state.date.value.format("YYYY-MM-DD"),
         showConfig: {
           option: false,
-          session: false,
+          session: isSession,
           variant: false,
           package: true
         },
-        is_eject: isEject ? 1 : 0
+        is_eject: isEject ? 1 : 0,
+        isOS: isSession
       },
       callback: (e, extension_type, detail) => {
         var _a2;
@@ -203,6 +205,8 @@ var Info = (props) => {
           lock = false;
         }, 2e3);
         const _detail = detail || item;
+        const other = JSON.parse(JSON.stringify(e));
+        other.session = e.session;
         let cacheItem = {
           ..._detail,
           product_id: item.id,
@@ -213,7 +217,7 @@ var Info = (props) => {
             quantity: 1,
             price: _detail.price,
             product_name: item.title,
-            other: JSON.parse(JSON.stringify(e))
+            other
           },
           new: 1
         };
@@ -312,6 +316,7 @@ var Info = (props) => {
     if (state.isBookingCreatePage) {
       return /* @__PURE__ */ import_react.default.createElement("div", { style: { height: 20 } });
     }
+    return null;
     if (state.renderType === "eventBooking") {
       return isService ? /* @__PURE__ */ import_react.default.createElement("div", { style: { height: 20 } }) : /* @__PURE__ */ import_react.default.createElement(
         import_addButton.default,