@pisell/private-materials 3.0.209 → 3.0.211

package/es/components/Sales/Cart/index.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { TUpdateDisabledCartItem } from './types';
 interface CartItem {
     _id: string;
     [key: string]: any;
@@ -27,11 +28,13 @@ interface CartContextType {
     addHolderToCartItem: (holderItem: any) => void;
     cartDataHolderList: any;
     addNoteToCartItem: (cartItem: CartItem) => void;
-    updateDisabledCartItem: (params: Array<{
-        relation_id: number;
-        product_id: number;
-        type: string;
-    }>) => void;
+    updateDisabledCartItem: TUpdateDisabledCartItem;
+    getWithoutCartItemsHolderNames: () => Array<string>;
+    checkBeforeAddToCartResquest: any;
+    checkBeforeAddToCart: () => Promise<{
+        result: boolean;
+        num: number;
+    }>;
 }
 interface CartProviderProps {
     children: React.ReactNode;

package/es/components/Sales/Cart/index.js

@@ -8,19 +8,20 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure " + obj); }
 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); }
 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; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { createContext, useMemo, useState } from 'react';
+import React, { createContext, useMemo, useRef, useState } from 'react';
 import dayjs from 'dayjs';
 import { getUniqueId } from '@pisell/utils';
 import { useSales } from "../../../businessModel/SalesModel";
-import "./serve";
+import { checkBeforeAddToCartApi } from "./serve";
 import { useCustomer } from "../Customer";
+import { useRequest } from 'ahooks';
+import { formatValues } from "../Checkout/utils";
 var defaultState = {
   cartItems: [],
   currentCartItem: null
@@ -40,7 +41,7 @@ export var CartProvider = function CartProvider(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     openCart = _useState2[0],
     setOpen = _useState2[1];
-  _objectDestructuringEmpty(hooks);
+  var checkRef = useRef(null);
   var cartData = useMemo(function () {
     return data.cartData || defaultState;
   }, [data]);
@@ -180,6 +181,12 @@ export var CartProvider = function CartProvider(_ref) {
   /**
    * 使用holder直接创建购物车
    */
+  /**
+   * @description: 使用holder直接创建购物车
+   * @param {any} holderItem holder信息
+   * @return {*}
+   * @Author: xiangfeng.xue
+   */
   var createCartItemFromHolder = function createCartItemFromHolder(holderItem) {
     var _data$resourceData;
     var cartItem = {
@@ -192,39 +199,88 @@ export var CartProvider = function CartProvider(_ref) {
     setCurrentCartItem(cartItem);
     return cartItem;
   };
+  var checkBeforeAddToCartResquest = useRequest(checkBeforeAddToCartApi, {
+    manual: true,
+    onSuccess: function onSuccess(res) {
+      var _res$data;
+      if ((_res$data = res.data) !== null && _res$data !== void 0 && _res$data.length) {
+        var _res$data2;
+        var isUnavailable = checkCartItemIsUnavailable(res.data, checkRef.current.cartItem);
+        // 检测当前商品是否不可用
+        checkRef.current.callback({
+          result: isUnavailable ? false : true,
+          num: isUnavailable ? (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.length : 0
+        });
+      } else {
+        checkRef.current.callback({
+          result: true
+        });
+      }
+    }
+  });
 
   /**
-   * 将商品加入购物车
+   * @title: 商品加入购物车前进行校验
+   * @description:
+   * @Author: xiangfeng.xue
    */
-  var addToCart = function addToCart() {
+  var checkBeforeAddToCart = function checkBeforeAddToCart() {
+    return new Promise(function (resolve) {
+      var _cartData = getCurrentData().cartData;
+      var newCartItem = createCartItemData() || {};
+      var params = formatValues({
+        cartData: {
+          cartItems: [].concat(_toConsumableArray(_cartData.cartItems || []), [newCartItem])
+        }
+      });
+      checkRef.current = {
+        callback: function callback(res) {
+          resolve(res);
+          checkRef.current = null;
+        },
+        cartItem: newCartItem
+      };
+      checkBeforeAddToCartResquest.runAsync(params);
+    });
+  };
+
+  /**
+   * @title: 构建当前商品的完整购物车数据
+   * @description:
+   * @return {*} Object | null
+   * @Author: xiangfeng.xue
+   */
+  var createCartItemData = function createCartItemData() {
     var _cartData = getCurrentData().cartData;
-    var _cartData$currentCart = _cartData.currentCartItem,
-      _id = _cartData$currentCart._id,
-      _cartData$currentCart2 = _cartData$currentCart.eventItem,
-      eventItem = _cartData$currentCart2 === void 0 ? {} : _cartData$currentCart2,
-      _cartData$currentCart3 = _cartData$currentCart.holderItem,
-      holderItem = _cartData$currentCart3 === void 0 ? {} : _cartData$currentCart3;
     if (_cartData.currentCartItem) {
       var _eventItem$eventDetai, _eventItem$eventDetai2, _eventItem$eventDetai3, _eventItem$eventDetai4, _startDateInfo$times, _startDateInfo$times$, _eventItem$eventDetai5, _eventItem$eventDetai6, _endDateInfo$times, _endDateInfo$times$sl, _endDateInfo$times$sl2;
-      var bookingOptionData = eventItem === null || eventItem === void 0 ? void 0 : (_eventItem$eventDetai = eventItem.eventDetail) === null || _eventItem$eventDetai === void 0 ? void 0 : (_eventItem$eventDetai2 = _eventItem$eventDetai.bookingOptionItem) === null || _eventItem$eventDetai2 === void 0 ? void 0 : _eventItem$eventDetai2._originData;
+      var _ref2 = _cartData.currentCartItem || {},
+        _id = _ref2._id,
+        _ref2$eventItem = _ref2.eventItem,
+        _eventItem = _ref2$eventItem === void 0 ? {} : _ref2$eventItem,
+        _ref2$holderItem = _ref2.holderItem,
+        _holderItem = _ref2$holderItem === void 0 ? {} : _ref2$holderItem;
+      var bookingOptionData = _eventItem === null || _eventItem === void 0 ? void 0 : (_eventItem$eventDetai = _eventItem.eventDetail) === null || _eventItem$eventDetai === void 0 ? void 0 : (_eventItem$eventDetai2 = _eventItem$eventDetai.bookingOptionItem) === null || _eventItem$eventDetai2 === void 0 ? void 0 : _eventItem$eventDetai2._originData;
       // 活动开始日期相关信息
-      var startDateInfo = eventItem === null || eventItem === void 0 ? void 0 : (_eventItem$eventDetai3 = eventItem.eventDetail) === null || _eventItem$eventDetai3 === void 0 ? void 0 : (_eventItem$eventDetai4 = _eventItem$eventDetai3.selectDate) === null || _eventItem$eventDetai4 === void 0 ? void 0 : _eventItem$eventDetai4.startDateInfo;
+      var startDateInfo = _eventItem === null || _eventItem === void 0 ? void 0 : (_eventItem$eventDetai3 = _eventItem.eventDetail) === null || _eventItem$eventDetai3 === void 0 ? void 0 : (_eventItem$eventDetai4 = _eventItem$eventDetai3.selectDate) === null || _eventItem$eventDetai4 === void 0 ? void 0 : _eventItem$eventDetai4.startDateInfo;
       var startTime = startDateInfo === null || startDateInfo === void 0 ? void 0 : (_startDateInfo$times = startDateInfo.times) === null || _startDateInfo$times === void 0 ? void 0 : (_startDateInfo$times$ = _startDateInfo$times[0]) === null || _startDateInfo$times$ === void 0 ? void 0 : _startDateInfo$times$.start_at;
-      var endDateInfo = eventItem === null || eventItem === void 0 ? void 0 : (_eventItem$eventDetai5 = eventItem.eventDetail) === null || _eventItem$eventDetai5 === void 0 ? void 0 : (_eventItem$eventDetai6 = _eventItem$eventDetai5.selectDate) === null || _eventItem$eventDetai6 === void 0 ? void 0 : _eventItem$eventDetai6.endDateInfo;
+      var endDateInfo = _eventItem === null || _eventItem === void 0 ? void 0 : (_eventItem$eventDetai5 = _eventItem.eventDetail) === null || _eventItem$eventDetai5 === void 0 ? void 0 : (_eventItem$eventDetai6 = _eventItem$eventDetai5.selectDate) === null || _eventItem$eventDetai6 === void 0 ? void 0 : _eventItem$eventDetai6.endDateInfo;
       var endTime = endDateInfo === null || endDateInfo === void 0 ? void 0 : (_endDateInfo$times = endDateInfo.times) === null || _endDateInfo$times === void 0 ? void 0 : (_endDateInfo$times$sl = _endDateInfo$times.slice(-1)) === null || _endDateInfo$times$sl === void 0 ? void 0 : (_endDateInfo$times$sl2 = _endDateInfo$times$sl[0]) === null || _endDateInfo$times$sl2 === void 0 ? void 0 : _endDateInfo$times$sl2.end_at;
+      var originTotal = Number((bookingOptionData === null || bookingOptionData === void 0 ? void 0 : bookingOptionData.original_price) || '');
       var newCartItem = {
         _id: _id,
-        id: eventItem.id,
-        name: eventItem.title,
+        id: _eventItem.id,
+        name: _eventItem.title,
         price: bookingOptionData === null || bookingOptionData === void 0 ? void 0 : bookingOptionData.price,
         total: bookingOptionData === null || bookingOptionData === void 0 ? void 0 : bookingOptionData.price,
-        origin_total: bookingOptionData === null || bookingOptionData === void 0 ? void 0 : bookingOptionData.original_price,
+        // 排除原始价格为0的场景
+        origin_total: isNaN(originTotal) || originTotal === 0 ? undefined : bookingOptionData === null || bookingOptionData === void 0 ? void 0 : bookingOptionData.original_price,
         num: 1,
-        image: eventItem.image,
+        image: _eventItem.image,
         isShowNote: true,
         note: '',
-        holder_title: holderItem.name,
-        holder_id: holderItem.id,
+        holder_title: _holderItem.name,
+        holder_id: _holderItem.id,
         symbol: appUtils === null || appUtils === void 0 ? void 0 : appUtils.getSymbolic(),
         start_date: (startDateInfo === null || startDateInfo === void 0 ? void 0 : startDateInfo.date) || '',
         start_time: startTime ? dayjs(startTime || '').format('HH:mm') : '',
@@ -244,26 +300,40 @@ export var CartProvider = function CartProvider(_ref) {
             product_option_item: [],
             product_variant_id: 0
           },
-          relation_id: eventItem.id,
+          relation_id: _eventItem.id,
           start_date: (startDateInfo === null || startDateInfo === void 0 ? void 0 : startDateInfo.date) || null,
           start_time: startTime ? dayjs(startTime || '').format('HH:mm') : null,
           select_date: (startDateInfo === null || startDateInfo === void 0 ? void 0 : startDateInfo.date) || null,
           metadata: {
             end_date_text: (endDateInfo === null || endDateInfo === void 0 ? void 0 : endDateInfo.date) || null,
             end_time_text: endTime ? dayjs(endTime || '').format('HH:mm') : null
-          }
+          },
+          event_unique_identifier: _id // 传递给接口用于商品可用性检测的比对
         })
       };
-      if (holderItem !== null && holderItem !== void 0 && holderItem._originData) {
+
+      if (_holderItem !== null && _holderItem !== void 0 && _holderItem._originData) {
         var _getUserInfo, _holderItem$_originDa, _holderItem$_originDa2, _holderItem$_originDa3;
         newCartItem._originData.holder = {
           customer_id: (_getUserInfo = getUserInfo()) === null || _getUserInfo === void 0 ? void 0 : _getUserInfo.id,
-          form_id: holderItem === null || holderItem === void 0 ? void 0 : (_holderItem$_originDa = holderItem._originData) === null || _holderItem$_originDa === void 0 ? void 0 : _holderItem$_originDa.form_id,
-          form_record: holderItem !== null && holderItem !== void 0 && (_holderItem$_originDa2 = holderItem._originData) !== null && _holderItem$_originDa2 !== void 0 && _holderItem$_originDa2.form_record_id ? [holderItem === null || holderItem === void 0 ? void 0 : (_holderItem$_originDa3 = holderItem._originData) === null || _holderItem$_originDa3 === void 0 ? void 0 : _holderItem$_originDa3.form_record_id] : null
+          form_id: _holderItem === null || _holderItem === void 0 ? void 0 : (_holderItem$_originDa = _holderItem._originData) === null || _holderItem$_originDa === void 0 ? void 0 : _holderItem$_originDa.form_id,
+          form_record: _holderItem !== null && _holderItem !== void 0 && (_holderItem$_originDa2 = _holderItem._originData) !== null && _holderItem$_originDa2 !== void 0 && _holderItem$_originDa2.form_record_id ? [_holderItem === null || _holderItem === void 0 ? void 0 : (_holderItem$_originDa3 = _holderItem._originData) === null || _holderItem$_originDa3 === void 0 ? void 0 : _holderItem$_originDa3.form_record_id] : null
         };
       }
+      return newCartItem;
+    }
+    return null;
+  };
+
+  /**
+   * 将商品加入购物车
+   */
+  var addToCart = function addToCart() {
+    var _cartData = getCurrentData().cartData;
+    var newCartItem = createCartItemData();
+    if (_cartData.currentCartItem && newCartItem) {
       setCartData({
-        cartItems: [].concat(_toConsumableArray(_cartData.cartItems), [newCartItem]),
+        cartItems: [].concat(_toConsumableArray(_cartData.cartItems || []), [newCartItem]),
         currentCartItem: null
       });
     }
@@ -302,6 +372,12 @@ export var CartProvider = function CartProvider(_ref) {
       cartItems: newCartItems
     });
   };
+
+  /**
+   * @description: 给购物车中商品增加备注
+   * @param {CartItem} cartItem
+   * @Author: xiangfeng.xue
+   */
   var addNoteToCartItem = function addNoteToCartItem(cartItem) {
     var newCartItems = getCurrentData().cartData.cartItems.map(function (item) {
       if (item._id === cartItem._id) {
@@ -380,9 +456,9 @@ export var CartProvider = function CartProvider(_ref) {
    * @Author: xiangfeng.xue
    */
   var getCurrentHolderItem = function getCurrentHolderItem() {
-    var _ref2 = getCurrentData().holderData || {},
-      selectedHolderItems = _ref2.selectedHolderItems,
-      currentHolderItem = _ref2.currentHolderItem;
+    var _ref3 = getCurrentData().holderData || {},
+      selectedHolderItems = _ref3.selectedHolderItems,
+      currentHolderItem = _ref3.currentHolderItem;
     if (selectedHolderItems !== null && selectedHolderItems !== void 0 && selectedHolderItems.length) {
       var newCurrentHolderItem = currentHolderItem;
       var result = selectedHolderItems.find(function (v) {
@@ -396,8 +472,37 @@ export var CartProvider = function CartProvider(_ref) {
     return null;
   };
 
+  /**
+   * @title: 检测购物车中商品是否是不可用状态
+   * @description: 250210：本期只关注库存的检测结果
+   * @param {any} list
+   * @param {CartItem} item
+   * @return {*} boolean
+   * @Author: xiangfeng.xue
+   */
+  var checkCartItemIsUnavailable = function checkCartItemIsUnavailable(list, item) {
+    var _item$_originData, _item$_originData$pro, _item$_originData2, _item$_originData3;
+    var productId = (_item$_originData = item._originData) === null || _item$_originData === void 0 ? void 0 : (_item$_originData$pro = _item$_originData.product) === null || _item$_originData$pro === void 0 ? void 0 : _item$_originData$pro.product_id;
+    var relationId = (_item$_originData2 = item._originData) === null || _item$_originData2 === void 0 ? void 0 : _item$_originData2.relation_id;
+    var eventUniqueIdentifier = (_item$_originData3 = item._originData) === null || _item$_originData3 === void 0 ? void 0 : _item$_originData3.event_unique_identifier;
+    // 根据检测项过滤检测结果
+    return list.find(function (res) {
+      var _res$details;
+      var checkType = ['available_capacity'];
+      var isTypeIncludes = ((_res$details = res.details) === null || _res$details === void 0 ? void 0 : _res$details.find(function (v) {
+        var _checkType$includes;
+        return (_checkType$includes = checkType.includes) === null || _checkType$includes === void 0 ? void 0 : _checkType$includes.call(checkType, v.type || '');
+      })) !== undefined;
+      if (isTypeIncludes) {
+        return res.product_id === productId && res.relation_id === relationId && res.event_unique_identifier === eventUniqueIdentifier;
+      }
+      return false;
+    }) !== undefined;
+  };
+
   /**
    * @title: 更新购物车中不可用的商品
+   * @discription
    * @return {void}
    * @Author: xiangfeng.xue
    */
@@ -405,13 +510,9 @@ export var CartProvider = function CartProvider(_ref) {
     var currentCartItems = getCurrentData().cartData.cartItems || [];
     if (list !== null && list !== void 0 && list.length && currentCartItems.length) {
       var newCartItems = currentCartItems.map(function (item) {
-        var _item$_originData, _item$_originData$pro, _item$_originData2;
-        var productId = (_item$_originData = item._originData) === null || _item$_originData === void 0 ? void 0 : (_item$_originData$pro = _item$_originData.product) === null || _item$_originData$pro === void 0 ? void 0 : _item$_originData$pro.product_id;
-        var relationId = (_item$_originData2 = item._originData) === null || _item$_originData2 === void 0 ? void 0 : _item$_originData2.relation_id;
+        var isUnavailable = checkCartItemIsUnavailable(list, item);
         // 需要判定活动id和商品id是否都匹配
-        if (list.find(function (v) {
-          return v.product_id === productId && v.relation_id === relationId;
-        }) !== undefined) {
+        if (isUnavailable) {
           item.disabled = true;
           // item.show_delete = true;
         } else {
@@ -424,6 +525,23 @@ export var CartProvider = function CartProvider(_ref) {
       });
     }
   };
+
+  /**
+   * @description: 获取没有商品信息的holder名称
+   * @return {Array<string>}
+   * @Author: xiangfeng.xue
+   */
+  var getWithoutCartItemsHolderNames = function getWithoutCartItemsHolderNames() {
+    var _cartDataHolderList$f;
+    var list = [];
+    cartDataHolderList === null || cartDataHolderList === void 0 ? void 0 : (_cartDataHolderList$f = cartDataHolderList.forEach) === null || _cartDataHolderList$f === void 0 ? void 0 : _cartDataHolderList$f.call(cartDataHolderList, function (v) {
+      var _v$children;
+      if (!(v !== null && v !== void 0 && (_v$children = v.children) !== null && _v$children !== void 0 && _v$children.length)) {
+        list.push((v === null || v === void 0 ? void 0 : v.name) || '');
+      }
+    });
+    return list;
+  };
   var contextValue = {
     createCartItem: createCartItem,
     createCartItemFromEvent: createCartItemFromEvent,
@@ -444,7 +562,10 @@ export var CartProvider = function CartProvider(_ref) {
     addHolderToCartItem: addHolderToCartItem,
     cartDataHolderList: cartDataHolderList,
     addNoteToCartItem: addNoteToCartItem,
-    updateDisabledCartItem: updateDisabledCartItem
+    updateDisabledCartItem: updateDisabledCartItem,
+    getWithoutCartItemsHolderNames: getWithoutCartItemsHolderNames,
+    checkBeforeAddToCartResquest: checkBeforeAddToCartResquest,
+    checkBeforeAddToCart: checkBeforeAddToCart
   };
   return /*#__PURE__*/React.createElement(CartContext.Provider, {
     value: contextValue

package/es/components/Sales/Cart/serve.d.ts

@@ -1 +1,2 @@
 export declare const getResourceListApi: () => Promise<any>;
+export declare const checkBeforeAddToCartApi: (data: any) => Promise<any>;

package/es/components/Sales/Cart/serve.js

@@ -3,4 +3,9 @@ import { request } from "../../../utils";
 //  获取资源列表
 export var getResourceListApi = function getResourceListApi() {
   return request.getRequest().get('/api/resource/list', {});
+};
+
+// 加购物车前置接口
+export var checkBeforeAddToCartApi = function checkBeforeAddToCartApi(data) {
+  return request.getRequest().post('/h5/eventbookingv2/order/check-config', data);
 };

package/es/components/Sales/Cart/types.d.ts

@@ -0,0 +1,19 @@
+/**
+ * available_capacity(容量)、deadline_day(截止日期)、future_day(预定天数)
+ */
+export declare type TCartItemUnavailableType = 'available_capacity' | 'deadline_day' | 'future_day';
+/**
+ * 商品不可用原因
+ */
+export interface IUnavailableResult {
+    event_unique_identifier: number;
+    relation_id: number;
+    product_id: number;
+    details?: Array<{
+        type: TCartItemUnavailableType;
+    }>;
+}
+/**
+ * 更新失效的购物车商品
+ */
+export declare type TUpdateDisabledCartItem = (list: Array<IUnavailableResult>) => void;

package/es/components/Sales/Cart/types.js

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

package/es/components/Sales/Checkout/index.js

@@ -47,6 +47,9 @@ export var CheckoutProvider = function CheckoutProvider(_ref) {
     manual: true,
     onSuccess: function onSuccess(res) {
       onPay(res.data);
+      checkoutCallback.current({
+        success: true
+      });
     }
   });
 

package/es/components/booking/info/pet/index.js

@@ -84,15 +84,15 @@ var Pet = function Pet(props) {
    * @Date: 2024-01-27 14:22
    */
   var petForm = useMemo(function () {
-    var _state$bookingConfig2;
+    var _state$bookingConfig2, _holder$form, _holder$form2;
     var _holder = (_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.holder;
     if (!_holder) {
       return null;
     }
     return _objectSpread(_objectSpread(_objectSpread({}, _holder), _holder === null || _holder === void 0 ? void 0 : _holder.form), {}, {
       options: [],
-      form_id: _holder.form.id,
-      field: _holder.form.form_field,
+      form_id: _holder === null || _holder === void 0 ? void 0 : (_holder$form = _holder.form) === null || _holder$form === void 0 ? void 0 : _holder$form.id,
+      field: _holder === null || _holder === void 0 ? void 0 : (_holder$form2 = _holder.form) === null || _holder$form2 === void 0 ? void 0 : _holder$form2.form_field,
       relation_type: 'appointment_booking',
       form_record: []
     });

package/es/components/booking/info/service2/utils.d.ts

@@ -237,4 +237,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => never[] | Promise<any>;
+export declare const updateServicePrice: (state: any) => Promise<any> | never[];

package/es/components/eftposPay/amount.d.ts

@@ -9,7 +9,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "fail", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/es/components/eftposPay/app.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { PosProps, RouteType } from './const';
-declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "mode" | "type" | "getApi"> & {
+declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "type" | "mode" | "getApi"> & {
     action: RouteType;
     device_number: string | number;
     api: ReturnType<PosProps['getApi']>;

package/es/components/eftposPay/device.d.ts

@@ -11,7 +11,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/es/components/eftposPay/store/index.d.ts

@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "success" | "warn" | "loading" | "fail" | "question";
+        status: "loading" | "success" | "warn" | "fail" | "question";
     };
 };
 /**
@@ -308,7 +308,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */