@pisell/private-materials 6.6.2 → 6.6.4

package/es/components/authentication/admin/SaaSAdminAuth/locales.js

@@ -0,0 +1,74 @@
+export default {
+  en: {
+    // Page title and description
+    'saas.admin.auth.title': 'SaaS Platform Admin Authentication',
+    'saas.admin.auth.description': 'Configure authentication methods for your SaaS platform admin portal and other administrative channels.',
+    // Auth Methods section
+    'saas.admin.auth.methods.title': 'Auth Methods',
+    'saas.admin.auth.methods.description': 'Configure authentication methods that will be available for SaaS platform admins. Drag to reorder by priority.',
+    // Password Settings section
+    'saas.admin.password.settings.title': 'Password Settings',
+    'saas.admin.password.settings.description': 'Configure password requirements specifically for SaaS platform admin accounts. These rules apply to all platform administrative users.',
+    // Buttons
+    'auth.button.cancel': 'Cancel',
+    'auth.button.save': 'Save',
+    'auth.button.settings': 'Settings',
+    // Messages
+    'auth.save.success': 'Settings saved successfully',
+    'auth.save.error': 'Failed to save settings',
+    // OAuth configuration
+    'auth.oauth.config.message': 'Configure OAuth settings in Auth Configuration page first',
+    'auth.oauth.config.link': 'click to config',
+    // Category badges
+    'auth.category.general': 'General',
+    'auth.category.oauth': 'OAuth'
+  },
+  'zh-CN': {
+    // Page title and description
+    'saas.admin.auth.title': 'SaaS平台管理员认证',
+    'saas.admin.auth.description': '为您的SaaS平台管理员门户和其他管理渠道配置认证方法。',
+    // Auth Methods section
+    'saas.admin.auth.methods.title': '认证方法',
+    'saas.admin.auth.methods.description': '配置SaaS平台管理员可用的认证方法。拖动以调整优先级。',
+    // Password Settings section
+    'saas.admin.password.settings.title': '密码设置',
+    'saas.admin.password.settings.description': '专门为SaaS平台管理员账户配置密码要求。这些规则适用于所有平台管理用户。',
+    // Buttons
+    'auth.button.cancel': '取消',
+    'auth.button.save': '保存',
+    'auth.button.settings': '设置',
+    // Messages
+    'auth.save.success': '保存成功',
+    'auth.save.error': '保存失败',
+    // OAuth configuration
+    'auth.oauth.config.message': '请先在OAuth配置页面中配置OAuth设置',
+    'auth.oauth.config.link': '点击配置',
+    // Category badges
+    'auth.category.general': '通用',
+    'auth.category.oauth': 'OAuth'
+  },
+  'zh-HK': {
+    // Page title and description
+    'saas.admin.auth.title': 'SaaS平台管理員認證',
+    'saas.admin.auth.description': '為您的SaaS平台管理員門戶和其他管理渠道配置認證方法。',
+    // Auth Methods section
+    'saas.admin.auth.methods.title': '認證方法',
+    'saas.admin.auth.methods.description': '配置SaaS平台管理員可用的認證方法。拖動以調整優先級。',
+    // Password Settings section
+    'saas.admin.password.settings.title': '密碼設置',
+    'saas.admin.password.settings.description': '專門為SaaS平台管理員賬戶配置密碼要求。這些規則適用於所有平台管理用戶。',
+    // Buttons
+    'auth.button.cancel': '取消',
+    'auth.button.save': '保存',
+    'auth.button.settings': '設置',
+    // Messages
+    'auth.save.success': '保存成功',
+    'auth.save.error': '保存失敗',
+    // OAuth configuration
+    'auth.oauth.config.message': '請先在OAuth配置頁面中配置OAuth設置',
+    'auth.oauth.config.link': '點擊配置',
+    // Category badges
+    'auth.category.general': '通用',
+    'auth.category.oauth': 'OAuth'
+  }
+};

package/es/components/authentication/admin/SaaSAdminAuth/types.d.ts

@@ -0,0 +1,16 @@
+/// <reference types="react" />
+import { AuthMethod } from '../AuthMethods/types';
+export interface SaaSAdminAuthProps {
+    /**
+     * 自定义类名
+     */
+    className?: string;
+    /**
+     * 自定义样式
+     */
+    style?: React.CSSProperties;
+    /**
+     * 保存回调
+     */
+    onSave?: (authMethods: AuthMethod[], passwordRules: any) => void;
+}

package/es/components/authentication/admin/SaaSAdminAuth/types.js

@@ -0,0 +1 @@
+export {};

package/es/components/authentication/admin/index.d.ts

@@ -0,0 +1,26 @@
+export type { AuthMethodsProps, AuthMethod } from './AuthMethods';
+export { AuthMethodType, AuthMethodCategory } from './AuthMethods';
+export { default as ChannelAuthSetting } from './ChannelAuthSetting';
+export type { ChannelAuthSettingProps, ChannelAuthSettingValue, TabKey } from './ChannelAuthSetting';
+export { default as PageSetting } from './ChannelAuthSetting/PageSetting';
+export { default as PageSettingItem } from './ChannelAuthSetting/PageSettingItem';
+export { default as AuthenticationMethods } from './ChannelAuthSetting/AuthenticationMethods';
+export { default as CollectInfo } from './ChannelAuthSetting/CollectInfo';
+export type { PageSettingProps, PageSettingValue, } from './ChannelAuthSetting/PageSetting/types';
+export type { PageSettingItemProps, PageSettingItemValue, TermsCondition, TranslationValue as PageTranslationValue, } from './ChannelAuthSetting/PageSettingItem/types';
+export type { AuthenticationMethodsProps, AuthenticationMethodsValue, GlobalAuthMethod, AuthenticationMethod, AuthenticationSettingsMode, } from './ChannelAuthSetting/AuthenticationMethods/types';
+export type { CollectInfoProps, CollectInfoValue, AccountField, CustomerFormItem, TranslationValue as CollectInfoTranslationValue, } from './ChannelAuthSetting/CollectInfo/types';
+export type { SaaSAdminAuthProps } from './SaaSAdminAuth';
+export type { OrgAdminAuthProps } from './OrgAdminAuth';
+export type { DeviceAuthProps } from './DeviceAuth';
+export type { POSOperatorAuthProps } from './POSOperatorAuth';
+export type { CustomerOAuthConfigProps } from './CustomerOAuthConfig';
+export { default as SaaSAdminAuth } from './SaaSAdminAuth';
+export { default as OrgAdminAuth } from './OrgAdminAuth';
+export { default as OAuthConfig } from './OAuthConfig';
+export { default as CustomerAuth } from './CustomerAuth';
+export { default as CustomerOAuthConfig } from './CustomerOAuthConfig';
+export { default as DeviceAuth } from './DeviceAuth';
+export { default as POSOperatorAuth } from './POSOperatorAuth';
+export { default as OnlineShopAuth } from './ChannelAuthSetting/OnlineShopAuth';
+export { default as SaaSManagermentAuth } from './ChannelAuthSetting/SaaSManagermentAuth';

package/es/components/authentication/admin/index.js

@@ -0,0 +1,23 @@
+// export { default as AuthMethods, SettingList } from './AuthMethods';
+
+export { AuthMethodType, AuthMethodCategory } from "./AuthMethods";
+
+// ChannelAuthSetting 主组件
+export { default as ChannelAuthSetting } from "./ChannelAuthSetting";
+// ChannelAuthSetting 子组件
+export { default as PageSetting } from "./ChannelAuthSetting/PageSetting";
+export { default as PageSettingItem } from "./ChannelAuthSetting/PageSettingItem";
+export { default as AuthenticationMethods } from "./ChannelAuthSetting/AuthenticationMethods";
+export { default as CollectInfo } from "./ChannelAuthSetting/CollectInfo";
+
+// ChannelAuthSetting 类型
+
+export { default as SaaSAdminAuth } from "./SaaSAdminAuth";
+export { default as OrgAdminAuth } from "./OrgAdminAuth";
+export { default as OAuthConfig } from "./OAuthConfig";
+export { default as CustomerAuth } from "./CustomerAuth";
+export { default as CustomerOAuthConfig } from "./CustomerOAuthConfig";
+export { default as DeviceAuth } from "./DeviceAuth";
+export { default as POSOperatorAuth } from "./POSOperatorAuth";
+export { default as OnlineShopAuth } from "./ChannelAuthSetting/OnlineShopAuth";
+export { default as SaaSManagermentAuth } from "./ChannelAuthSetting/SaaSManagermentAuth";

package/es/components/booking/components/TabProduct/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 interface TabProductProps {
     list: any[];

package/es/components/booking/components/TabProduct/productItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItem;

package/es/components/booking/components/TabProduct/selectProductItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const SelectProductItem: ({ item, onClick, onChangeQuantity, amountSymbol, style, className, disabled, }: any) => JSX.Element;
 export default SelectProductItem;

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

@@ -1 +1,2 @@
+/// <reference types="react" />
 export declare const renderBundles: (item: any, amountSymbol: string) => JSX.Element;

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

@@ -270,15 +270,34 @@ var CustomSelect = function CustomSelect(props, ref) {
   var renderList = useMemo(function () {
     var _list = _toConsumableArray(options);
     if (search) {
-      var isIncludes = function isIncludes(str) {
-        return str.toLowerCase().indexOf(search.toLowerCase()) !== -1;
+      var isIncludes = function isIncludes(item) {
+        try {
+          var q = search.toLowerCase();
+          var numericKeys = Object.keys(item).filter(function (k) {
+            return /^\d+$/.test(k);
+          });
+          var customerKeys = ['customer_nickname', 'customer_first_name', 'customer_last_name', 'customer_phone', 'customer_email'];
+          var allKeys = [].concat(_toConsumableArray(numericKeys), customerKeys);
+          return allKeys.some(function (k) {
+            var val = item[k];
+            if (val === null || val === undefined) return false;
+            try {
+              var str = JSON.stringify(val);
+              return str.includes(q) || str.toLocaleLowerCase().includes(q);
+            } catch (error) {
+              return false;
+            }
+          });
+        } catch (e) {
+          return false;
+        }
       };
       _list = _list.filter(function (d) {
         // 自定义搜索
         if (filterItem) {
           return filterItem(d, search);
         }
-        return isIncludes(d.main_field || '');
+        return isIncludes(d);
       });
     }
     return _list;

package/es/components/booking/components/emptyBooking/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 /**
  * @title: 空状态
  * @description:

package/es/components/booking/components/footer/FooterMenus/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const FooterMenus: ({ state, menuChange, items }: any) => JSX.Element | null;
 export default FooterMenus;

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

@@ -621,46 +621,50 @@ var Footer = function Footer(props) {
    */
   var handleCheckoutInternal = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-      var isNewOrder, isHasDayProducts, res, modalData, _res;
+      var _state$bookingConfig5;
+      var isToastMode, isNewOrder, isHasDayProducts, res, modalData, _res;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            // 关闭页面上所有的PaymentResultToast
-            closeAllPaymentResultToasts();
+            // 弹窗模式判断
+            isToastMode = (state === null || state === void 0 || (_state$bookingConfig5 = state.bookingConfig) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.config) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.payment_setting) === null || _state$bookingConfig5 === void 0 ? void 0 : _state$bookingConfig5.payment_result_display_mode) !== 'modal';
+            if (isToastMode) {
+              closeAllPaymentResultToasts();
+            }
             isNewOrder = !state.bookingId; // 如果有编辑内容, 则先保存
             if (!isEdit) {
-              _context4.next = 26;
+              _context4.next = 27;
               break;
             }
             if (!isDayBooking(state)) {
-              _context4.next = 7;
+              _context4.next = 8;
               break;
             }
             isHasDayProducts = handleDaySubmit();
             if (!isHasDayProducts) {
-              _context4.next = 7;
+              _context4.next = 8;
               break;
             }
             return _context4.abrupt("return");
-          case 7:
+          case 8:
             if (!state.isBookingTicket2) {
-              _context4.next = 20;
+              _context4.next = 21;
               break;
             }
-            _context4.next = 10;
+            _context4.next = 11;
             return handleSave({
               type: 'checkout',
               messageShow: !(isTerminal !== null && isTerminal !== void 0 && isTerminal()),
               noSubmit: true
             });
-          case 10:
+          case 11:
             res = _context4.sent;
             if (res) {
-              _context4.next = 13;
+              _context4.next = 14;
               break;
             }
             return _context4.abrupt("return");
-          case 13:
+          case 14:
             // 使用新版支付弹窗
             modalData = {
               order_info: res,
@@ -702,24 +706,24 @@ var Footer = function Footer(props) {
                 }
               };
             });
-            _context4.next = 25;
+            _context4.next = 26;
             break;
-          case 20:
-            _context4.next = 22;
+          case 21:
+            _context4.next = 23;
             return handleSave({
               type: 'checkout',
               messageShow: !(isTerminal !== null && isTerminal !== void 0 && isTerminal())
             });
-          case 22:
+          case 23:
             _res = _context4.sent;
             // goCheckout2(res);
             console.log(_res);
             goCheckout((_res === null || _res === void 0 ? void 0 : _res.order_id) || state.bookingId, isNewOrder);
-          case 25:
-            return _context4.abrupt("return");
           case 26:
-            return _context4.abrupt("return", goCheckout(state.bookingId, isNewOrder));
+            return _context4.abrupt("return");
           case 27:
+            return _context4.abrupt("return", goCheckout(state.bookingId, isNewOrder));
+          case 28:
           case "end":
             return _context4.stop();
         }
@@ -850,43 +854,47 @@ 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 _state$bookingConfig6, _state$service$value2, _state$client3;
+      var type, _ref6$messageShow, messageShow, _ref6$noSubmit, noSubmit, isToastMode, isHasDayProducts, hasUnspecifiedHolderProduct, _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:
             type = _ref6.type, _ref6$messageShow = _ref6.messageShow, messageShow = _ref6$messageShow === void 0 ? true : _ref6$messageShow, _ref6$noSubmit = _ref6.noSubmit, noSubmit = _ref6$noSubmit === void 0 ? false : _ref6$noSubmit;
             // 关闭页面上所有的PaymentResultToast
-            closeAllPaymentResultToasts();
+            // 弹窗模式判断
+            isToastMode = (state === null || state === void 0 || (_state$bookingConfig6 = state.bookingConfig) === null || _state$bookingConfig6 === void 0 || (_state$bookingConfig6 = _state$bookingConfig6.config) === null || _state$bookingConfig6 === void 0 || (_state$bookingConfig6 = _state$bookingConfig6.payment_setting) === null || _state$bookingConfig6 === void 0 ? void 0 : _state$bookingConfig6.payment_result_display_mode) !== 'modal'; // 只有 toast 模式才关闭，modal 模式留着
+            if (isToastMode) {
+              closeAllPaymentResultToasts();
+            }
             // 跨日预约验证是否有预约商品
             if (!isDayBooking(state)) {
-              _context6.next = 6;
+              _context6.next = 7;
               break;
             }
             isHasDayProducts = handleDaySubmit();
             if (!isHasDayProducts) {
-              _context6.next = 6;
+              _context6.next = 7;
               break;
             }
             return _context6.abrupt("return");
-          case 6:
+          case 7:
             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;
+              _context6.next = 11;
               break;
             }
-            _context6.next = 10;
+            _context6.next = 11;
             return showConfirmHolderModal(state, dispatch);
-          case 10:
+          case 11:
             if (!(isBooking4Shop && getIsSubjectRequire(state) && checkHolderIsError(state))) {
-              _context6.next = 12;
+              _context6.next = 13;
               break;
             }
             return _context6.abrupt("return");
-          case 12:
+          case 13:
             // 区分loading, 是点击的checkout 还是save
             _setLoading = type === 'checkout' ? setCheckoutLoading : setLoading;
             _setLoading(true);
@@ -895,34 +903,34 @@ var Footer = function Footer(props) {
             createApi = state.renderType === 'eventBooking' ? createEventBooking : createBooking;
             saveOtherValue = {};
             if (!(type === 'save')) {
-              _context6.next = 25;
+              _context6.next = 26;
               break;
             }
-            _context6.next = 21;
+            _context6.next = 22;
             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 22:
             _context6.t0 = _context6.sent;
             if (_context6.t0) {
-              _context6.next = 24;
+              _context6.next = 25;
               break;
             }
             _context6.t0 = {};
-          case 24:
-            saveOtherValue = _context6.t0;
           case 25:
-            _context6.prev = 25;
+            saveOtherValue = _context6.t0;
+          case 26:
+            _context6.prev = 26;
             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 = 32;
               break;
             }
             return _context6.abrupt("return", values);
-          case 31:
+          case 32:
             checkout = pisellos.getModule('checkout'); // 如果有 orderid，则应该走更新逻辑
             if (!editOrderId) {
-              _context6.next = 41;
+              _context6.next = 42;
               break;
             }
             subtotal_info = {
@@ -931,7 +939,7 @@ var Footer = function Footer(props) {
               total: cloneDeep(total),
               showDetail: showDetail
             };
-            _context6.next = 36;
+            _context6.next = 37;
             return checkout.updateLocalOrderAsync({
               orderId: editOrderId,
               orderData: values,
@@ -939,10 +947,10 @@ var Footer = function Footer(props) {
               autoPayment: true,
               totalInfo: subtotal_info
             });
-          case 36:
-            _context6.next = 38;
+          case 37:
+            _context6.next = 39;
             return checkout.manualSyncOrderAsync();
-          case 38:
+          case 39:
             res = _context6.sent;
             if (res.success) {
               // 回调关闭弹窗
@@ -950,7 +958,7 @@ var Footer = function Footer(props) {
               _setLoading(false);
             }
             return _context6.abrupt("return");
-          case 41:
+          case 42:
             // 如果是保存，检查是否需要支付定金
             if (type === 'save') {
               isNeedDeposit = checkout.checkIsNeedDepositAsync(values.bookings, values.relation_products);
@@ -1014,43 +1022,43 @@ var Footer = function Footer(props) {
 
             // 如果有addons改动, 则先保存
             if (!addonsEdit) {
-              _context6.next = 47;
+              _context6.next = 48;
               break;
             }
-            _context6.next = 47;
+            _context6.next = 48;
             return handleSaveAddons();
-          case 47:
+          case 48:
             if (!infoEdit) {
-              _context6.next = 52;
+              _context6.next = 53;
               break;
             }
-            _context6.next = 50;
+            _context6.next = 51;
             return api(values, state.bookingId || editOrderId);
-          case 50:
+          case 51:
             callbackData = _context6.sent;
             if (messageShow) {
               message.success(locales.getText(state.bookingId ? 'pisell2.text.appointment-updated' : 'pisell2.text.created-successfully'));
             }
-          case 52:
+          case 53:
             // 回调关闭弹窗
             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 58:
+            _context6.prev = 58;
+            _context6.t1 = _context6["catch"](26);
             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 63:
           case "end":
             return _context6.stop();
         }
-      }, _callee6, null, [[25, 57]]);
+      }, _callee6, null, [[26, 58]]);
     }));
     return function handleSave(_x5) {
       return _ref7.apply(this, arguments);

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),
@@ -519,8 +519,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$_extend27, _item$_extend32, _item$_extend33;
     // 自定义商品直接使用 _extend 中的数据，并将 id 转换为 0 提交给后端
     if (item.isCustomItem) {
       bookings.push(_objectSpread(_objectSpread({}, item._extend), {}, {
@@ -568,13 +569,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$_extend32 = item._extend) === null || _item$_extend32 === void 0 ? void 0 : _item$_extend32.groupId];
+    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;
     }
     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,
@@ -593,9 +598,15 @@ var formatBookings = function formatBookings(data, values) {
         cacheItem: item
       }) : item._extend.number || 1,
       resources: formatResource(item),
-      note: item._extend.note
+      note: item._extend.note,
+      "metadata": formatMetaData(item, !isSetGroupId)
     }, eventOtherParams || {}), dayParams);
 
+    // 记录下每个GroupId第一次出现的时机
+    if (!isSetGroupId) {
+      obj[item._extend.groupId] = true;
+    }
+
     // 跨日预约模版或当前是跨日预约商品时
     if (isDay || isMultiDay) {
       bookings.push(booking);
@@ -630,16 +641,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$_extend34;
     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$_extend34 = item._extend) === null || _item$_extend34 === void 0 ? void 0 : _item$_extend34.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$_extend35;
+    if (!((_item$_extend35 = item._extend) !== null && _item$_extend35 !== void 0 && _item$_extend35.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
@@ -658,8 +669,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$_extend36;
+    if (!((_item$_extend36 = item._extend) !== null && _item$_extend36 !== void 0 && _item$_extend36.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
@@ -784,19 +795,19 @@ export var checkHolderIsError = function checkHolderIsError(state) {
   var _state$client;
   var errorRowKey = '';
   var holderError = state.service.value.some(function (item) {
-    var _item$_extend$holder_, _item$_extend37;
+    var _item$_extend$holder_, _item$_extend38;
     // 普通商品不需要检测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);
+      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;
     }
-    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$_extend38 = item._extend) === null || _item$_extend38 === void 0 || (_item$_extend38 = _item$_extend38.holder_id) === null || _item$_extend38 === void 0 ? void 0 : _item$_extend38.length) !== item._extend.quantity) {
+      var _item$_extend39;
+      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend39 = item._extend) === null || _item$_extend39 === void 0 || (_item$_extend39 = _item$_extend39.other) === null || _item$_extend39 === void 0 ? void 0 : _item$_extend39.rowKey);
       return true;
     }
     return false;