@pisell/private-materials 6.6.1 → 6.7.1

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/actionButtons/index.js

@@ -3,12 +3,12 @@ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableTo
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -41,7 +41,7 @@ var createToastContent = function createToastContent(text) {
   }, text);
 };
 var ActionButtons = function ActionButtons(_ref) {
-  var _context$appHelper, _state$service3, _state$addons2, _state$service5, _state$service7, _context$appHelper3, _state$service9, _state$addons4, _context$appHelper4, _context$appHelper4$g;
+  var _context$appHelper, _state$service2, _state$addons2, _state$service4, _state$service6, _context$appHelper3, _state$service8, _state$addons4, _context$appHelper4, _context$appHelper4$g;
   var state = _ref.state,
     dispatch = _ref.dispatch,
     _ref$disabled = _ref.disabled,
@@ -77,7 +77,6 @@ var ActionButtons = function ActionButtons(_ref) {
 
   // 将选中的客户数据传递给状态管理
   var changeCustomerToGlobalState = useMemoizedFn(function (value) {
-    var _state$service;
     dispatch({
       type: 'setClient',
       payload: {
@@ -85,21 +84,6 @@ var ActionButtons = function ActionButtons(_ref) {
         edit: true
       }
     });
-    if (state !== null && state !== void 0 && (_state$service = state.service) !== null && _state$service !== void 0 && (_state$service = _state$service.value) !== null && _state$service !== void 0 && _state$service.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
@@ -171,9 +155,9 @@ var ActionButtons = function ActionButtons(_ref) {
 
   // 检查是否有购物车内容
   var hasCartItems = useMemo(function () {
-    var _state$service2, _state$addons;
-    return ((state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 || (_state$service2 = _state$service2.value) === null || _state$service2 === void 0 ? void 0 : _state$service2.length) || 0) + ((state === null || state === void 0 || (_state$addons = state.addons) === null || _state$addons === void 0 || (_state$addons = _state$addons.value) === null || _state$addons === void 0 ? void 0 : _state$addons.length) || 0) > 0;
-  }, [state === null || state === void 0 || (_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : _state$service3.value, state === null || state === void 0 || (_state$addons2 = state.addons) === null || _state$addons2 === void 0 ? void 0 : _state$addons2.value]);
+    var _state$service, _state$addons;
+    return ((state === null || state === void 0 || (_state$service = state.service) === null || _state$service === void 0 || (_state$service = _state$service.value) === null || _state$service === void 0 ? void 0 : _state$service.length) || 0) + ((state === null || state === void 0 || (_state$addons = state.addons) === null || _state$addons === void 0 || (_state$addons = _state$addons.value) === null || _state$addons === void 0 ? void 0 : _state$addons.length) || 0) > 0;
+  }, [state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value, state === null || state === void 0 || (_state$addons2 = state.addons) === null || _state$addons2 === void 0 ? void 0 : _state$addons2.value]);
 
   // 检查是否禁用编辑
   var isDisabledEdit = useMemo(function () {
@@ -210,8 +194,8 @@ var ActionButtons = function ActionButtons(_ref) {
   // 计算已使用的券数量
   var usedVouchersCount = useMemo(function () {
     try {
-      var _state$service4;
-      if (!((_state$service4 = state.service) !== null && _state$service4 !== void 0 && (_state$service4 = _state$service4.value) !== null && _state$service4 !== void 0 && _state$service4.length)) {
+      var _state$service3;
+      if (!((_state$service3 = state.service) !== null && _state$service3 !== void 0 && (_state$service3 = _state$service3.value) !== null && _state$service3 !== void 0 && _state$service3.length)) {
         return 0;
       }
       // 直接从全局折扣券列表中计算被选中的数量，避免重复计数
@@ -222,14 +206,14 @@ var ActionButtons = function ActionButtons(_ref) {
       console.error('计算已使用券数量失败:', error);
       return 0;
     }
-  }, [discountList, (_state$service5 = state.service) === null || _state$service5 === void 0 ? void 0 : _state$service5.value]);
+  }, [discountList, (_state$service4 = state.service) === null || _state$service4 === void 0 ? void 0 : _state$service4.value]);
 
   // 判断是否有券可用但手动取消使用（显示红色感叹号）
   var shouldShowWarning = useMemo(function () {
     try {
-      var _state$service6;
+      var _state$service5;
       // 条件：购物车不为空 && discountList 长度大于 0，且没有 isSelected 的优惠券，且有 isManualSelect 的优惠券
-      return ((_state$service6 = state.service) === null || _state$service6 === void 0 || (_state$service6 = _state$service6.value) === null || _state$service6 === void 0 ? void 0 : _state$service6.length) > 0 && discountList.length > 0 && !discountList.some(function (discount) {
+      return ((_state$service5 = state.service) === null || _state$service5 === void 0 || (_state$service5 = _state$service5.value) === null || _state$service5 === void 0 ? void 0 : _state$service5.length) > 0 && discountList.length > 0 && !discountList.some(function (discount) {
         return discount.isSelected;
       }) && discountList.some(function (discount) {
         return discount.isManualSelect;
@@ -238,7 +222,7 @@ var ActionButtons = function ActionButtons(_ref) {
       console.error('判断警告状态失败:', error);
       return false;
     }
-  }, [discountList, (_state$service7 = state.service) === null || _state$service7 === void 0 ? void 0 : _state$service7.value]);
+  }, [discountList, (_state$service6 = state.service) === null || _state$service6 === void 0 ? void 0 : _state$service6.value]);
 
   // 监听折扣券列表变化
   useEffect(function () {
@@ -306,8 +290,8 @@ var ActionButtons = function ActionButtons(_ref) {
 
   // 清空所有内容并重置购物车
   var handleClearAllAndReset = function handleClearAllAndReset() {
-    var _window;
-    (_window = window) === null || _window === void 0 || (_window = _window.shopApi) === null || _window === void 0 || (_window = _window.bookingTicket) === null || _window === void 0 || _window.clearAllCart();
+    var _shopDiscount$clear;
+    // (window as any)?.shopApi?.bookingTicket?.clearAllCart();
     clearAllScanListenersTaskQueue();
     // 清空服务项目
     dispatch({
@@ -374,6 +358,8 @@ var ActionButtons = function ActionButtons(_ref) {
     // TODO: 如果需要重置更多信息，可以在这里添加
     // 比如重置优惠券、表单数据、宠物信息等
 
+    // 清空商品券
+    shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$clear = shopDiscount.clear) === null || _shopDiscount$clear === void 0 || _shopDiscount$clear.call(shopDiscount);
     setShowClearModal(false);
     Toast === null || Toast === void 0 || Toast.success(createToastContent(locales.getText('pisell2.action-buttons.clear-success')));
   };
@@ -389,8 +375,8 @@ var ActionButtons = function ActionButtons(_ref) {
 
   // 商品清空后，重置折扣信息
   useEffect(function () {
-    var _state$service8, _state$addons3;
-    if (((_state$service8 = state.service) === null || _state$service8 === void 0 || (_state$service8 = _state$service8.value) === null || _state$service8 === void 0 ? void 0 : _state$service8.length) === 0 && ((_state$addons3 = state.addons) === null || _state$addons3 === void 0 || (_state$addons3 = _state$addons3.value) === null || _state$addons3 === void 0 ? void 0 : _state$addons3.length) === 0) {
+    var _state$service7, _state$addons3;
+    if (((_state$service7 = state.service) === null || _state$service7 === void 0 || (_state$service7 = _state$service7.value) === null || _state$service7 === void 0 ? void 0 : _state$service7.length) === 0 && ((_state$addons3 = state.addons) === null || _state$addons3 === void 0 || (_state$addons3 = _state$addons3.value) === null || _state$addons3 === void 0 ? void 0 : _state$addons3.length) === 0) {
       dispatch({
         type: 'setState',
         payload: {
@@ -398,7 +384,7 @@ var ActionButtons = function ActionButtons(_ref) {
         }
       });
     }
-  }, [(_state$service9 = state.service) === null || _state$service9 === void 0 ? void 0 : _state$service9.value, (_state$addons4 = state.addons) === null || _state$addons4 === void 0 ? void 0 : _state$addons4.value]);
+  }, [(_state$service8 = state.service) === null || _state$service8 === void 0 ? void 0 : _state$service8.value, (_state$addons4 = state.addons) === null || _state$addons4 === void 0 ? void 0 : _state$addons4.value]);
 
   // 处理价格调整完成
   var handlePriceAdjustConfirm = function handlePriceAdjustConfirm(discountAmount) {
@@ -427,7 +413,7 @@ var ActionButtons = function ActionButtons(_ref) {
 
   // 处理自定义商品保存
   var handleCustomiseItemSave = function handleCustomiseItemSave(data) {
-    var _state$service10;
+    var _state$service9;
     console.log('保存自定义商品:', data);
 
     // 创建自定义商品项，按照标准商品结构
@@ -471,7 +457,7 @@ var ActionButtons = function ActionButtons(_ref) {
     };
 
     // 添加到购物车（使用 service 来存储自定义商品）
-    var currentServices = (state === null || state === void 0 || (_state$service10 = state.service) === null || _state$service10 === void 0 ? void 0 : _state$service10.value) || [];
+    var currentServices = (state === null || state === void 0 || (_state$service9 = state.service) === null || _state$service9 === void 0 ? void 0 : _state$service9.value) || [];
 
     // 直接添加自定义商品，不检查重复
     var updatedServices = [customItem].concat(_toConsumableArray(currentServices));

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/footer/amount.js

@@ -7,11 +7,10 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-import { flexibleObj, getDiscountTimeByDayMinutes } from "../../utils";
+import { getDiscountTime, flexibleObj } from "../../utils";
 import { formatAmount } from '@pisell/utils';
 import Decimal from 'decimal.js';
-import { isDayBooking, isNormalProductByDurationSchedule } from "../../info/service2/utils";
-import { isMultiDayProduct } from "../../info2/service/addService/utils";
+import { isDayBooking, isDayBookingProduct, isNormalProductByDurationSchedule } from "../../info/service2/utils";
 export var getRelationDetailsTotal = function getRelationDetailsTotal(relation_details) {
   var total = new Decimal(0);
   var _iterator = _createForOfIteratorHelper(relation_details),
@@ -40,8 +39,6 @@ var getProductExpectAmount = function getProductExpectAmount(state, isEdit) {
   var duration = new Decimal(0);
   // 是否是跨日预约
   var isDay = isDayBooking(state);
-  var dayDuration = new Decimal(0);
-  var minuteDuration = new Decimal(0);
   if (isEdit) {
     // 计算总价  服务 和 附加商品
     if (state !== null && state !== void 0 && state.service || state !== null && state !== void 0 && state.addons) {
@@ -54,18 +51,14 @@ var getProductExpectAmount = function getProductExpectAmount(state, isEdit) {
           for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
             var item = _step2.value;
             // 跨日预约
-            if (isDay || isNormalProductByDurationSchedule(item) || isMultiDayProduct(item)) {
+            if (isDay || isNormalProductByDurationSchedule(item)) {
               var quantity = new Decimal(item._extend.quantity || 1);
               var itemTotal = new Decimal(item._extend.total || 0);
               price = price.add(itemTotal.mul(quantity));
 
               // 普通商品不能加到时长上
-              var _duration = !isNormalProductByDurationSchedule(item) ? new Decimal(item._extend.duration || 0) : new Decimal(0);
-              if (isDay || isMultiDayProduct(item)) {
-                dayDuration = dayDuration.add(_duration);
-              } else {
-                minuteDuration = minuteDuration.add(_duration);
-              }
+              var _duration = isDayBookingProduct(item, state) ? new Decimal(item._extend.duration || 0) : new Decimal(0);
+              duration = duration.add(_duration);
             } else {
               var _quantity = new Decimal(item._extend.quantity || 1);
               var _itemTotal = new Decimal(item._extend.total || 0);
@@ -76,11 +69,6 @@ var getProductExpectAmount = function getProductExpectAmount(state, isEdit) {
               price = price.add(relationTotal);
               var itemDuration = new Decimal(flexibleObj.getValue(item._extend.duration) || 0);
               duration = duration.add(itemDuration);
-              if (isMultiDayProduct(item)) {
-                dayDuration = dayDuration.add(itemDuration);
-              } else {
-                minuteDuration = minuteDuration.add(itemDuration);
-              }
             }
           }
         } catch (err) {
@@ -114,25 +102,20 @@ var getProductExpectAmount = function getProductExpectAmount(state, isEdit) {
     var services = (state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value) || [];
     duration = services.reduce(function (pre, cur) {
       var current = new Decimal(0);
-      if (isDay || isMultiDayProduct(cur)) {
+      if (isDay) {
         // 普通商品不能加到时长上
-        var _duration2 = !isNormalProductByDurationSchedule(cur) ? new Decimal(cur._extend.duration || 0) : new Decimal(0);
+        var _duration2 = isDayBookingProduct(cur, state) ? new Decimal(cur._extend.duration || 0) : new Decimal(0);
         current = _duration2;
       } else {
         var _cur$_extend;
         current = new Decimal(flexibleObj.getValue(((_cur$_extend = cur._extend) === null || _cur$_extend === void 0 ? void 0 : _cur$_extend.duration) || 0) || 0);
       }
-      if (isDay || isMultiDayProduct(cur)) {
-        dayDuration = dayDuration.add(current);
-      } else {
-        minuteDuration = minuteDuration.add(current);
-      }
       return pre.add(current);
     }, new Decimal(0));
   }
   return {
     productExpectAmount: price.toNumber(),
-    duration: getDiscountTimeByDayMinutes(dayDuration.toNumber(), minuteDuration.toNumber())
+    duration: getDiscountTime(duration.toNumber(), isDay)
   };
 };
 var getProductItemTax = function getProductItemTax(item, state, options) {