@pisell/private-materials 6.4.71 → 6.4.72

package/es/components/booking/info/service2/utils.js

@@ -28,7 +28,7 @@ import localeTexts from "../../locales";
 import { concatBookings, isGroupBooking, getProductByGroupId } from "./Group/utils";
 import { isShowAddTime } from "../utils";
 import { formatResources } from "../service/addService/utils";
-import { getProductExtend } from "../../info2/service/addService/utils";
+import { getProductExtend, isMultiDayProduct } from "../../info2/service/addService/utils";
 import { getErrorList as getErrorListInfo2 } from "../../info2/utilsByBooking";
 import { getRelationDetailsTotal } from "../../components/footer/amount";
 locales.init(localeTexts, localStorage.getItem('umi_locale') || 'en');
@@ -616,10 +616,11 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
     }];
   }
   var isNormalProduct = isNormalProductByDurationSchedule(item);
+  var isMultiDay = isMultiDayProduct(item);
   return _objectSpread({
     format: ['HH:mm', 'HH:mm'],
     show_time: true,
-    duration_type: 'minutes',
+    duration_type: isMultiDay ? 'days' : 'minutes',
     // 当前可选择holder列表
     holders: formatHolders(holders),
     isShowChangeHolder: !isNormalProduct,
@@ -655,8 +656,6 @@ export var formatProducts = function formatProducts(lists, state) {
   var isGeneral = arguments.length > 3 ? arguments[3] : undefined;
   var isParallelResource = arguments.length > 4 ? arguments[4] : undefined;
   if (!(lists !== null && lists !== void 0 && lists.length)) return [];
-  var normalList = [];
-  var groupList = [];
   var formItem = function formItem(item) {
     var _item$_extend10, _item$_extend11, _item$_extend12, _item$_extend14, _item$_extend15, _item$_extend16, _item$_extend17, _item$_extend18, _item$_extend19, _item$_extend20, _item$_extend21, _item$_extend22, _item$_extend23, _resourceItem, _item$_extend24, _item$_extend25, _item$_extend26, _item$_extend27, _item$_extend28;
     var _isDayBookingProduct = isDayBookingProduct(item, state);
@@ -711,31 +710,78 @@ export var formatProducts = function formatProducts(lists, state) {
       _origin: item
     });
   };
-  console.log(normalList, 'normalList');
   if (isRenderGroup) {
-    // 将商品分为组商品和非组商品
-    lists.forEach(function (item) {
+    // 记录每个商品在原始列表中的索引
+    var normalItemsWithIndex = [];
+    var groupItemsWithIndex = [];
+    // 记录每个组第一次出现的索引
+    var groupFirstIndexMap = {};
+
+    // 将商品分为组商品和非组商品，并记录索引
+    lists.forEach(function (item, index) {
       var _item$_extend29;
       if (!(item !== null && item !== void 0 && (_item$_extend29 = item._extend) !== null && _item$_extend29 !== void 0 && _item$_extend29.groupId)) {
-        normalList.push(formItem(item));
+        normalItemsWithIndex.push({
+          item: item,
+          index: index
+        });
       } else {
-        groupList.push(item);
+        var _item$_extend30;
+        var groupId = item === null || item === void 0 || (_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.groupId;
+        groupItemsWithIndex.push({
+          item: item,
+          index: index
+        });
+        // 记录组第一次出现的索引
+        if (groupFirstIndexMap[groupId] === undefined) {
+          groupFirstIndexMap[groupId] = index;
+        }
       }
     });
 
     // 根据item._extend.groupId 进行分组
-    var groups = groupList.reduce(function (prev, item) {
-      var _item$_extend30;
-      var groupId = item === null || item === void 0 || (_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.groupId;
+    var groups = groupItemsWithIndex.reduce(function (prev, _ref11) {
+      var _item$_extend31;
+      var item = _ref11.item;
+      var groupId = item === null || item === void 0 || (_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.groupId;
       if (!prev[groupId]) {
         prev[groupId] = [];
       }
       prev[groupId].push(item);
       return prev;
     }, {});
-    return Object.values(groups).map(function (d) {
-      return formItem(concatBookings(d));
-    }).concat(normalList);
+
+    // 将分组商品转换为合并后的商品，并记录组第一次出现的索引
+    var mergedGroupItems = Object.entries(groups).map(function (_ref12) {
+      var _ref13 = _slicedToArray(_ref12, 2),
+        groupId = _ref13[0],
+        items = _ref13[1];
+      return {
+        item: formItem(concatBookings(items)),
+        index: groupFirstIndexMap[groupId]
+      };
+    });
+
+    // 将非组商品格式化
+    var formattedNormalItems = normalItemsWithIndex.map(function (_ref14) {
+      var item = _ref14.item,
+        index = _ref14.index;
+      return {
+        item: formItem(item),
+        index: index
+      };
+    });
+
+    // 合并分组商品和非组商品，按照原始索引排序
+    var allItems = [].concat(_toConsumableArray(mergedGroupItems), _toConsumableArray(formattedNormalItems)).sort(function (a, b) {
+      return a.index - b.index;
+    });
+
+    // 返回格式化后的商品列表
+    return allItems.map(function (_ref15) {
+      var item = _ref15.item;
+      return item;
+    });
   } else {
     return lists === null || lists === void 0 ? void 0 : lists.map(function (item) {
       return formItem(item);
@@ -815,9 +861,9 @@ export var formatDayDate = function formatDayDate(_extend) {
  * @Author: WangHan
  * @Date: 2024-12-04 12:07
  */
-export var formatDayTime = function formatDayTime(_ref11) {
-  var startDate = _ref11.startDate,
-    endDate = _ref11.endDate;
+export var formatDayTime = function formatDayTime(_ref16) {
+  var startDate = _ref16.startDate,
+    endDate = _ref16.endDate;
   // 营业日时间
   var shopOpeningTime = localStorage.getItem('shopOpeningHours') || '00:00';
 
@@ -894,8 +940,8 @@ export var isHasDayAppointmentProduct = function isHasDayAppointmentProduct(stat
       // 如果该购物车中没选择任何商品，则不需要验证，所以直接用1来填充
       // services: !holderProducts?.length ? [1] : holderProducts?.filter((d: any) => appointmentTypes.includes(d.extension_type))
       services: services.filter(function (item) {
-        var _item$_extend31;
-        return ((_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.holder_id) == d.form_record_id && checkType(item.extension_type);
+        var _item$_extend32;
+        return ((_item$_extend32 = item._extend) === null || _item$_extend32 === void 0 ? void 0 : _item$_extend32.holder_id) == d.form_record_id && checkType(item.extension_type);
       })
     });
   });
@@ -1074,10 +1120,10 @@ function updateSinglePrice(currentValue, single) {
  * @Author: WangHan
  * @Date: 2024-12-31 15:17
  */
-function updateBundlePrice(currentValue, _ref12) {
-  var _ref13 = _slicedToArray(_ref12, 2),
-    bundle = _ref13[0],
-    single = _ref13[1];
+function updateBundlePrice(currentValue, _ref17) {
+  var _ref18 = _slicedToArray(_ref17, 2),
+    bundle = _ref18[0],
+    single = _ref18[1];
   var _bundle = [];
   var _loop2 = function _loop2() {
     var item = currentValue[index];
@@ -1213,7 +1259,7 @@ export function updateNormalBundlePrice(currentValue, newBundleData) {
  * @Date: 2024-12-31 15:15
  */
 var normalServicePrice = /*#__PURE__*/function () {
-  var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(ids, state) {
+  var _ref19 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(ids, state) {
     var _state$service6, _state$client, _data$list;
     var services, customerId, data, _lists;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -1288,7 +1334,7 @@ var normalServicePrice = /*#__PURE__*/function () {
     }, _callee);
   }));
   return function normalServicePrice(_x, _x2) {
-    return _ref14.apply(this, arguments);
+    return _ref19.apply(this, arguments);
   };
 }();
 
@@ -1302,13 +1348,13 @@ var normalServicePrice = /*#__PURE__*/function () {
  * @Date: 2024-12-25 16:41
  */
 export var updateAppointmentServicePrice = /*#__PURE__*/function () {
-  var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(state, _ref15) {
+  var _ref21 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(state, _ref20) {
     var _state$service7;
     var start_date, end_date, product_id, defaultReturn, _state$client2, _state$service$cacheI, _res$data, _res$data2, format, customer_id, _product_id, multi_day_price, startDate, endDate, params, res, _prices;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          start_date = _ref15.start_date, end_date = _ref15.end_date, product_id = _ref15.product_id;
+          start_date = _ref20.start_date, end_date = _ref20.end_date, product_id = _ref20.product_id;
           defaultReturn = {
             multiDayPrices: [],
             price: Number(state === null || state === void 0 || (_state$service7 = state.service) === null || _state$service7 === void 0 || (_state$service7 = _state$service7.cacheItem) === null || _state$service7 === void 0 || (_state$service7 = _state$service7._extend) === null || _state$service7 === void 0 ? void 0 : _state$service7.price) || 0
@@ -1371,7 +1417,7 @@ export var updateAppointmentServicePrice = /*#__PURE__*/function () {
     }, _callee2, null, [[2, 21]]);
   }));
   return function updateAppointmentServicePrice(_x3, _x4) {
-    return _ref16.apply(this, arguments);
+    return _ref21.apply(this, arguments);
   };
 }();
 

package/es/components/booking/info/utils.js

@@ -7,6 +7,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 import dayjs from "dayjs";
 import { getDays, getIsEdit, isSessionProduct } from "../utils";
 import { isUsableProduct } from "../info2/service/addTimeModal/utils";
+import { isMultiDayProduct } from "../info2/service/addService/utils";
 // 商品是套餐或单规格多规格
 export var getIsBundleOrCombination = function getIsBundleOrCombination(productDetail) {
   var _productDetail$bundle;
@@ -161,6 +162,10 @@ export var isOpenAddTime = function isOpenAddTime(state) {
 
 // 是否展示加时按钮
 export var isShowAddTime = function isShowAddTime(state, currentService) {
+  // 跨日预约不显示加时按钮
+  if (isMultiDayProduct(currentService)) {
+    return false;
+  }
   if (!isOpenAddTime(state)) {
     return false;
   }

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

@@ -29,12 +29,13 @@ import "../../../info/service/addService/index.less";
 import useEngineContext from "../../../../../hooks/useEngineContext";
 import { getProductDetail } from "../../../info/service/serve";
 import { getIsBundleOrCombination } from "../../../info/utils";
-import { getProductExtend } from "./utils";
+import { getMultiDay, getProductExtend, isMultiDayProduct } 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;
@@ -276,98 +277,154 @@ 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 callback(e, extension_type, detail) {
-        // 防止选择商品弹窗多次触发callback
-        if (lock) {
-          return;
-        }
-        lock = true;
+      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;
 
-        // 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
+                // 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
                 });
-              }
-              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
+                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
+                  }
+                });
+                onEdit === null || onEdit === void 0 || onEdit(cacheItem);
+              case 32:
+              case "end":
+                return _context4.stop();
             }
-          });
-          onEdit === null || onEdit === void 0 || onEdit(cacheItem);
+          }, _callee4);
+        }));
+        function callback(_x3, _x4, _x5) {
+          return _callback.apply(this, arguments);
         }
-      }
+        return callback;
+      }()
     });
   };
   var renderList = useMemo(function () {

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

@@ -7,7 +7,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;
@@ -79,6 +79,14 @@ 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: