@pisell/private-materials 6.8.6 → 6.8.8

package/es/components/appointmentBooking/components/Cart/Item/index.js

@@ -235,6 +235,7 @@ var CartItem = function CartItem(_ref) {
       disabledEdit: isLastStep,
       isShowChangeResource: currentStep === null || currentStep === void 0 || (_currentStep$step = currentStep.step) === null || _currentStep$step === void 0 || (_currentStep$step = _currentStep$step.key) === null || _currentStep$step === void 0 ? void 0 : _currentStep$step.startsWith('select-resource'),
       isShowDelete: (currentStep === null || currentStep === void 0 || (_currentStep$step2 = currentStep.step) === null || _currentStep$step2 === void 0 ? void 0 : _currentStep$step2.key) === 'select-service',
+      isShowAmountFooter: true,
       isShowPackageNote: false,
       isShowChangeHolder: isLastStep ? false : isFormSubject && isLogin,
       isShowHolder: isFormSubject,

package/es/components/appointmentBooking/components/Voucher/index.js

@@ -111,10 +111,26 @@ var VoucherCard = function VoucherCard(props) {
     appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$b = appointmentBooking.batchUpdateCart) === null || _appointmentBooking$b === void 0 || _appointmentBooking$b.call(appointmentBooking, items);
   };
   var onCartChange = function onCartChange() {
+    var _shopDiscount$setBook, _appointmentBooking$o;
     var products = cart === null || cart === void 0 ? void 0 : cart.getItems();
+    shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$setBook = shopDiscount.setBookingSubject) === null || _shopDiscount$setBook === void 0 || _shopDiscount$setBook.call(shopDiscount, appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o = appointmentBooking.otherParams) === null || _appointmentBooking$o === void 0 || (_appointmentBooking$o = _appointmentBooking$o.bookingSetting) === null || _appointmentBooking$o === void 0 ? void 0 : _appointmentBooking$o.bookingSubject);
     var val = shopDiscount.calcDiscount(products);
     batchUpdateCart(val.productList);
   };
+  var stringifiedHolders = useMemo(function () {
+    var _ret;
+    try {
+      _ret = JSON.stringify(products.map(function (item) {
+        return (item === null || item === void 0 ? void 0 : item.holder_id) || '';
+      }));
+    } catch (error) {
+      _ret = '';
+    }
+    return _ret;
+  }, [products]);
+  useEffect(function () {
+    onCartChange();
+  }, [stringifiedHolders]);
 
   // // 监听customer变化
   useEffect(function () {

package/es/components/booking/addons/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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$service2, _state$addons2, _state$service4, _state$service6, _context$appHelper3, _state$service8, _state$addons4, _context$appHelper4, _context$appHelper4$g;
+  var _context$appHelper, _state$service3, _state$addons2, _state$service5, _state$service7, _context$appHelper3, _state$service9, _state$addons4, _context$appHelper4, _context$appHelper4$g;
   var state = _ref.state,
     dispatch = _ref.dispatch,
     _ref$disabled = _ref.disabled,
@@ -77,6 +77,8 @@ var ActionButtons = function ActionButtons(_ref) {
 
   // 将选中的客户数据传递给状态管理
   var changeCustomerToGlobalState = useMemoizedFn(function (value) {
+    var _state$client, _state$service;
+    var beforeValue = state === null || state === void 0 || (_state$client = state.client) === null || _state$client === void 0 ? void 0 : _state$client.value;
     dispatch({
       type: 'setClient',
       payload: {
@@ -84,6 +86,22 @@ var ActionButtons = function ActionButtons(_ref) {
         edit: true
       }
     });
+    if ((beforeValue === null || beforeValue === void 0 ? void 0 : beforeValue.id) === (value === null || value === void 0 ? void 0 : value.id)) return;
+    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
@@ -155,9 +173,9 @@ var ActionButtons = function ActionButtons(_ref) {
 
   // 检查是否有购物车内容
   var hasCartItems = useMemo(function () {
-    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 _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 isDisabledEdit = useMemo(function () {
@@ -194,8 +212,8 @@ var ActionButtons = function ActionButtons(_ref) {
   // 计算已使用的券数量
   var usedVouchersCount = useMemo(function () {
     try {
-      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)) {
+      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)) {
         return 0;
       }
       // 直接从全局折扣券列表中计算被选中的数量，避免重复计数
@@ -206,14 +224,14 @@ var ActionButtons = function ActionButtons(_ref) {
       console.error('计算已使用券数量失败:', error);
       return 0;
     }
-  }, [discountList, (_state$service4 = state.service) === null || _state$service4 === void 0 ? void 0 : _state$service4.value]);
+  }, [discountList, (_state$service5 = state.service) === null || _state$service5 === void 0 ? void 0 : _state$service5.value]);
 
   // 判断是否有券可用但手动取消使用（显示红色感叹号）
   var shouldShowWarning = useMemo(function () {
     try {
-      var _state$service5;
+      var _state$service6;
       // 条件：购物车不为空 && discountList 长度大于 0，且没有 isSelected 的优惠券，且有 isManualSelect 的优惠券
-      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 ((_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 discount.isSelected;
       }) && discountList.some(function (discount) {
         return discount.isManualSelect;
@@ -222,7 +240,7 @@ var ActionButtons = function ActionButtons(_ref) {
       console.error('判断警告状态失败:', error);
       return false;
     }
-  }, [discountList, (_state$service6 = state.service) === null || _state$service6 === void 0 ? void 0 : _state$service6.value]);
+  }, [discountList, (_state$service7 = state.service) === null || _state$service7 === void 0 ? void 0 : _state$service7.value]);
 
   // 监听折扣券列表变化
   useEffect(function () {
@@ -375,8 +393,8 @@ var ActionButtons = function ActionButtons(_ref) {
 
   // 商品清空后，重置折扣信息
   useEffect(function () {
-    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) {
+    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) {
       dispatch({
         type: 'setState',
         payload: {
@@ -384,7 +402,7 @@ var ActionButtons = function ActionButtons(_ref) {
         }
       });
     }
-  }, [(_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]);
+  }, [(_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]);
 
   // 处理价格调整完成
   var handlePriceAdjustConfirm = function handlePriceAdjustConfirm(discountAmount) {
@@ -413,7 +431,7 @@ var ActionButtons = function ActionButtons(_ref) {
 
   // 处理自定义商品保存
   var handleCustomiseItemSave = function handleCustomiseItemSave(data) {
-    var _state$service9;
+    var _state$service10;
     console.log('保存自定义商品:', data);
 
     // 创建自定义商品项，按照标准商品结构
@@ -457,7 +475,7 @@ var ActionButtons = function ActionButtons(_ref) {
     };
 
     // 添加到购物车（使用 service 来存储自定义商品）
-    var currentServices = (state === null || state === void 0 || (_state$service9 = state.service) === null || _state$service9 === void 0 ? void 0 : _state$service9.value) || [];
+    var currentServices = (state === null || state === void 0 || (_state$service10 = state.service) === null || _state$service10 === void 0 ? void 0 : _state$service10.value) || [];
 
     // 直接添加自定义商品，不检查重复
     var updatedServices = [customItem].concat(_toConsumableArray(currentServices));

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

@@ -15,10 +15,11 @@ 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 { getDiscountTime, flexibleObj } from "../../utils";
+import { flexibleObj, getDiscountTimeByDayMinutes } from "../../utils";
 import { formatAmount } from '@pisell/utils';
 import Decimal from 'decimal.js';
-import { isDayBooking, isDayBookingProduct, isNormalProductByDurationSchedule } from "../../info/service2/utils";
+import { isDayBooking, isNormalProductByDurationSchedule } from "../../info/service2/utils";
+import { isMultiDayProduct } from "../../info2/service/addService/utils";
 export var getRelationDetailsTotal = function getRelationDetailsTotal(relation_details) {
   var total = new Decimal(0);
   var _iterator = _createForOfIteratorHelper(relation_details),
@@ -47,6 +48,8 @@ var getProductExpectAmount = function getProductExpectAmount(state, isEdit, isOr
   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) {
@@ -59,15 +62,19 @@ var getProductExpectAmount = function getProductExpectAmount(state, isEdit, isOr
           for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
             var item = _step2.value;
             // 跨日预约
-            if (isDay || isNormalProductByDurationSchedule(item)) {
+            if (isDay || isNormalProductByDurationSchedule(item) || isMultiDayProduct(item)) {
               var quantity = new Decimal(item._extend.quantity || 1);
               var itemTotal = new Decimal(item._extend.total || 0);
               var itemOriginTotal = new Decimal(item._extend.origin_total || 0);
               price = price.add((isOriginTotal ? itemOriginTotal : itemTotal).mul(quantity));
 
               // 普通商品不能加到时长上
-              var _duration = isDayBookingProduct(item, state) ? new Decimal(item._extend.duration || 0) : new Decimal(0);
-              duration = duration.add(_duration);
+              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);
+              }
             } else {
               var _quantity = new Decimal(item._extend.quantity || 1);
               var _itemTotal = new Decimal(item._extend.total || 0);
@@ -79,6 +86,11 @@ var getProductExpectAmount = function getProductExpectAmount(state, isEdit, isOr
               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) {
@@ -113,20 +125,25 @@ var getProductExpectAmount = function getProductExpectAmount(state, isEdit, isOr
     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) {
+      if (isDay || isMultiDayProduct(cur)) {
         // 普通商品不能加到时长上
-        var _duration2 = isDayBookingProduct(cur, state) ? new Decimal(cur._extend.duration || 0) : new Decimal(0);
+        var _duration2 = !isNormalProductByDurationSchedule(cur) ? 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: getDiscountTime(duration.toNumber(), isDay)
+    duration: getDiscountTimeByDayMinutes(dayDuration.toNumber(), minuteDuration.toNumber())
   };
 };
 var getProductItemTax = function getProductItemTax(item, state, options) {

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

@@ -28,7 +28,7 @@ import useEngineContext from "../../../../hooks/useEngineContext";
 import PaymentModal from "../../../checkout/PaymentModal";
 import { closeAllPaymentResultToasts } from "../../../checkout/components/PaymentResultToast";
 import { formatProducts } from "../../addons";
-import { getIsSubjectRequire, isDayBooking, isEventBooking, isHasDayAppointmentProduct } from "../../info/service2/utils";
+import { getIsSubjectRequire, isDayBooking, isEventBooking, isHasDayAppointmentProduct, isNormalProductByDurationSchedule } from "../../info/service2/utils";
 import { createBookings, editBookings } from "../../info2/serve";
 import AppointmentProductModal from "./AppointmentProductModal";
 import FooterMenus from "./FooterMenus";
@@ -37,6 +37,7 @@ import "./index.less";
 import { createEventBooking, editEventBooking } from "./serve";
 import { checkHolderIsError, formatValues } from "./utils";
 import NoteModal from "../../../../plus/noteModal";
+import { showConfirmHolderModal, ConfirmHolderModal } from "../../utils/confirmHolderModal";
 import { SubTotal } from "../../../../index";
 import { useIsBooking4Shop } from "../../hooks/useIsBooking4Shop";
 import { sendWarningLog } from '@pisell/utils';
@@ -47,6 +48,7 @@ import { useCustomer } from "../../../ticketBooking/hooks/pisellos/useCustomer";
 import { useDebounceEffect, useDebounceFn, useMemoizedFn } from 'ahooks';
 import { cloneDeep } from 'lodash';
 import { useShopDiscountModule } from "../../../ticketBooking/hooks/pisellos/useShopDiscountModule";
+import { isWalkIn } from "../../utils";
 
 /**
  * @title: 底部
@@ -57,7 +59,7 @@ import { useShopDiscountModule } from "../../../ticketBooking/hooks/pisellos/use
  * @Date: 2024-01-30 16:51
  */
 var Footer = function Footer(props) {
-  var _context$appHelper, _state$paymentPaid2, _state$bookingConfig2, _state$bookingConfig4, _state$addons2, _state$bookingDetail, _state$bookingDetail2, _state$client2, _state$notes3, _state$bookingDetail13, _state$addons4, _state$notes4, _state$bookingConfig7, _state$client3;
+  var _context$appHelper, _state$paymentPaid2, _state$bookingConfig2, _state$bookingConfig4, _state$addons2, _state$bookingDetail, _state$bookingDetail2, _state$client2, _state$notes3, _state$bookingDetail13, _state$addons4, _state$notes4, _state$bookingConfig7, _state$client5;
   var state = props.state,
     buttons = props.buttons,
     dispatch = props.dispatch,
@@ -852,8 +854,8 @@ var Footer = function Footer(props) {
    */
   var handleSave = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref6) {
-      var _state$bookingConfig6;
-      var type, _ref6$messageShow, messageShow, _ref6$noSubmit, noSubmit, isToastMode, isHasDayProducts, _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:
@@ -876,12 +878,24 @@ var Footer = function Footer(props) {
             }
             return _context6.abrupt("return");
           case 7:
+            debugger;
+            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 = 12;
+              break;
+            }
+            _context6.next = 12;
+            return showConfirmHolderModal(state, dispatch);
+          case 12:
             if (!(isBooking4Shop && getIsSubjectRequire(state) && checkHolderIsError(state))) {
-              _context6.next = 9;
+              _context6.next = 14;
               break;
             }
             return _context6.abrupt("return");
-          case 9:
+          case 14:
             // 区分loading, 是点击的checkout 还是save
             _setLoading = type === 'checkout' ? setCheckoutLoading : setLoading;
             _setLoading(true);
@@ -890,34 +904,34 @@ var Footer = function Footer(props) {
             createApi = state.renderType === 'eventBooking' ? createEventBooking : createBooking;
             saveOtherValue = {};
             if (!(type === 'save')) {
-              _context6.next = 22;
+              _context6.next = 27;
               break;
             }
-            _context6.next = 18;
+            _context6.next = 23;
             return state === null || state === void 0 || (_state$onSave = state.onSave) === null || _state$onSave === void 0 ? void 0 : _state$onSave.call(state, state.client);
-          case 18:
+          case 23:
             _context6.t0 = _context6.sent;
             if (_context6.t0) {
-              _context6.next = 21;
+              _context6.next = 26;
               break;
             }
             _context6.t0 = {};
-          case 21:
+          case 26:
             saveOtherValue = _context6.t0;
-          case 22:
-            _context6.prev = 22;
+          case 27:
+            _context6.prev = 27;
             callbackData = null; // 格式化提交的参数
             values = formatValues(_objectSpread(_objectSpread({}, state), saveOtherValue)); // checkout 2.0 补充商品总税费字段
             values.product_tax_fee = total.tax || 0;
             if (!noSubmit) {
-              _context6.next = 28;
+              _context6.next = 33;
               break;
             }
             return _context6.abrupt("return", values);
-          case 28:
+          case 33:
             checkout = pisellos.getModule('checkout'); // 如果有 orderid，则应该走更新逻辑
             if (!editOrderId) {
-              _context6.next = 38;
+              _context6.next = 43;
               break;
             }
             subtotal_info = {
@@ -926,7 +940,7 @@ var Footer = function Footer(props) {
               total: cloneDeep(total),
               showDetail: showDetail
             };
-            _context6.next = 33;
+            _context6.next = 38;
             return checkout.updateLocalOrderAsync({
               orderId: editOrderId,
               orderData: values,
@@ -934,10 +948,10 @@ var Footer = function Footer(props) {
               autoPayment: true,
               totalInfo: subtotal_info
             });
-          case 33:
-            _context6.next = 35;
+          case 38:
+            _context6.next = 40;
             return checkout.manualSyncOrderAsync();
-          case 35:
+          case 40:
             res = _context6.sent;
             if (res.success) {
               // 回调关闭弹窗
@@ -945,7 +959,7 @@ var Footer = function Footer(props) {
               _setLoading(false);
             }
             return _context6.abrupt("return");
-          case 38:
+          case 43:
             // 如果是保存，检查是否需要支付定金
             if (type === 'save') {
               isNeedDeposit = checkout.checkIsNeedDepositAsync(values.bookings, values.relation_products);
@@ -1009,43 +1023,43 @@ var Footer = function Footer(props) {
 
             // 如果有addons改动, 则先保存
             if (!addonsEdit) {
-              _context6.next = 44;
+              _context6.next = 49;
               break;
             }
-            _context6.next = 44;
+            _context6.next = 49;
             return handleSaveAddons();
-          case 44:
+          case 49:
             if (!infoEdit) {
-              _context6.next = 49;
+              _context6.next = 54;
               break;
             }
-            _context6.next = 47;
+            _context6.next = 52;
             return api(values, state.bookingId || editOrderId);
-          case 47:
+          case 52:
             callbackData = _context6.sent;
             if (messageShow) {
               message.success(locales.getText(state.bookingId ? 'pisell2.text.appointment-updated' : 'pisell2.text.created-successfully'));
             }
-          case 49:
+          case 54:
             // 回调关闭弹窗
             state === null || state === void 0 || state.callback(callbackData, type);
             _setLoading(false);
 
             // return数据  checkout时需要
             return _context6.abrupt("return", callbackData || values);
-          case 54:
-            _context6.prev = 54;
-            _context6.t1 = _context6["catch"](22);
+          case 59:
+            _context6.prev = 59;
+            _context6.t1 = _context6["catch"](27);
             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 59:
+          case 64:
           case "end":
             return _context6.stop();
         }
-      }, _callee6, null, [[22, 54]]);
+      }, _callee6, null, [[27, 59]]);
     }));
     return function handleSave(_x5) {
       return _ref7.apply(this, arguments);
@@ -1734,6 +1748,8 @@ var Footer = function Footer(props) {
     }
   };
   var changeCustomerToGlobalState = useMemoizedFn(function (value) {
+    var _state$client4, _state$service4;
+    var beforeValue = state === null || state === void 0 || (_state$client4 = state.client) === null || _state$client4 === void 0 ? void 0 : _state$client4.value;
     dispatch({
       type: 'setClient',
       payload: {
@@ -1741,6 +1757,22 @@ var Footer = function Footer(props) {
         edit: true
       }
     });
+    if ((beforeValue === null || beforeValue === void 0 ? void 0 : beforeValue.id) === (value === null || value === void 0 ? void 0 : value.id)) return;
+    if (state !== null && state !== void 0 && (_state$service4 = state.service) !== null && _state$service4 !== void 0 && (_state$service4 = _state$service4.value) !== null && _state$service4 !== void 0 && _state$service4.length) {
+      // 还需要清空商品内的 holder 信息
+      dispatch({
+        type: 'setService',
+        payload: {
+          value: state.service.value.map(function (item) {
+            return _objectSpread(_objectSpread({}, item), {}, {
+              _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
+                holder_id: []
+              })
+            });
+          })
+        }
+      });
+    }
   });
   var _useCustomer = useCustomer({
       changeCustomerToGlobalState: changeCustomerToGlobalState
@@ -1943,7 +1975,7 @@ var Footer = function Footer(props) {
     setEditCartMode: setEditCartMode,
     paymentResultDisplayMode: state === null || state === void 0 || (_state$bookingConfig7 = state.bookingConfig) === null || _state$bookingConfig7 === void 0 || (_state$bookingConfig7 = _state$bookingConfig7.config) === null || _state$bookingConfig7 === void 0 || (_state$bookingConfig7 = _state$bookingConfig7.payment_setting) === null || _state$bookingConfig7 === void 0 ? void 0 : _state$bookingConfig7.payment_result_display_mode,
     shopDiscount: state.shop_discount,
-    client: (_state$client3 = state.client) === null || _state$client3 === void 0 ? void 0 : _state$client3.value,
+    client: (_state$client5 = state.client) === null || _state$client5 === void 0 ? void 0 : _state$client5.value,
     currentTotalPrice: total.productAmount,
     onChangeShopDiscount: function onChangeShopDiscount(discount) {
       dispatch({
@@ -1982,6 +2014,6 @@ var Footer = function Footer(props) {
       //   handleClearAllAndReset();
       // }
     }
-  }));
+  }), /*#__PURE__*/React.createElement(ConfirmHolderModal, null));
 };
 export default Footer;

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

@@ -56,5 +56,12 @@ export declare const formatOriginalPrice: (item: any) => number;
 export declare const formatSellingPrice: (item: any) => number;
 export declare const getSourceProductPrice: (item: any) => number;
 export declare const getMainProductSellingPrice: (item: any) => number | undefined;
+/**
+ * @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;