@pisell/private-materials 6.4.72 → 6.4.74

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

@@ -518,11 +518,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,
@@ -547,6 +546,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);
@@ -599,23 +600,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]) {
@@ -624,16 +619,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;
   }

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

@@ -49,7 +49,6 @@ var import_utils4 = require("@pisell/utils");
 var import_ahooks = require("ahooks");
 var import_utils5 = require("../../../info/service2/utils");
 var import_utils6 = require("../../../../ticketBooking/utils");
-var import_utils7 = require("../../../info/service2/Group/utils");
 var shopList = [
   2886,
   4422,
@@ -224,7 +223,7 @@ var Info = (props) => {
         isOS: isSession,
         customer_id: (_c2 = (_b2 = state.client) == null ? void 0 : _b2.value) == null ? void 0 : _c2.id
       },
-      callback: async (e, extension_type, detail) => {
+      callback: (e, extension_type, detail) => {
         var _a3, _b3;
         if (lock) {
           return;
@@ -250,10 +249,7 @@ var Info = (props) => {
           },
           new: 1
         };
-        const isMultiDay = (0, import_utils2.isMultiDayProduct)(cacheItem);
-        if (isMultiDay) {
-          cacheItem._extend.end_date = state.date.value.add(1, "day");
-        }
+        console.log(cacheItem, "cacheItem", e);
         let _total = (0, import_utils3.getProductTotalPrice)(cacheItem);
         cacheItem._extend.total = _total;
         cacheItem._extend.origin_total = _total;
@@ -266,19 +262,7 @@ var Info = (props) => {
           cacheItem.currentDefaultTime = state.date.value.format("HH:mm");
         }
         cacheItem = (0, import_utils2.getProductExtend)({ cacheItem, state });
-        const getMultiDayCacheItem = async (isConcatBookings) => {
-          cacheItem = await (0, import_utils2.getMultiDay)({
-            start_date: cacheItem._extend.start_date,
-            end_date: cacheItem._extend.end_date,
-            state,
-            cacheItem
-          });
-          cacheItem = (0, import_utils7.createBookingItemsByGroup)(cacheItem);
-          if (isConcatBookings) {
-            cacheItem = (0, import_utils7.concatBookings)(cacheItem);
-          }
-        };
-        if (state.renderType === "eventBooking" || isMultiDay) {
+        if (state.renderType === "eventBooking") {
           cacheItem.autoClose = false;
         }
         if (cacheItem.autoClose) {
@@ -305,9 +289,6 @@ var Info = (props) => {
           });
         } else {
           (_b3 = window.openBookingEditModal) == null ? void 0 : _b3.call(window);
-          if (isMultiDay) {
-            await getMultiDayCacheItem(true);
-          }
           dispatch({
             type: "setService",
             payload: {

package/lib/components/booking/info2/service/addService/utils.d.ts

@@ -79,14 +79,6 @@ export declare const setDefaultCapacitys: ({ capacitys, cacheItem }: any) => any
  * @Date: 2024-09-19 20:23
  */
 export declare const getResourceByIds: (resourcesOriginMap: any, cacheItem: any, extraParams?: any) => any[];
-/**
- * @title: 是否是跨日商品
- * @description:
- * @param {any} cacheItem
- * @return {*}
- */
-export declare const isMultiDayProduct: (product: any) => boolean;
-export declare const getMultiDay: ({ start_date, end_date, state, cacheItem, }: any) => Promise<any>;
 /**
  * @title: 预生成服务的 extend
  * @description:

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

@@ -32,13 +32,11 @@ __export(utils_exports, {
   formatResources: () => formatResources,
   getDurationProps: () => getDurationProps,
   getFlexibleOption: () => getFlexibleOption,
-  getMultiDay: () => getMultiDay,
   getProductExtend: () => getProductExtend,
   getResourceByIds: () => getResourceByIds,
   getTimeObj: () => getTimeObj,
   getTimeSlices: () => getTimeSlices,
   getUsableTime: () => getUsableTime,
-  isMultiDayProduct: () => isMultiDayProduct,
   setDefaultCapacitys: () => setDefaultCapacitys,
   setDefaultResource: () => setDefaultResource,
   transServiceList: () => transServiceList
@@ -53,8 +51,6 @@ var import_AlertTriangle = __toESM(require("@pisell/icon/es/AlertTriangle"));
 var import_utils3 = require("../editService/utils");
 var import_mock = require("../../../mock");
 var import_lodash = require("lodash");
-var import_utils4 = require("../../../info/service2/utils");
-var import_utils5 = require("../../../info/utils");
 var getUsableTime = (cacheItem) => {
   try {
     let items = [];
@@ -142,7 +138,6 @@ var getTimeObj = ({
   durationProps
 }) => {
   var _a, _b, _c;
-  const isMultiDay = isMultiDayProduct(cacheItem);
   const flexibleOption = getFlexibleOption({
     cacheItem,
     useStartTime,
@@ -153,8 +148,7 @@ var getTimeObj = ({
   });
   let obj = (0, import_utils.sliceDayIntoFiveMinutes)(
     (_c = (_b = (_a = state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.service_time,
-    import_utils2.locales.locale,
-    isMultiDay
+    import_utils2.locales.locale
   );
   let timeSlices = [...obj.timeSlices];
   let durationSlicesBasedOnTime = [...obj.durationSlicesBasedOnTime];
@@ -163,7 +157,7 @@ var getTimeObj = ({
   }
   if (useDuration && !durationSlicesBasedOnTime.some((d) => d.value === useDuration)) {
     durationSlicesBasedOnTime.unshift({
-      label: (0, import_utils.getDiscountTime)(useDuration, isMultiDay),
+      label: (0, import_utils.getDiscountTime)(useDuration),
       value: useDuration,
       //@ts-ignore
       disabled: true
@@ -401,44 +395,12 @@ var getIsAutoClose = (cacheItem) => {
     }
   );
 };
-var isMultiDayProduct = (product) => {
-  var _a;
-  return ((_a = product == null ? void 0 : product.duration) == null ? void 0 : _a.type) === "days";
-};
-var getMultiDay = async ({
-  start_date,
-  end_date,
-  state,
-  cacheItem
-}) => {
-  let _cacheItem = cacheItem || state.service.cacheItem;
-  if (isMultiDayProduct(_cacheItem)) {
-    const { multiDayPrices, price } = await (0, import_utils4.updateAppointmentServicePrice)(
-      state,
-      {
-        start_date,
-        end_date,
-        product_id: _cacheItem.product_id
-      }
-    );
-    _cacheItem._extend.multiDayPrices = (0, import_utils5.getMultiDayPrices)(multiDayPrices || []);
-    if (!(multiDayPrices == null ? void 0 : multiDayPrices.length)) {
-      _cacheItem._extend.price = price;
-    }
-    return _cacheItem;
-  }
-  return _cacheItem;
-};
 var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d, _e, _f, _g;
   const isNew = cacheItem.new || !cacheItem._extend.endDate;
   let _cacheItem = { ...cacheItem };
   const resourcesOriginMap = state.service.resourcesOriginMap || {};
   _cacheItem._data = {};
-  if (isMultiDayProduct(cacheItem)) {
-    _cacheItem._extend.holder_id = ((_a = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _a.holder_id) || [];
-    _cacheItem._extend.sub_type = "days";
-  }
   if (isNew) {
     _cacheItem._data.timeObj = getTimeObj({
       cacheItem,
@@ -456,7 +418,7 @@ var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
       cacheItem,
       {
         //  此数据用来控制 该商品所展示的资源是自身关联的,  还是全部的
-        resourceTab: (_c = (_b = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _b.config) == null ? void 0 : _c.resource_tab,
+        resourceTab: (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.resource_tab,
         resourcesOrigin: state.service.resourcesOrigin
       }
     );
@@ -482,8 +444,10 @@ var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
         state
       });
       if ((0, import_utils.getDuration)(_cacheItem == null ? void 0 : _cacheItem.duration) === "flexible") {
-        _cacheItem._extend.duration = (_f = (_e = (_d = _cacheItem._data.timeObj) == null ? void 0 : _d.durationSlicesBasedOnTime) == null ? void 0 : _e[0]) == null ? void 0 : _f.value;
-        const { startDate, endDate } = (0, import_utils.getServiceTimes)(_cacheItem);
+        _cacheItem._extend.duration = (_e = (_d = (_c = _cacheItem._data.timeObj) == null ? void 0 : _c.durationSlicesBasedOnTime) == null ? void 0 : _d[0]) == null ? void 0 : _e.value;
+        const { startDate, endDate } = (0, import_utils.getServiceTimes)({
+          _extend: _cacheItem._extend
+        });
         _cacheItem._extend.endDate = endDate;
       }
     }
@@ -514,7 +478,7 @@ var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
         {
           extraResources,
           //  此数据用来控制 该商品所展示的资源是自身关联的,  还是全部的
-          resourceTab: (_h = (_g = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _g.config) == null ? void 0 : _h.resource_tab,
+          resourceTab: (_g = (_f = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _f.config) == null ? void 0 : _g.resource_tab,
           resourcesOrigin: state.service.resourcesOrigin
         }
       );
@@ -554,13 +518,11 @@ var transServiceList = (list) => {
   formatResources,
   getDurationProps,
   getFlexibleOption,
-  getMultiDay,
   getProductExtend,
   getResourceByIds,
   getTimeObj,
   getTimeSlices,
   getUsableTime,
-  isMultiDayProduct,
   setDefaultCapacitys,
   setDefaultResource,
   transServiceList