@pisell/private-materials 6.6.1 → 6.7.1

package/es/components/booking/info2/utilsByBooking.js

@@ -10,8 +10,8 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import dayjs from 'dayjs';
 import { locales } from "@pisell/utils";
 import { getCacheParams, getServeStartTime, getLastServer, flexibleObj, getServiceTimes, findNextDuration, getDays, isSessionProduct } from "../utils";
+import { isNormalProductByDurationSchedule } from "../info/service2/utils";
 import { isOption } from "../../ticketBooking/components/addServiceVariant/utils";
-import { isMultiDayProduct } from "./service/addService/utils";
 
 // 获取当前剩余量
 var getUseableEventCount = function getUseableEventCount(eventList, current) {
@@ -321,7 +321,7 @@ export var getAppointmentTimingPreference = function getAppointmentTimingPrefere
  * @Date: 2024-01-26 14:09
  */
 export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTime(state, cacheItem, timeObj) {
-  var _state$service$value, _cacheItem$_extend2;
+  var _state$service$value, _cacheItem$duration, _cacheItem$_extend2;
   // 自定义商品不需要时间相关处理，直接返回基础扩展参数
   if (cacheItem !== null && cacheItem !== void 0 && cacheItem.isCustomItem) {
     return {
@@ -332,20 +332,13 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
 
   // 获取上一个服务商品（过滤掉自定义商品）
   var lastServer = getLastServer((_state$service$value = state.service.value) === null || _state$service$value === void 0 ? void 0 : _state$service$value.filter(function (item) {
-    return !item.isCustomItem;
+    return !item.isCustomItem && !isNormalProductByDurationSchedule(item);
   }));
-  var getDuration = function getDuration(cacheItem) {
-    var _cacheItem$duration;
-    if (isMultiDayProduct(cacheItem)) {
-      return getDays(cacheItem, 'days');
-    }
-    return findNextDuration(cacheItem.duration, timeObj === null || timeObj === void 0 ? void 0 : timeObj.durationSlicesBasedOnTime, cacheItem === null || cacheItem === void 0 || (_cacheItem$duration = cacheItem.duration) === null || _cacheItem$duration === void 0 ? void 0 : _cacheItem$duration.value);
-  };
 
   // 下一个商品的扩展参数
   var _extend = {
     // 时长: 当前商品时长 > 第一个时长
-    duration: getDuration(cacheItem)
+    duration: findNextDuration(cacheItem.duration, timeObj === null || timeObj === void 0 ? void 0 : timeObj.durationSlicesBasedOnTime, cacheItem === null || cacheItem === void 0 || (_cacheItem$duration = cacheItem.duration) === null || _cacheItem$duration === void 0 ? void 0 : _cacheItem$duration.value)
   };
 
   // 如果有上一个商品, 将上一个商品的某些参数 设置到新商品上
@@ -362,8 +355,7 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
         var _timeObj$timeSlices;
         _extend.start_time = timeObj === null || timeObj === void 0 ? void 0 : timeObj.timeSlices[(timeObj === null || timeObj === void 0 || (_timeObj$timeSlices = timeObj.timeSlices) === null || _timeObj$timeSlices === void 0 ? void 0 : _timeObj$timeSlices.length) - 1].value;
       } else {
-        var _ref2;
-        _extend.start_time = (_ref2 = lastServerEndDate || dayjs()) === null || _ref2 === void 0 ? void 0 : _ref2.format("HH:mm");
+        _extend.start_time = lastServerEndDate.format("HH:mm");
       }
     }
   } else {
@@ -399,20 +391,23 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
   _extend = _objectSpread(_objectSpread({}, _extend), cacheItem._extend);
 
   // 计算服务的开始和结束时间
-  var _getServiceTimes2 = getServiceTimes(_objectSpread(_objectSpread({}, cacheItem), {}, {
+  var _getServiceTimes2 = getServiceTimes({
       _extend: _extend
-    })),
+    }),
     startDate = _getServiceTimes2.startDate,
     endDate = _getServiceTimes2.endDate;
   _extend.startDate = startDate;
   _extend.endDate = endDate;
   var session = cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 || (_cacheItem$_extend2 = _cacheItem$_extend2.other) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.session;
   if (isSessionProduct(cacheItem) && session) {
-    _extend.start_date = session.start_at;
-    _extend.startDate = session.start_at;
+    var startAt = dayjs("".concat(state.date.value.format('YYYY-MM-DD'), " ").concat(session.start_at.format('HH:mm:ss')));
+    var endAt = dayjs("".concat(state.date.value.format('YYYY-MM-DD'), " ").concat(session.end_at.format('HH:mm:ss')));
+    _extend.start_date = startAt;
+    _extend.startDate = startAt;
     _extend.start_time = session.start_time;
-    _extend.end_date = session.end_at;
-    _extend.endDate = session.end_at;
+    _extend.end_date = endAt;
+    _extend.endDate = endAt;
+    _extend.end_time = session.end_time;
     _extend.duration = getDays({
       _extend: _extend
     }, 'minutes');

package/es/components/booking/locales.d.ts

@@ -44,9 +44,6 @@ declare const _default: {
         'pisell2.text.order-notes': string;
         'pisell2.text.add-order-notes': string;
         'pisell2.text.add-internal-notes': string;
-        'pisell2.text.holder-unassigned': (count: number) => string;
-        'pisell2.text.press-card-assign-holder': string;
-        'pisell2.text.skip-for-now': string;
         'pisell2.text.add-notes': string;
         'pisell2.text.notes': string;
         'pisell2.text.new-appointment': string;
@@ -201,7 +198,6 @@ declare const _default: {
         'page.booking.text.refund': string;
         'page.booking.text.confirm': string;
         'page.booking.text.go-back': string;
-        'page.booking.text.undo': string;
         'page.booking.text.cancel-booking': string;
         'page.booking.text.cancel-booking.msg': string;
         'page.booking.text.disabled-tickets': string;
@@ -211,7 +207,6 @@ declare const _default: {
         'page.booking.text.please-choose-an-option-2': string;
         'page.booking.text.resource.min-length-error': (x: number, y: string) => string;
         'page.booking.text.resource.check-auto-allocation-tip': string;
-        'page.booking.text.holder.length-error': string;
         'page.booking.text.price-extra': (origin: string, current: string) => string;
         'pisell2.booking.dashboard.groups-on-site-now': string;
         'pisell2.booking.dashboard.groups-on-site-now-tip': string;
@@ -233,8 +228,6 @@ declare const _default: {
         'pisell2.booking.info.text.clear': string;
         'pisell2.booking.info.text.clear-cart': string;
         'pisell2.booking.info.text.clear-all': string;
-        'pisell2.booking.info.text.add-holder': string;
-        'pisell2.booking.info.text.select-holder-title': string;
         'pisell2.booking.info.text.create-new': string;
         'pisell2.booking.info.text.form-agreement-yes': string;
         'pisell2.booking.info.text.form-agreement-no': string;
@@ -250,7 +243,6 @@ declare const _default: {
         'pisell2.text.missing.reservation.content': string;
         'pisell2.text.confirm': string;
         'pisell2.text.cancel': string;
-        'pisell2.text.close-confirm-message': string;
         'pisell2.action-buttons.clear': string;
         'pisell2.action-buttons.manuel-order': string;
         'pisell2.action-buttons.customise-item': string;
@@ -312,8 +304,6 @@ declare const _default: {
         'pisell2.text.form.link.to.another.record.more': string;
         'pisell2.booking.text.contact-info.title': string;
         'pisell2.booking.text.search-placeholder': string;
-        'pisell-select-holder-please-select': string;
-        'pisell-select-holder-selected': string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -365,9 +355,6 @@ declare const _default: {
         'pisell2.text.order-notes': string;
         'pisell2.text.add-order-notes': string;
         'pisell2.text.add-internal-notes': string;
-        'pisell2.text.holder-unassigned': (count: number) => string;
-        'pisell2.text.press-card-assign-holder': string;
-        'pisell2.text.skip-for-now': string;
         'pisell2.text.add-notes': string;
         'pisell2.text.notes': string;
         'pisell2.text.new-appointment': string;
@@ -517,7 +504,6 @@ declare const _default: {
         'page.booking.text.refund': string;
         'page.booking.text.confirm': string;
         'page.booking.text.go-back': string;
-        'page.booking.text.undo': string;
         'page.booking.text.cancel-booking': string;
         'page.booking.text.cancel-booking.msg': string;
         'page.booking.text.disabled-tickets': string;
@@ -527,7 +513,6 @@ declare const _default: {
         'page.booking.text.please-choose-an-option-2': string;
         'page.booking.text.resource.min-length-error': (x: number, y: string) => string;
         'page.booking.text.resource.check-auto-allocation-tip': string;
-        'page.booking.text.holder.length-error': string;
         'page.booking.text.price-extra': (origin: string, current: string) => string;
         'pisell2.booking.dashboard.groups-on-site-now': string;
         'pisell2.booking.dashboard.groups-on-site-now-tip': string;
@@ -549,8 +534,6 @@ declare const _default: {
         'pisell2.booking.info.text.clear': string;
         'pisell2.booking.info.text.clear-cart': string;
         'pisell2.booking.info.text.clear-all': string;
-        'pisell2.booking.info.text.add-holder': string;
-        'pisell2.booking.info.text.select-holder-title': string;
         'pisell2.booking.info.text.create-new': string;
         'pisell2.booking.info.text.form-agreement-yes': string;
         'pisell2.booking.info.text.form-agreement-no': string;
@@ -566,7 +549,6 @@ declare const _default: {
         'pisell2.text.missing.reservation.content': string;
         'pisell2.text.confirm': string;
         'pisell2.text.cancel': string;
-        'pisell2.text.close-confirm-message': string;
         'pisell2.action-buttons.clear': string;
         'pisell2.action-buttons.manuel-order': string;
         'pisell2.action-buttons.customise-item': string;
@@ -628,8 +610,6 @@ declare const _default: {
         'pisell2.text.form.link.to.another.record.more': string;
         'pisell2.booking.text.contact-info.title': string;
         'pisell2.booking.text.search-placeholder': string;
-        'pisell-select-holder-please-select': string;
-        'pisell-select-holder-selected': string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -681,9 +661,6 @@ declare const _default: {
         'pisell2.text.order-notes': string;
         'pisell2.text.add-order-notes': string;
         'pisell2.text.add-internal-notes': string;
-        'pisell2.text.holder-unassigned': (count: number) => string;
-        'pisell2.text.press-card-assign-holder': string;
-        'pisell2.text.skip-for-now': string;
         'pisell2.text.add-notes': string;
         'pisell2.text.notes': string;
         'pisell2.text.new-appointment': string;
@@ -833,7 +810,6 @@ declare const _default: {
         'page.booking.text.refund': string;
         'page.booking.text.confirm': string;
         'page.booking.text.go-back': string;
-        'page.booking.text.undo': string;
         'page.booking.text.cancel-booking': string;
         'page.booking.text.cancel-booking.msg': string;
         'page.booking.text.disabled-tickets': string;
@@ -843,7 +819,6 @@ declare const _default: {
         'page.booking.text.please-choose-an-option-2': string;
         'page.booking.text.resource.min-length-error': (x: number, y: string) => string;
         'page.booking.text.resource.check-auto-allocation-tip': string;
-        'page.booking.text.holder.length-error': string;
         'page.booking.text.price-extra': (origin: string, current: string) => string;
         'pisell2.booking.dashboard.groups-on-site-now': string;
         'pisell2.booking.dashboard.groups-on-site-now-tip': string;
@@ -865,8 +840,6 @@ declare const _default: {
         'pisell2.booking.info.text.clear': string;
         'pisell2.booking.info.text.clear-cart': string;
         'pisell2.booking.info.text.clear-all': string;
-        'pisell2.booking.info.text.add-holder': string;
-        'pisell2.booking.info.text.select-holder-title': string;
         'pisell2.booking.info.text.create-new': string;
         'pisell2.booking.info.text.form-agreement-yes': string;
         'pisell2.booking.info.text.form-agreement-no': string;
@@ -882,7 +855,6 @@ declare const _default: {
         'pisell2.text.missing.reservation.content': string;
         'pisell2.text.confirm': string;
         'pisell2.text.cancel': string;
-        'pisell2.text.close-confirm-message': string;
         'pisell2.action-buttons.clear': string;
         'pisell2.action-buttons.manuel-order': string;
         'pisell2.action-buttons.customise-item': string;
@@ -944,8 +916,6 @@ declare const _default: {
         'pisell2.text.form.link.to.another.record.more': string;
         'pisell2.booking.text.contact-info.title': string;
         'pisell2.booking.text.search-placeholder': string;
-        'pisell-select-holder-please-select': string;
-        'pisell-select-holder-selected': string;
     };
 };
 export default _default;

package/es/components/booking/locales.js

@@ -45,11 +45,6 @@ export default {
     'pisell2.text.order-notes': 'Order notes',
     'pisell2.text.add-order-notes': 'Add Order Note',
     'pisell2.text.add-internal-notes': 'Add Internal note',
-    'pisell2.text.holder-unassigned': function pisell2TextHolderUnassigned(count) {
-      return "".concat(count, " Holder(s) Unassigned");
-    },
-    'pisell2.text.press-card-assign-holder': 'Please Press Each Card to Assign Holder',
-    'pisell2.text.skip-for-now': 'Skip for Now',
     'pisell2.text.add-notes': 'Add Notes',
     'pisell2.text.notes': 'Notes',
     'pisell2.text.new-appointment': 'New appointment',
@@ -234,7 +229,6 @@ export default {
     'page.booking.text.refund': 'Refund',
     'page.booking.text.confirm': 'Confirm',
     'page.booking.text.go-back': 'Go back',
-    'page.booking.text.undo': 'Undo',
     'page.booking.text.cancel-booking': "Cancel Booking",
     'page.booking.text.cancel-booking.msg': "The action is irreversible. Please proceed with caution. ",
     'page.booking.text.disabled-tickets': "All tickets will be disabled.",
@@ -248,7 +242,6 @@ export default {
       return "Select at least ".concat(x, " ").concat(y);
     },
     'page.booking.text.resource.check-auto-allocation-tip': "When checked, content will be automatically filled in without manual selection",
-    'page.booking.text.holder.length-error': 'Please select enough holder(s)',
     'page.booking.text.price-extra': function pageBookingTextPriceExtra(origin, current) {
       return "Original price of the item:".concat(origin, ",Current price of the item:").concat(current);
     },
@@ -272,8 +265,6 @@ export default {
     'pisell2.booking.info.text.clear': "Clear",
     'pisell2.booking.info.text.clear-cart': "Clear cart",
     'pisell2.booking.info.text.clear-all': "Clear all",
-    'pisell2.booking.info.text.add-holder': "Select",
-    'pisell2.booking.info.text.select-holder-title': "Who would you like to book this event for？",
     'pisell2.booking.info.text.create-new': "Create new",
     'pisell2.booking.info.text.form-agreement-yes': "Yes",
     'pisell2.booking.info.text.form-agreement-no': "No",
@@ -291,7 +282,6 @@ export default {
     'pisell2.text.missing.reservation.content': 'You have not selected a reservation type, Please select one before proceeding.',
     'pisell2.text.confirm': 'Confirm',
     'pisell2.text.cancel': 'Cancel',
-    'pisell2.text.close-confirm-message': 'Closing will discard all changes. Are you sure you want to close?',
     // Action Buttons
     'pisell2.action-buttons.clear': 'Clear',
     'pisell2.action-buttons.manuel-order': "Manual\nOrder\xA0$",
@@ -367,9 +357,7 @@ export default {
     'pisell2.text.form.link.to.another.record.more': 'View More',
     // 联系信息
     'pisell2.booking.text.contact-info.title': 'Contact info',
-    'pisell2.booking.text.search-placeholder': 'Search Customers / Contacts',
-    'pisell-select-holder-please-select': 'Please Select',
-    'pisell-select-holder-selected': 'Selected: '
+    'pisell2.booking.text.search-placeholder': 'Search Customers / Contacts'
   },
   'zh-CN': {
     'pisell2.text.refunded-amount': '已退金额',
@@ -421,11 +409,6 @@ export default {
     'pisell2.text.order-notes': '订单备注',
     'pisell2.text.add-order-notes': '添加订单备注',
     'pisell2.text.add-internal-notes': '添加内部备注',
-    'pisell2.text.holder-unassigned': function pisell2TextHolderUnassigned(count) {
-      return "".concat(count, " \u4E2A\u9884\u7EA6\u4E3B\u4F53\u672A\u5206\u914D");
-    },
-    'pisell2.text.press-card-assign-holder': '请点击每个卡片来分配预约主体',
-    'pisell2.text.skip-for-now': '稍后处理',
     'pisell2.text.add-notes': '添加备注',
     'pisell2.text.notes': '备注',
     'pisell2.text.new-appointment': '新预约',
@@ -610,7 +593,6 @@ export default {
     'page.booking.text.refund': '退款',
     'page.booking.text.confirm': '确认',
     'page.booking.text.go-back': '返回',
-    'page.booking.text.undo': '撤销',
     'page.booking.text.cancel-booking': "取消预约",
     'page.booking.text.cancel-booking.msg': "该操作不可撤销，请谨慎操作。",
     'page.booking.text.disabled-tickets': "所有票单将被禁用。",
@@ -624,7 +606,6 @@ export default {
       return "\u81F3\u5C11\u9009\u62E9".concat(x, "\u9879").concat(y);
     },
     'page.booking.text.resource.check-auto-allocation-tip': "\u52FE\u9009\u540E\u5C06\u81EA\u52A8\u586B\u5165\u5185\u5BB9\uFF0C\u65E0\u9700\u624B\u52A8\u9009\u62E9",
-    'page.booking.text.holder.length-error': '请选择足够的持有者',
     'page.booking.text.price-extra': function pageBookingTextPriceExtra(origin, current) {
       return "\u5546\u54C1\u539F\u4EF7:".concat(origin, ",\u5546\u54C1\u73B0\u4EF7:").concat(current);
     },
@@ -648,8 +629,6 @@ export default {
     'pisell2.booking.info.text.clear': "清空",
     'pisell2.booking.info.text.clear-cart': "清空购物车",
     'pisell2.booking.info.text.clear-all': "清空",
-    'pisell2.booking.info.text.add-holder': "请选择",
-    'pisell2.booking.info.text.select-holder-title': '您想为谁预订这个活动？',
     'pisell2.booking.info.text.create-new': "新建",
     'pisell2.booking.info.text.form-agreement-yes': "是",
     'pisell2.booking.info.text.form-agreement-no': "否",
@@ -667,7 +646,6 @@ export default {
     'pisell2.text.missing.reservation.content': '您尚未选择预约类型，请在继续操作前选择。',
     'pisell2.text.confirm': '确定',
     'pisell2.text.cancel': '取消',
-    'pisell2.text.close-confirm-message': '关闭后，已填写或操作的内容将不会保存，确定要关闭吗？',
     // Action Buttons
     'pisell2.action-buttons.clear': '清空',
     'pisell2.action-buttons.manuel-order': "\u624B\u52A8\n\u8BA2\u5355\xA0$",
@@ -743,9 +721,7 @@ export default {
     'pisell2.text.form.link.to.another.record.more': '查看更多',
     // 联系信息
     'pisell2.booking.text.contact-info.title': '联系信息',
-    'pisell2.booking.text.search-placeholder': '搜索客户/联系信息',
-    'pisell-select-holder-please-select': '请选择',
-    'pisell-select-holder-selected': '已选择：'
+    'pisell2.booking.text.search-placeholder': '搜索客户/联系信息'
   },
   'zh-HK': {
     'pisell2.text.refunded-amount': '已退金額',
@@ -797,11 +773,6 @@ export default {
     'pisell2.text.order-notes': '訂單備注',
     'pisell2.text.add-order-notes': '添加訂單備注',
     'pisell2.text.add-internal-notes': '添加內部備注',
-    'pisell2.text.holder-unassigned': function pisell2TextHolderUnassigned(count) {
-      return "".concat(count, " \u500B\u9810\u7D04\u4E3B\u9AD4\u672A\u5206\u914D");
-    },
-    'pisell2.text.press-card-assign-holder': '請點擊每個卡片來分配預約主體',
-    'pisell2.text.skip-for-now': '稍後處理',
     'pisell2.text.add-notes': '添加備注',
     'pisell2.text.notes': '備注',
     'pisell2.text.new-appointment': '新預約',
@@ -986,7 +957,6 @@ export default {
     'page.booking.text.refund': '退款',
     'page.booking.text.confirm': '確認',
     'page.booking.text.go-back': '返回',
-    'page.booking.text.undo': '撤销',
     'page.booking.text.cancel-booking': '取消預約',
     'page.booking.text.cancel-booking.msg': '該操作不可撤銷，請謹慎操作。',
     'page.booking.text.disabled-tickets': '所有票單將被禁用。',
@@ -1000,7 +970,6 @@ export default {
       return "\u81F3\u5C11\u9078\u64C7".concat(x, "\u9805").concat(y);
     },
     'page.booking.text.resource.check-auto-allocation-tip': "\u52FE\u9078\u5F8C\u5C07\u81EA\u52D5\u586B\u5165\u5167\u5BB9\uFF0C\u7121\u9700\u624B\u52D5\u9078\u64C7",
-    'page.booking.text.holder.length-error': '請選擇足夠的持有者',
     'page.booking.text.price-extra': function pageBookingTextPriceExtra(origin, current) {
       return "\u5546\u54C1\u539F\u50F9:".concat(origin, ",\u5546\u54C1\u73FE\u50F9:").concat(current);
     },
@@ -1024,8 +993,6 @@ export default {
     'pisell2.booking.info.text.clear': "清空",
     'pisell2.booking.info.text.clear-cart': "清空購物車",
     'pisell2.booking.info.text.clear-all': "清空",
-    'pisell2.booking.info.text.add-holder': "请选择",
-    'pisell2.booking.info.text.select-holder-title': "您想为谁预订这个活动？",
     'pisell2.booking.info.text.create-new': "新建",
     'pisell2.booking.info.text.form-agreement-yes': "是",
     'pisell2.booking.info.text.form-agreement-no': "否",
@@ -1043,7 +1010,6 @@ export default {
     'pisell2.text.missing.reservation.content': '您尚未選擇預約類型，請在繼續操作前選擇。',
     'pisell2.text.confirm': '確定',
     'pisell2.text.cancel': '取消',
-    'pisell2.text.close-confirm-message': '關閉後，已填寫或操作的內容將不會保存，確定要關閉嗎？',
     // Action Buttons
     'pisell2.action-buttons.clear': '清空',
     'pisell2.action-buttons.manuel-order': "\u624B\u52D5\n\u8A02\u55AE\xA0$",
@@ -1119,8 +1085,6 @@ export default {
     'pisell2.text.form.link.to.another.record.more': '查看更多',
     // 联系信息
     'pisell2.booking.text.contact-info.title': '聯繫信息',
-    'pisell2.booking.text.search-placeholder': '搜索客戶/聯系信息',
-    'pisell-select-holder-please-select': '請選擇',
-    'pisell-select-holder-selected': '已選擇：'
+    'pisell2.booking.text.search-placeholder': '搜索客戶/聯系信息'
   }
 };

package/es/components/booking/utils.d.ts

@@ -1,4 +1,8 @@
 import dayjs from 'dayjs';
+/**
+ * @title: 高阶函数结果缓存（Memoization）
+ */
+export declare function memoize<T extends (...args: any[]) => any>(fn: T): T;
 declare type RType = (url: string, data?: {} | undefined, config?: {} | undefined) => Promise<any>;
 declare class Request {
     private request;
@@ -23,21 +27,8 @@ export declare const request: Request;
  */
 export declare const getDiscountTime: (service_times: number, isDay?: boolean) => string;
 /**
- * @title: 格式化跨日预约的时长用于展示
- * @description:
- * @param {number} days
- * @param {number} minutes
- * @return {*}
- */
-export declare const getDiscountTimeByDayMinutes: (days: number, minutes: number) => string;
-/**
- * @title: 时间切片
- * @description:
- * @param {any} config
- * @param {string} locale
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2024-04-26 13:59
+ * @title: 时间切片（带缓存版本）
+ * @description: 使用 memoize 高阶函数包裹 sliceDayIntoFiveMinutes，相同参数时直接返回缓存结果
  */
 export declare const sliceDayIntoFiveMinutes: (config: any, locale: string, isDay?: boolean) => {
     timeSlices: {
@@ -121,7 +112,7 @@ export declare const flexibleObj: {
 export declare const getEndDate: (startDate: any, duration: string | number, endDate: any) => any;
 export declare const getServiceTimes: (service: any) => {
     startDate: dayjs.Dayjs;
-    endDate: any;
+    endDate: dayjs.Dayjs;
 };
 export declare const getErrorList: (resource: any, cacheItem: any, isDay?: boolean) => {
     label: any;

package/es/components/booking/utils.js

@@ -19,7 +19,31 @@ import { isDayBooking, formatDayDate } from "./info/service2/utils";
 import { intersectionBy } from 'lodash';
 import { getAppointmentTimingPreference } from "./info2/utilsByBooking";
 import Decimal from 'decimal.js';
-import { isMultiDayProduct } from "./info2/service/addService/utils";
+
+/**
+ * @title: 高阶函数结果缓存（Memoization）
+ */
+export function memoize(fn) {
+  // 使用 Map 存储缓存，支持任意类型的 key
+  var cache = new Map();
+  return function () {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    // 将参数序列化为字符串作为缓存的 key
+    var key = JSON.stringify(args);
+
+    // 如果缓存中存在该 key，直接返回缓存的结果
+    if (cache.has(key)) {
+      return cache.get(key);
+    }
+
+    // 否则执行函数并缓存结果
+    var result = fn.apply(this, args);
+    cache.set(key, result);
+    return result;
+  };
+}
 var Request = /*#__PURE__*/function () {
   function Request() {
     _classCallCheck(this, Request);
@@ -71,20 +95,6 @@ export var getDiscountTime = function getDiscountTime(service_times, isDay) {
   }
 };
 
-/**
- * @title: 格式化跨日预约的时长用于展示
- * @description:
- * @param {number} days
- * @param {number} minutes
- * @return {*}
- */
-export var getDiscountTimeByDayMinutes = function getDiscountTimeByDayMinutes(days, minutes) {
-  if (days === 0) {
-    return getDiscountTime(minutes);
-  }
-  return "".concat(days, " ").concat(locales.getText('pisell2.text.day')(days), " ").concat(getDiscountTime(minutes));
-};
-
 /**
  * @title: 时间切片
  * @description:
@@ -94,7 +104,7 @@ export var getDiscountTimeByDayMinutes = function getDiscountTimeByDayMinutes(da
  * @Author: zhiwei.Wang
  * @Date: 2024-04-26 13:59
  */
-export var sliceDayIntoFiveMinutes = function sliceDayIntoFiveMinutes(config, locale, isDay) {
+var _sliceDayIntoFiveMinutes = function _sliceDayIntoFiveMinutes(config, locale, isDay) {
   var _locale = locale;
   var dayjsLocale = _locale === 'en-US' || _locale === 'en' ? 'en' : 'zh-cn';
   dayjs.locale(dayjsLocale);
@@ -157,6 +167,12 @@ export var sliceDayIntoFiveMinutes = function sliceDayIntoFiveMinutes(config, lo
   };
 };
 
+/**
+ * @title: 时间切片（带缓存版本）
+ * @description: 使用 memoize 高阶函数包裹 sliceDayIntoFiveMinutes，相同参数时直接返回缓存结果
+ */
+export var sliceDayIntoFiveMinutes = memoize(_sliceDayIntoFiveMinutes);
+
 //  获取当前时间
 export var getNowTime = function getNowTime() {
   return dayjs().format('HH:mm');
@@ -219,12 +235,15 @@ export var findNextSlice = function findNextSlice(_ref) {
   return timeSlices[index].value;
 };
 export var findNextDuration = function findNextDuration(current, array, defaultValue) {
+  if (defaultValue) {
+    return defaultValue;
+  }
   for (var i = 0; i < array.length; i++) {
     if (array[i].value == (current === null || current === void 0 ? void 0 : current.value)) {
       return array[i].value;
     }
   }
-  return defaultValue || array[0].value;
+  return array[0].value;
 };
 export var formatProductListByCategory = function formatProductListByCategory(list, filterItem) {
   var _list = list || [];
@@ -505,14 +524,6 @@ export var getEndDate = function getEndDate(startDate, duration, endDate) {
 export var getServiceTimes = function getServiceTimes(service) {
   var _service$_extend;
   var startDate = dayjs(dayjs(service._extend.start_date).format('YYYY-MM-DD ') + getServeStartTime(service._extend.start_time));
-
-  // 跨日预约
-  if (isMultiDayProduct(service)) {
-    return {
-      startDate: startDate,
-      endDate: service._extend.end_date
-    };
-  }
   var endDate = startDate.add(flexibleObj.getValue(service._extend.duration), 'minute');
   var session = service === null || service === void 0 || (_service$_extend = service._extend) === null || _service$_extend === void 0 || (_service$_extend = _service$_extend.other) === null || _service$_extend === void 0 ? void 0 : _service$_extend.session;
   if (isSessionProduct(service) && session) {
@@ -623,7 +634,7 @@ export var formatResource = function formatResource(resourceItem, cacheItem, for
 
 // 获取最后一个服务商品
 export var getLastServer = function getLastServer(list) {
-  return list[list.length - 1];
+  return list === null || list === void 0 ? void 0 : list[0];
 };
 export var getCacheParams = function getCacheParams() {
   // 从缓存里读默认参数,  如果有 则需要默认选中某些参数,  添加完商品后则删除