@pisell/private-materials 6.4.72 → 6.4.74

package/lib/components/authentication/admin/index.d.ts

@@ -0,0 +1,26 @@
+export type { AuthMethodsProps, AuthMethod } from './AuthMethods';
+export { AuthMethodType, AuthMethodCategory } from './AuthMethods';
+export { default as ChannelAuthSetting } from './ChannelAuthSetting';
+export type { ChannelAuthSettingProps, ChannelAuthSettingValue, TabKey } from './ChannelAuthSetting';
+export { default as PageSetting } from './ChannelAuthSetting/PageSetting';
+export { default as PageSettingItem } from './ChannelAuthSetting/PageSettingItem';
+export { default as AuthenticationMethods } from './ChannelAuthSetting/AuthenticationMethods';
+export { default as CollectInfo } from './ChannelAuthSetting/CollectInfo';
+export type { PageSettingProps, PageSettingValue, } from './ChannelAuthSetting/PageSetting/types';
+export type { PageSettingItemProps, PageSettingItemValue, TermsCondition, TranslationValue as PageTranslationValue, } from './ChannelAuthSetting/PageSettingItem/types';
+export type { AuthenticationMethodsProps, AuthenticationMethodsValue, GlobalAuthMethod, AuthenticationMethod, AuthenticationSettingsMode, } from './ChannelAuthSetting/AuthenticationMethods/types';
+export type { CollectInfoProps, CollectInfoValue, AccountField, CustomerFormItem, TranslationValue as CollectInfoTranslationValue, } from './ChannelAuthSetting/CollectInfo/types';
+export type { SaaSAdminAuthProps } from './SaaSAdminAuth';
+export type { OrgAdminAuthProps } from './OrgAdminAuth';
+export type { DeviceAuthProps } from './DeviceAuth';
+export type { POSOperatorAuthProps } from './POSOperatorAuth';
+export type { CustomerOAuthConfigProps } from './CustomerOAuthConfig';
+export { default as SaaSAdminAuth } from './SaaSAdminAuth';
+export { default as OrgAdminAuth } from './OrgAdminAuth';
+export { default as OAuthConfig } from './OAuthConfig';
+export { default as CustomerAuth } from './CustomerAuth';
+export { default as CustomerOAuthConfig } from './CustomerOAuthConfig';
+export { default as DeviceAuth } from './DeviceAuth';
+export { default as POSOperatorAuth } from './POSOperatorAuth';
+export { default as OnlineShopAuth } from './ChannelAuthSetting/OnlineShopAuth';
+export { default as SaaSManagermentAuth } from './ChannelAuthSetting/SaaSManagermentAuth';

package/lib/components/authentication/admin/index.js

@@ -0,0 +1,83 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/authentication/admin/index.ts
+var admin_exports = {};
+__export(admin_exports, {
+  AuthMethodCategory: () => import_AuthMethods.AuthMethodCategory,
+  AuthMethodType: () => import_AuthMethods.AuthMethodType,
+  AuthenticationMethods: () => import_AuthenticationMethods.default,
+  ChannelAuthSetting: () => import_ChannelAuthSetting.default,
+  CollectInfo: () => import_CollectInfo.default,
+  CustomerAuth: () => import_CustomerAuth.default,
+  CustomerOAuthConfig: () => import_CustomerOAuthConfig.default,
+  DeviceAuth: () => import_DeviceAuth.default,
+  OAuthConfig: () => import_OAuthConfig.default,
+  OnlineShopAuth: () => import_OnlineShopAuth.default,
+  OrgAdminAuth: () => import_OrgAdminAuth.default,
+  POSOperatorAuth: () => import_POSOperatorAuth.default,
+  PageSetting: () => import_PageSetting.default,
+  PageSettingItem: () => import_PageSettingItem.default,
+  SaaSAdminAuth: () => import_SaaSAdminAuth.default,
+  SaaSManagermentAuth: () => import_SaaSManagermentAuth.default
+});
+module.exports = __toCommonJS(admin_exports);
+var import_AuthMethods = require("./AuthMethods");
+var import_ChannelAuthSetting = __toESM(require("./ChannelAuthSetting"));
+var import_PageSetting = __toESM(require("./ChannelAuthSetting/PageSetting"));
+var import_PageSettingItem = __toESM(require("./ChannelAuthSetting/PageSettingItem"));
+var import_AuthenticationMethods = __toESM(require("./ChannelAuthSetting/AuthenticationMethods"));
+var import_CollectInfo = __toESM(require("./ChannelAuthSetting/CollectInfo"));
+var import_SaaSAdminAuth = __toESM(require("./SaaSAdminAuth"));
+var import_OrgAdminAuth = __toESM(require("./OrgAdminAuth"));
+var import_OAuthConfig = __toESM(require("./OAuthConfig"));
+var import_CustomerAuth = __toESM(require("./CustomerAuth"));
+var import_CustomerOAuthConfig = __toESM(require("./CustomerOAuthConfig"));
+var import_DeviceAuth = __toESM(require("./DeviceAuth"));
+var import_POSOperatorAuth = __toESM(require("./POSOperatorAuth"));
+var import_OnlineShopAuth = __toESM(require("./ChannelAuthSetting/OnlineShopAuth"));
+var import_SaaSManagermentAuth = __toESM(require("./ChannelAuthSetting/SaaSManagermentAuth"));
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  AuthMethodCategory,
+  AuthMethodType,
+  AuthenticationMethods,
+  ChannelAuthSetting,
+  CollectInfo,
+  CustomerAuth,
+  CustomerOAuthConfig,
+  DeviceAuth,
+  OAuthConfig,
+  OnlineShopAuth,
+  OrgAdminAuth,
+  POSOperatorAuth,
+  PageSetting,
+  PageSettingItem,
+  SaaSAdminAuth,
+  SaaSManagermentAuth
+});

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

@@ -165,14 +165,37 @@ var CustomSelect = (props, ref) => {
   const renderList = (0, import_react.useMemo)(() => {
     let _list = [...options];
     if (search) {
-      const isIncludes = (str) => {
-        return str.toLowerCase().indexOf(search.toLowerCase()) !== -1;
+      const isIncludes = (item) => {
+        try {
+          const q = search.toLowerCase();
+          const numericKeys = Object.keys(item).filter((k) => /^\d+$/.test(k));
+          const customerKeys = [
+            "customer_nickname",
+            "customer_first_name",
+            "customer_last_name",
+            "customer_phone",
+            "customer_email"
+          ];
+          const allKeys = [...numericKeys, ...customerKeys];
+          return allKeys.some((k) => {
+            const val = item[k];
+            if (val === null || val === void 0) return false;
+            try {
+              const str = JSON.stringify(val);
+              return str.includes(q) || str.toLocaleLowerCase().includes(q);
+            } catch (error) {
+              return false;
+            }
+          });
+        } catch (e) {
+          return false;
+        }
       };
       _list = _list.filter((d) => {
         if (filterItem) {
           return filterItem(d, search);
         }
-        return isIncludes(d.main_field || "");
+        return isIncludes(d);
       });
     }
     return _list;

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

@@ -38,7 +38,6 @@ var import_utils = require("../../utils");
 var import_utils2 = require("@pisell/utils");
 var import_decimal = __toESM(require("decimal.js"));
 var import_utils3 = require("../../info/service2/utils");
-var import_utils4 = require("../../info2/service/addService/utils");
 var getRelationDetailsTotal = (relation_details) => {
   let total = new import_decimal.default(0);
   for (let item of relation_details) {
@@ -53,22 +52,16 @@ var getProductExpectAmount = (state, isEdit) => {
   let price = new import_decimal.default(0);
   let duration = new import_decimal.default(0);
   const isDay = (0, import_utils3.isDayBooking)(state);
-  let dayDuration = new import_decimal.default(0);
-  let minuteDuration = new import_decimal.default(0);
   if (isEdit) {
     if ((state == null ? void 0 : state.service) || (state == null ? void 0 : state.addons)) {
       if (Array.isArray((_a = state == null ? void 0 : state.service) == null ? void 0 : _a.value)) {
         for (let item of state.service.value) {
-          if (isDay || (0, import_utils3.isNormalProductByDurationSchedule)(item) || (0, import_utils4.isMultiDayProduct)(item)) {
+          if (isDay || (0, import_utils3.isNormalProductByDurationSchedule)(item)) {
             const quantity = new import_decimal.default(item._extend.quantity || 1);
             const itemTotal = new import_decimal.default(item._extend.total || 0);
             price = price.add(itemTotal.mul(quantity));
-            const _duration = !(0, import_utils3.isNormalProductByDurationSchedule)(item) ? new import_decimal.default(item._extend.duration || 0) : new import_decimal.default(0);
-            if (isDay || (0, import_utils4.isMultiDayProduct)(item)) {
-              dayDuration = dayDuration.add(_duration);
-            } else {
-              minuteDuration = minuteDuration.add(_duration);
-            }
+            const _duration = (0, import_utils3.isDayBookingProduct)(item, state) ? new import_decimal.default(item._extend.duration || 0) : new import_decimal.default(0);
+            duration = duration.add(_duration);
           } else {
             const quantity = new import_decimal.default(item._extend.quantity || 1);
             const itemTotal = new import_decimal.default(item._extend.total || 0);
@@ -79,11 +72,6 @@ var getProductExpectAmount = (state, isEdit) => {
             price = price.add(relationTotal);
             const itemDuration = new import_decimal.default(import_utils.flexibleObj.getValue(item._extend.duration) || 0);
             duration = duration.add(itemDuration);
-            if ((0, import_utils4.isMultiDayProduct)(item)) {
-              dayDuration = dayDuration.add(itemDuration);
-            } else {
-              minuteDuration = minuteDuration.add(itemDuration);
-            }
           }
         }
       }
@@ -101,23 +89,18 @@ var getProductExpectAmount = (state, isEdit) => {
     duration = services.reduce((pre, cur) => {
       var _a2;
       let current = new import_decimal.default(0);
-      if (isDay || (0, import_utils4.isMultiDayProduct)(cur)) {
-        const _duration = !(0, import_utils3.isNormalProductByDurationSchedule)(cur) ? new import_decimal.default(cur._extend.duration || 0) : new import_decimal.default(0);
+      if (isDay) {
+        const _duration = (0, import_utils3.isDayBookingProduct)(cur, state) ? new import_decimal.default(cur._extend.duration || 0) : new import_decimal.default(0);
         current = _duration;
       } else {
         current = new import_decimal.default(import_utils.flexibleObj.getValue(((_a2 = cur._extend) == null ? void 0 : _a2.duration) || 0) || 0);
       }
-      if (isDay || (0, import_utils4.isMultiDayProduct)(cur)) {
-        dayDuration = dayDuration.add(current);
-      } else {
-        minuteDuration = minuteDuration.add(current);
-      }
       return pre.add(current);
     }, new import_decimal.default(0));
   }
   return {
     productExpectAmount: price.toNumber(),
-    duration: (0, import_utils.getDiscountTimeByDayMinutes)(dayDuration.toNumber(), minuteDuration.toNumber())
+    duration: (0, import_utils.getDiscountTime)(duration.toNumber(), isDay)
   };
 };
 var getProductItemTax = (item, state, options) => {

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

@@ -467,7 +467,11 @@ var Footer = (props) => {
     (_l = (_k = state.client) == null ? void 0 : _k.value) == null ? void 0 : _l.id
   ]);
   const handleCheckoutInternal = async () => {
-    (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
+    var _a2, _b2, _c2;
+    const isToastMode = ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.payment_setting) == null ? void 0 : _c2.payment_result_display_mode) !== "modal";
+    if (isToastMode) {
+      (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
+    }
     const isNewOrder = !state.bookingId;
     if (isEdit) {
       if ((0, import_utils2.isDayBooking)(state)) {
@@ -494,18 +498,18 @@ var Footer = (props) => {
         setIsPaymentModalOpen(true);
         setCheckoutLoading(false);
         setPaymentCallback(() => (paymentResult) => {
-          var _a2, _b2, _c2, _d2;
+          var _a3, _b3, _c3, _d2;
           console.log("Payment result:", paymentResult);
           setIsPaymentModalOpen(false);
           if ((paymentResult == null ? void 0 : paymentResult.status) === "success") {
             console.log("Payment completed successfully");
-            (_b2 = (_a2 = window == null ? void 0 : window.shopApi) == null ? void 0 : _a2.bookingTicket) == null ? void 0 : _b2.clearAllCart();
+            (_b3 = (_a3 = window == null ? void 0 : window.shopApi) == null ? void 0 : _a3.bookingTicket) == null ? void 0 : _b3.clearAllCart();
             setPaymentModalData(null);
             setPaymentCallback(null);
           } else if ((paymentResult == null ? void 0 : paymentResult.status) === "cancelled") {
             console.log("Payment cancelled");
             if (res == null ? void 0 : res.order_id) {
-              (_d2 = (_c2 = window == null ? void 0 : window.shopApi) == null ? void 0 : _c2.booking) == null ? void 0 : _d2.voidBooking(res.order_id);
+              (_d2 = (_c3 = window == null ? void 0 : window.shopApi) == null ? void 0 : _c3.booking) == null ? void 0 : _d2.voidBooking(res.order_id);
             }
             setPaymentModalData(null);
             setPaymentCallback(null);
@@ -596,8 +600,11 @@ var Footer = (props) => {
     messageShow = true,
     noSubmit = false
   }) => {
-    var _a2, _b2, _c2, _d2, _e2;
-    (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
+    const isToastMode = ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.payment_setting) == null ? void 0 : _c2.payment_result_display_mode) !== "modal";
+    if (isToastMode) {
+      (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
+    }
     if ((0, import_utils2.isDayBooking)(state)) {
       const isHasDayProducts = handleDaySubmit();
       if (isHasDayProducts) return;
@@ -612,7 +619,7 @@ var Footer = (props) => {
     const createApi = state.renderType === "eventBooking" ? import_serve2.createEventBooking : createBooking;
     let saveOtherValue = {};
     if (type === "save") {
-      saveOtherValue = await ((_a2 = state == null ? void 0 : state.onSave) == null ? void 0 : _a2.call(state, state.client)) || {};
+      saveOtherValue = await ((_d2 = state == null ? void 0 : state.onSave) == null ? void 0 : _d2.call(state, state.client)) || {};
     }
     try {
       let callbackData = null;
@@ -658,7 +665,7 @@ var Footer = (props) => {
           { key: "日期", value: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm") },
           {
             key: "店铺id",
-            value: (_e2 = (_d2 = (_c2 = (_b2 = store == null ? void 0 : store.getState) == null ? void 0 : _b2.call(store)) == null ? void 0 : _c2.global) == null ? void 0 : _d2.globalConfig) == null ? void 0 : _e2.id
+            value: (_h2 = (_g2 = (_f2 = (_e2 = store == null ? void 0 : store.getState) == null ? void 0 : _e2.call(store)) == null ? void 0 : _f2.global) == null ? void 0 : _g2.globalConfig) == null ? void 0 : _h2.id
           },
           {
             key: "shopApi",

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

@@ -37,12 +37,5 @@ export declare const checkResourcesFormat: (resources: any[], service: any, isCh
  * @Date: 2024-12-23 12:05
  */
 export declare const formatProductPrice: (item: any) => number;
-/**
- * @title: 是否包含跨日预约商品
- * @description:
- * @param {any} data
- * @return {*}
- */
-export declare const getHasMultiDayProduct: (data: any) => any;
 export declare const formatValues: (state: any) => any;
 export declare const checkHolderIsError: (state: any) => any;

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

@@ -35,8 +35,7 @@ __export(utils_exports, {
   formatProductBundle: () => formatProductBundle,
   formatProductOption: () => formatProductOption,
   formatProductPrice: () => formatProductPrice,
-  formatValues: () => formatValues,
-  getHasMultiDayProduct: () => getHasMultiDayProduct
+  formatValues: () => formatValues
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
@@ -238,7 +237,7 @@ var formatSellingPrice = (item) => {
   var _a;
   return Number((_a = item._extend) == null ? void 0 : _a.total);
 };
-var formatMetaData = (item) => {
+var formatMetaData = (item, isMultiDayPrices) => {
   var _a, _b, _c, _d, _e, _f, _g;
   let metadata = {};
   if ((_a = item._extend) == null ? void 0 : _a.capacity) {
@@ -250,7 +249,7 @@ var formatMetaData = (item) => {
   if ((_b = item._extend) == null ? void 0 : _b.holder_id) {
     metadata.holder_id = (_c = item._extend) == null ? void 0 : _c.holder_id;
   }
-  if ((_d = item._extend) == null ? void 0 : _d.multiDayPrices) {
+  if (isMultiDayPrices && ((_d = item._extend) == null ? void 0 : _d.multiDayPrices)) {
     metadata.multiDayPrices = (_e = item._extend) == null ? void 0 : _e.multiDayPrices;
   }
   if ((_f = item._extend) == null ? void 0 : _f.unique_identification_number) {
@@ -310,7 +309,7 @@ var formatProducts = (item, quantity) => {
     product_option_item: formatProductOption((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.option),
     product_variant_id: ((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.product_variant_id) || 0,
     discount_list: notManualDiscount,
-    metadata: formatMetaData(item),
+    metadata: formatMetaData(item, false),
     // checkout 需求新增字段
     calculated_original_price: formatOriginalPrice(item),
     calculated_selling_price: formatSellingPrice(item),
@@ -352,14 +351,6 @@ 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);
@@ -379,6 +370,7 @@ var formatBookings = (data, values) => {
   let dayParams = {};
   const eventOtherParams = data.eventOtherParams;
   let bookings = [];
+  let obj = {};
   list.forEach((item) => {
     var _a, _b, _c, _d, _e, _f;
     if (item.isCustomItem) {
@@ -389,7 +381,6 @@ 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");
@@ -399,8 +390,8 @@ var formatBookings = (data, values) => {
     }
     dayParams.holder = formatHolders(data, item, values);
     if (isDay) {
-      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 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 { startDateTime, endDateTime } = (0, import_utils4.formatDayTime)({
         startDate,
         endDate
@@ -416,13 +407,13 @@ var formatBookings = (data, values) => {
         "minutes"
       );
     }
+    const isSetGroupId = obj[(_e = item == null ? void 0 : item._extend) == null ? void 0 : _e.groupId];
     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;
     }
     const booking = {
       product: formatProducts(item),
-      metadata: formatMetaData(item),
       relation_products: formatRelationDetails(item._extend.relation_details),
       id: item.booking_id || 0,
       relation_id: item._extend.relation_id || 0,
@@ -436,14 +427,18 @@ var formatBookings = (data, values) => {
       start_time,
       end_date,
       start_date,
-      duration: isDay || isMultiDay ? 0 : import_utils.flexibleObj.getValue(item._extend.duration),
+      duration: isDay ? 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,
+      "metadata": formatMetaData(item, !isSetGroupId),
       ...eventOtherParams || {},
       ...dayParams
     };
-    if (isDay || isMultiDay) {
+    if (!isSetGroupId) {
+      obj[item._extend.groupId] = true;
+    }
+    if (isDay) {
       bookings.push(booking);
       return;
     }
@@ -531,7 +526,6 @@ 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);
@@ -549,10 +543,10 @@ var formatValues = (state) => {
     ...customer
   };
   values.holder = formatHolder(state, values);
-  if (isEvent) {
+  if (isDay || isEvent) {
     values.relation_products = formatRelationProducts(
       state,
-      "event"
+      isDay ? "day" : "event"
     );
   } else {
     values.relation_products = formatNormalProducts(state);
@@ -566,7 +560,7 @@ var formatValues = (state) => {
     startTime = `${startTime || "00:00"}:00`;
     values.schedule_date = `${values.bookings[0].select_date} ${startTime}`;
   }
-  if (isDay || isHasMultiDay) {
+  if (isDay) {
     values.metadata.is_multiday_appointment = 1;
   }
   if (!((_g = values == null ? void 0 : values.bookings) == null ? void 0 : _g.length)) {
@@ -618,6 +612,5 @@ var checkHolderIsError = (state) => {
   formatProductBundle,
   formatProductOption,
   formatProductPrice,
-  formatValues,
-  getHasMultiDayProduct
+  formatValues
 });

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<any>;
+    handleOk: (values: SendModalValues) => Promise<boolean | undefined>;
 };
 export default useSendModal;

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/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,
-      true,
+      false,
       true,
       isParallelResource
     );

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,7 +19,6 @@ 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
@@ -31,12 +30,8 @@ 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,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) {