@pisell/private-materials 6.4.72 → 6.4.74

package/es/components/booking/info2/service/editService/index.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 _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -26,7 +23,7 @@ import { Context } from "../../../info/model";
 import Duration from "../../../materiels/duration";
 import Capacity from "./Capacity";
 import Resources from "./Resources";
-import { Input, Button, Row, Col, Form, InputNumber, DatePicker } from 'antd';
+import { Input, Button, Row, Col, Form, InputNumber } from 'antd';
 import "./index.less";
 import CollapsibleList from "../../../components/collapsibleList";
 import { renderBundles } from "../../../components/collapsibleList/utils";
@@ -35,20 +32,16 @@ import { useUpdateEffect, useMemoizedFn, useDebounceFn } from 'ahooks';
 // import SelectTime from "../../../../../../../materials/src/components/select-time";
 import { ConfigProvider, Iconfont } from '@pisell/materials';
 import { addService, genServiceKey, getIsShowNumber } from "../../../../ticketBooking/utils";
-import { disabledDate as _disabledDate, isNormalProductByDurationSchedule } from "../../../info/service2/utils";
+import { isNormalProductByDurationSchedule } from "../../../info/service2/utils";
 import { editSessionProduct } from "../../../info/utils";
-import { deleteCacheParams, getDays, getProductTotalPrice, getServiceTimes, isSessionProduct } from "../../../utils";
+import { deleteCacheParams, getProductTotalPrice, getServiceTimes, isSessionProduct } from "../../../utils";
 import { getErrorList, getIsNoSpecAndPackage } from "../../utilsByBooking";
-import { formatResources, getDurationProps, getFlexibleOption, getMultiDay, getTimeObj, setDefaultCapacitys } from "../addService/utils";
+import { formatResources, getDurationProps, getFlexibleOption, getTimeObj, setDefaultCapacitys } from "../addService/utils";
 import NoteModal from "../../../../../plus/noteModal";
 import { DiscountKeyboard } from "../../../../../pro/priceKeyboard";
-import EditTabs from "../../../info/service/editService/EditTabs";
-import BookingList from "../../../info/service/editService/BookingList";
-import dayjs from "dayjs";
-import { createBookingItemsByGroup, getGroupTotalPrice } from "../../../info/service2/Group/utils";
 var submitLock = false;
 var Info = function Info(_, ref) {
-  var _state$service4, _state$bookingConfig2, _state$bookingConfig3, _state$service$cacheI5, _state$service$cacheI7, _state$service6, _window$BaseMaterials, _state$service8, _state$service$cacheI12, _state$bookingConfig5, _state$service$cacheI13, _state$service$cacheI14, _state$service9, _state$service$resour2, _state$service$cacheI15, _state$service$cacheI16;
+  var _state$service4, _state$bookingConfig2, _state$bookingConfig3, _state$service$cacheI5, _state$service$cacheI6, _state$service6, _window$BaseMaterials, _state$service8, _state$service$cacheI11, _state$bookingConfig5, _state$service$cacheI12, _state$service$cacheI13, _state$service9, _state$service$resour2, _state$service$cacheI14, _state$service$cacheI15;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -57,8 +50,6 @@ var Info = function Info(_, ref) {
   var useStartTime = Form.useWatch('start_time', form);
   var useDuration = Form.useWatch('duration', form);
   var useNote = Form.useWatch('note', form);
-  var useStartDate = Form.useWatch('start_date', form);
-  var useEndDate = Form.useWatch('end_date', form);
   var _useContext = useContext(Context),
     state = _useContext.state,
     dispatch = _useContext.dispatch;
@@ -72,11 +63,6 @@ var Info = function Info(_, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     open = _useState4[0],
     setOpen = _useState4[1];
-  // 当前tab 跨日预约时展示tabs
-  var _useState5 = useState('batch_edit'),
-    _useState6 = _slicedToArray(_useState5, 2),
-    currentTab = _useState6[0],
-    setCurrentTab = _useState6[1];
   useEffect(function () {
     window.openBookingEditModal = function () {
       setOpen(true);
@@ -163,7 +149,6 @@ var Info = function Info(_, ref) {
    */
   var timeObj = useMemo(function () {
     var val = getTimeObj({
-      cacheItem: getCurrentCacheItem(),
       durationProps: durationProps,
       useStartTime: useStartTime,
       currentResource: currentResource,
@@ -255,7 +240,7 @@ var Info = function Info(_, ref) {
    * @Date: 2024-01-09 14:04
    */
   var onFinish = function onFinish(values) {
-    var _resourcesRef$current, _item$_extend, _item$_extend2, _state$service$cacheI3, _window$closeBookingE2, _window2;
+    var _resourcesRef$current, _item$_extend, _state$service$cacheI3, _window$closeBookingE2, _window2;
     var isSuccess = (_resourcesRef$current = resourcesRef.current) === null || _resourcesRef$current === void 0 ? void 0 : _resourcesRef$current.check();
     if (isShowTimeAndResource && !isSuccess) {
       return;
@@ -279,22 +264,13 @@ var Info = function Info(_, ref) {
         quantity: values.quantity
       })
     }, values);
-
-    // 跨日预约商品
-    if (isEditGroup) {
-      // 更新商品数量和更新日期
-      _extend.quantity = 1;
-      _extend.startDate = _extend === null || _extend === void 0 ? void 0 : _extend.start_date;
-      _extend.endDate = _extend === null || _extend === void 0 ? void 0 : _extend.end_date;
-    } else {
-      var _getServiceTimes = getServiceTimes({
-          _extend: _extend
-        }),
-        startDate = _getServiceTimes.startDate,
-        endDate = _getServiceTimes.endDate;
-      _extend.startDate = startDate;
-      _extend.endDate = endDate;
-    }
+    var _getServiceTimes = getServiceTimes({
+        _extend: _extend
+      }),
+      startDate = _getServiceTimes.startDate,
+      endDate = _getServiceTimes.endDate;
+    _extend.startDate = startDate;
+    _extend.endDate = endDate;
     if (_extend.bundle_edit !== undefined) {
       _extend.bundle_edit = 1;
     }
@@ -302,31 +278,23 @@ var Info = function Info(_, ref) {
     _item._time = new Date().getTime();
     _item._serviceKey = genServiceKey(_item);
     var _id = _item === null || _item === void 0 ? void 0 : _item._id;
-    var groupId = _item === null || _item === void 0 || (_item$_extend2 = _item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.groupId;
-    if (groupId) {
-      _list = _list.filter(function (d) {
-        var _d$_extend;
-        return ((_d$_extend = d._extend) === null || _d$_extend === void 0 ? void 0 : _d$_extend.groupId) !== groupId;
-      });
-      _list = _list.concat(createBookingItemsByGroup(_item, true));
+
+    // 判断是新增还是编辑
+    if (!_list.some(function (d) {
+      return d._id === _id;
+    })) {
+      var detail = addService(_list, _item, state);
+      _list = detail.list;
     } else {
-      // 判断是新增还是编辑
-      if (!_list.some(function (d) {
-        return d._id === _id;
-      })) {
-        var detail = addService(_list, _item, state);
-        _list = detail.list;
-      } else {
-        // 手动改价时移除优惠券使用
-        if (isChangeTotal.current) {
-          delete _item.discount_list;
-        }
-        _list = _list.map(function (d) {
-          return d._id === _id ? _objectSpread(_objectSpread({}, _item), {}, {
-            new: 0
-          }) : d;
-        });
+      // 手动改价时移除优惠券使用
+      if (isChangeTotal.current) {
+        delete _item.discount_list;
       }
+      _list = _list.map(function (d) {
+        return d._id === _id ? _objectSpread(_objectSpread({}, _item), {}, {
+          new: 0
+        }) : d;
+      });
     }
     deleteCacheParams();
     console.log('_onFinish', _list);
@@ -362,7 +330,6 @@ var Info = function Info(_, ref) {
   var setEditData = useMemoizedFn(function (_cacheItem, open, openProductDetail) {
     console.timeEnd('handleChange');
     console.log('setEditDatasetEditData', _cacheItem, open);
-    setCurrentTab('batch_edit');
     isChangeTotal.current = false;
     var cacheItem = _cacheItem || state.service.cacheItem;
     var values = cacheItem._extend;
@@ -420,10 +387,9 @@ var Info = function Info(_, ref) {
     return cPrice !== oPrice;
   }, [useTotal, (_state$service$cacheI5 = state.service.cacheItem) === null || _state$service$cacheI5 === void 0 || (_state$service$cacheI5 = _state$service$cacheI5._extend) === null || _state$service$cacheI5 === void 0 ? void 0 : _state$service$cacheI5.origin_total]);
   var getResources = function getResources() {
-    var _state$service$cacheI6;
     var res = formatResources({
       cacheItem: getCurrentCacheItem(),
-      resourcesOrigin: (_state$service$cacheI6 = state.service.cacheItem) === null || _state$service$cacheI6 === void 0 || (_state$service$cacheI6 = _state$service$cacheI6._data) === null || _state$service$cacheI6 === void 0 ? void 0 : _state$service$cacheI6.resourcesOrigin
+      resourcesOrigin: state.service.cacheItem._data.resourcesOrigin
     });
     dispatch({
       type: 'setService',
@@ -493,7 +459,7 @@ var Info = function Info(_, ref) {
    */
   useEffect(function () {
     getDiscount();
-  }, [useTotal, (_state$service$cacheI7 = state.service.cacheItem) === null || _state$service$cacheI7 === void 0 || (_state$service$cacheI7 = _state$service$cacheI7._extend) === null || _state$service$cacheI7 === void 0 ? void 0 : _state$service$cacheI7.origin_total]);
+  }, [useTotal, (_state$service$cacheI6 = state.service.cacheItem) === null || _state$service$cacheI6 === void 0 || (_state$service$cacheI6 = _state$service$cacheI6._extend) === null || _state$service$cacheI6 === void 0 ? void 0 : _state$service$cacheI6.origin_total]);
   var bundles = useMemo(function () {
     var _state$service5;
     return ((_state$service5 = state.service) === null || _state$service5 === void 0 || (_state$service5 = _state$service5.cacheItem) === null || _state$service5 === void 0 || (_state$service5 = _state$service5._extend) === null || _state$service5 === void 0 || (_state$service5 = _state$service5.other) === null || _state$service5 === void 0 ? void 0 : _state$service5.bundle) || [];
@@ -517,11 +483,11 @@ var Info = function Info(_, ref) {
     var isSession = isSessionProduct(item);
     var sessionValue = {};
     if (isSession) {
-      var _item$_extend3, _item$_extend4, _item$_extend5;
+      var _item$_extend2, _item$_extend3, _item$_extend4;
       sessionValue.startEndTime = {
-        startDate: item === null || item === void 0 || (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.start_date,
-        endDate: item === null || item === void 0 || (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.end_date,
-        duration: item === null || item === void 0 || (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.duration
+        startDate: item === null || item === void 0 || (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.start_date,
+        endDate: item === null || item === void 0 || (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.end_date,
+        duration: item === null || item === void 0 || (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.duration
       };
     }
 
@@ -648,17 +614,6 @@ var Info = function Info(_, ref) {
   }, [state.renderType, isNormalProduct]);
   var SelectTime = (_window$BaseMaterials = window.BaseMaterials) === null || _window$BaseMaterials === void 0 ? void 0 : _window$BaseMaterials.SelectTime;
   var isNoSpecAndPackage = getIsNoSpecAndPackage(state.service.cacheItem);
-
-  // 商品组数据
-  var items = useMemo(function () {
-    var _getCurrentCacheItem;
-    return ((_getCurrentCacheItem = getCurrentCacheItem()) === null || _getCurrentCacheItem === void 0 || (_getCurrentCacheItem = _getCurrentCacheItem._extend) === null || _getCurrentCacheItem === void 0 ? void 0 : _getCurrentCacheItem.items) || [];
-  }, [getCurrentCacheItem(), state.service.cacheItem, currentResource, useTotal]);
-
-  // 是否是编辑组
-  var isEditGroup = useMemo(function () {
-    return items.length;
-  }, [items]);
   var handleNoteConfirm = function handleNoteConfirm(noteValue) {
     form.setFieldsValue({
       note: noteValue
@@ -702,7 +657,7 @@ var Info = function Info(_, ref) {
     }))));
   }, [(_state$service8 = state.service) === null || _state$service8 === void 0 || (_state$service8 = _state$service8.cacheItem) === null || _state$service8 === void 0 || (_state$service8 = _state$service8._extend) === null || _state$service8 === void 0 ? void 0 : _state$service8.product_name, bundles, state.amountSymbol, state.isBookingCreatePage]);
   var price = useMemo(function () {
-    var _state$service$cacheI8, _state$service$cacheI9, _state$service$cacheI10, _state$service$cacheI11;
+    var _state$service$cacheI7, _state$service$cacheI8, _state$service$cacheI9, _state$service$cacheI10;
     return /*#__PURE__*/React.createElement(Col, {
       span: 24
     }, /*#__PURE__*/React.createElement(Form.Item, {
@@ -711,7 +666,7 @@ var Info = function Info(_, ref) {
       rules: [{
         required: true
       }],
-      extra: useTotal !== ((_state$service$cacheI8 = state.service.cacheItem) === null || _state$service$cacheI8 === void 0 || (_state$service$cacheI8 = _state$service$cacheI8._extend) === null || _state$service$cacheI8 === void 0 ? void 0 : _state$service$cacheI8.origin_total) && locales.getText('page.booking.text.price-extra')(formatAmount((_state$service$cacheI9 = state.service.cacheItem) === null || _state$service$cacheI9 === void 0 || (_state$service$cacheI9 = _state$service$cacheI9._extend) === null || _state$service$cacheI9 === void 0 ? void 0 : _state$service$cacheI9.origin_total, 2, state.amountSymbol), formatAmount(useTotal, 2, state.amountSymbol))
+      extra: useTotal !== ((_state$service$cacheI7 = state.service.cacheItem) === null || _state$service$cacheI7 === void 0 || (_state$service$cacheI7 = _state$service$cacheI7._extend) === null || _state$service$cacheI7 === void 0 ? void 0 : _state$service$cacheI7.origin_total) && locales.getText('page.booking.text.price-extra')(formatAmount((_state$service$cacheI8 = state.service.cacheItem) === null || _state$service$cacheI8 === void 0 || (_state$service$cacheI8 = _state$service$cacheI8._extend) === null || _state$service$cacheI8 === void 0 ? void 0 : _state$service$cacheI8.origin_total, 2, state.amountSymbol), formatAmount(useTotal, 2, state.amountSymbol))
     }, /*#__PURE__*/React.createElement(DiscountKeyboard.InputNumber, {
       style: {
         width: '100%'
@@ -721,8 +676,8 @@ var Info = function Info(_, ref) {
       prefix: state.amountSymbol,
       onChange: handleTotalChange,
       disabled: state.channelDisabledEdit,
-      originalValue: ((_state$service$cacheI10 = state.service.cacheItem) === null || _state$service$cacheI10 === void 0 || (_state$service$cacheI10 = _state$service$cacheI10._extend) === null || _state$service$cacheI10 === void 0 ? void 0 : _state$service$cacheI10.origin_total) || 0,
-      placeholder: ((_state$service$cacheI11 = state.service.cacheItem) === null || _state$service$cacheI11 === void 0 || (_state$service$cacheI11 = _state$service$cacheI11._extend) === null || _state$service$cacheI11 === void 0 ? void 0 : _state$service$cacheI11.origin_total) || '0',
+      originalValue: ((_state$service$cacheI9 = state.service.cacheItem) === null || _state$service$cacheI9 === void 0 || (_state$service$cacheI9 = _state$service$cacheI9._extend) === null || _state$service$cacheI9 === void 0 ? void 0 : _state$service$cacheI9.origin_total) || 0,
+      placeholder: ((_state$service$cacheI10 = state.service.cacheItem) === null || _state$service$cacheI10 === void 0 || (_state$service$cacheI10 = _state$service$cacheI10._extend) === null || _state$service$cacheI10 === void 0 ? void 0 : _state$service$cacheI10.origin_total) || '0',
       size: "large",
       keyboardProps: {
         containerProps: {
@@ -731,7 +686,7 @@ var Info = function Info(_, ref) {
         selectType: 'dark'
       }
     })));
-  }, [useTotal, (_state$service$cacheI12 = state.service.cacheItem) === null || _state$service$cacheI12 === void 0 || (_state$service$cacheI12 = _state$service$cacheI12._extend) === null || _state$service$cacheI12 === void 0 ? void 0 : _state$service$cacheI12.origin_total, state.amountSymbol, state.channelDisabledEdit]);
+  }, [useTotal, (_state$service$cacheI11 = state.service.cacheItem) === null || _state$service$cacheI11 === void 0 || (_state$service$cacheI11 = _state$service$cacheI11._extend) === null || _state$service$cacheI11 === void 0 ? void 0 : _state$service$cacheI11.origin_total, state.amountSymbol, state.channelDisabledEdit]);
   var reason = useMemo(function () {
     return isReason ? /*#__PURE__*/React.createElement(Col, {
       span: 24
@@ -742,30 +697,17 @@ var Info = function Info(_, ref) {
       size: "large"
     }))) : null;
   }, [isReason]);
-  var DateCom = function DateCom(position) {
-    return /*#__PURE__*/React.createElement(DatePicker, {
-      className: "pisell-lowcode__booking-service-select-date",
-      disabledDate: function disabledDate(current) {
-        return _disabledDate(current, position, state.date.value);
-      },
-      size: "large",
-      style: {
-        width: '100%'
-      },
-      format: state.locale === 'en' ? 'DD/MM/YYYY' : 'YYYY-MM-DD'
-    });
-  };
   var startTime = useMemo(function () {
     var _state$bookingConfig4;
     return /*#__PURE__*/React.createElement(Col, {
       span: 12
     }, /*#__PURE__*/React.createElement(Form.Item, {
-      label: locales.getText(isEditGroup ? 'pisell2.text.start_date' : 'pisell2.text.start_time'),
-      name: isEditGroup ? 'start_date' : 'start_time',
+      label: locales.getText('pisell2.text.start_time'),
+      name: "start_time",
       rules: [{
         required: true
       }]
-    }, isEditGroup ? DateCom('start') : SelectTime ? /*#__PURE__*/React.createElement(SelectTime, {
+    }, SelectTime ? /*#__PURE__*/React.createElement(SelectTime, {
       slice: (_state$bookingConfig4 = state.bookingConfig) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.config) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.basic) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.service_time) === null || _state$bookingConfig4 === void 0 ? void 0 : _state$bookingConfig4.value,
       timePickerProps: {
         style: {
@@ -778,22 +720,11 @@ var Info = function Info(_, ref) {
         }
       }
     }) : null));
-  }, [SelectTime, (_state$bookingConfig5 = state.bookingConfig) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.config) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.basic) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.service_time) === null || _state$bookingConfig5 === void 0 ? void 0 : _state$bookingConfig5.value, isEditGroup]);
-  var endTime = useMemo(function () {
-    if (!isEditGroup) {
-      return null;
-    }
-    return /*#__PURE__*/React.createElement(Col, {
-      span: 12
-    }, /*#__PURE__*/React.createElement(Form.Item, {
-      label: locales.getText('pisell2.text.end_date'),
-      name: "end_date"
-    }, DateCom('end')));
-  }, [isEditGroup]);
+  }, [SelectTime, (_state$bookingConfig5 = state.bookingConfig) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.config) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.basic) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.service_time) === null || _state$bookingConfig5 === void 0 ? void 0 : _state$bookingConfig5.value]);
   var duration = useMemo(function () {
     console.log('render form duration');
     return /*#__PURE__*/React.createElement(Col, {
-      span: isEditGroup ? 24 : 12
+      span: 12
     }, /*#__PURE__*/React.createElement(Form.Item, {
       label: locales.getText('pisell2.text.duration'),
       name: "duration",
@@ -803,7 +734,7 @@ var Info = function Info(_, ref) {
     }, /*#__PURE__*/React.createElement(Duration, _extends({}, durationProps, {
       timeObj: timeObj
     }))));
-  }, [durationProps, timeObj, isEditGroup]);
+  }, [durationProps, timeObj]);
   var resource = useMemo(function () {
     console.log('render form resource');
     return /*#__PURE__*/React.createElement(Form.Item, {
@@ -819,7 +750,7 @@ var Info = function Info(_, ref) {
       // useStartTime={useStartTime}
     }));
     // 只监听内部使用值
-  }, [state.renderType, (_state$service$cacheI13 = state.service.cacheItem) === null || _state$service$cacheI13 === void 0 || (_state$service$cacheI13 = _state$service$cacheI13._data) === null || _state$service$cacheI13 === void 0 ? void 0 : _state$service$cacheI13.resources, (_state$service$cacheI14 = state.service.cacheItem) === null || _state$service$cacheI14 === void 0 || (_state$service$cacheI14 = _state$service$cacheI14._data) === null || _state$service$cacheI14 === void 0 ? void 0 : _state$service$cacheI14.resourceMaps]);
+  }, [state.renderType, (_state$service$cacheI12 = state.service.cacheItem) === null || _state$service$cacheI12 === void 0 || (_state$service$cacheI12 = _state$service$cacheI12._data) === null || _state$service$cacheI12 === void 0 ? void 0 : _state$service$cacheI12.resources, (_state$service$cacheI13 = state.service.cacheItem) === null || _state$service$cacheI13 === void 0 || (_state$service$cacheI13 = _state$service$cacheI13._data) === null || _state$service$cacheI13 === void 0 ? void 0 : _state$service$cacheI13.resourceMaps]);
   var capacity = useMemo(function () {
     return /*#__PURE__*/React.createElement(Form.Item, {
       noStyle: true,
@@ -906,11 +837,11 @@ var Info = function Info(_, ref) {
     }, locales.getText('pisell2.text.apply')));
   }, [(_state$service$resour2 = state.service.resourcesOrigin) === null || _state$service$resour2 === void 0 ? void 0 : _state$service$resour2.length, isNormalProduct]);
   console.log('render edit');
-  console.log(state.service.editModal && !((_state$service$cacheI15 = state.service.cacheItem) !== null && _state$service$cacheI15 !== void 0 && _state$service$cacheI15.autoClose), performance.now() - window.pp1, '打开商品1');
-  var _useState7 = useState(false),
-    _useState8 = _slicedToArray(_useState7, 2),
-    val = _useState8[0],
-    setVal = _useState8[1];
+  console.log(state.service.editModal && !((_state$service$cacheI14 = state.service.cacheItem) !== null && _state$service$cacheI14 !== void 0 && _state$service$cacheI14.autoClose), performance.now() - window.pp1, '打开商品1');
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    val = _useState6[0],
+    setVal = _useState6[1];
   useEffect(function () {
     if (isShowTimeAndResource) {
       setTimeout(function () {
@@ -920,113 +851,6 @@ var Info = function Info(_, ref) {
       setVal(false);
     }
   }, [isShowTimeAndResource]);
-  var groupDom = useMemo(function () {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, !!isEditGroup && /*#__PURE__*/React.createElement(EditTabs, {
-      value: currentTab,
-      onChange: function onChange(e) {
-        console.log(e);
-        setCurrentTab(e);
-      }
-    }), /*#__PURE__*/React.createElement("div", {
-      className: "",
-      style: {
-        display: currentTab === 'booking_list' ? 'block' : 'none'
-      }
-    }, /*#__PURE__*/React.createElement(BookingList, {
-      items: items
-    })));
-  }, [isEditGroup, currentTab, items]);
-  var updateMultiDay = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-      var start_date, end_date, duration, cacheItem, fieldsValues;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            start_date = _ref.start_date, end_date = _ref.end_date, duration = _ref.duration;
-            _context.next = 3;
-            return getMultiDay({
-              start_date: start_date,
-              end_date: end_date,
-              state: state,
-              cacheItem: getCurrentCacheItem()
-            });
-          case 3:
-            cacheItem = _context.sent;
-            // 兼容时长为空的情况
-            if (duration !== undefined) {
-              cacheItem._extend.duration = duration;
-            }
-            cacheItem._extend.items = createBookingItemsByGroup(cacheItem);
-            cacheItem._extend = _objectSpread(_objectSpread({}, cacheItem._extend), getGroupTotalPrice(cacheItem._extend.items));
-            // 覆盖商品
-            dispatch({
-              type: 'setService',
-              payload: {
-                cacheItem: cacheItem
-              }
-            });
-            fieldsValues = {
-              total: cacheItem._extend.total
-            }; // 更新表单内的商品价格
-            form.setFieldsValue(fieldsValues);
-          case 10:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function updateMultiDay(_x) {
-      return _ref2.apply(this, arguments);
-    };
-  }();
-  var onValuesChange = function onValuesChange(changedValues) {
-    // 跨日预约
-    if (isEditGroup) {
-      // 根据时长更新结束时间
-      if (changedValues !== null && changedValues !== void 0 && changedValues.duration) {
-        var end_date = dayjs(useStartDate).add(changedValues === null || changedValues === void 0 ? void 0 : changedValues.duration, 'day');
-        form.setFieldsValue({
-          end_date: end_date
-        });
-
-        // 跨日预约报价单
-        return updateMultiDay({
-          start_date: useStartDate,
-          end_date: end_date,
-          duration: changedValues === null || changedValues === void 0 ? void 0 : changedValues.duration
-        });
-      }
-
-      // 验证结束日期
-      if (changedValues !== null && changedValues !== void 0 && changedValues.start_date) {
-        var startDate = dayjs(changedValues === null || changedValues === void 0 ? void 0 : changedValues.start_date);
-        var endDate = dayjs(useEndDate);
-        // 如果开始日期大于结束日期，则清空数据
-        if (startDate.isAfter(endDate)) {
-          return form.setFieldsValue({
-            duration: undefined,
-            end_date: undefined
-          });
-        }
-      }
-
-      // 计算时长
-      if (changedValues !== null && changedValues !== void 0 && changedValues.start_date || changedValues !== null && changedValues !== void 0 && changedValues.end_date) {
-        var _cacheItem2 = getCurrentCacheItem();
-        var _duration = getDays(_cacheItem2, 'days');
-        var start_date = (changedValues === null || changedValues === void 0 ? void 0 : changedValues.start_date) || useStartDate;
-        var _end_date = (changedValues === null || changedValues === void 0 ? void 0 : changedValues.end_date) || useEndDate;
-        updateMultiDay({
-          start_date: start_date,
-          end_date: _end_date,
-          duration: _duration
-        });
-        return form.setFieldsValue({
-          duration: _duration
-        });
-      }
-    }
-  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Drawer, {
     titleNoWrap: true
     //通过zIndex的方式控制  添加商品 和 编辑服务弹窗的上下层级
@@ -1034,7 +858,7 @@ var Info = function Info(_, ref) {
     zIndex: state.service.changeService ? 999 : 1000,
     forceRender: true,
     mask: state.drawerMask,
-    open: !isNoSpecAndPackage && state.service.editModal && !((_state$service$cacheI16 = state.service.cacheItem) !== null && _state$service$cacheI16 !== void 0 && _state$service$cacheI16.autoClose),
+    open: !isNoSpecAndPackage && state.service.editModal && !((_state$service$cacheI15 = state.service.cacheItem) !== null && _state$service$cacheI15 !== void 0 && _state$service$cacheI15.autoClose),
     title: locales.getText('pisell2.text.edit-service'),
     onClose: function onClose() {
       var _window$closeBookingE4, _window4;
@@ -1050,20 +874,16 @@ var Info = function Info(_, ref) {
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-body-edit"
-  }, groupDom, /*#__PURE__*/React.createElement(Form, {
+  }, /*#__PURE__*/React.createElement(Form, {
     layout: "vertical",
     form: form,
-    onFinish: onFinish,
-    onValuesChange: onValuesChange,
-    style: {
-      display: currentTab === 'batch_edit' ? 'block' : 'none'
-    }
+    onFinish: onFinish
   }, /*#__PURE__*/React.createElement(Row, {
     style: {
       width: '100%'
     },
     gutter: [16, 0]
-  }, productName, price, reason, val && isShowTimeAndResource && /*#__PURE__*/React.createElement(React.Fragment, null, startTime, endTime, duration, resource, capacity, hiddenQuantity), isNormalProduct && quantity), /*#__PURE__*/React.createElement(Form.Item, {
+  }, productName, price, reason, val && isShowTimeAndResource && /*#__PURE__*/React.createElement(React.Fragment, null, startTime, duration, resource, capacity, hiddenQuantity), isNormalProduct && quantity), /*#__PURE__*/React.createElement(Form.Item, {
     noStyle: true,
     name: "note"
   }, noteModalOpen && /*#__PURE__*/React.createElement(NoteModal, {

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

@@ -11,7 +11,6 @@ import dayjs from 'dayjs';
 import { locales } from "@pisell/utils";
 import { getCacheParams, getServeStartTime, getLastServer, flexibleObj, getServiceTimes, findNextDuration, getDays, isSessionProduct } from "../utils";
 import { isOption } from "../../ticketBooking/components/addServiceVariant/utils";
-import { isMultiDayProduct } from "./service/addService/utils";
 
 // 获取当前剩余量
 var getUseableEventCount = function getUseableEventCount(eventList, current) {
@@ -321,7 +320,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 {
@@ -334,18 +333,11 @@ 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;
   }));
-  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 +354,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,9 +390,9 @@ 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;

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

@@ -22,14 +22,6 @@ export declare const request: Request;
  * @Date: 2024-04-26 14:00
  */
 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:
@@ -121,7 +113,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,6 @@ 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";
 var Request = /*#__PURE__*/function () {
   function Request() {
     _classCallCheck(this, Request);
@@ -71,20 +70,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:
@@ -505,14 +490,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) {