@pisell/private-materials 6.4.71 → 6.4.72

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

@@ -35,7 +35,8 @@ __export(utils_exports, {
   formatProductBundle: () => formatProductBundle,
   formatProductOption: () => formatProductOption,
   formatProductPrice: () => formatProductPrice,
-  formatValues: () => formatValues
+  formatValues: () => formatValues,
+  getHasMultiDayProduct: () => getHasMultiDayProduct
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
@@ -351,6 +352,14 @@ var getHolderByIndex = (holder, index) => {
     form_record: [(_a = holder == null ? void 0 : holder.form_record) == null ? void 0 : _a[index]].filter(Boolean)
   };
 };
+var getHasMultiDayProduct = (data) => {
+  const list = data.service.value;
+  const isHas = list.some((item) => {
+    var _a;
+    return (_a = item._extend) == null ? void 0 : _a.groupId;
+  });
+  return isHas;
+};
 var formatBookings = (data, values) => {
   const isDay = (0, import_utils4.isDaysBooking)(data);
   const isEvent = (0, import_utils4.isEventBooking)(data);
@@ -371,7 +380,7 @@ var formatBookings = (data, values) => {
   const eventOtherParams = data.eventOtherParams;
   let bookings = [];
   list.forEach((item) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     if (item.isCustomItem) {
       bookings.push({
         ...item._extend,
@@ -380,6 +389,7 @@ var formatBookings = (data, values) => {
       });
       return;
     }
+    const isMultiDay = (_a = item._extend) == null ? void 0 : _a.groupId;
     let start_date = item._extend.startDate.format("YYYY-MM-DD");
     let end_date = item._extend.endDate.format("YYYY-MM-DD");
     let end_time = item._extend.endDate.format("HH:mm");
@@ -389,8 +399,8 @@ var formatBookings = (data, values) => {
     }
     dayParams.holder = formatHolders(data, item, values);
     if (isDay) {
-      const startDate = ((_a = item._extend) == null ? void 0 : _a.startDate) || ((_b = item._extend) == null ? void 0 : _b.start_date);
-      const endDate = ((_c = item._extend) == null ? void 0 : _c.endDate) || ((_d = item._extend) == null ? void 0 : _d.end_date);
+      const startDate = ((_b = item._extend) == null ? void 0 : _b.startDate) || ((_c = item._extend) == null ? void 0 : _c.start_date);
+      const endDate = ((_d = item._extend) == null ? void 0 : _d.endDate) || ((_e = item._extend) == null ? void 0 : _e.end_date);
       const { startDateTime, endDateTime } = (0, import_utils4.formatDayTime)({
         startDate,
         endDate
@@ -406,7 +416,7 @@ var formatBookings = (data, values) => {
         "minutes"
       );
     }
-    if (!((_e = item._extend) == null ? void 0 : _e.unique_identification_number)) {
+    if (!((_f = item._extend) == null ? void 0 : _f.unique_identification_number)) {
       const unique_identification_number = (0, import_utils5.getUniqueId)();
       item._extend.unique_identification_number = unique_identification_number;
     }
@@ -426,14 +436,14 @@ var formatBookings = (data, values) => {
       start_time,
       end_date,
       start_date,
-      duration: isDay ? 0 : import_utils.flexibleObj.getValue(item._extend.duration),
+      duration: isDay || isMultiDay ? 0 : import_utils.flexibleObj.getValue(item._extend.duration),
       number: item._extend.capacity ? (0, import_utilsByBooking.getSumCapacity)({ cacheItem: item }) : item._extend.number || 1,
       resources: formatResource(item),
       note: item._extend.note,
       ...eventOtherParams || {},
       ...dayParams
     };
-    if (isDay) {
+    if (isDay || isMultiDay) {
       bookings.push(booking);
       return;
     }
@@ -521,6 +531,7 @@ var formatValues = (state) => {
     metadata: {}
   };
   const isDay = (0, import_utils4.isDaysBooking)(state);
+  const isHasMultiDay = getHasMultiDayProduct(state);
   const isEvent = (0, import_utils4.isEventBooking)(state);
   if (!state.bookingId || isDay) {
     values.shop_note = formatNote(state);
@@ -538,10 +549,10 @@ var formatValues = (state) => {
     ...customer
   };
   values.holder = formatHolder(state, values);
-  if (isDay || isEvent) {
+  if (isEvent) {
     values.relation_products = formatRelationProducts(
       state,
-      isDay ? "day" : "event"
+      "event"
     );
   } else {
     values.relation_products = formatNormalProducts(state);
@@ -555,7 +566,7 @@ var formatValues = (state) => {
     startTime = `${startTime || "00:00"}:00`;
     values.schedule_date = `${values.bookings[0].select_date} ${startTime}`;
   }
-  if (isDay) {
+  if (isDay || isHasMultiDay) {
     values.metadata.is_multiday_appointment = 1;
   }
   if (!((_g = values == null ? void 0 : values.bookings) == null ? void 0 : _g.length)) {
@@ -607,5 +618,6 @@ var checkHolderIsError = (state) => {
   formatProductBundle,
   formatProductOption,
   formatProductPrice,
-  formatValues
+  formatValues,
+  getHasMultiDayProduct
 });

package/lib/components/booking/forms/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/forms/sendModal/useSendModal.d.ts

@@ -4,6 +4,6 @@ declare const useSendModal: (bookingId?: number) => {
     setOpen: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     handleOpen: () => void;
     handleValuesChange: (val: any) => void;
-    handleOk: (values: SendModalValues) => Promise<boolean | undefined>;
+    handleOk: (values: SendModalValues) => Promise<any>;
 };
 export default useSendModal;

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

@@ -40,6 +40,7 @@ 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 = {};
@@ -70,15 +71,19 @@ 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;
-    const newProduct = newProducts.find((newItem2) => newItem2.id === item.product_id);
+    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
+    );
     if (!newProduct) {
       return item;
     }
     let isChangePrice = newProduct.price != item.price;
     const bundleItemMap = formatBundleItemMap(newProduct);
-    const newBundle = (((_b = (_a = item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) || []).map((bundle) => {
+    const newBundle = (((_c = (_b = item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.bundle) || []).map((bundle) => {
       if (!bundleItemMap[bundle.id]) {
         isNotFoundBundle = true;
         if (!notFoundProducts.some((p) => p._id === bundle._id)) {
@@ -102,6 +107,24 @@ 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 {
@@ -119,7 +142,7 @@ var setNewCartValue = (cartValue, newProducts) => {
         bundle_edit: isBundleChange ? 1 : item._extend.bundle_edit,
         other: {
           ...item._extend.other,
-          option: (_d = (_c = item._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.option,
+          option: (_f = (_e = item._extend) == null ? void 0 : _e.other) == null ? void 0 : _f.option,
           bundle: newBundle
         }
       }
@@ -145,22 +168,31 @@ var useQuotation = (state, dispatch) => {
   cartValueRef.current = state.service.value;
   const getCartQuotation = async (params) => {
     if (!cartValueRef.current.length) return;
-    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
+    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
     });
-    return data;
+    return data.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 == null ? void 0 : data.data)) return;
-    const { isChange, value: newCartValue, isNotFoundBundle, notFoundProducts } = setNewCartValue(cartValueRef.current, data.data);
+    if (!data || !data.length) return;
+    const { isChange, value: newCartValue, isNotFoundBundle, notFoundProducts } = setNewCartValue(cartValueRef.current, data);
     if (isNotFoundBundle) {
       setProducts(notFoundProducts);
       setOpen(true);

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

@@ -1,14 +1,5 @@
-/// <reference types="react" />
-import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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

@@ -109,7 +109,7 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
     const p = (0, import_utils.formatProducts)(
       ((_a2 = state == null ? void 0 : state.service) == null ? void 0 : _a2.value) || [],
       state,
-      false,
+      true,
       true,
       isParallelResource
     );

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

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

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

@@ -18,3 +18,17 @@ 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,6 +19,7 @@ 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
@@ -30,8 +31,12 @@ var postMultiDay = async (id, params) => import_utils.request.getRequest().post(
   useCache: true
 });
 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,6 +31,7 @@ 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;
@@ -98,6 +99,7 @@ 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,39 +67,7 @@ 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) => {
-    _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[];
-}[];
+export declare const formatProducts: (lists: any[], state: any, isRenderGroup?: boolean, isGeneral?: boolean, isParallelResource?: boolean) => any[];
 /**
  * @title: 禁用日期
  * @description:

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

@@ -518,10 +518,11 @@ 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: "minutes",
+    duration_type: isMultiDay ? "days" : "minutes",
     // 当前可选择holder列表
     holders: formatHolders(holders),
     isShowChangeHolder: !isNormalProduct,
@@ -546,8 +547,6 @@ 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);
@@ -600,17 +599,23 @@ var formatProducts = (lists, state, isRenderGroup = true, isGeneral, isParallelR
       _origin: item
     };
   };
-  console.log(normalList, "normalList");
   if (isRenderGroup) {
-    lists.forEach((item) => {
-      var _a;
+    const normalItemsWithIndex = [];
+    const groupItemsWithIndex = [];
+    const groupFirstIndexMap = {};
+    lists.forEach((item, index) => {
+      var _a, _b;
       if (!((_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.groupId)) {
-        normalList.push(formItem(item));
+        normalItemsWithIndex.push({ item, index });
       } else {
-        groupList.push(item);
+        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;
+        }
       }
     });
-    let groups = groupList.reduce((prev, item) => {
+    const groups = groupItemsWithIndex.reduce((prev, { item }) => {
       var _a;
       const groupId = (_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.groupId;
       if (!prev[groupId]) {
@@ -619,7 +624,16 @@ var formatProducts = (lists, state, isRenderGroup = true, isGeneral, isParallelR
       prev[groupId].push(item);
       return prev;
     }, {});
-    return Object.values(groups).map((d) => formItem((0, import_utils3.concatBookings)(d))).concat(normalList);
+    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);
   } else {
     return lists == null ? void 0 : lists.map((item) => formItem(item));
   }

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

@@ -45,6 +45,7 @@ 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) {
@@ -195,6 +196,9 @@ 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,6 +49,7 @@ 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,
@@ -223,7 +224,7 @@ var Info = (props) => {
         isOS: isSession,
         customer_id: (_c2 = (_b2 = state.client) == null ? void 0 : _b2.value) == null ? void 0 : _c2.id
       },
-      callback: (e, extension_type, detail) => {
+      callback: async (e, extension_type, detail) => {
         var _a3, _b3;
         if (lock) {
           return;
@@ -249,7 +250,10 @@ var Info = (props) => {
           },
           new: 1
         };
-        console.log(cacheItem, "cacheItem", e);
+        const isMultiDay = (0, import_utils2.isMultiDayProduct)(cacheItem);
+        if (isMultiDay) {
+          cacheItem._extend.end_date = state.date.value.add(1, "day");
+        }
         let _total = (0, import_utils3.getProductTotalPrice)(cacheItem);
         cacheItem._extend.total = _total;
         cacheItem._extend.origin_total = _total;
@@ -262,7 +266,19 @@ var Info = (props) => {
           cacheItem.currentDefaultTime = state.date.value.format("HH:mm");
         }
         cacheItem = (0, import_utils2.getProductExtend)({ cacheItem, state });
-        if (state.renderType === "eventBooking") {
+        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) {
           cacheItem.autoClose = false;
         }
         if (cacheItem.autoClose) {
@@ -289,6 +305,9 @@ 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

@@ -7,7 +7,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;
@@ -79,6 +79,14 @@ 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: