@pisell/private-materials 6.4.72 → 6.4.73

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

@@ -29,13 +29,12 @@ import "../../../info/service/addService/index.less";
 import useEngineContext from "../../../../../hooks/useEngineContext";
 import { getProductDetail } from "../../../info/service/serve";
 import { getIsBundleOrCombination } from "../../../info/utils";
-import { getMultiDay, getProductExtend, isMultiDayProduct } from "./utils";
+import { getProductExtend } from "./utils";
 import { formatProductListByCategory, getIsEject, getIsOnlySession, getProductTotalPrice, isSessionProduct, request } from "../../../utils";
 import { locales, getUniqueId } from '@pisell/utils';
 import { useUpdateEffect } from 'ahooks';
 import { isNormalProductByDurationSchedule } from "../../../info/service2/utils";
 import { getIsShowNumber } from "../../../../ticketBooking/utils";
-import { concatBookings, createBookingItemsByGroup } from "../../../info/service2/Group/utils";
 var shopList = [2886, 4422, 5538, 6930, 6814, 6813, 6812, 6087, 6303, 6080, 6978, 7386, 6848, 6305];
 var Info = function Info(props) {
   var _state$client2, _state$service3, _state$service5, _state$service6;
@@ -277,154 +276,98 @@ var Info = function Info(props) {
         isOS: isSession,
         customer_id: (_state$client3 = state.client) === null || _state$client3 === void 0 || (_state$client3 = _state$client3.value) === null || _state$client3 === void 0 ? void 0 : _state$client3.id
       },
-      callback: function () {
-        var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(e, extension_type, detail) {
-          var _detail, other, cacheItem, isMultiDay, _total, _isEdit, _state$service$cacheI, getMultiDayCacheItem, newValue, _window$openBookingEd, _window;
-          return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-            while (1) switch (_context4.prev = _context4.next) {
-              case 0:
-                if (!lock) {
-                  _context4.next = 2;
-                  break;
-                }
-                return _context4.abrupt("return");
-              case 2:
-                lock = true;
+      callback: function callback(e, extension_type, detail) {
+        // 防止选择商品弹窗多次触发callback
+        if (lock) {
+          return;
+        }
+        lock = true;
 
-                // 2秒后解除
-                setTimeout(function () {
-                  lock = false;
-                }, 2000);
-                _detail = detail || item;
-                other = JSON.parse(JSON.stringify(e));
-                other.session = e.session;
-                cacheItem = _objectSpread(_objectSpread({}, _detail), {}, {
-                  product_id: item.id,
-                  _id: getUniqueId(),
-                  _key: e.key,
-                  _extend: {
-                    start_date: state.date.value,
-                    quantity: (e === null || e === void 0 ? void 0 : e.quantity) || 1,
-                    price: _detail.price,
-                    product_name: item.title,
-                    other: other
-                  },
-                  new: 1
-                });
-                isMultiDay = isMultiDayProduct(cacheItem);
-                if (isMultiDay) {
-                  cacheItem._extend.end_date = state.date.value.add(1, 'day');
-                }
-                _total = getProductTotalPrice(cacheItem); // 用于折扣 可修改
-                cacheItem._extend.total = _total;
-                // 用于储存原价
-                cacheItem._extend.origin_total = _total;
-                _isEdit = !!state.service.cacheItem;
-                if (_isEdit) {
-                  cacheItem._id = (_state$service$cacheI = state.service.cacheItem) === null || _state$service$cacheI === void 0 ? void 0 : _state$service$cacheI._id;
-                  cacheItem.new = 0;
-                }
-                // 渲染到当前位置模式时，默认无资源 时间默认取顶部设置的时间
-                if (renderMode === 'current') {
-                  // cacheItem._extend.resource = 0;
-                  cacheItem.currentDefaultTime = state.date.value.format('HH:mm');
-                }
-                cacheItem = getProductExtend({
-                  cacheItem: cacheItem,
-                  state: state
-                });
-                getMultiDayCacheItem = /*#__PURE__*/function () {
-                  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(isConcatBookings) {
-                    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-                      while (1) switch (_context3.prev = _context3.next) {
-                        case 0:
-                          _context3.next = 2;
-                          return getMultiDay({
-                            start_date: cacheItem._extend.start_date,
-                            end_date: cacheItem._extend.end_date,
-                            state: state,
-                            cacheItem: cacheItem
-                          });
-                        case 2:
-                          cacheItem = _context3.sent;
-                          cacheItem = createBookingItemsByGroup(cacheItem);
-                          if (isConcatBookings) {
-                            cacheItem = concatBookings(cacheItem);
-                          }
-                        case 5:
-                        case "end":
-                          return _context3.stop();
-                      }
-                    }, _callee3);
-                  }));
-                  return function getMultiDayCacheItem(_x6) {
-                    return _ref3.apply(this, arguments);
-                  };
-                }();
-                if (state.renderType === 'eventBooking' || isMultiDay) {
-                  cacheItem.autoClose = false;
-                }
-                if (!cacheItem.autoClose) {
-                  _context4.next = 26;
-                  break;
-                }
-                cacheItem.autoClose = false;
-                newValue = _toConsumableArray(state.service.value);
-                if (!newValue.some(function (item) {
-                  return item._id === cacheItem._id;
-                })) {
-                  newValue.push(cacheItem);
-                } else {
-                  newValue = newValue.map(function (item) {
-                    if (item._id === cacheItem._id) {
-                      return _objectSpread(_objectSpread({}, cacheItem), {}, {
-                        new: 0
-                      });
-                    }
-                    return item;
-                  });
-                }
-                dispatch({
-                  type: 'setService',
-                  payload: {
-                    addModal: false,
-                    value: newValue,
-                    edit: true,
-                    changeService: false
-                  }
-                });
-                _context4.next = 32;
-                break;
-              case 26:
-                (_window$openBookingEd = (_window = window).openBookingEditModal) === null || _window$openBookingEd === void 0 || _window$openBookingEd.call(_window);
-                if (!isMultiDay) {
-                  _context4.next = 30;
-                  break;
-                }
-                _context4.next = 30;
-                return getMultiDayCacheItem(true);
-              case 30:
-                dispatch({
-                  type: 'setService',
-                  payload: {
-                    editModal: true,
-                    cacheItem: cacheItem,
-                    addModal: !cacheItem.autoClose,
-                    changeService: false
-                  }
+        // 2秒后解除
+        setTimeout(function () {
+          lock = false;
+        }, 2000);
+        var _detail = detail || item;
+        var other = JSON.parse(JSON.stringify(e));
+        other.session = e.session;
+        var cacheItem = _objectSpread(_objectSpread({}, _detail), {}, {
+          product_id: item.id,
+          _id: getUniqueId(),
+          _key: e.key,
+          _extend: {
+            start_date: state.date.value,
+            quantity: (e === null || e === void 0 ? void 0 : e.quantity) || 1,
+            price: _detail.price,
+            product_name: item.title,
+            other: other
+          },
+          new: 1
+        });
+        console.log(cacheItem, 'cacheItem', e);
+        var _total = getProductTotalPrice(cacheItem);
+        // 用于折扣 可修改
+        cacheItem._extend.total = _total;
+        // 用于储存原价
+        cacheItem._extend.origin_total = _total;
+        var _isEdit = !!state.service.cacheItem;
+        if (_isEdit) {
+          var _state$service$cacheI;
+          cacheItem._id = (_state$service$cacheI = state.service.cacheItem) === null || _state$service$cacheI === void 0 ? void 0 : _state$service$cacheI._id;
+          cacheItem.new = 0;
+        }
+        // 渲染到当前位置模式时，默认无资源 时间默认取顶部设置的时间
+        if (renderMode === 'current') {
+          // cacheItem._extend.resource = 0;
+          cacheItem.currentDefaultTime = state.date.value.format('HH:mm');
+        }
+        cacheItem = getProductExtend({
+          cacheItem: cacheItem,
+          state: state
+        });
+        if (state.renderType === 'eventBooking') {
+          cacheItem.autoClose = false;
+        }
+        if (cacheItem.autoClose) {
+          cacheItem.autoClose = false;
+          var newValue = _toConsumableArray(state.service.value);
+          if (!newValue.some(function (item) {
+            return item._id === cacheItem._id;
+          })) {
+            newValue.push(cacheItem);
+          } else {
+            newValue = newValue.map(function (item) {
+              if (item._id === cacheItem._id) {
+                return _objectSpread(_objectSpread({}, cacheItem), {}, {
+                  new: 0
                 });
-                onEdit === null || onEdit === void 0 || onEdit(cacheItem);
-              case 32:
-              case "end":
-                return _context4.stop();
+              }
+              return item;
+            });
+          }
+          dispatch({
+            type: 'setService',
+            payload: {
+              addModal: false,
+              value: newValue,
+              edit: true,
+              changeService: false
+            }
+          });
+        } else {
+          var _window$openBookingEd, _window;
+          (_window$openBookingEd = (_window = window).openBookingEditModal) === null || _window$openBookingEd === void 0 || _window$openBookingEd.call(_window);
+          dispatch({
+            type: 'setService',
+            payload: {
+              editModal: true,
+              cacheItem: cacheItem,
+              addModal: !cacheItem.autoClose,
+              changeService: false
             }
-          }, _callee4);
-        }));
-        function callback(_x3, _x4, _x5) {
-          return _callback.apply(this, arguments);
+          });
+          onEdit === null || onEdit === void 0 || onEdit(cacheItem);
         }
-        return callback;
-      }()
+      }
     });
   };
   var renderList = useMemo(function () {

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

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

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

@@ -1,7 +1,4 @@
 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 _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
@@ -27,8 +24,6 @@ import AlertTriangle from '@pisell/icon/es/AlertTriangle';
 import { getAutoAllocationStorage } from "../editService/utils";
 import { getNoResource2 } from "../../../mock";
 import { cloneDeep } from 'lodash';
-import { updateAppointmentServicePrice } from "../../../info/service2/utils";
-import { getMultiDayPrices } from "../../../info/utils";
 export var getUsableTime = function getUsableTime(cacheItem) {
   try {
     var items = [];
@@ -129,7 +124,6 @@ export var getTimeObj = function getTimeObj(_ref4) {
     state = _ref4.state,
     useDuration = _ref4.useDuration,
     durationProps = _ref4.durationProps;
-  var isMultiDay = isMultiDayProduct(cacheItem);
   var flexibleOption = getFlexibleOption({
     cacheItem: cacheItem,
     useStartTime: useStartTime,
@@ -138,7 +132,7 @@ export var getTimeObj = function getTimeObj(_ref4) {
     // state,
     durationProps: durationProps
   });
-  var obj = sliceDayIntoFiveMinutes((_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.config) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.basic) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.service_time, locales.locale, isMultiDay);
+  var obj = sliceDayIntoFiveMinutes((_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.config) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.basic) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.service_time, locales.locale);
   var timeSlices = _toConsumableArray(obj.timeSlices);
   var durationSlicesBasedOnTime = _toConsumableArray(obj.durationSlicesBasedOnTime);
 
@@ -152,7 +146,7 @@ export var getTimeObj = function getTimeObj(_ref4) {
     return d.value === useDuration;
   })) {
     durationSlicesBasedOnTime.unshift({
-      label: getDiscountTime(useDuration, isMultiDay),
+      label: getDiscountTime(useDuration),
       value: useDuration,
       //@ts-ignore
       disabled: true
@@ -526,65 +520,6 @@ var getIsAutoClose = function getIsAutoClose(cacheItem) {
   });
 };
 
-/**
- * @title: 是否是跨日商品
- * @description:
- * @param {any} cacheItem
- * @return {*}
- */
-export var isMultiDayProduct = function isMultiDayProduct(product) {
-  var _product$duration;
-  return (product === null || product === void 0 || (_product$duration = product.duration) === null || _product$duration === void 0 ? void 0 : _product$duration.type) === 'days';
-};
-export var getMultiDay = /*#__PURE__*/function () {
-  var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref11) {
-    var start_date, end_date, state, cacheItem, _cacheItem, _yield$updateAppointm, multiDayPrices, price;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          start_date = _ref11.start_date, end_date = _ref11.end_date, state = _ref11.state, cacheItem = _ref11.cacheItem;
-          _cacheItem = cacheItem || state.service.cacheItem; // 跨日预约报价单
-          if (!isMultiDayProduct(_cacheItem)) {
-            _context.next = 11;
-            break;
-          }
-          _context.next = 5;
-          return updateAppointmentServicePrice(state, {
-            start_date: start_date,
-            end_date: end_date,
-            product_id: _cacheItem.product_id
-          });
-        case 5:
-          _yield$updateAppointm = _context.sent;
-          multiDayPrices = _yield$updateAppointm.multiDayPrices;
-          price = _yield$updateAppointm.price;
-          // // 获取商品总价
-          // let _total = getProductTotalPrice(_cacheItem);
-
-          // // 用于折扣 可修改
-          // _cacheItem._extend.total = _total;
-
-          // // 用于储存原价
-          // _cacheItem._extend.origin_total = _total;
-
-          _cacheItem._extend.multiDayPrices = getMultiDayPrices(multiDayPrices || []);
-          if (!(multiDayPrices !== null && multiDayPrices !== void 0 && multiDayPrices.length)) {
-            _cacheItem._extend.price = price;
-          }
-          return _context.abrupt("return", _cacheItem);
-        case 11:
-          return _context.abrupt("return", _cacheItem);
-        case 12:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return function getMultiDay(_x) {
-    return _ref12.apply(this, arguments);
-  };
-}();
-
 /**
  * @title: 预生成服务的 extend
  * @description:
@@ -593,10 +528,10 @@ export var getMultiDay = /*#__PURE__*/function () {
  * @Author: zhiwei.Wang
  * @Date: 2024-06-01 13:25
  */
-export var getProductExtend = function getProductExtend(_ref13) {
-  var cacheItem = _ref13.cacheItem,
-    state = _ref13.state,
-    isDisabledTime = _ref13.isDisabledTime;
+export var getProductExtend = function getProductExtend(_ref11) {
+  var cacheItem = _ref11.cacheItem,
+    state = _ref11.state,
+    isDisabledTime = _ref11.isDisabledTime;
   // 有endDate 说明是在编辑已经保存过的商品, 没有则是编辑还没保存过的商品
   var isNew = cacheItem.new || !cacheItem._extend.endDate;
   var _cacheItem = _objectSpread({}, cacheItem);
@@ -606,12 +541,6 @@ export var getProductExtend = function getProductExtend(_ref13) {
   // const resourcesOrigin = state.s;
 
   _cacheItem._data = {};
-  if (isMultiDayProduct(cacheItem)) {
-    var _cacheItem$_extend2;
-    _cacheItem._extend.holder_id = (cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.holder_id) || [];
-    // _cacheItem._extend.end_date = state.date.end_date;
-    _cacheItem._extend.sub_type = 'days';
-  }
 
   // 新商品
   if (isNew) {
@@ -674,7 +603,9 @@ export var getProductExtend = function getProductExtend(_ref13) {
         _cacheItem._extend.duration = (_cacheItem$_data$time = _cacheItem._data.timeObj) === null || _cacheItem$_data$time === void 0 || (_cacheItem$_data$time = _cacheItem$_data$time.durationSlicesBasedOnTime) === null || _cacheItem$_data$time === void 0 || (_cacheItem$_data$time = _cacheItem$_data$time[0]) === null || _cacheItem$_data$time === void 0 ? void 0 : _cacheItem$_data$time.value;
 
         // 计算服务的开始和结束时间
-        var _getServiceTimes = getServiceTimes(_cacheItem),
+        var _getServiceTimes = getServiceTimes({
+            _extend: _cacheItem._extend
+          }),
           startDate = _getServiceTimes.startDate,
           endDate = _getServiceTimes.endDate;
         _cacheItem._extend.endDate = endDate;