@pisell/private-materials 6.9.6 → 6.10.2

package/es/components/ticketBooking/components/addServiceVariant/addService.js

@@ -21,7 +21,7 @@ import { getUniqueId, locales, sendWarningLog } from '@pisell/utils';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useMemoizedFn } from 'ahooks';
 import useEngineContext, { usePlatform } from "../../../../hooks/useEngineContext";
-import { isSessionProduct, request, getProductTotalPrice, getIsEject, getIsOnlySession, isWalkIn, getMainPrice } from "../../../booking/utils";
+import { isSessionProduct, request, getProductTotalPrice, getIsEject, getIsOnlySession, getMainPrice } from "../../../booking/utils";
 import { getProductExtend } from "../../../booking/info2/service/addService/utils";
 import { holderId, isNormalProductByDurationSchedule } from "../../../booking/info/service2/utils";
 import { isBooking4Shop } from "../../../booking/info/utils";
@@ -35,7 +35,7 @@ import { useProducts } from "../../hooks/pisellos";
 import { createCacheItem, genValues, isBundle, isOption, setHandleSetService } from "./utils";
 import { useToast } from '@pisell/materials';
 import { useIsActive } from "../../context/IsActiveContext";
-import { selectHolderModal, SelectHolderModal } from "../../../booking/utils/selectHolderModal";
+import { SelectHolderModal } from "../../../booking/utils/selectHolderModal";
 import { getOpenNormalServiceHandler } from "../../../booking/info2/service/openNormalService";
 var productListLayout = {
   grid: true,
@@ -50,7 +50,7 @@ var productListSetting = {
   isStock: 0
 };
 var AddSerivce = function AddSerivce(props) {
-  var _context$appHelper, _context$appHelper2, _context$appHelper2$g, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _state$service, _state$bookingConfig2, _state$client2;
+  var _context$appHelper, _context$appHelper$ge, _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _state$service, _state$bookingConfig2, _state$client2;
   var onEdit = props.onEdit,
     state = props.state,
     dispatch = props.dispatch,
@@ -61,8 +61,6 @@ var AddSerivce = function AddSerivce(props) {
     productDisplayConfig = props.productDisplayConfig;
   var context = useEngineContext();
   var platform = usePlatform();
-  var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
-    getData = _context$appHelper$ut.getData;
   var notAvailableRef = useRef(null);
   request.setRequest(context.appHelper.utils.request);
   var isActive = useIsActive();
@@ -75,7 +73,7 @@ var AddSerivce = function AddSerivce(props) {
     }),
     createBookingData = _useService.createBookingData,
     createBooking = _useService.createBooking;
-  var isBooking4 = isBooking4Shop(((_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.utils) === null || _context$appHelper2 === void 0 || (_context$appHelper2$g = _context$appHelper2.getData) === null || _context$appHelper2$g === void 0 ? void 0 : _context$appHelper2$g.call(_context$appHelper2, 'shop_id')) || ((_context$appHelper$ut2 = context.appHelper.utils.store) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut2.getState) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.call(_context$appHelper$ut2)) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.global) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.globalConfig) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.id), state === null || state === void 0 ? void 0 : state.renderType, (_context$appHelper$ut4 = context.appHelper.utils) === null || _context$appHelper$ut4 === void 0 ? void 0 : _context$appHelper$ut4.businessUtils);
+  var isBooking4 = isBooking4Shop(((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getData) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper, 'shop_id')) || ((_context$appHelper$ut = context.appHelper.utils.store) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut.getState) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.global) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.globalConfig) === null || _context$appHelper$ut2 === void 0 ? void 0 : _context$appHelper$ut2.id), state === null || state === void 0 ? void 0 : state.renderType, (_context$appHelper$ut3 = context.appHelper.utils) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.businessUtils);
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     currentProduct = _useState2[0],
@@ -287,43 +285,36 @@ var AddSerivce = function AddSerivce(props) {
 
   // 创建缓存项
   var createCacheItemFromParams = useMemoizedFn(function (item, params, detail) {
-    var _state$bookingConfig3, _detail$_extend, _detail$_extend2, _detail$_extend3, _detail$_extend4, _detail$_extend5, _detail$_extend$price, _detail$_extend6, _cacheItem$_extend, _cacheItem$_extend2;
+    var _state$bookingConfig3, _detail$_extend, _detail$_extend2, _cacheItem$_extend, _cacheItem$_extend2;
     var _detail = detail || item;
     var other = JSON.parse(JSON.stringify(params));
     other.session = params.session;
     var cacheItem = _objectSpread(_objectSpread({}, _detail), {}, {
       product_id: item.id,
       _id: getUniqueId(),
-      is_price_include_tax: getData('is_price_include_tax'),
       _key: params.key,
       _extend: {
         start_date: state.date.value,
         quantity: (params === null || params === void 0 ? void 0 : params.quantity) || 1,
+        price: _detail.price,
         product_name: item.title,
         other: other,
         // end_date: endDate, 这个参数合并过来的没有入参
         isFormSubject: (state === null || state === void 0 || (_state$bookingConfig3 = state.bookingConfig) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.config) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.basic) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.appointment_subject) === null || _state$bookingConfig3 === void 0 ? void 0 : _state$bookingConfig3.type) === 'form',
         isNormalProduct: isNormalProductByDurationSchedule(item),
         note: _detail === null || _detail === void 0 || (_detail$_extend = _detail._extend) === null || _detail$_extend === void 0 ? void 0 : _detail$_extend.note,
-        priceOverride: _detail === null || _detail === void 0 || (_detail$_extend2 = _detail._extend) === null || _detail$_extend2 === void 0 ? void 0 : _detail$_extend2.priceOverride,
-        origin_total: _detail === null || _detail === void 0 || (_detail$_extend3 = _detail._extend) === null || _detail$_extend3 === void 0 ? void 0 : _detail$_extend3.origin_total,
-        // 用于在购物车里唤醒 sku 弹窗时，复原商品的选择数据
-        // 因为packages/private-materials/src/components/booking/info2/service/editNormalService/index.tsx
-        // 可能会去修改option 之类的 price 字段，所以这里必须先 cloneDeep 一次，再次打开 SKU 弹窗时，应该使用没有修改的价格才对
-        _skuValue: _detail === null || _detail === void 0 || (_detail$_extend4 = _detail._extend) === null || _detail$_extend4 === void 0 ? void 0 : _detail$_extend4.skuValue,
-        price: _detail === null || _detail === void 0 || (_detail$_extend5 = _detail._extend) === null || _detail$_extend5 === void 0 ? void 0 : _detail$_extend5.price
+        priceOverride: _detail === null || _detail === void 0 || (_detail$_extend2 = _detail._extend) === null || _detail$_extend2 === void 0 ? void 0 : _detail$_extend2.priceOverride
       },
       new: 1
     });
-    cacheItem._extend.price = getMainPrice(cacheItem, (_detail$_extend$price = _detail === null || _detail === void 0 || (_detail$_extend6 = _detail._extend) === null || _detail$_extend6 === void 0 ? void 0 : _detail$_extend6.price) !== null && _detail$_extend$price !== void 0 ? _detail$_extend$price : _detail.price);
-    // if (cacheItem._extend?.priceOverride || cacheItem._extend?.priceOverride === 0) {
-    //   cacheItem._extend.price = cacheItem._extend?.priceOverride
-    // }
+    cacheItem._extend.price = getMainPrice(cacheItem, _detail.price);
+    if ((_cacheItem$_extend = cacheItem._extend) !== null && _cacheItem$_extend !== void 0 && _cacheItem$_extend.priceOverride || ((_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.priceOverride) === 0) {
+      var _cacheItem$_extend3;
+      cacheItem._extend.price = (_cacheItem$_extend3 = cacheItem._extend) === null || _cacheItem$_extend3 === void 0 ? void 0 : _cacheItem$_extend3.priceOverride;
+    }
     var _total = getProductTotalPrice(cacheItem);
     cacheItem._extend.total = _total;
-    if (!((_cacheItem$_extend = cacheItem._extend) !== null && _cacheItem$_extend !== void 0 && _cacheItem$_extend.origin_total) && ((_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.origin_total) !== 0) {
-      cacheItem._extend.origin_total = _total;
-    }
+    cacheItem._extend.origin_total = _total;
     var _isEdit = !!state.service.cacheItem;
     if (_isEdit) {
       var _state$service$cacheI;
@@ -365,12 +356,12 @@ var AddSerivce = function AddSerivce(props) {
 
   // 处理自动关闭的服务添加（带防抖）
   var processAutoCloseService = useMemoizedFn(function (cacheItem, item, detail, notShowToast) {
-    var _cacheItem$_extend3;
+    var _cacheItem$_extend4;
     console.time('processAutoCloseService2');
     cacheItem.autoClose = false;
     cacheItem._serviceKey = genServiceKey(cacheItem);
     var productKey = getProductKey(item, cacheItem);
-    var addCount = (cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend3 = cacheItem._extend) === null || _cacheItem$_extend3 === void 0 ? void 0 : _cacheItem$_extend3.quantity) || 1;
+    var addCount = (cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend4 = cacheItem._extend) === null || _cacheItem$_extend4 === void 0 ? void 0 : _cacheItem$_extend4.quantity) || 1;
 
     // 如果已经有待处理的同商品，增加点击次数
     if (pendingCacheValuesRef.current[productKey]) {
@@ -413,7 +404,7 @@ var AddSerivce = function AddSerivce(props) {
 
   // 执行实际的 dispatch 操作
   var executeServiceDispatch = useMemoizedFn(function (productKey) {
-    var _cacheItem$_extend4;
+    var _cacheItem$_extend5;
     console.time('executeServiceDispatch');
     console.time('executeServiceDispatch1');
     var pendingData = pendingCacheValuesRef.current[productKey];
@@ -421,7 +412,7 @@ var AddSerivce = function AddSerivce(props) {
     var cacheItem = pendingData.cacheItem,
       item = pendingData.item,
       detail = pendingData.detail;
-    var clickCount = clickCountRef.current[productKey] || (cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend4 = cacheItem._extend) === null || _cacheItem$_extend4 === void 0 ? void 0 : _cacheItem$_extend4.quantity) || 1;
+    var clickCount = clickCountRef.current[productKey] || (cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend5 = cacheItem._extend) === null || _cacheItem$_extend5 === void 0 ? void 0 : _cacheItem$_extend5.quantity) || 1;
 
     // 更新 quantity 为累积的点击次数
     var finalCacheItem = _objectSpread(_objectSpread({}, cacheItem), {}, {
@@ -490,8 +481,8 @@ var AddSerivce = function AddSerivce(props) {
   // 特定商店的日志记录
   var logServiceForSpecificShop = useMemoizedFn(function (item, detail, _list) {
     try {
-      var _context$appHelper$ut5, _context$appHelper$ut6;
-      if (((_context$appHelper$ut5 = context.appHelper.utils.store) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut6 = _context$appHelper$ut5.getState) === null || _context$appHelper$ut6 === void 0 || (_context$appHelper$ut6 = _context$appHelper$ut6.call(_context$appHelper$ut5)) === null || _context$appHelper$ut6 === void 0 || (_context$appHelper$ut6 = _context$appHelper$ut6.global) === null || _context$appHelper$ut6 === void 0 || (_context$appHelper$ut6 = _context$appHelper$ut6.globalConfig) === null || _context$appHelper$ut6 === void 0 ? void 0 : _context$appHelper$ut6.id) === 2155) {
+      var _context$appHelper$ut4, _context$appHelper$ut5;
+      if (((_context$appHelper$ut4 = context.appHelper.utils.store) === null || _context$appHelper$ut4 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut4.getState) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.call(_context$appHelper$ut4)) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.global) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.globalConfig) === null || _context$appHelper$ut5 === void 0 ? void 0 : _context$appHelper$ut5.id) === 2155) {
         var val = _list === null || _list === void 0 ? void 0 : _list.map(function (s) {
           return {
             product_id: s === null || s === void 0 ? void 0 : s.product_id,
@@ -555,101 +546,32 @@ var AddSerivce = function AddSerivce(props) {
     };
   }());
 
-  // 处理添加 holder 的函数
-  var handleAddHolder = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(cacheItem) {
-      var _stateRef$current2, _cacheItem$_extend5;
-      var holderConfig, currentMaxSelectedCount, result;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            // 获取 maxSelectedCount
-            holderConfig = ((_stateRef$current2 = stateRef.current) === null || _stateRef$current2 === void 0 || (_stateRef$current2 = _stateRef$current2.bookingConfig) === null || _stateRef$current2 === void 0 ? void 0 : _stateRef$current2.holder) || {};
-            currentMaxSelectedCount = (holderConfig === null || holderConfig === void 0 ? void 0 : holderConfig.maxSelectedCount) || (cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend5 = cacheItem._extend) === null || _cacheItem$_extend5 === void 0 ? void 0 : _cacheItem$_extend5.quantity) || 1; // 调用 selectHolderModal，所有逻辑都在内部处理
-            _context2.next = 4;
-            return selectHolderModal({
-              state: stateRef.current,
-              dispatch: dispatch,
-              maxSelectedCount: currentMaxSelectedCount
-            });
-          case 4:
-            result = _context2.sent;
-            return _context2.abrupt("return", result);
-          case 6:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2);
-    }));
-    return function (_x4) {
-      return _ref2.apply(this, arguments);
-    };
-  }());
-
   // 处理 booking4 的服务添加
-  var handleBooking4Service = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(item, params, detail, notShowToast) {
-      var _state$client3, _state$bookingConfig4, _state$bookingConfig5;
-      var cacheItem, res, _state$bookingConfig6;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
-          case 0:
-            cacheItem = createCacheItemFromParams(item, params, detail); // 如果没有 holder 数据，且此时要求选择 holder，则弹出 holder 弹窗
-            // 且预约主体是表单
-            if (!(!isNormalProductByDurationSchedule(cacheItem) && (!cacheItem._extend.holder_id || !cacheItem._extend.holder_id.length) && !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) && (state === null || state === void 0 || (_state$bookingConfig4 = state.bookingConfig) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.config) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.basic) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.appointment_subject) === null || _state$bookingConfig4 === void 0 ? void 0 : _state$bookingConfig4.type) === 'form' && (state === null || state === void 0 || (_state$bookingConfig5 = state.bookingConfig) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.config) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.basic) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.appointment_subject) === null || _state$bookingConfig5 === void 0 ? void 0 : _state$bookingConfig5.show_hold_on_add_cart) !== 0)) {
-              _context3.next = 11;
-              break;
-            }
-            _context3.next = 4;
-            return handleAddHolder(cacheItem);
-          case 4:
-            res = _context3.sent;
-            if (!(res && res.length > 0)) {
-              _context3.next = 9;
-              break;
-            }
-            cacheItem._extend.holder_id = res;
-            _context3.next = 11;
-            break;
-          case 9:
-            if (!((state === null || state === void 0 || (_state$bookingConfig6 = state.bookingConfig) === null || _state$bookingConfig6 === void 0 || (_state$bookingConfig6 = _state$bookingConfig6.config) === null || _state$bookingConfig6 === void 0 || (_state$bookingConfig6 = _state$bookingConfig6.basic) === null || _state$bookingConfig6 === void 0 ? void 0 : _state$bookingConfig6.subject_require) === 'require')) {
-              _context3.next = 11;
-              break;
-            }
-            return _context3.abrupt("return");
-          case 11:
-            if (cacheItem.autoClose) {
-              processAutoCloseService(cacheItem, item, detail, notShowToast);
-            } else {
-              processManualEditService(cacheItem);
-            }
-          case 12:
-          case "end":
-            return _context3.stop();
-        }
-      }, _callee3);
-    }));
-    return function (_x5, _x6, _x7, _x8) {
-      return _ref3.apply(this, arguments);
-    };
-  }());
+  var handleBooking4Service = useMemoizedFn(function (item, params, detail, notShowToast) {
+    var cacheItem = createCacheItemFromParams(item, params, detail);
+    if (cacheItem.autoClose) {
+      processAutoCloseService(cacheItem, item, detail, notShowToast);
+    } else {
+      processManualEditService(cacheItem);
+    }
+  });
 
   // 直接添加商品（不打开弹窗）
   var handleDirectAddService = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(item) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
       var cacheItem;
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
             console.log(item, 'handleSelectProduct33', '_list_list');
             if (isBooking4) {
-              _context4.next = 5;
+              _context2.next = 5;
               break;
             }
-            _context4.next = 4;
+            _context2.next = 4;
             return handleBookingCreation(item, item.cartDetailValue);
           case 4:
-            return _context4.abrupt("return");
+            return _context2.abrupt("return");
           case 5:
             console.time('createCacheItemFromParams');
             cacheItem = createCacheItemFromParams(item, item.cartDetailValue);
@@ -667,41 +589,41 @@ var AddSerivce = function AddSerivce(props) {
             }
           case 9:
           case "end":
-            return _context4.stop();
+            return _context2.stop();
         }
-      }, _callee4);
+      }, _callee2);
     }));
-    return function (_x9) {
-      return _ref4.apply(this, arguments);
+    return function (_x4) {
+      return _ref2.apply(this, arguments);
     };
   }());
 
   // 创建产品弹窗回调
   var createProductModalCallback = useMemoizedFn(function (item) {
     return /*#__PURE__*/function () {
-      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(e, extension_type, detail, notShowToast) {
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(e, extension_type, detail, notShowToast) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               setCurrentProduct(null);
               if (isBooking4) {
-                _context5.next = 5;
+                _context3.next = 5;
                 break;
               }
-              _context5.next = 4;
+              _context3.next = 4;
               return handleBookingCreation(item, e, detail);
             case 4:
-              return _context5.abrupt("return");
+              return _context3.abrupt("return");
             case 5:
               handleBooking4Service(item, e, detail, notShowToast);
             case 6:
             case "end":
-              return _context5.stop();
+              return _context3.stop();
           }
-        }, _callee5);
+        }, _callee3);
       }));
-      return function (_x10, _x11, _x12, _x13) {
-        return _ref5.apply(this, arguments);
+      return function (_x5, _x6, _x7, _x8) {
+        return _ref3.apply(this, arguments);
       };
     }();
   });
@@ -756,45 +678,45 @@ var AddSerivce = function AddSerivce(props) {
 
   // 处理产品选择
   var handleSelectProduct = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(item) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(item) {
       var type,
-        _args6 = arguments;
-      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+        _args4 = arguments;
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            type = _args6.length > 1 && _args6[1] !== undefined ? _args6[1] : 'select';
+            type = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : 'select';
             console.time("handleSelectProduct2");
             console.log(item, 'handleSelectProduct');
             // 检查资源可用性
             console.time("checkResourceAvailability");
             if (checkResourceAvailability(item)) {
-              _context6.next = 6;
+              _context4.next = 6;
               break;
             }
-            return _context6.abrupt("return");
+            return _context4.abrupt("return");
           case 6:
             console.timeEnd("checkResourceAvailability");
             // 0ms
             // 如果不需要打开详情弹窗，直接添加服务
             if (!(!item.isOpenDetailModal && item.cartDetailValue)) {
-              _context6.next = 11;
+              _context4.next = 11;
               break;
             }
-            _context6.next = 10;
+            _context4.next = 10;
             return handleDirectAddService(item);
           case 10:
-            return _context6.abrupt("return");
+            return _context4.abrupt("return");
           case 11:
             // 打开产品选择弹窗
             openProductModal(item, type);
           case 12:
           case "end":
-            return _context6.stop();
+            return _context4.stop();
         }
-      }, _callee6);
+      }, _callee4);
     }));
-    return function (_x14) {
-      return _ref6.apply(this, arguments);
+    return function (_x9) {
+      return _ref4.apply(this, arguments);
     };
   }());
   /**
@@ -884,7 +806,6 @@ var AddSerivce = function AddSerivce(props) {
             price: _detail.price,
             product_name: _currentItem.title,
             other,
-            isNormalProduct: isNormalProductByDurationSchedule(item),
           },
           new: 1,
         };
@@ -1026,7 +947,7 @@ var AddSerivce = function AddSerivce(props) {
       }
       // 如果是完全的普通商品
       // 或者非 sessions 商品但有 sku 规格商品
-      if (isNormalProductByDurationSchedule(item)) {
+      if (isNormalProductByDurationSchedule(item) || (!isSession && isEject)) {
         const openNormalService = getOpenNormalServiceHandler();
         if (openNormalService) {
           openNormalService({
@@ -1063,7 +984,7 @@ var AddSerivce = function AddSerivce(props) {
           },
           callback,
         });
-      }
+      }      
     }
   );
   */

package/es/components/ticketBooking/components/bookingDataPanel/index.js

@@ -60,9 +60,8 @@ var BookingDataPanel = /*#__PURE__*/forwardRef(function (props, ref) {
     tabBarExtraContent: /*#__PURE__*/React.createElement("div", {
       className: "pisell-ticket-booking-data-panel-tab-extra",
       onClick: function onClick() {
-        var _bookingListRef$curre2, _bookingDashboardRef$2, _Toast$success;
+        var _bookingListRef$curre2, _Toast$success;
         (_bookingListRef$curre2 = bookingListRef.current) === null || _bookingListRef$curre2 === void 0 || _bookingListRef$curre2.refresh();
-        (_bookingDashboardRef$2 = bookingDashboardRef.current) === null || _bookingDashboardRef$2 === void 0 || _bookingDashboardRef$2.refresh();
         Toast === null || Toast === void 0 || (_Toast$success = Toast.success) === null || _Toast$success === void 0 || _Toast$success.call(Toast, locales.getText('pisell2.ticket-booking.refresh-success'));
       }
     }, /*#__PURE__*/React.createElement(SyncOutlined, null)),

package/es/components/ticketBooking/components/ticketBooking/index.js

@@ -49,11 +49,10 @@ import { useCustomer } from "../../hooks/pisellos";
 import { useMemoizedFn } from 'ahooks';
 import useScanManager from "../../hooks/pisellos/useScanManager";
 import { useDebounceFn } from 'ahooks';
-import { useBusinessCode, useOsKey } from "../../context";
+import { useOsKey } from "../../context";
 import { useIsActive } from "../../context/IsActiveContext";
 import { useShopDiscountModule } from "../../hooks/pisellos/useShopDiscountModule";
 import { isWalkIn } from "../../../booking/utils";
-import useLogger from "../../../../hooks/useLogger";
 export var _formatBookingDetail = function _formatBookingDetail(data, modalState) {
   var _bookings$list, _bookings$list2;
   var customer_id = data.customer_id,
@@ -242,7 +241,6 @@ var TicketBooking = function TicketBooking(props) {
     getProductsRef.current = getProducts;
   });
   var engineContext = useEngineContext();
-  var logger = useLogger();
   var engineProps = engineContext.engine.props;
   var _engineContext$appHel = (_engineContext$appHel2 = engineContext.appHelper) === null || _engineContext$appHel2 === void 0 ? void 0 : _engineContext$appHel2.utils,
     action = _engineContext$appHel.action,
@@ -324,7 +322,6 @@ var TicketBooking = function TicketBooking(props) {
       }
     }
   });
-  var businessCode = useBusinessCode();
   useEffect(function () {
     if (isActive) {
       openScan(function (data) {
@@ -469,7 +466,7 @@ var TicketBooking = function TicketBooking(props) {
     if (isActive) {
       var _interaction$utils2;
       interaction === null || interaction === void 0 || (_interaction$utils2 = interaction.utils) === null || _interaction$utils2 === void 0 || _interaction$utils2.mountFunction('bookingTicket', 'clearAllCart', function (type, orderId) {
-        var _shopDiscount$clear, _logger$addLog;
+        var _shopDiscount$clear;
         console.log('bookingTicket.clearAllCart');
         // 支付成功后清空状态
         _initFn(function () {});
@@ -484,14 +481,6 @@ var TicketBooking = function TicketBooking(props) {
         }, 200);
         enableAllScanListeners();
         shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$clear = shopDiscount.clear) === null || _shopDiscount$clear === void 0 || _shopDiscount$clear.call(shopDiscount);
-        logger === null || logger === void 0 || (_logger$addLog = logger.addLog) === null || _logger$addLog === void 0 || _logger$addLog.call(logger, {
-          type: 'info',
-          metadata: {
-            type: type,
-            orderId: orderId
-          },
-          title: "\u6E05\u7A7A\u8D2D\u7269\u8F66 bookingTicket.clearAllCart"
-        });
         // setState({
         //   createCount: state.createCount + 1,
         // });
@@ -1246,8 +1235,7 @@ var TicketBooking = function TicketBooking(props) {
       }),
       key: 'dashboard',
       onClick: function onClick() {
-        var _window, _pisellFloatingPanelR3;
-        (_window = window) === null || _window === void 0 || (_window = _window.shopApi) === null || _window === void 0 || (_window = _window.bookingTicket) === null || _window === void 0 || _window.clearAllCart();
+        var _pisellFloatingPanelR3;
         (_pisellFloatingPanelR3 = pisellFloatingPanelRef.current) === null || _pisellFloatingPanelR3 === void 0 || _pisellFloatingPanelR3.open();
       }
     }];
@@ -1336,12 +1324,10 @@ var TicketBooking = function TicketBooking(props) {
       drawerMask: true,
       isBookingTicket2: true,
       isParallelResourcesBooking: state.isParallelResourcesBooking,
-      setIntervalTime: _setIntervalTime,
       onQrCodeClick: function onQrCodeClick() {
         console.log('onQrCodeClick');
         bookingTicket === null || bookingTicket === void 0 || bookingTicket.activateCamera();
-      },
-      businessCode: businessCode
+      }
     });
   }, [state.modalState, state.amountSymbol, state.bookingConfig, state.bookingDetail, state.bookingId, apis, state.open, state.bookingStatus, state.addTimeProducts, state.isParallelResourcesBooking, engineProps.locale]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
@@ -1408,7 +1394,7 @@ var TicketBooking = function TicketBooking(props) {
       holder: 1,
       note: 1
     }
-  })), isShowFloatButtons && /*#__PURE__*/React.createElement(PisellFloatingPanel, {
+  })), /*#__PURE__*/React.createElement(PisellFloatingPanel, {
     bookingId: activeBookingId,
     ref: pisellFloatingPanelRef,
     currentDate: currentDate,

package/es/components/ticketBooking/context/OsKeyContext.d.ts

@@ -7,12 +7,10 @@ import React from 'react';
 interface OsKeyContextType {
     /** pisellos 模块的唯一标识 */
     osKey: string | undefined;
-    businessCode: string | undefined;
 }
 declare const OsKeyContext: React.Context<OsKeyContextType>;
 interface OsKeyProviderProps {
     osKey: string | undefined;
-    businessCode: string | undefined;
     children: React.ReactNode;
 }
 /**
@@ -25,5 +23,4 @@ export declare const OsKeyProvider: React.FC<OsKeyProviderProps>;
  * 在子组件中使用此 hook 获取 osKey
  */
 export declare const useOsKey: () => string;
-export declare const useBusinessCode: () => string;
 export default OsKeyContext;

package/es/components/ticketBooking/context/OsKeyContext.js

@@ -7,8 +7,7 @@ import React, { createContext, useContext } from 'react';
  */
 
 var OsKeyContext = /*#__PURE__*/createContext({
-  osKey: undefined,
-  businessCode: undefined
+  osKey: undefined
 });
 /**
  * OsKey Provider
@@ -16,12 +15,10 @@ var OsKeyContext = /*#__PURE__*/createContext({
  */
 export var OsKeyProvider = function OsKeyProvider(_ref) {
   var osKey = _ref.osKey,
-    businessCode = _ref.businessCode,
     children = _ref.children;
   return /*#__PURE__*/React.createElement(OsKeyContext.Provider, {
     value: {
-      osKey: osKey,
-      businessCode: businessCode
+      osKey: osKey
     }
   }, children);
 };
@@ -37,11 +34,4 @@ export var useOsKey = function useOsKey() {
   }
   return (context === null || context === void 0 ? void 0 : context.osKey) || "ticket";
 };
-export var useBusinessCode = function useBusinessCode() {
-  var context = useContext(OsKeyContext);
-  if (!context) {
-    throw new Error('useBusinessCode must be used within an OsKeyProvider');
-  }
-  return (context === null || context === void 0 ? void 0 : context.businessCode) || "";
-};
 export default OsKeyContext;

package/es/components/ticketBooking/context/index.d.ts

@@ -1,2 +1,2 @@
-export { OsKeyProvider, useOsKey, useBusinessCode } from './OsKeyContext';
+export { OsKeyProvider, useOsKey } from './OsKeyContext';
 export { default as OsKeyContext } from './OsKeyContext';

package/es/components/ticketBooking/context/index.js

@@ -1,2 +1,2 @@
-export { OsKeyProvider, useOsKey, useBusinessCode } from "./OsKeyContext";
+export { OsKeyProvider, useOsKey } from "./OsKeyContext";
 export { default as OsKeyContext } from "./OsKeyContext";

package/es/components/ticketBooking/hooks/pisellos/useCustomer.d.ts

@@ -19,7 +19,7 @@ export declare const useCustomer: (props: {
     changePage: (page: number, pageSize: number) => Promise<void>;
     selectCustomer: (customer: ClientData | null, options?: any) => void;
     addCustomerToFirst: (customer: ClientData) => void;
-    initLoad: (this: any, keyword: any, formId: number) => Promise<void>;
+    initLoad: (this: any, keyword?: any) => Promise<void>;
     hasMore: boolean;
     loadMore: () => Promise<void>;
 };

package/es/components/ticketBooking/hooks/pisellos/useCustomer.js

@@ -129,34 +129,31 @@ export var useCustomer = function useCustomer(props) {
   // 初始化滚动加载
   var initLoad = useMemoizedFn( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
     var keyword,
-      formId,
       _args2 = arguments;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           keyword = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : '';
-          formId = _args2.length > 1 ? _args2[1] : undefined;
-          _context2.prev = 2;
+          _context2.prev = 1;
           setLoading(true);
-          _context2.next = 6;
+          _context2.next = 5;
           return bookingTicket.resetAndLoadCustomers({
-            search: keyword || undefined,
-            relation_form_id: formId || undefined
+            search: keyword || undefined
           });
-        case 6:
-          _context2.next = 11;
+        case 5:
+          _context2.next = 10;
           break;
-        case 8:
-          _context2.prev = 8;
-          _context2.t0 = _context2["catch"](2);
+        case 7:
+          _context2.prev = 7;
+          _context2.t0 = _context2["catch"](1);
           console.error('初始化加载失败:', _context2.t0);
-        case 11:
+        case 10:
           setLoading(false);
-        case 12:
+        case 11:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[2, 8]]);
+    }, _callee2, null, [[1, 7]]);
   })));
 
   // 加载更多