@pisell/private-materials 6.4.72 → 6.4.74

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

@@ -281,7 +281,7 @@ var formatSellingPrice = function formatSellingPrice(item) {
   var _item$_extend9;
   return Number((_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.total);
 };
-var formatMetaData = function formatMetaData(item) {
+var formatMetaData = function formatMetaData(item, isMultiDayPrices) {
   var _item$_extend10, _item$_extend11, _item$_extend13, _item$_extend15;
   var metadata = {};
   if ((_item$_extend10 = item._extend) !== null && _item$_extend10 !== void 0 && _item$_extend10.capacity) {
@@ -294,7 +294,7 @@ var formatMetaData = function formatMetaData(item) {
     var _item$_extend12;
     metadata.holder_id = (_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.holder_id;
   }
-  if ((_item$_extend13 = item._extend) !== null && _item$_extend13 !== void 0 && _item$_extend13.multiDayPrices) {
+  if (isMultiDayPrices && (_item$_extend13 = item._extend) !== null && _item$_extend13 !== void 0 && _item$_extend13.multiDayPrices) {
     var _item$_extend14;
     metadata.multiDayPrices = (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.multiDayPrices;
   }
@@ -386,7 +386,7 @@ var formatProducts = function formatProducts(item, quantity) {
     product_option_item: formatProductOption((_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 || (_item$_extend21 = _item$_extend21.other) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.option),
     product_variant_id: ((_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 || (_item$_extend22 = _item$_extend22.other) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.product_variant_id) || 0,
     discount_list: notManualDiscount,
-    metadata: formatMetaData(item),
+    metadata: formatMetaData(item, false),
     // checkout 需求新增字段
     calculated_original_price: formatOriginalPrice(item),
     calculated_selling_price: formatSellingPrice(item),
@@ -471,21 +471,6 @@ var getHolderByIndex = function getHolderByIndex(holder, index) {
   });
 };
 
-/**
- * @title: 是否包含跨日预约商品
- * @description:
- * @param {any} data
- * @return {*}
- */
-export var getHasMultiDayProduct = function getHasMultiDayProduct(data) {
-  var list = data.service.value;
-  var isHas = list.some(function (item) {
-    var _item$_extend26;
-    return (_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.groupId;
-  });
-  return isHas;
-};
-
 /**
  * @title: 预约商品信息
  * @description:
@@ -519,8 +504,9 @@ var formatBookings = function formatBookings(data, values) {
   var dayParams = {};
   var eventOtherParams = data.eventOtherParams;
   var bookings = [];
+  var obj = {};
   list.forEach(function (item) {
-    var _item$_extend27, _item$_extend32;
+    var _item$_extend30, _item$_extend31;
     // 自定义商品直接使用 _extend 中的数据，并将 id 转换为 0 提交给后端
     if (item.isCustomItem) {
       bookings.push(_objectSpread(_objectSpread({}, item._extend), {}, {
@@ -528,9 +514,6 @@ var formatBookings = function formatBookings(data, values) {
       }));
       return;
     }
-
-    // 当前商品是跨日预约商品
-    var isMultiDay = (_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.groupId;
     var start_date = item._extend.startDate.format('YYYY-MM-DD');
     var end_date = item._extend.endDate.format('YYYY-MM-DD');
     var end_time = item._extend.endDate.format('HH:mm');
@@ -544,9 +527,9 @@ var formatBookings = function formatBookings(data, values) {
 
     // 跨日预约下的普通商品
     if (isDay) {
-      var _item$_extend28, _item$_extend29, _item$_extend30, _item$_extend31;
-      var startDate = ((_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.startDate) || ((_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.start_date);
-      var endDate = ((_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.endDate) || ((_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.end_date);
+      var _item$_extend26, _item$_extend27, _item$_extend28, _item$_extend29;
+      var startDate = ((_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.startDate) || ((_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.start_date);
+      var endDate = ((_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.endDate) || ((_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.end_date);
       var _formatDayTime = formatDayTime({
           startDate: startDate,
           endDate: endDate
@@ -568,13 +551,17 @@ var formatBookings = function formatBookings(data, values) {
         }
       }, 'minutes');
     }
-    if (!((_item$_extend32 = item._extend) !== null && _item$_extend32 !== void 0 && _item$_extend32.unique_identification_number)) {
+
+    // 跨日预约处理： 跨日预约所有数据都在list中， 每一组预约通过groupId进行分组
+    // 通过obj 记录下每个GroupId第一次出现的时机，  第一次出现需要设置 metadata.multiDayPrices
+    // 后续出现不需要设置 metadata.multiDayPrices. 节省体积
+    var isSetGroupId = obj[item === null || item === void 0 || (_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.groupId];
+    if (!((_item$_extend31 = item._extend) !== null && _item$_extend31 !== void 0 && _item$_extend31.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
     var booking = _objectSpread(_objectSpread({
       product: formatProducts(item),
-      metadata: formatMetaData(item),
       relation_products: formatRelationDetails(item._extend.relation_details),
       id: item.booking_id || 0,
       relation_id: item._extend.relation_id || 0,
@@ -588,16 +575,20 @@ var formatBookings = function formatBookings(data, values) {
       start_time: start_time,
       end_date: end_date,
       start_date: start_date,
-      duration: isDay || isMultiDay ? 0 : flexibleObj.getValue(item._extend.duration),
+      duration: isDay ? 0 : flexibleObj.getValue(item._extend.duration),
       number: item._extend.capacity ? getSumCapacity({
         cacheItem: item
       }) : item._extend.number || 1,
       resources: formatResource(item),
-      note: item._extend.note
+      note: item._extend.note,
+      "metadata": formatMetaData(item, !isSetGroupId)
     }, eventOtherParams || {}), dayParams);
 
-    // 跨日预约模版或当前是跨日预约商品时
-    if (isDay || isMultiDay) {
+    // 记录下每个GroupId第一次出现的时机
+    if (!isSetGroupId) {
+      obj[item._extend.groupId] = true;
+    }
+    if (isDay) {
       bookings.push(booking);
       return;
     }
@@ -630,16 +621,16 @@ var formatRelationProducts = function formatRelationProducts(data, type) {
   var list = ((_data$service = data.service) === null || _data$service === void 0 ? void 0 : _data$service.value) || [];
   // open items 下的商品
   list = list.filter(function (item) {
-    var _item$_extend33;
+    var _item$_extend32;
     return (
       // 跨日预约把普通商品加在relationProducts 活动预约按之前逻辑
-      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend33 = item._extend) === null || _item$_extend33 === void 0 ? void 0 : _item$_extend33.holder_id) && appointmentTypes.includes(item.extension_type)
+      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend32 = item._extend) === null || _item$_extend32 === void 0 ? void 0 : _item$_extend32.holder_id) && appointmentTypes.includes(item.extension_type)
     );
   });
   var relationProducts = [];
   relationProducts = list.map(function (item) {
-    var _item$_extend34;
-    if (!((_item$_extend34 = item._extend) !== null && _item$_extend34 !== void 0 && _item$_extend34.unique_identification_number)) {
+    var _item$_extend33;
+    if (!((_item$_extend33 = item._extend) !== null && _item$_extend33 !== void 0 && _item$_extend33.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
@@ -658,8 +649,8 @@ var formatNormalProducts = function formatNormalProducts(data) {
   });
   var relationProducts = [];
   relationProducts = list.map(function (item) {
-    var _item$_extend35;
-    if (!((_item$_extend35 = item._extend) !== null && _item$_extend35 !== void 0 && _item$_extend35.unique_identification_number)) {
+    var _item$_extend34;
+    if (!((_item$_extend34 = item._extend) !== null && _item$_extend34 !== void 0 && _item$_extend34.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
@@ -716,11 +707,7 @@ export var formatValues = function formatValues(state) {
     relation_products: [],
     metadata: {}
   };
-
-  // 是是跨日预约模版
   var isDay = isDaysBooking(state);
-  // 是否包含跨日预约商品
-  var isHasMultiDay = getHasMultiDayProduct(state);
   var isEvent = isEventBooking(state);
   if (!state.bookingId || isDay) {
     // 备注
@@ -743,8 +730,8 @@ export var formatValues = function formatValues(state) {
   // 主体
   values.holder = formatHolder(state, values);
   // todo
-  if (isEvent) {
-    values.relation_products = formatRelationProducts(state, 'event');
+  if (isDay || isEvent) {
+    values.relation_products = formatRelationProducts(state, isDay ? 'day' : 'event');
   } else {
     var _values$relation_prod;
     values.relation_products = formatNormalProducts(state);
@@ -765,7 +752,7 @@ export var formatValues = function formatValues(state) {
   }
 
   // 跨日预约增加多余参数区分
-  if (isDay || isHasMultiDay) {
+  if (isDay) {
     values.metadata.is_multiday_appointment = 1;
     // is_bundle_price_calculated 用于区分商品的price是总价，还是商品的单价
     // values.is_bundle_price_calculated = 1
@@ -784,19 +771,19 @@ export var checkHolderIsError = function checkHolderIsError(state) {
   var _state$client;
   var errorRowKey = '';
   var holderError = state.service.value.some(function (item) {
-    var _item$_extend37;
+    var _item$_extend36;
     // 普通商品不需要检测holder
     if (isNormalProductByDurationSchedule(item)) {
       return false;
     }
     if (item._extend.quantity === 1 && !item._extend.holder_id) {
-      var _item$_extend36;
-      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend36 = item._extend) === null || _item$_extend36 === void 0 || (_item$_extend36 = _item$_extend36.other) === null || _item$_extend36 === void 0 ? void 0 : _item$_extend36.rowKey);
+      var _item$_extend35;
+      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend35 = item._extend) === null || _item$_extend35 === void 0 || (_item$_extend35 = _item$_extend35.other) === null || _item$_extend35 === void 0 ? void 0 : _item$_extend35.rowKey);
       return true;
     }
-    if (item._extend.quantity > 1 && ((_item$_extend37 = item._extend) === null || _item$_extend37 === void 0 || (_item$_extend37 = _item$_extend37.holder_id) === null || _item$_extend37 === void 0 ? void 0 : _item$_extend37.length) !== item._extend.quantity) {
-      var _item$_extend38;
-      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend38 = item._extend) === null || _item$_extend38 === void 0 || (_item$_extend38 = _item$_extend38.other) === null || _item$_extend38 === void 0 ? void 0 : _item$_extend38.rowKey);
+    if (item._extend.quantity > 1 && ((_item$_extend36 = item._extend) === null || _item$_extend36 === void 0 || (_item$_extend36 = _item$_extend36.holder_id) === null || _item$_extend36 === void 0 ? void 0 : _item$_extend36.length) !== item._extend.quantity) {
+      var _item$_extend37;
+      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend37 = item._extend) === null || _item$_extend37 === void 0 || (_item$_extend37 = _item$_extend37.other) === null || _item$_extend37 === void 0 ? void 0 : _item$_extend37.rowKey);
       return true;
     }
     return false;

package/es/components/booking/forms/sendModal/useSendModal.d.ts

@@ -4,6 +4,6 @@ declare const useSendModal: (bookingId?: number) => {
     setOpen: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     handleOpen: () => void;
     handleValuesChange: (val: any) => void;
-    handleOk: (values: SendModalValues) => Promise<any>;
+    handleOk: (values: SendModalValues) => Promise<boolean | undefined>;
 };
 export default useSendModal;

package/es/components/booking/hooks/useQuotation.js

@@ -18,9 +18,8 @@ import { getProductTotalPrice } from "../utils";
 import useEngineContext from "../../../hooks/useEngineContext";
 import { locales } from "@pisell/utils";
 import { PisellModal } from "@pisell/materials";
-import { getNormalAndMultiDayProductPrice } from "../info/service/serve";
+import { getProductPrice } from "../info/service/serve";
 import Decimal from 'decimal.js';
-import dayjs from 'dayjs';
 var formatBundleItemMap = function formatBundleItemMap(product) {
   return product.bundle_group.reduce(function (pre, cur) {
     var curObj = {};
@@ -54,17 +53,10 @@ var setNewCartValue = function setNewCartValue(cartValue, newProducts) {
   // 是否套餐子商品被删除
   var isNotFoundBundle = false;
   var notFoundProducts = [];
-
-  // 缓存跨日商品的 multiDayPrices，避免同一 groupId 重复计算
-  var multiDayPricesCache = new Map();
   var value = cartValue.map(function (item) {
-    var _item$_extend, _item$_extend2, _item$_extend3, _item$_extend4;
-    // 格式化商品日期用于匹配
-    var itemScheduleDate = (_item$_extend = item._extend) !== null && _item$_extend !== void 0 && _item$_extend.startDate ? dayjs(item._extend.startDate).format('YYYY-MM-DD') : '';
-
-    // 根据 product_id 和 schedule_date 匹配
+    var _item$_extend, _item$_extend2;
     var newProduct = newProducts.find(function (newItem) {
-      return newItem.id === item.product_id && newItem.schedule_date === itemScheduleDate;
+      return newItem.id === item.product_id;
     });
     if (!newProduct) {
       return item;
@@ -72,7 +64,7 @@ var setNewCartValue = function setNewCartValue(cartValue, newProducts) {
     // 是否报价单变更价格更新
     var isChangePrice = newProduct.price != item.price;
     var bundleItemMap = formatBundleItemMap(newProduct);
-    var newBundle = (((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 || (_item$_extend2 = _item$_extend2.other) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.bundle) || []).map(function (bundle) {
+    var newBundle = (((_item$_extend = item._extend) === null || _item$_extend === void 0 || (_item$_extend = _item$_extend.other) === null || _item$_extend === void 0 ? void 0 : _item$_extend.bundle) || []).map(function (bundle) {
       if (!bundleItemMap[bundle.id]) {
         isNotFoundBundle = true;
         if (!notFoundProducts.some(function (p) {
@@ -100,36 +92,6 @@ var setNewCartValue = function setNewCartValue(cartValue, newProducts) {
       });
     });
 
-    // 处理跨日商品的 multiDayPrices
-    if ((_item$_extend3 = item._extend) !== null && _item$_extend3 !== void 0 && _item$_extend3.groupId) {
-      // 检查缓存中是否已经计算过该 groupId
-      if (!multiDayPricesCache.has(item._extend.groupId)) {
-        // 找到该商品所有日期的价格记录
-        var productPrices = newProducts.filter(function (p) {
-          return p.id === item.product_id;
-        });
-
-        // 构建 multiDayPrices 对象
-        var multiDayPrices = {};
-        productPrices.forEach(function (priceItem) {
-          multiDayPrices[priceItem.schedule_date] = {
-            total: Number(priceItem.price),
-            origin_total: Number(priceItem.price),
-            num: 1,
-            quotation_id: priceItem.quotation_id || 0,
-            start_date: priceItem.schedule_date,
-            end_date: dayjs(priceItem.schedule_date).add(1, 'day').format('YYYY-MM-DD')
-          };
-        });
-
-        // 缓存结果
-        multiDayPricesCache.set(item._extend.groupId, multiDayPrices);
-      }
-
-      // 从缓存获取并设置到商品
-      item._extend.multiDayPrices = multiDayPricesCache.get(item._extend.groupId);
-    }
-
     // 价格都没有变动时返回原始信息
     if (!isChangePrice) {
       return item;
@@ -145,7 +107,7 @@ var setNewCartValue = function setNewCartValue(cartValue, newProducts) {
         // total: newProduct.total,
         bundle_edit: isBundleChange ? 1 : item._extend.bundle_edit,
         other: _objectSpread(_objectSpread({}, item._extend.other), {}, {
-          option: (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 || (_item$_extend4 = _item$_extend4.other) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.option,
+          option: (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 || (_item$_extend2 = _item$_extend2.other) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.option,
           bundle: newBundle
         })
       })
@@ -177,7 +139,7 @@ var useQuotation = function useQuotation(state, dispatch) {
   cartValueRef.current = state.service.value;
   var getCartQuotation = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
-      var queryData, data;
+      var ids, data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -187,38 +149,28 @@ var useQuotation = function useQuotation(state, dispatch) {
             }
             return _context.abrupt("return");
           case 2:
-            if (params !== null && params !== void 0 && params.customer_id) {
-              _context.next = 4;
-              break;
-            }
-            return _context.abrupt("return");
-          case 4:
-            // 构建查询参数：为每个商品生成 { product_id, schedule_date }
-            queryData = cartValueRef.current.filter(function (item) {
+            ids = cartValueRef.current.filter(function (item) {
               return !item.isCustomItem;
             }) // 过滤掉自定义商品
             .map(function (item) {
-              var _item$_extend5;
-              return {
-                product_id: item.product_id,
-                schedule_date: (_item$_extend5 = item._extend) !== null && _item$_extend5 !== void 0 && _item$_extend5.startDate ? dayjs(item._extend.startDate).format('YYYY-MM-DD') : params === null || params === void 0 ? void 0 : params.schedule_date // 如果没有商品日期，使用传入的默认日期
-              };
+              return item.product_id;
             });
-            if (queryData.length) {
-              _context.next = 7;
+            if (ids.length) {
+              _context.next = 5;
               break;
             }
             return _context.abrupt("return");
-          case 7:
-            _context.next = 9;
-            return getNormalAndMultiDayProductPrice({
-              customer_id: params === null || params === void 0 ? void 0 : params.customer_id,
-              data: queryData
+          case 5:
+            _context.next = 7;
+            return getProductPrice({
+              ids: ids,
+              schedule_date: params === null || params === void 0 ? void 0 : params.schedule_date,
+              customer_id: params === null || params === void 0 ? void 0 : params.customer_id
             });
-          case 9:
+          case 7:
             data = _context.sent;
-            return _context.abrupt("return", data.data);
-          case 11:
+            return _context.abrupt("return", data);
+          case 9:
           case "end":
             return _context.stop();
         }
@@ -241,13 +193,13 @@ var useQuotation = function useQuotation(state, dispatch) {
             return getCartQuotation(params);
           case 2:
             data = _context2.sent;
-            if (!(!data || !data.length)) {
+            if (data !== null && data !== void 0 && data.data) {
               _context2.next = 5;
               break;
             }
             return _context2.abrupt("return");
           case 5:
-            _setNewCartValue = setNewCartValue(cartValueRef.current, data), isChange = _setNewCartValue.isChange, newCartValue = _setNewCartValue.value, isNotFoundBundle = _setNewCartValue.isNotFoundBundle, notFoundProducts = _setNewCartValue.notFoundProducts;
+            _setNewCartValue = setNewCartValue(cartValueRef.current, data.data), isChange = _setNewCartValue.isChange, newCartValue = _setNewCartValue.value, isNotFoundBundle = _setNewCartValue.isNotFoundBundle, notFoundProducts = _setNewCartValue.notFoundProducts;
             if (!isNotFoundBundle) {
               _context2.next = 10;
               break;

package/es/components/booking/info/service/Lists.js

@@ -104,7 +104,7 @@ var Lists = function Lists(_ref) {
   var products = useMemo(function () {
     var _state$service;
     console.time('products');
-    var p = formatProducts((state === null || state === void 0 || (_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || [], state, true, true, isParallelResource);
+    var p = formatProducts((state === null || state === void 0 || (_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || [], state, false, true, isParallelResource);
     console.timeEnd('products');
     return p;
   }, [state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value, state]);

package/es/components/booking/info/service/serve.d.ts

@@ -18,17 +18,3 @@ export declare const getProductPrice: (params: {
     customer_id: number;
     schedule_date: string;
 }) => Promise<any>;
-declare type MultiDayProductPriceParams = {
-    customer_id: number;
-    data: {
-        product_id: number;
-        schedule_date: string;
-    }[];
-};
-/**
- * 获取普通商品和跨日预约的价格
- * @param params
- * @returns
- */
-export declare const getNormalAndMultiDayProductPrice: (params: MultiDayProductPriceParams) => Promise<any>;
-export {};

package/es/components/booking/info/service/serve.js

@@ -22,7 +22,7 @@ export var getProductDetail = /*#__PURE__*/function () {
 
 /**
  * @title: 跨日预约获取预约商品报价单
- * @description:
+ * @description: 
  * @param {string} id
  * @param {any} params
  * @return {*}
@@ -67,25 +67,4 @@ export var getProductPrice = /*#__PURE__*/function () {
   return function getProductPrice(_x5) {
     return _ref3.apply(this, arguments);
   };
-}();
-/**
- * 获取普通商品和跨日预约的价格
- * @param params
- * @returns
- */
-export var getNormalAndMultiDayProductPrice = /*#__PURE__*/function () {
-  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
-    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-      while (1) switch (_context4.prev = _context4.next) {
-        case 0:
-          return _context4.abrupt("return", request.getRequest().post("/shop/product/query/shelf/price", params));
-        case 1:
-        case "end":
-          return _context4.stop();
-      }
-    }, _callee4);
-  }));
-  return function getNormalAndMultiDayProductPrice(_x6) {
-    return _ref4.apply(this, arguments);
-  };
 }();

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

@@ -7,7 +7,6 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { getUniqueId } from "@pisell/utils";
 import { getProductTotalPrice } from "../../../utils";
 import { distributeDiscountOrIncrease } from "../../service/serviceManager/distributeDiscount";
-import { genServiceKey } from "../../../../ticketBooking/utils";
 
 // 创建group
 
@@ -108,7 +107,6 @@ export var createBookingItemsByGroup = function createBookingItemsByGroup(item,
     cacheItem._extend.total = totalPrice;
     cacheItem._extend.origin_total = totalPrice;
     cacheItem._extend.items = undefined;
-    cacheItem._serviceKey = genServiceKey(cacheItem);
     bookings.push(cacheItem);
   }
   if (isBatchEdit) {

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

@@ -67,7 +67,39 @@ export declare const genRowKey: (key: string) => string;
  * @Author: WangHan
  * @Date: 2024-11-29 17:36
  */
-export declare const formatProducts: (lists: any[], state: any, isRenderGroup?: boolean, isGeneral?: boolean, isParallelResource?: boolean) => any[];
+export declare const formatProducts: (lists: any[], state: any, isRenderGroup?: boolean, isGeneral?: boolean, isParallelResource?: boolean) => {
+    _origin: any;
+    id: any;
+    _id: any;
+    name: any;
+    title: any;
+    price: any;
+    total: number;
+    origin_total: number;
+    num: any;
+    image: any;
+    isShowNote: boolean;
+    note: any;
+    like_status: any;
+    bundle: any;
+    options: any;
+    errorMessage: string;
+    product_option_string: any;
+    discount_reason: any;
+    resource_id: any;
+    relation_form_name: any;
+    holder_title: any;
+    start_date: any;
+    end_date: any;
+    holder_id: any;
+    isNormalProduct: boolean;
+    isCustomItem: any;
+    vouchersApplicable: any;
+    locale: any;
+    symbol: any;
+    relation_products: any;
+    items: any[];
+}[];
 /**
  * @title: 禁用日期
  * @description: