@pisell/private-materials 6.6.1 → 6.7.1

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

@@ -28,7 +28,7 @@ import useEngineContext from "../../../../hooks/useEngineContext";
 import PaymentModal from "../../../checkout/PaymentModal";
 import { closeAllPaymentResultToasts } from "../../../checkout/components/PaymentResultToast";
 import { formatProducts } from "../../addons";
-import { getIsSubjectRequire, isDayBooking, isEventBooking, isHasDayAppointmentProduct, isNormalProductByDurationSchedule } from "../../info/service2/utils";
+import { getIsSubjectRequire, isDayBooking, isEventBooking, isHasDayAppointmentProduct } from "../../info/service2/utils";
 import { createBookings, editBookings } from "../../info2/serve";
 import AppointmentProductModal from "./AppointmentProductModal";
 import FooterMenus from "./FooterMenus";
@@ -37,7 +37,6 @@ import "./index.less";
 import { createEventBooking, editEventBooking } from "./serve";
 import { checkHolderIsError, formatValues } from "./utils";
 import NoteModal from "../../../../plus/noteModal";
-import { showConfirmHolderModal, ConfirmHolderModal } from "../../utils/confirmHolderModal";
 import { SubTotal } from "../../../../index";
 import { useIsBooking4Shop } from "../../hooks/useIsBooking4Shop";
 import { sendWarningLog } from '@pisell/utils';
@@ -48,7 +47,6 @@ import { useCustomer } from "../../../ticketBooking/hooks/pisellos/useCustomer";
 import { useDebounceEffect, useDebounceFn, useMemoizedFn } from 'ahooks';
 import { cloneDeep } from 'lodash';
 import { useShopDiscountModule } from "../../../ticketBooking/hooks/pisellos/useShopDiscountModule";
-import { isWalkIn } from "../../utils";
 
 /**
  * @title: 底部
@@ -850,8 +848,7 @@ var Footer = function Footer(props) {
    */
   var handleSave = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref6) {
-      var _state$service$value2, _state$client3;
-      var type, _ref6$messageShow, messageShow, _ref6$noSubmit, noSubmit, isHasDayProducts, hasUnspecifiedHolderProduct, _setLoading, _getApis, createBooking, editBooking, editApi, createApi, saveOtherValue, _state$onSave, _store$getState, _window7, callbackData, values, checkout, subtotal_info, res, isNeedDeposit, api;
+      var type, _ref6$messageShow, messageShow, _ref6$noSubmit, noSubmit, isHasDayProducts, _setLoading, _getApis, createBooking, editBooking, editApi, createApi, saveOtherValue, _state$onSave, _store$getState, _window7, callbackData, values, checkout, subtotal_info, res, isNeedDeposit, api;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
@@ -870,23 +867,12 @@ var Footer = function Footer(props) {
             }
             return _context6.abrupt("return");
           case 6:
-            hasUnspecifiedHolderProduct = (_state$service$value2 = state.service.value) === null || _state$service$value2 === void 0 ? void 0 : _state$service$value2.some(function (item) {
-              var _item$_extend, _item$_extend2;
-              return (!((_item$_extend = item._extend) !== null && _item$_extend !== void 0 && _item$_extend.holder_id) || ((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 || (_item$_extend2 = _item$_extend2.holder_id) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.length) === 0) && !isNormalProductByDurationSchedule(item);
-            });
-            if (!(!isWalkIn((_state$client3 = state.client) === null || _state$client3 === void 0 || (_state$client3 = _state$client3.value) === null || _state$client3 === void 0 ? void 0 : _state$client3.id) && getIsSubjectRequire(state) && hasUnspecifiedHolderProduct)) {
-              _context6.next = 10;
-              break;
-            }
-            _context6.next = 10;
-            return showConfirmHolderModal(state, dispatch);
-          case 10:
             if (!(isBooking4Shop && getIsSubjectRequire(state) && checkHolderIsError(state))) {
-              _context6.next = 12;
+              _context6.next = 8;
               break;
             }
             return _context6.abrupt("return");
-          case 12:
+          case 8:
             // 区分loading, 是点击的checkout 还是save
             _setLoading = type === 'checkout' ? setCheckoutLoading : setLoading;
             _setLoading(true);
@@ -895,34 +881,34 @@ var Footer = function Footer(props) {
             createApi = state.renderType === 'eventBooking' ? createEventBooking : createBooking;
             saveOtherValue = {};
             if (!(type === 'save')) {
-              _context6.next = 25;
+              _context6.next = 21;
               break;
             }
-            _context6.next = 21;
+            _context6.next = 17;
             return state === null || state === void 0 || (_state$onSave = state.onSave) === null || _state$onSave === void 0 ? void 0 : _state$onSave.call(state, state.client);
-          case 21:
+          case 17:
             _context6.t0 = _context6.sent;
             if (_context6.t0) {
-              _context6.next = 24;
+              _context6.next = 20;
               break;
             }
             _context6.t0 = {};
-          case 24:
+          case 20:
             saveOtherValue = _context6.t0;
-          case 25:
-            _context6.prev = 25;
+          case 21:
+            _context6.prev = 21;
             callbackData = null; // 格式化提交的参数
             values = formatValues(_objectSpread(_objectSpread({}, state), saveOtherValue)); // checkout 2.0 补充商品总税费字段
             values.product_tax_fee = total.tax || 0;
             if (!noSubmit) {
-              _context6.next = 31;
+              _context6.next = 27;
               break;
             }
             return _context6.abrupt("return", values);
-          case 31:
+          case 27:
             checkout = pisellos.getModule('checkout'); // 如果有 orderid，则应该走更新逻辑
             if (!editOrderId) {
-              _context6.next = 41;
+              _context6.next = 37;
               break;
             }
             subtotal_info = {
@@ -931,7 +917,7 @@ var Footer = function Footer(props) {
               total: cloneDeep(total),
               showDetail: showDetail
             };
-            _context6.next = 36;
+            _context6.next = 32;
             return checkout.updateLocalOrderAsync({
               orderId: editOrderId,
               orderData: values,
@@ -939,10 +925,10 @@ var Footer = function Footer(props) {
               autoPayment: true,
               totalInfo: subtotal_info
             });
-          case 36:
-            _context6.next = 38;
+          case 32:
+            _context6.next = 34;
             return checkout.manualSyncOrderAsync();
-          case 38:
+          case 34:
             res = _context6.sent;
             if (res.success) {
               // 回调关闭弹窗
@@ -950,7 +936,7 @@ var Footer = function Footer(props) {
               _setLoading(false);
             }
             return _context6.abrupt("return");
-          case 41:
+          case 37:
             // 如果是保存，检查是否需要支付定金
             if (type === 'save') {
               isNeedDeposit = checkout.checkIsNeedDepositAsync(values.bookings, values.relation_products);
@@ -1014,43 +1000,43 @@ var Footer = function Footer(props) {
 
             // 如果有addons改动, 则先保存
             if (!addonsEdit) {
-              _context6.next = 47;
+              _context6.next = 43;
               break;
             }
-            _context6.next = 47;
+            _context6.next = 43;
             return handleSaveAddons();
-          case 47:
+          case 43:
             if (!infoEdit) {
-              _context6.next = 52;
+              _context6.next = 48;
               break;
             }
-            _context6.next = 50;
+            _context6.next = 46;
             return api(values, state.bookingId || editOrderId);
-          case 50:
+          case 46:
             callbackData = _context6.sent;
             if (messageShow) {
               message.success(locales.getText(state.bookingId ? 'pisell2.text.appointment-updated' : 'pisell2.text.created-successfully'));
             }
-          case 52:
+          case 48:
             // 回调关闭弹窗
             state === null || state === void 0 || state.callback(callbackData, type);
             _setLoading(false);
 
             // return数据  checkout时需要
             return _context6.abrupt("return", callbackData || values);
-          case 57:
-            _context6.prev = 57;
-            _context6.t1 = _context6["catch"](25);
+          case 53:
+            _context6.prev = 53;
+            _context6.t1 = _context6["catch"](21);
             console.log(_context6.t1);
             if ((_context6.t1 === null || _context6.t1 === void 0 ? void 0 : _context6.t1.code) === 70101) {
               message.error(_context6.t1 === null || _context6.t1 === void 0 ? void 0 : _context6.t1.message);
             }
             _setLoading(false);
-          case 62:
+          case 58:
           case "end":
             return _context6.stop();
         }
-      }, _callee6, null, [[25, 57]]);
+      }, _callee6, null, [[21, 53]]);
     }));
     return function handleSave(_x5) {
       return _ref7.apply(this, arguments);
@@ -1739,7 +1725,6 @@ var Footer = function Footer(props) {
     }
   };
   var changeCustomerToGlobalState = useMemoizedFn(function (value) {
-    var _state$service4;
     dispatch({
       type: 'setClient',
       payload: {
@@ -1747,21 +1732,6 @@ var Footer = function Footer(props) {
         edit: true
       }
     });
-    if (state !== null && state !== void 0 && (_state$service4 = state.service) !== null && _state$service4 !== void 0 && (_state$service4 = _state$service4.value) !== null && _state$service4 !== void 0 && _state$service4.length) {
-      // 还需要清空商品内的 holder 信息
-      dispatch({
-        type: 'setService',
-        payload: {
-          value: state.service.value.map(function (item) {
-            return _objectSpread(_objectSpread({}, item), {}, {
-              _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
-                holder_id: []
-              })
-            });
-          })
-        }
-      });
-    }
   });
   var _useCustomer = useCustomer({
       changeCustomerToGlobalState: changeCustomerToGlobalState
@@ -1991,6 +1961,6 @@ var Footer = function Footer(props) {
       //   handleClearAllAndReset();
       // }
     }
-  }), /*#__PURE__*/React.createElement(ConfirmHolderModal, null));
+  }));
 };
 export default Footer;

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

@@ -37,12 +37,5 @@ export declare const checkResourcesFormat: (resources: any[], service: any, isCh
  * @Date: 2024-12-23 12:05
  */
 export declare const formatProductPrice: (item: any) => number;
-/**
- * @title: 是否包含跨日预约商品
- * @description:
- * @param {any} data
- * @return {*}
- */
-export declare const getHasMultiDayProduct: (data: any) => any;
 export declare const formatValues: (state: any) => any;
 export declare const checkHolderIsError: (state: any) => any;

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

@@ -12,7 +12,7 @@ import { getDays } from "../../utils";
 import { appointmentTypes } from "../../info/service2/status";
 import { isDaysBooking, formatDayTime, isEventBooking, isNormalProductByDurationSchedule, genRowKey } from "../../info/service2/utils";
 import { isArr, locales, sendWarningLog, getUniqueId } from '@pisell/utils';
-import { PisellToast } from '@pisell/materials';
+import { PisellToast } from "@pisell/materials";
 import { getClientName } from "../../../../plus/clientName/utils";
 import { cloneDeep } from 'lodash';
 import Decimal from 'decimal.js';
@@ -49,10 +49,10 @@ export var formatProductOption = function formatProductOption(option) {
   }
   return option.map(function (d) {
     return {
-      num: d.num,
-      option_group_item_id: d.product_option_item_id || d.option_group_item_id,
-      option_group_id: d.option_group_id,
-      custom_add_price: Number(d === null || d === void 0 ? void 0 : d.add_price)
+      "num": d.num,
+      "option_group_item_id": d.product_option_item_id || d.option_group_item_id,
+      "option_group_id": d.option_group_id,
+      "custom_add_price": Number(d === null || d === void 0 ? void 0 : d.add_price)
     };
   });
 };
@@ -117,7 +117,7 @@ export var formatProductBundle = function formatProductBundle(bundle) {
       // checkout 2.0 新增
       "price_type": d === null || d === void 0 ? void 0 : d.price_type,
       // checkout 2.0 新增
-      "custom_price": Math.abs(new Decimal(d === null || d === void 0 ? void 0 : d.price).sub(option_price).toNumber()).toFixed(2),
+      "custom_price": new Decimal(d === null || d === void 0 ? void 0 : d.price).sub(option_price).toNumber().toFixed(2),
       "custom_price_type": d === null || d === void 0 ? void 0 : d.price_type,
       "option": option
     };
@@ -261,7 +261,6 @@ export var formatProductPrice = function formatProductPrice(item) {
   }
   return price;
 };
-
 /**
  * checkout2.0: 单个数量商品总价（原价）,包含所有套餐子商品金额、报价单等等
  * @param item
@@ -281,7 +280,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 +293,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;
   }
@@ -368,30 +367,30 @@ var formatProducts = function formatProducts(item, quantity) {
     item.product_id = 0;
   }
   return {
-    name: item.name,
-    num: quantity || item._extend.quantity,
-    price: formatProductPrice(item),
-    source_product_price: getSourceProductPrice(item),
-    product_id: item !== null && item !== void 0 && item.product_id || item.product_id === 0 ? item.product_id : item.id,
-    discount_amount: notManualDiscount.length > 0 ? 0 : discount_amount,
-    product_discount_reason: item._extend.discount_reason || '',
-    is_charge_tax: item.is_charge_tax,
-    note: ((_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.note) || '',
-    discountway: item._extend.discountway || 'num',
-    discount_per: item._extend.discount_per,
-    discount_type: item._extend.discount_type || discount_type,
-    order_detail_id: item._extend.order_detail_id || 0,
-    product_bundle: formatProductBundle((_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 || (_item$_extend20 = _item$_extend20.other) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.bundle),
-    bundle_edit: item._extend.bundle_edit,
-    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),
+    "name": item.name,
+    "num": quantity || item._extend.quantity,
+    "price": formatProductPrice(item),
+    "source_product_price": getSourceProductPrice(item),
+    "product_id": item !== null && item !== void 0 && item.product_id || item.product_id === 0 ? item.product_id : item.id,
+    "discount_amount": notManualDiscount.length > 0 ? 0 : discount_amount,
+    "product_discount_reason": item._extend.discount_reason || '',
+    "is_charge_tax": item.is_charge_tax,
+    "note": ((_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.note) || '',
+    "discountway": item._extend.discountway || "num",
+    "discount_per": item._extend.discount_per,
+    "discount_type": item._extend.discount_type || discount_type,
+    "order_detail_id": item._extend.order_detail_id || 0,
+    "product_bundle": formatProductBundle((_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 || (_item$_extend20 = _item$_extend20.other) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.bundle),
+    "bundle_edit": item._extend.bundle_edit,
+    "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, false),
     // checkout 需求新增字段
-    calculated_original_price: formatOriginalPrice(item),
-    calculated_selling_price: formatSellingPrice(item),
-    tax_fee: item._extend.tax_fee,
-    custom_deposit_data: item.custom_deposit_data
+    "calculated_original_price": formatOriginalPrice(item),
+    "calculated_selling_price": formatSellingPrice(item),
+    "tax_fee": item._extend.tax_fee,
+    "custom_deposit_data": item.custom_deposit_data
   };
 };
 
@@ -471,21 +470,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 +503,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 +513,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 +526,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,36 +550,44 @@ var formatBookings = function formatBookings(data, values) {
         }
       }, 'minutes');
     }
-    if (!((_item$_extend32 = item._extend) !== null && _item$_extend32 !== void 0 && _item$_extend32.unique_identification_number)) {
+    if (!((_item$_extend30 = item._extend) !== null && _item$_extend30 !== void 0 && _item$_extend30.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
+
+    // 跨日预约处理： 跨日预约所有数据都在list中， 每一组预约通过groupId进行分组
+    // 通过obj 记录下每个GroupId第一次出现的时机，  第一次出现需要设置 metadata.multiDayPrices
+    // 后续出现不需要设置 metadata.multiDayPrices. 节省体积
+    var isSetGroupId = obj[item === null || item === void 0 || (_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.groupId];
     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,
-      like_status: item._extend.like_status || 'common',
-      relation_type: item._extend.relation_type || '',
-      is_all: false,
-      schedule_id: item._extend.schedule_id || 0,
-      end_time: end_time,
-      sub_type: isDay ? 'days' : getSubType(item),
-      select_date: start_date,
-      start_time: start_time,
-      end_date: end_date,
-      start_date: start_date,
-      duration: isDay || isMultiDay ? 0 : flexibleObj.getValue(item._extend.duration),
-      number: item._extend.capacity ? getSumCapacity({
+      "product": formatProducts(item),
+      "metadata": formatMetaData(item, !isSetGroupId),
+      "relation_products": formatRelationDetails(item._extend.relation_details),
+      'id': item.booking_id || 0,
+      "relation_id": item._extend.relation_id || 0,
+      "like_status": item._extend.like_status || 'common',
+      "relation_type": item._extend.relation_type || '',
+      "is_all": false,
+      "schedule_id": item._extend.schedule_id || 0,
+      "end_time": end_time,
+      "sub_type": isDay ? 'days' : getSubType(item),
+      "select_date": start_date,
+      "start_time": start_time,
+      "end_date": end_date,
+      "start_date": start_date,
+      "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
+      "resources": formatResource(item),
+      "note": item._extend.note
     }, eventOtherParams || {}), dayParams);
 
-    // 跨日预约模版或当前是跨日预约商品时
-    if (isDay || isMultiDay) {
+    // 记录下每个GroupId第一次出现的时机
+    if (!isSetGroupId) {
+      obj[item._extend.groupId] = true;
+    }
+    if (isDay) {
       bookings.push(booking);
       return;
     }
@@ -605,12 +595,12 @@ var formatBookings = function formatBookings(data, values) {
       var newItem = cloneDeep(item);
       newItem._extend.unique_identification_number = "".concat(item._extend.unique_identification_number, "_").concat(i);
       bookings.push(_objectSpread(_objectSpread({}, booking), {}, {
-        product: formatProducts(newItem, 1),
-        number: item._extend.capacity ? getSumCapacity({
+        "product": formatProducts(newItem, 1),
+        "number": item._extend.capacity ? getSumCapacity({
           cacheItem: newItem
         }, false) : newItem._extend.number || 1,
-        holder: getHolderByIndex(booking.holder, i),
-        metadata: formatMetaData(newItem)
+        "holder": getHolderByIndex(booking.holder, i),
+        "metadata": formatMetaData(newItem)
       }));
     }
   });
@@ -630,16 +620,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 +648,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 +706,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 +729,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 +751,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
@@ -782,21 +768,21 @@ export var formatValues = function formatValues(state) {
 // 检测预约主体是否为空
 export var checkHolderIsError = function checkHolderIsError(state) {
   var _state$client;
-  var errorRowKey = '';
+  var errorRowKey = "";
   var holderError = state.service.value.some(function (item) {
-    var _item$_extend$holder_, _item$_extend37;
+    var _item$_extend36;
     // 普通商品不需要检测holder
     if (isNormalProductByDurationSchedule(item)) {
       return false;
     }
-    if (item._extend.quantity === 1 && (!item._extend.holder_id || ((_item$_extend$holder_ = item._extend.holder_id) === null || _item$_extend$holder_ === void 0 ? void 0 : _item$_extend$holder_.length) === 0)) {
-      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);
+    if (item._extend.quantity === 1 && !item._extend.holder_id) {
+      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;