@pisell/private-materials 6.0.24 → 6.1.1

package/es/components/booking/payments/model.js

@@ -1,9 +1,9 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { miniRedux } from "@pisell/utils";
 var defaultState = {};
 var _miniRedux = miniRedux({

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

@@ -21,7 +21,7 @@ export declare const request: Request;
  * @Author: zhiwei.Wang
  * @Date: 2024-04-26 14:00
  */
-export declare const getDiscountTime: (service_times: number) => string;
+export declare const getDiscountTime: (service_times: number, isDay?: boolean) => string;
 /**
  * @title: 时间切片
  * @description:
@@ -31,7 +31,7 @@ export declare const getDiscountTime: (service_times: number) => string;
  * @Author: zhiwei.Wang
  * @Date: 2024-04-26 13:59
  */
-export declare const sliceDayIntoFiveMinutes: (config: any, locale: string) => {
+export declare const sliceDayIntoFiveMinutes: (config: any, locale: string, isDay?: boolean) => {
     timeSlices: {
         label: string;
         value: string;
@@ -115,7 +115,7 @@ export declare const getServiceTimes: (service: any) => {
     startDate: dayjs.Dayjs;
     endDate: dayjs.Dayjs;
 };
-export declare const getErrorList: (resource: any, cacheItem: any) => {
+export declare const getErrorList: (resource: any, cacheItem: any, isDay?: boolean) => {
     label: any;
     type: string;
 }[];
@@ -131,6 +131,18 @@ export declare const formatResource: (resourceItem: any, cacheItem?: any, format
 export declare const getLastServer: (list: any) => any;
 export declare const getCacheParams: () => any;
 export declare const deleteCacheParams: () => void;
+/**
+ * @title: 获取跨日预约的时长
+ * @description:
+ * @param {any} cacheItem
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-01 22:43
+ */
+export declare const getDays: (cacheItem: any, type: 'minutes' | 'days') => any;
+export declare const isSessionProduct: (cacheItem: any) => boolean;
+export declare const getIsEject: (item: any, type: 'select' | 'detail') => boolean;
+export declare const getIsOnlySession: (item: any) => boolean;
 /**
  * @title: 创建一个服务商品
  * @description:
@@ -153,10 +165,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | {
+}) => number | "flexible" | {
     type: string;
     value: number;
-} | "flexible";
+};
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/es/components/booking/utils.js

@@ -15,7 +15,9 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import dayjs from 'dayjs';
 import { locales } from '@pisell/utils';
+import { isDayBooking, formatDayDate } from "./info/service2/utils";
 import { intersectionBy } from 'lodash';
+import { getAppointmentTimingPreference } from "./info2/utilsByBooking";
 var Request = /*#__PURE__*/function () {
   function Request() {
     _classCallCheck(this, Request);
@@ -44,10 +46,15 @@ export var request = new Request();
  * @Author: zhiwei.Wang
  * @Date: 2024-04-26 14:00
  */
-export var getDiscountTime = function getDiscountTime(service_times) {
-  if (!service_times) {
+export var getDiscountTime = function getDiscountTime(service_times, isDay) {
+  if (!service_times || service_times < 0) {
     return '';
   }
+
+  // 跨日预约
+  if (isDay) {
+    return "".concat(service_times, " ").concat(locales.getText('pisell2.text.day')(service_times));
+  }
   if (service_times < 60) {
     return "".concat(service_times, " ").concat(locales.getText('pisell2.text.min'));
   } else {
@@ -71,7 +78,7 @@ export var getDiscountTime = function getDiscountTime(service_times) {
  * @Author: zhiwei.Wang
  * @Date: 2024-04-26 13:59
  */
-export var sliceDayIntoFiveMinutes = function sliceDayIntoFiveMinutes(config, locale) {
+export var sliceDayIntoFiveMinutes = function sliceDayIntoFiveMinutes(config, locale, isDay) {
   var _locale = locale;
   var dayjsLocale = _locale === 'en-US' || _locale === 'en' ? 'en' : 'zh-cn';
   dayjs.locale(dayjsLocale);
@@ -82,12 +89,34 @@ export var sliceDayIntoFiveMinutes = function sliceDayIntoFiveMinutes(config, lo
   var timeSlices = [];
   var durationSlicesBasedOnTime = [];
   var currentTime = startTime;
+
+  // 跨日预约
+  if (isDay) {
+    var currentDay = 1;
+    while (currentDay <= 30) {
+      var timeLabel = currentTime.format('hh:mm A');
+      var timeValue = currentTime.format('HH:mm');
+      timeSlices.push({
+        label: timeLabel,
+        value: timeValue
+      });
+      durationSlicesBasedOnTime.push({
+        label: "".concat(currentDay, " ").concat(locales.getText('pisell2.text.day')(currentDay)),
+        value: currentDay
+      });
+      currentDay++;
+    }
+    return {
+      timeSlices: timeSlices,
+      durationSlicesBasedOnTime: durationSlicesBasedOnTime
+    };
+  }
   while (currentTime.isBefore(endTime)) {
-    var timeLabel = currentTime.format('hh:mm A');
-    var timeValue = currentTime.format('HH:mm');
+    var _timeLabel = currentTime.format('hh:mm A');
+    var _timeValue = currentTime.format('HH:mm');
     timeSlices.push({
-      label: timeLabel,
-      value: timeValue
+      label: _timeLabel,
+      value: _timeValue
     });
     var nextTime = currentTime.add(timeSlice, 'minute');
     var durationValue = nextTime.diff(startTime, 'minute');
@@ -222,6 +251,12 @@ export var formatProductListByCategory = function formatProductListByCategory(li
   });
 };
 export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cacheItem) {
+  var _cacheItem$_extend;
+  // 是编辑的商品
+  var isEdit = !!cacheItem.booking_id;
+
+  // 是当前绑定的资源
+  var isCurrentRelation = item.item_id === (cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.relation_id);
   var startDate = dayjs(cacheItem._extend.start_date.format('YYYY-MM-DD') + ' ' + getServeStartTime(cacheItem._extend.start_time));
   var isFlexible = flexibleObj.isFlexible(cacheItem._extend.duration);
 
@@ -235,8 +270,9 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
   if (time.max_participants_limit == 0) {
     isMaxLimitRange = true;
   } else {
-    // unknown 为 未知的,  需要掉接口确认是否可用
-    isMaxLimitRange = 'unknown';
+    // 编辑当前选择资源，当前资源已预约数量 - 1
+    var orderEventCount = isEdit && isCurrentRelation ? time.order_event_count - 1 : time.order_event_count;
+    isMaxLimitRange = orderEventCount < time.max_participants_limit;
   }
   var timeStartDate = dayjs(time.start_date + ' ' + time.start_time).subtract(1, 'second');
   var timeEndDate = dayjs(time.end_date + ' ' + time.end_time).add(1, 'second');
@@ -276,6 +312,29 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
  * @Date: 2024-01-09 13:57
  */
 export var formatTimes = function formatTimes(resourceItem, cacheItem) {
+  var _cacheItem$_extend2;
+  if ((cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.sub_type) === 'days') {
+    var isResourceItem = (resourceItem === null || resourceItem === void 0 ? void 0 : resourceItem.form_record_id) > 0;
+
+    // 是否在最大预约数量的区间内
+    var isMaxLimitRange = (resourceItem === null || resourceItem === void 0 ? void 0 : resourceItem.sold_out) === 1;
+
+    // 是否在日期范围内
+    var isDateRange = (resourceItem === null || resourceItem === void 0 ? void 0 : resourceItem.available_status) === 1;
+
+    // 是否可用
+    var isUsable = isDateRange && !isMaxLimitRange;
+    var usableTime = {
+      isMaxLimitRange: isMaxLimitRange,
+      isDateRange: isDateRange,
+      isUsable: isResourceItem ? isUsable : true
+    };
+    resourceItem._extend = _objectSpread(_objectSpread({}, resourceItem._extend), {}, {
+      usableTime: usableTime
+    });
+    return resourceItem;
+  }
+
   // 可用的time列表
   var usableTimes = [];
   var _resourceItem = _objectSpread({}, resourceItem);
@@ -428,14 +487,22 @@ export var getEndDate = function getEndDate(startDate, duration, endDate) {
 // export const get
 
 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));
   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) {
+    return {
+      startDate: dayjs(session.start_at),
+      endDate: dayjs(session.end_at)
+    };
+  }
   return {
     startDate: startDate,
     endDate: endDate
   };
 };
-export var getErrorList = function getErrorList(resource, cacheItem) {
+export var getErrorList = function getErrorList(resource, cacheItem, isDay) {
   if (!(cacheItem !== null && cacheItem !== void 0 && cacheItem.id)) {
     return [{
       label: locales.getText('pisell2.text.no-product-added'),
@@ -448,7 +515,7 @@ export var getErrorList = function getErrorList(resource, cacheItem) {
   var list = [];
   // 当前资源不可用
   if (!resource.usable) {
-    var _resource$_extend, _resource$_extend2;
+    var _resource$_extend, _resource$_extend2, _resource$_extend3;
     // 挂接的商品不可用
     if (!(resource !== null && resource !== void 0 && (_resource$_extend = resource._extend) !== null && _resource$_extend !== void 0 && _resource$_extend.usableProduct)) {
       list.push({
@@ -456,23 +523,35 @@ export var getErrorList = function getErrorList(resource, cacheItem) {
         type: 'product'
       });
     }
-    var _getServiceTimes = getServiceTimes(cacheItem),
-      startDate = _getServiceTimes.startDate,
-      endDate = _getServiceTimes.endDate;
-    // 如果跨天  结束时间前面加一个明天
-    var startText = startDate.format('hh:mm A');
-    var endText = endDate.format('hh:mm A');
-    if (dayjs(endDate).isAfter(startDate, 'day')) {
-      endText = locales.getText('pisell1.text.tomorrow') + endText;
+    var startText = '';
+    var endText = '';
+
+    // 跨日预约
+    if (isDay) {
+      var _cacheItem$_extend3 = cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem._extend,
+        start_date = _cacheItem$_extend3.start_date,
+        end_date = _cacheItem$_extend3.end_date;
+      startText = start_date === null || start_date === void 0 ? void 0 : start_date.format('YYYY-MM-DD');
+      endText = end_date ? end_date === null || end_date === void 0 ? void 0 : end_date.format('YYYY-MM-DD') : '';
+    } else {
+      var _getServiceTimes = getServiceTimes(cacheItem),
+        startDate = _getServiceTimes.startDate,
+        endDate = _getServiceTimes.endDate;
+      // 如果跨天  结束时间前面加一个明天
+      startText = startDate.format('hh:mm A');
+      endText = endDate.format('hh:mm A');
+      if (dayjs(endDate).isAfter(startDate, 'day')) {
+        endText = locales.getText('pisell1.text.tomorrow') + endText;
+      }
     }
-    if (!((_resource$_extend2 = resource._extend) !== null && _resource$_extend2 !== void 0 && _resource$_extend2.usableTime)) {
+    if (isDay ? !((_resource$_extend2 = resource._extend) !== null && _resource$_extend2 !== void 0 && (_resource$_extend2 = _resource$_extend2.usableTime) !== null && _resource$_extend2 !== void 0 && _resource$_extend2.isDateRange) : !((_resource$_extend3 = resource._extend) !== null && _resource$_extend3 !== void 0 && _resource$_extend3.usableTime)) {
       list.push({
         label: locales.getText('pisell1.text.resource-error-message-2')(resource.labelText, startText, endText),
         type: 'time'
       });
     } else {
-      var _resource$_extend3;
-      if (!((_resource$_extend3 = resource._extend) !== null && _resource$_extend3 !== void 0 && _resource$_extend3.usableTime._extend.isMaxLimitRange)) {
+      var _resource$_extend4, _resource$_extend5;
+      if (isDay ? (_resource$_extend4 = resource._extend) === null || _resource$_extend4 === void 0 || (_resource$_extend4 = _resource$_extend4.usableTime) === null || _resource$_extend4 === void 0 ? void 0 : _resource$_extend4.isMaxLimitRange : !((_resource$_extend5 = resource._extend) !== null && _resource$_extend5 !== void 0 && (_resource$_extend5 = _resource$_extend5.usableTime) !== null && _resource$_extend5 !== void 0 && (_resource$_extend5 = _resource$_extend5._extend) !== null && _resource$_extend5 !== void 0 && _resource$_extend5.isMaxLimitRange)) {
         list.push({
           label: locales.getText('pisell1.text.resource-error-message-3')(resource.labelText, startText, endText),
           type: 'limit'
@@ -492,6 +571,7 @@ export var getErrorList = function getErrorList(resource, cacheItem) {
  * @Date: 2024-01-09 13:40
  */
 export var formatResource = function formatResource(resourceItem, cacheItem, formatLabel) {
+  var _resourceItem$_extend, _cacheItem$_extend4;
   // 当前资源
   var _resourceItem = _objectSpread({}, resourceItem);
 
@@ -503,7 +583,13 @@ export var formatResource = function formatResource(resourceItem, cacheItem, for
 
   // 格式化label
   _resourceItem.labelText = _resourceItem.room_name || _resourceItem.name;
-  var usable = _resourceItem._extend.usableTime && _resourceItem._extend.usableProduct;
+  var usable = _resourceItem._extend.usableTime && ((_resourceItem$_extend = _resourceItem._extend.usableTime._extend) === null || _resourceItem$_extend === void 0 ? void 0 : _resourceItem$_extend.isMaxLimitRange) && _resourceItem._extend.usableProduct;
+
+  // 跨日预约
+  if ((cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend4 = cacheItem._extend) === null || _cacheItem$_extend4 === void 0 ? void 0 : _cacheItem$_extend4.sub_type) === 'days') {
+    var _resourceItem$_extend2, _resourceItem$_extend3;
+    usable = ((_resourceItem$_extend2 = _resourceItem._extend) === null || _resourceItem$_extend2 === void 0 || (_resourceItem$_extend2 = _resourceItem$_extend2.usableTime) === null || _resourceItem$_extend2 === void 0 ? void 0 : _resourceItem$_extend2.isUsable) && ((_resourceItem$_extend3 = _resourceItem._extend) === null || _resourceItem$_extend3 === void 0 ? void 0 : _resourceItem$_extend3.usableProduct);
+  }
   _resourceItem.usable = usable;
   if (formatLabel) {
     _resourceItem.label = formatLabel(_resourceItem);
@@ -525,6 +611,40 @@ export var deleteCacheParams = function deleteCacheParams() {
   sessionStorage.removeItem('pisell2.booking.serviceParams');
 };
 
+/**
+ * @title: 获取跨日预约的时长
+ * @description: 
+ * @param {any} cacheItem
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-01 22:43
+ */
+export var getDays = function getDays(cacheItem, type) {
+  var _cacheItem$_extend5, _cacheItem$_extend6;
+  // 计算天数
+  if (type === 'days') {
+    var _formatDayDate = formatDayDate(cacheItem._extend),
+      start_date = _formatDayDate.start_date,
+      end_date = _formatDayDate.end_date;
+    return end_date.diff(start_date, 'day');
+  }
+  var startDate = dayjs((_cacheItem$_extend5 = cacheItem._extend) === null || _cacheItem$_extend5 === void 0 ? void 0 : _cacheItem$_extend5.start_date);
+  var endDate = dayjs((_cacheItem$_extend6 = cacheItem._extend) === null || _cacheItem$_extend6 === void 0 ? void 0 : _cacheItem$_extend6.end_date);
+  return endDate.diff(startDate, type);
+};
+export var isSessionProduct = function isSessionProduct(cacheItem) {
+  return ['session_product', 'session_ticket'].includes(cacheItem.extension_type);
+};
+export var getIsEject = function getIsEject(item, type) {
+  var isSession = isSessionProduct(item);
+  // 是否有单规格 组合规格 套餐, 或者session商品 如果没有不需要打开弹窗
+  return type === 'detail' || item.bundle_group_count > 0 || item.option_group_count > 0 || item.is_variant > 0 || isSession;
+};
+export var getIsOnlySession = function getIsOnlySession(item) {
+  var isSession = isSessionProduct(item);
+  return !(item.bundle_group_count > 0 || item.option_group_count > 0 || item.is_variant > 0) && isSession;
+};
+
 /**
  * @title: 创建一个服务商品
  * @description:
@@ -535,18 +655,30 @@ export var deleteCacheParams = function deleteCacheParams() {
  * @Date: 2024-01-26 14:09
  */
 export var getServerItemExtend = function getServerItemExtend(state, cacheItem, timeObj) {
-  var _cacheItem$duration;
   // 编辑直接返回原数据
   if (!cacheItem.new && cacheItem._extend.endDate) {
     return cacheItem._extend;
   }
+  var appointmentTimingPreference = getAppointmentTimingPreference(state);
+  var isSession = isSessionProduct(cacheItem);
+  var isDay = isDayBooking(state);
+  var setDuration = function setDuration() {
+    var _cacheItem$duration;
+    if (isDay) {
+      return getDays(cacheItem, 'days');
+    }
+    if (isSession) {
+      return getDays(cacheItem, 'minutes');
+    }
+    return findNextDuration(cacheItem.duration, timeObj.durationSlicesBasedOnTime, cacheItem === null || cacheItem === void 0 || (_cacheItem$duration = cacheItem.duration) === null || _cacheItem$duration === void 0 ? void 0 : _cacheItem$duration.value);
+  };
 
   // 获取上一个服务商品
-  var lastServer = getLastServer(state.service.value);
+  var lastServer = isDay ? false : getLastServer(state.service.value);
 
   // 下一个商品的扩展参数
   var _extend = {
-    duration: findNextDuration(cacheItem.duration, timeObj.durationSlicesBasedOnTime, cacheItem === null || cacheItem === void 0 || (_cacheItem$duration = cacheItem.duration) === null || _cacheItem$duration === void 0 ? void 0 : _cacheItem$duration.value)
+    duration: setDuration()
   };
 
   // 如果有上一个商品, 将上一个商品的某些参数 设置到新商品上
@@ -555,11 +687,17 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
     _extend.resource = lastServer._extend.resource;
     var lastServerStartDate = lastServer._extend.startDate;
     var lastServerEndDate = lastServer._extend.endDate;
-    // 如果上个服务商品的结束时间跨天, 那么设置为最后一个时间段,  不跨天则取上一个的结束时间
-    if (dayjs(lastServerEndDate).isAfter(lastServerStartDate, 'day')) {
-      _extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
+
+    // 同时预约模式
+    if (appointmentTimingPreference === 'parallel') {
+      _extend.start_time = lastServerStartDate.format('HH:mm');
     } else {
-      _extend.start_time = lastServerEndDate.format('HH:mm');
+      // 如果上个服务商品的结束时间跨天, 那么设置为最后一个时间段,  不跨天则取上一个的结束时间
+      if (dayjs(lastServerEndDate).isAfter(lastServerStartDate, 'day')) {
+        _extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
+      } else {
+        _extend.start_time = lastServerEndDate.format("HH:mm");
+      }
     }
   } else {
     // 没有上一个商品  资源为 0
@@ -599,22 +737,46 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
     }
   }
   _extend = _objectSpread(_objectSpread({}, _extend), cacheItem._extend);
+
+  // 跨日预约
+  if (isDay) {
+    _extend.end_date = dayjs(_extend.start_date).add(_extend.duration, 'day');
+    var _formatDayDate2 = formatDayDate(_extend),
+      start_date = _formatDayDate2.start_date,
+      end_date = _formatDayDate2.end_date;
+    _extend = _objectSpread(_objectSpread({}, _extend), {}, {
+      start_date: start_date,
+      startDate: start_date,
+      end_date: end_date,
+      endDate: end_date
+    });
+  }
   return _extend;
 };
 
-// 商品价格:   (商品价格 + (套餐价格 + 单规格价格 * 单规格数量) * 套餐数量)  * 商品数量
+// 商品价格:   (商品价格 + (套餐价格 + 单规格价格 * 单规格数量) * 套餐数量 + 单规格价格 * 单规格数量)  * 商品数量
 export var getProductTotalPrice = function getProductTotalPrice(item) {
   var _item$_extend;
-  var price = 0;
-  price += Number(item._extend.price);
+  var price = Number(item._extend.price);
   var other = (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.other;
+
+  // 多规格
+  if (other !== null && other !== void 0 && other.product_variant_id) {
+    price = Number(other === null || other === void 0 ? void 0 : other.price);
+  }
   if (other !== null && other !== void 0 && other.bundle) {
     // bundle
     price = other === null || other === void 0 ? void 0 : other.bundle.reduce(function (accumulator, currentValue) {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
-  price = price;
+
+  // 单规格
+  if (other !== null && other !== void 0 && other.option) {
+    price = other === null || other === void 0 ? void 0 : other.option.reduce(function (accumulator, currentValue) {
+      return accumulator + Number(currentValue.price) * Number(currentValue.num);
+    }, price);
+  }
   return price;
 };
 /**

package/es/components/eftpos/hooks.d.ts

@@ -6,8 +6,8 @@ import { Eftpos } from './const';
  * @Date: 2024-08-20 13:23
  */
 export declare const usePairTerminalo: (type: Eftpos, params: {
-    url?: string | undefined;
-    version?: string | undefined;
+    url?: string;
+    version?: string;
 }) => ({ mid, tid, apiKey, posProductData, }: {
     mid: string;
     tid: string;
@@ -29,6 +29,6 @@ export declare const usePairTerminalo: (type: Eftpos, params: {
  * @Date: 2024-08-19 18:36
  */
 export declare const useTyro: (params: {
-    url?: string | undefined;
-    version?: string | undefined;
+    url?: string;
+    version?: string;
 }) => readonly [import("react").MutableRefObject<any>, boolean];

package/es/components/eftpos/pos.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { DeviceProp } from "./const";
 interface PosProps {
     eftposName: string;

package/es/components/eftposPay/amount.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PosProps } from './const';
 /**
  * @title: 支付金额信息配置页
@@ -9,7 +8,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/es/components/eftposPay/app.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PosProps, RouteType } from './const';
 declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "type" | "mode" | "getApi"> & {
     action: RouteType;

package/es/components/eftposPay/component/fail/failCustom.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ className, isMobile, onChange }: ActionProps) => JSX.Element;
 export default _default;

package/es/components/eftposPay/component/fail/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ onChange, className, isMobile }: ActionProps) => JSX.Element;
 export default _default;

package/es/components/eftposPay/component/fail/network.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 断网(客户端)提示页

package/es/components/eftposPay/component/fail/unknow.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 支付状态未知页面

package/es/components/eftposPay/component/manual/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 import './index.less';
 /**

package/es/components/eftposPay/component/signature/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 取消签名确认页

package/es/components/eftposPay/component/step/index.d.ts

@@ -2,11 +2,11 @@
 import { StatusType } from '../../const';
 declare const _default: (props: {
     status: StatusType;
-    warn?: string | undefined;
-    text?: string | undefined;
-    tip?: string | undefined;
-    loading?: string | undefined;
-    success?: string | undefined;
-    fail?: string | undefined;
+    warn?: string;
+    text?: string;
+    tip?: string;
+    loading?: string;
+    success?: string;
+    fail?: string;
 }) => JSX.Element;
 export default _default;

package/es/components/eftposPay/component/step/step.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="react" />
 declare const _default: (props: {
     status: string;
-    pedding?: string | undefined;
-    resolve?: string | undefined;
-    reject?: string | undefined;
-    className?: string | undefined;
+    pedding?: string;
+    resolve?: string;
+    reject?: string;
+    className?: string;
 }) => JSX.Element;
 export default _default;

package/es/components/eftposPay/device.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PayProps, PosProps } from './const';
 import './device.less';
 /**
@@ -11,7 +10,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/es/components/eftposPay/hooks.d.ts

@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"success" | "loading" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"tyro" | "windcave" | "payo" | "stripe">;
+    readonly eftposRef: React.MutableRefObject<"tyro" | "windcave" | "stripe" | "payo">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };
@@ -31,5 +31,5 @@ export declare const useStoreRef: <T extends {
  * @Date: 2024-08-12 11:54
  */
 export declare const useFail: (index: number) => (res: {
-    code?: "200" | "4004" | "701000" | "701001" | "701003" | "701004" | "701005" | "701006" | "701007" | "701008" | "701009" | "701010" | undefined;
+    code?: `${PayStatus}`;
 }, isMark?: boolean) => void;

package/es/components/eftposPay/pay.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PayProps } from './const';
 import './index.less';
 /**