@pisell/private-materials 6.6.2 → 6.7.2

package/lib/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/lib/components/authentication/admin/index.js

@@ -0,0 +1,83 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/authentication/admin/index.ts
+var admin_exports = {};
+__export(admin_exports, {
+  AuthMethodCategory: () => import_AuthMethods.AuthMethodCategory,
+  AuthMethodType: () => import_AuthMethods.AuthMethodType,
+  AuthenticationMethods: () => import_AuthenticationMethods.default,
+  ChannelAuthSetting: () => import_ChannelAuthSetting.default,
+  CollectInfo: () => import_CollectInfo.default,
+  CustomerAuth: () => import_CustomerAuth.default,
+  CustomerOAuthConfig: () => import_CustomerOAuthConfig.default,
+  DeviceAuth: () => import_DeviceAuth.default,
+  OAuthConfig: () => import_OAuthConfig.default,
+  OnlineShopAuth: () => import_OnlineShopAuth.default,
+  OrgAdminAuth: () => import_OrgAdminAuth.default,
+  POSOperatorAuth: () => import_POSOperatorAuth.default,
+  PageSetting: () => import_PageSetting.default,
+  PageSettingItem: () => import_PageSettingItem.default,
+  SaaSAdminAuth: () => import_SaaSAdminAuth.default,
+  SaaSManagermentAuth: () => import_SaaSManagermentAuth.default
+});
+module.exports = __toCommonJS(admin_exports);
+var import_AuthMethods = require("./AuthMethods");
+var import_ChannelAuthSetting = __toESM(require("./ChannelAuthSetting"));
+var import_PageSetting = __toESM(require("./ChannelAuthSetting/PageSetting"));
+var import_PageSettingItem = __toESM(require("./ChannelAuthSetting/PageSettingItem"));
+var import_AuthenticationMethods = __toESM(require("./ChannelAuthSetting/AuthenticationMethods"));
+var import_CollectInfo = __toESM(require("./ChannelAuthSetting/CollectInfo"));
+var import_SaaSAdminAuth = __toESM(require("./SaaSAdminAuth"));
+var import_OrgAdminAuth = __toESM(require("./OrgAdminAuth"));
+var import_OAuthConfig = __toESM(require("./OAuthConfig"));
+var import_CustomerAuth = __toESM(require("./CustomerAuth"));
+var import_CustomerOAuthConfig = __toESM(require("./CustomerOAuthConfig"));
+var import_DeviceAuth = __toESM(require("./DeviceAuth"));
+var import_POSOperatorAuth = __toESM(require("./POSOperatorAuth"));
+var import_OnlineShopAuth = __toESM(require("./ChannelAuthSetting/OnlineShopAuth"));
+var import_SaaSManagermentAuth = __toESM(require("./ChannelAuthSetting/SaaSManagermentAuth"));
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  AuthMethodCategory,
+  AuthMethodType,
+  AuthenticationMethods,
+  ChannelAuthSetting,
+  CollectInfo,
+  CustomerAuth,
+  CustomerOAuthConfig,
+  DeviceAuth,
+  OAuthConfig,
+  OnlineShopAuth,
+  OrgAdminAuth,
+  POSOperatorAuth,
+  PageSetting,
+  PageSettingItem,
+  SaaSAdminAuth,
+  SaaSManagermentAuth
+});

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

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

package/lib/components/booking/components/actionButtons/index.js

@@ -72,7 +72,6 @@ var ActionButtons = ({
   const { ScheduleModule } = pisellosAllModule;
   const shopDiscount = (0, import_useShopDiscountModule.useShopDiscountModule)();
   const changeCustomerToGlobalState = (0, import_ahooks.useMemoizedFn)((value) => {
-    var _a2, _b2;
     dispatch({
       type: "setClient",
       payload: {
@@ -80,14 +79,6 @@ var ActionButtons = ({
         edit: true
       }
     });
-    if ((_b2 = (_a2 = state == null ? void 0 : state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length) {
-      dispatch({
-        type: "setService",
-        payload: {
-          value: state.service.value.map((item) => ({ ...item, _extend: { ...item._extend, holder_id: [] } }))
-        }
-      });
-    }
   });
   const { selectCustomer } = (0, import_useCustomer.useCustomer)({
     changeCustomerToGlobalState
@@ -251,8 +242,7 @@ var ActionButtons = ({
     );
   };
   const handleClearAllAndReset = () => {
-    var _a2, _b2;
-    (_b2 = (_a2 = window == null ? void 0 : window.shopApi) == null ? void 0 : _a2.bookingTicket) == null ? void 0 : _b2.clearAllCart();
+    var _a2;
     clearAllScanListenersTaskQueue();
     dispatch({
       type: "setService",
@@ -296,6 +286,7 @@ var ActionButtons = ({
         value: {}
       }
     });
+    (_a2 = shopDiscount == null ? void 0 : shopDiscount.clear) == null ? void 0 : _a2.call(shopDiscount);
     setShowClearModal(false);
     Toast == null ? void 0 : Toast.success(
       createToastContent(

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

@@ -165,14 +165,37 @@ var CustomSelect = (props, ref) => {
   const renderList = (0, import_react.useMemo)(() => {
     let _list = [...options];
     if (search) {
-      const isIncludes = (str) => {
-        return str.toLowerCase().indexOf(search.toLowerCase()) !== -1;
+      const isIncludes = (item) => {
+        try {
+          const q = search.toLowerCase();
+          const numericKeys = Object.keys(item).filter((k) => /^\d+$/.test(k));
+          const customerKeys = [
+            "customer_nickname",
+            "customer_first_name",
+            "customer_last_name",
+            "customer_phone",
+            "customer_email"
+          ];
+          const allKeys = [...numericKeys, ...customerKeys];
+          return allKeys.some((k) => {
+            const val = item[k];
+            if (val === null || val === void 0) return false;
+            try {
+              const str = JSON.stringify(val);
+              return str.includes(q) || str.toLocaleLowerCase().includes(q);
+            } catch (error) {
+              return false;
+            }
+          });
+        } catch (e) {
+          return false;
+        }
       };
       _list = _list.filter((d) => {
         if (filterItem) {
           return filterItem(d, search);
         }
-        return isIncludes(d.main_field || "");
+        return isIncludes(d);
       });
     }
     return _list;

package/lib/components/booking/components/footer/amount.js

@@ -38,7 +38,6 @@ var import_utils = require("../../utils");
 var import_utils2 = require("@pisell/utils");
 var import_decimal = __toESM(require("decimal.js"));
 var import_utils3 = require("../../info/service2/utils");
-var import_utils4 = require("../../info2/service/addService/utils");
 var getRelationDetailsTotal = (relation_details) => {
   let total = new import_decimal.default(0);
   for (let item of relation_details) {
@@ -53,22 +52,16 @@ var getProductExpectAmount = (state, isEdit) => {
   let price = new import_decimal.default(0);
   let duration = new import_decimal.default(0);
   const isDay = (0, import_utils3.isDayBooking)(state);
-  let dayDuration = new import_decimal.default(0);
-  let minuteDuration = new import_decimal.default(0);
   if (isEdit) {
     if ((state == null ? void 0 : state.service) || (state == null ? void 0 : state.addons)) {
       if (Array.isArray((_a = state == null ? void 0 : state.service) == null ? void 0 : _a.value)) {
         for (let item of state.service.value) {
-          if (isDay || (0, import_utils3.isNormalProductByDurationSchedule)(item) || (0, import_utils4.isMultiDayProduct)(item)) {
+          if (isDay || (0, import_utils3.isNormalProductByDurationSchedule)(item)) {
             const quantity = new import_decimal.default(item._extend.quantity || 1);
             const itemTotal = new import_decimal.default(item._extend.total || 0);
             price = price.add(itemTotal.mul(quantity));
-            const _duration = !(0, import_utils3.isNormalProductByDurationSchedule)(item) ? new import_decimal.default(item._extend.duration || 0) : new import_decimal.default(0);
-            if (isDay || (0, import_utils4.isMultiDayProduct)(item)) {
-              dayDuration = dayDuration.add(_duration);
-            } else {
-              minuteDuration = minuteDuration.add(_duration);
-            }
+            const _duration = (0, import_utils3.isDayBookingProduct)(item, state) ? new import_decimal.default(item._extend.duration || 0) : new import_decimal.default(0);
+            duration = duration.add(_duration);
           } else {
             const quantity = new import_decimal.default(item._extend.quantity || 1);
             const itemTotal = new import_decimal.default(item._extend.total || 0);
@@ -79,11 +72,6 @@ var getProductExpectAmount = (state, isEdit) => {
             price = price.add(relationTotal);
             const itemDuration = new import_decimal.default(import_utils.flexibleObj.getValue(item._extend.duration) || 0);
             duration = duration.add(itemDuration);
-            if ((0, import_utils4.isMultiDayProduct)(item)) {
-              dayDuration = dayDuration.add(itemDuration);
-            } else {
-              minuteDuration = minuteDuration.add(itemDuration);
-            }
           }
         }
       }
@@ -101,23 +89,18 @@ var getProductExpectAmount = (state, isEdit) => {
     duration = services.reduce((pre, cur) => {
       var _a2;
       let current = new import_decimal.default(0);
-      if (isDay || (0, import_utils4.isMultiDayProduct)(cur)) {
-        const _duration = !(0, import_utils3.isNormalProductByDurationSchedule)(cur) ? new import_decimal.default(cur._extend.duration || 0) : new import_decimal.default(0);
+      if (isDay) {
+        const _duration = (0, import_utils3.isDayBookingProduct)(cur, state) ? new import_decimal.default(cur._extend.duration || 0) : new import_decimal.default(0);
         current = _duration;
       } else {
         current = new import_decimal.default(import_utils.flexibleObj.getValue(((_a2 = cur._extend) == null ? void 0 : _a2.duration) || 0) || 0);
       }
-      if (isDay || (0, import_utils4.isMultiDayProduct)(cur)) {
-        dayDuration = dayDuration.add(current);
-      } else {
-        minuteDuration = minuteDuration.add(current);
-      }
       return pre.add(current);
     }, new import_decimal.default(0));
   }
   return {
     productExpectAmount: price.toNumber(),
-    duration: (0, import_utils.getDiscountTimeByDayMinutes)(dayDuration.toNumber(), minuteDuration.toNumber())
+    duration: (0, import_utils.getDiscountTime)(duration.toNumber(), isDay)
   };
 };
 var getProductItemTax = (item, state, options) => {

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

@@ -51,7 +51,6 @@ var import_index = require("./index.less");
 var import_serve2 = require("./serve");
 var import_utils3 = require("./utils");
 var import_noteModal = __toESM(require("../../../../plus/noteModal"));
-var import_confirmHolderModal = require("../../utils/confirmHolderModal");
 var import__ = require("../../../../index");
 var import_useIsBooking4Shop = require("../../hooks/useIsBooking4Shop");
 var import_utils4 = require("@pisell/utils");
@@ -62,7 +61,6 @@ var import_useCustomer = require("../../../ticketBooking/hooks/pisellos/useCusto
 var import_ahooks = require("ahooks");
 var import_lodash = require("lodash");
 var import_useShopDiscountModule = require("../../../ticketBooking/hooks/pisellos/useShopDiscountModule");
-var import_utils5 = require("../../utils");
 var Footer = (props) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
   const { state, buttons, dispatch, source } = props;
@@ -598,19 +596,12 @@ var Footer = (props) => {
     messageShow = true,
     noSubmit = false
   }) => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
+    var _a2, _b2, _c2, _d2, _e2;
     (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
     if ((0, import_utils2.isDayBooking)(state)) {
       const isHasDayProducts = handleDaySubmit();
       if (isHasDayProducts) return;
     }
-    const hasUnspecifiedHolderProduct = (_a2 = state.service.value) == null ? void 0 : _a2.some((item) => {
-      var _a3, _b3, _c3;
-      return (!((_a3 = item._extend) == null ? void 0 : _a3.holder_id) || ((_c3 = (_b3 = item._extend) == null ? void 0 : _b3.holder_id) == null ? void 0 : _c3.length) === 0) && !(0, import_utils2.isNormalProductByDurationSchedule)(item);
-    });
-    if (!(0, import_utils5.isWalkIn)((_c2 = (_b2 = state.client) == null ? void 0 : _b2.value) == null ? void 0 : _c2.id) && (0, import_utils2.getIsSubjectRequire)(state) && hasUnspecifiedHolderProduct) {
-      await (0, import_confirmHolderModal.showConfirmHolderModal)(state, dispatch);
-    }
     if (isBooking4Shop && (0, import_utils2.getIsSubjectRequire)(state) && (0, import_utils3.checkHolderIsError)(state)) {
       return;
     }
@@ -621,7 +612,7 @@ var Footer = (props) => {
     const createApi = state.renderType === "eventBooking" ? import_serve2.createEventBooking : createBooking;
     let saveOtherValue = {};
     if (type === "save") {
-      saveOtherValue = await ((_d2 = state == null ? void 0 : state.onSave) == null ? void 0 : _d2.call(state, state.client)) || {};
+      saveOtherValue = await ((_a2 = state == null ? void 0 : state.onSave) == null ? void 0 : _a2.call(state, state.client)) || {};
     }
     try {
       let callbackData = null;
@@ -667,7 +658,7 @@ var Footer = (props) => {
           { key: "日期", value: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm") },
           {
             key: "店铺id",
-            value: (_h2 = (_g2 = (_f2 = (_e2 = store == null ? void 0 : store.getState) == null ? void 0 : _e2.call(store)) == null ? void 0 : _f2.global) == null ? void 0 : _g2.globalConfig) == null ? void 0 : _h2.id
+            value: (_e2 = (_d2 = (_c2 = (_b2 = store == null ? void 0 : store.getState) == null ? void 0 : _b2.call(store)) == null ? void 0 : _c2.global) == null ? void 0 : _d2.globalConfig) == null ? void 0 : _e2.id
           },
           {
             key: "shopApi",
@@ -1253,7 +1244,6 @@ var Footer = (props) => {
     }
   };
   const changeCustomerToGlobalState = (0, import_ahooks.useMemoizedFn)((value) => {
-    var _a2, _b2;
     dispatch({
       type: "setClient",
       payload: {
@@ -1261,14 +1251,6 @@ var Footer = (props) => {
         edit: true
       }
     });
-    if ((_b2 = (_a2 = state == null ? void 0 : state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length) {
-      dispatch({
-        type: "setService",
-        payload: {
-          value: state.service.value.map((item) => ({ ...item, _extend: { ...item._extend, holder_id: [] } }))
-        }
-      });
-    }
   });
   const { selectCustomer } = (0, import_useCustomer.useCustomer)({
     changeCustomerToGlobalState
@@ -1451,6 +1433,6 @@ var Footer = (props) => {
         }
       }
     }
-  ), /* @__PURE__ */ import_react.default.createElement(import_confirmHolderModal.ConfirmHolderModal, null));
+  ));
 };
 var footer_default = Footer;

package/lib/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/lib/components/booking/components/footer/utils.js

@@ -35,8 +35,7 @@ __export(utils_exports, {
   formatProductBundle: () => formatProductBundle,
   formatProductOption: () => formatProductOption,
   formatProductPrice: () => formatProductPrice,
-  formatValues: () => formatValues,
-  getHasMultiDayProduct: () => getHasMultiDayProduct
+  formatValues: () => formatValues
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
@@ -75,10 +74,10 @@ var formatProductOption = (option) => {
   }
   return option.map((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 ? 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 ? void 0 : d.add_price)
     };
   });
 };
@@ -121,7 +120,7 @@ var formatProductBundle = (bundle) => {
       // checkout 2.0 新增
       "price_type": d == null ? void 0 : d.price_type,
       // checkout 2.0 新增
-      "custom_price": Math.abs(new import_decimal.default(d == null ? void 0 : d.price).sub(option_price).toNumber()).toFixed(2),
+      "custom_price": new import_decimal.default(d == null ? void 0 : d.price).sub(option_price).toNumber().toFixed(2),
       "custom_price_type": d == null ? void 0 : d.price_type,
       "option": option
     };
@@ -238,7 +237,7 @@ var formatSellingPrice = (item) => {
   var _a;
   return Number((_a = item._extend) == null ? void 0 : _a.total);
 };
-var formatMetaData = (item) => {
+var formatMetaData = (item, isMultiDayPrices) => {
   var _a, _b, _c, _d, _e, _f, _g;
   let metadata = {};
   if ((_a = item._extend) == null ? void 0 : _a.capacity) {
@@ -250,7 +249,7 @@ var formatMetaData = (item) => {
   if ((_b = item._extend) == null ? void 0 : _b.holder_id) {
     metadata.holder_id = (_c = item._extend) == null ? void 0 : _c.holder_id;
   }
-  if ((_d = item._extend) == null ? void 0 : _d.multiDayPrices) {
+  if (isMultiDayPrices && ((_d = item._extend) == null ? void 0 : _d.multiDayPrices)) {
     metadata.multiDayPrices = (_e = item._extend) == null ? void 0 : _e.multiDayPrices;
   }
   if ((_f = item._extend) == null ? void 0 : _f.unique_identification_number) {
@@ -292,30 +291,30 @@ var 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 ? 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: ((_a = item._extend) == null ? void 0 : _a.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((_c = (_b = item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.bundle),
-    bundle_edit: item._extend.bundle_edit,
-    product_option_item: formatProductOption((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.option),
-    product_variant_id: ((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.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 ? 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": ((_a = item._extend) == null ? void 0 : _a.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((_c = (_b = item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.bundle),
+    "bundle_edit": item._extend.bundle_edit,
+    "product_option_item": formatProductOption((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.option),
+    "product_variant_id": ((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.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
   };
 };
 var formatAppointmentProductLists = (data) => {
@@ -352,14 +351,6 @@ var getHolderByIndex = (holder, index) => {
     form_record: [(_a = holder == null ? void 0 : holder.form_record) == null ? void 0 : _a[index]].filter(Boolean)
   };
 };
-var getHasMultiDayProduct = (data) => {
-  const list = data.service.value;
-  const isHas = list.some((item) => {
-    var _a;
-    return (_a = item._extend) == null ? void 0 : _a.groupId;
-  });
-  return isHas;
-};
 var formatBookings = (data, values) => {
   const isDay = (0, import_utils4.isDaysBooking)(data);
   const isEvent = (0, import_utils4.isEventBooking)(data);
@@ -379,6 +370,7 @@ var formatBookings = (data, values) => {
   let dayParams = {};
   const eventOtherParams = data.eventOtherParams;
   let bookings = [];
+  let obj = {};
   list.forEach((item) => {
     var _a, _b, _c, _d, _e, _f;
     if (item.isCustomItem) {
@@ -389,7 +381,6 @@ var formatBookings = (data, values) => {
       });
       return;
     }
-    const isMultiDay = (_a = item._extend) == null ? void 0 : _a.groupId;
     let start_date = item._extend.startDate.format("YYYY-MM-DD");
     let end_date = item._extend.endDate.format("YYYY-MM-DD");
     let end_time = item._extend.endDate.format("HH:mm");
@@ -399,8 +390,8 @@ var formatBookings = (data, values) => {
     }
     dayParams.holder = formatHolders(data, item, values);
     if (isDay) {
-      const startDate = ((_b = item._extend) == null ? void 0 : _b.startDate) || ((_c = item._extend) == null ? void 0 : _c.start_date);
-      const endDate = ((_d = item._extend) == null ? void 0 : _d.endDate) || ((_e = item._extend) == null ? void 0 : _e.end_date);
+      const startDate = ((_a = item._extend) == null ? void 0 : _a.startDate) || ((_b = item._extend) == null ? void 0 : _b.start_date);
+      const endDate = ((_c = item._extend) == null ? void 0 : _c.endDate) || ((_d = item._extend) == null ? void 0 : _d.end_date);
       const { startDateTime, endDateTime } = (0, import_utils4.formatDayTime)({
         startDate,
         endDate
@@ -416,34 +407,38 @@ var formatBookings = (data, values) => {
         "minutes"
       );
     }
-    if (!((_f = item._extend) == null ? void 0 : _f.unique_identification_number)) {
+    if (!((_e = item._extend) == null ? void 0 : _e.unique_identification_number)) {
       const unique_identification_number = (0, import_utils5.getUniqueId)();
       item._extend.unique_identification_number = unique_identification_number;
     }
+    const isSetGroupId = obj[(_f = item == null ? void 0 : item._extend) == null ? void 0 : _f.groupId];
     const booking = {
-      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,
-      sub_type: isDay ? "days" : getSubType(item),
-      select_date: start_date,
-      start_time,
-      end_date,
-      start_date,
-      duration: isDay || isMultiDay ? 0 : import_utils.flexibleObj.getValue(item._extend.duration),
-      number: item._extend.capacity ? (0, import_utilsByBooking.getSumCapacity)({ cacheItem: item }) : item._extend.number || 1,
-      resources: formatResource(item),
-      note: item._extend.note,
+      "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 : import_utils.flexibleObj.getValue(item._extend.duration),
+      "number": item._extend.capacity ? (0, import_utilsByBooking.getSumCapacity)({ cacheItem: item }) : item._extend.number || 1,
+      "resources": formatResource(item),
+      "note": item._extend.note,
       ...eventOtherParams || {},
       ...dayParams
     };
-    if (isDay || isMultiDay) {
+    if (!isSetGroupId) {
+      obj[item._extend.groupId] = true;
+    }
+    if (isDay) {
       bookings.push(booking);
       return;
     }
@@ -452,10 +447,10 @@ var formatBookings = (data, values) => {
       newItem._extend.unique_identification_number = `${item._extend.unique_identification_number}_${i}`;
       bookings.push({
         ...booking,
-        product: formatProducts(newItem, 1),
-        number: item._extend.capacity ? (0, import_utilsByBooking.getSumCapacity)({ cacheItem: newItem }, false) : newItem._extend.number || 1,
-        holder: getHolderByIndex(booking.holder, i),
-        metadata: formatMetaData(newItem)
+        "product": formatProducts(newItem, 1),
+        "number": item._extend.capacity ? (0, import_utilsByBooking.getSumCapacity)({ cacheItem: newItem }, false) : newItem._extend.number || 1,
+        "holder": getHolderByIndex(booking.holder, i),
+        "metadata": formatMetaData(newItem)
       });
     }
   });
@@ -531,7 +526,6 @@ var formatValues = (state) => {
     metadata: {}
   };
   const isDay = (0, import_utils4.isDaysBooking)(state);
-  const isHasMultiDay = getHasMultiDayProduct(state);
   const isEvent = (0, import_utils4.isEventBooking)(state);
   if (!state.bookingId || isDay) {
     values.shop_note = formatNote(state);
@@ -549,10 +543,10 @@ var formatValues = (state) => {
     ...customer
   };
   values.holder = formatHolder(state, values);
-  if (isEvent) {
+  if (isDay || isEvent) {
     values.relation_products = formatRelationProducts(
       state,
-      "event"
+      isDay ? "day" : "event"
     );
   } else {
     values.relation_products = formatNormalProducts(state);
@@ -566,7 +560,7 @@ var formatValues = (state) => {
     startTime = `${startTime || "00:00"}:00`;
     values.schedule_date = `${values.bookings[0].select_date} ${startTime}`;
   }
-  if (isDay || isHasMultiDay) {
+  if (isDay) {
     values.metadata.is_multiday_appointment = 1;
   }
   if (!((_g = values == null ? void 0 : values.bookings) == null ? void 0 : _g.length)) {
@@ -579,16 +573,16 @@ var checkHolderIsError = (state) => {
   var _a, _b;
   let errorRowKey = "";
   const holderError = state.service.value.some((item) => {
-    var _a2, _b2, _c, _d, _e, _f, _g;
+    var _a2, _b2, _c, _d, _e, _f;
     if ((0, import_utils4.isNormalProductByDurationSchedule)(item)) {
       return false;
     }
-    if (item._extend.quantity === 1 && (!item._extend.holder_id || ((_a2 = item._extend.holder_id) == null ? void 0 : _a2.length) === 0)) {
-      errorRowKey = (0, import_utils4.genRowKey)((_c = (_b2 = item == null ? void 0 : item._extend) == null ? void 0 : _b2.other) == null ? void 0 : _c.rowKey);
+    if (item._extend.quantity === 1 && !item._extend.holder_id) {
+      errorRowKey = (0, import_utils4.genRowKey)((_b2 = (_a2 = item == null ? void 0 : item._extend) == null ? void 0 : _a2.other) == null ? void 0 : _b2.rowKey);
       return true;
     }
-    if (item._extend.quantity > 1 && ((_e = (_d = item._extend) == null ? void 0 : _d.holder_id) == null ? void 0 : _e.length) !== item._extend.quantity) {
-      errorRowKey = (0, import_utils4.genRowKey)((_g = (_f = item == null ? void 0 : item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.rowKey);
+    if (item._extend.quantity > 1 && ((_d = (_c = item._extend) == null ? void 0 : _c.holder_id) == null ? void 0 : _d.length) !== item._extend.quantity) {
+      errorRowKey = (0, import_utils4.genRowKey)((_f = (_e = item == null ? void 0 : item._extend) == null ? void 0 : _e.other) == null ? void 0 : _f.rowKey);
       return true;
     }
     return false;
@@ -618,6 +612,5 @@ var checkHolderIsError = (state) => {
   formatProductBundle,
   formatProductOption,
   formatProductPrice,
-  formatValues,
-  getHasMultiDayProduct
+  formatValues
 });