@pisell/private-materials 6.0.25 → 6.2.1

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

@@ -41,4 +41,10 @@ export declare const getMultiDayPrices: (data: DataEntry[]) => ResultStructure;
  * @Date: 2024-11-29 11:19
  */
 export declare const isDayBooking: (shopId: number) => boolean;
+export declare const isOpenAddTime: (state: any) => boolean;
+export declare const isShowAddTime: (state: any, currentService: any) => boolean;
+export declare const editSessionProduct: (cacheItem: any, session: any) => {
+    duration: any;
+    start_time: any;
+} | undefined;
 export {};

package/es/components/booking/info/utils.js

@@ -5,6 +5,8 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 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 dayjs from "dayjs";
+import { getDays, getIsEdit, isSessionProduct } from "../utils";
+import { isUsableProduct } from "../info2/service/addTimeModal/utils";
 // 商品是套餐或单规格多规格
 export var getIsBundleOrCombination = function getIsBundleOrCombination(productDetail) {
   var _productDetail$bundle;
@@ -93,7 +95,7 @@ export var isBooking4Shop = function isBooking4Shop(shopId, renderType) {
   if (renderType === 'eventBooking') {
     return false;
   }
-  var booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8581, 8586];
+  var booking4Shops = [8390, 1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 8609, 8610, 8782, 1285, 6124, 8727, 5538, 6988, 8872, 6930, 8824, 8913];
   return booking4Shops.includes(shopId);
 };
 function generateDateRange(start, end) {
@@ -127,4 +129,63 @@ export var getMultiDayPrices = function getMultiDayPrices(data) {
 export var isDayBooking = function isDayBooking(shopId) {
   var dayBookingShops = [9];
   return dayBookingShops.includes(shopId);
+};
+var getAddTimeProducts = function getAddTimeProducts(state, currentService) {
+  return (state.addTimeProducts || []).some(function (item) {
+    return isUsableProduct(item.add_time, currentService);
+  });
+};
+export var isOpenAddTime = function isOpenAddTime(state) {
+  var _state$bookingConfig;
+  var appointment_card = (state === null || state === void 0 || (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.information_tab) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.appointment_card) || {
+    quick_time: 1
+  };
+  // event预约不需要
+  if ((state === null || state === void 0 ? void 0 : state.renderType) === 'eventBooking') {
+    return false;
+  }
+
+  // 禁止编辑
+  if (state !== null && state !== void 0 && state.disabledEdit) {
+    return false;
+  }
+
+  // 未开启加时
+  if (appointment_card.quick_time !== 1) {
+    return false;
+  }
+  return true;
+};
+
+// 是否展示加时按钮
+export var isShowAddTime = function isShowAddTime(state, currentService) {
+  if (!isOpenAddTime(state)) {
+    return false;
+  }
+
+  // 如果在编辑态, 不展示加时
+  if (getIsEdit(state)) {
+    return false;
+  }
+  if (!getAddTimeProducts(state, currentService)) {
+    return false;
+  }
+  return true;
+};
+export var editSessionProduct = function editSessionProduct(cacheItem, session) {
+  if (isSessionProduct(cacheItem) && session) {
+    cacheItem._extend.start_date = session.start_at;
+    cacheItem._extend.startDate = session.start_at;
+    cacheItem._extend.start_time = session.start_time;
+    cacheItem._extend.end_time = session.end_time;
+    cacheItem._extend.end_date = session.end_at;
+    cacheItem._extend.endDate = session.end_at;
+    cacheItem._extend.duration = getDays({
+      _extend: cacheItem._extend
+    }, 'minutes');
+    return {
+      duration: cacheItem._extend.duration,
+      start_time: session.start_time
+    };
+  }
 };

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

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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); }
-import React, { useContext, useEffect, useMemo } from 'react';
+import React, { useContext, useEffect, useMemo, useRef } from 'react';
 import { Provider, Context } from "../info/model";
 import Client from "../info/client";
 import Service from "./service";
@@ -19,6 +19,7 @@ import AddNote from "../notes/addNote";
 import Header from "../info/header";
 import localeTexts from "../locales";
 import { locales } from '@pisell/utils';
+import ReloadResourceModal from "../components/reloadResourceModal";
 import { findNextDuration, flexibleObj, sliceDayIntoFiveMinutes, request } from "../utils";
 import { formatResource } from "./utilsByBooking";
 import { getErrorList } from "./utilsByBooking";
@@ -27,10 +28,11 @@ import { updateServiceDate } from "../info/date";
 import useEngineContext from "../../../hooks/useEngineContext";
 import Notes from "../info/notes";
 import "../info/index.less";
-import { Skeleton } from "antd";
-import classNames from "classnames";
+import { Skeleton } from 'antd';
+import classNames from 'classnames';
 import useCreateBookingPageHeader from "../hooks/useCreateBookingPageHeader";
 import { getLocale } from "../../../utils/locales";
+import { useDebounceEffect } from 'ahooks';
 var defaultModules = {
   client: 1,
   date: 1,
@@ -54,6 +56,8 @@ var Info = Provider(function (props) {
     var _modal$state;
     return ((_modal$state = modal.state) === null || _modal$state === void 0 || (_modal$state = _modal$state.bookingConfig) === null || _modal$state === void 0 || (_modal$state = _modal$state.config) === null || _modal$state === void 0 || (_modal$state = _modal$state.basic) === null || _modal$state === void 0 ? void 0 : _modal$state.appointment_subject) || {};
   }, [(_modal$state2 = modal.state) === null || _modal$state2 === void 0 || (_modal$state2 = _modal$state2.bookingConfig) === null || _modal$state2 === void 0 || (_modal$state2 = _modal$state2.config) === null || _modal$state2 === void 0 || (_modal$state2 = _modal$state2.basic) === null || _modal$state2 === void 0 ? void 0 : _modal$state2.appointment_subject]);
+  var stateRef = useRef(globalState);
+  stateRef.current = globalState;
   var _useCreateBookingPage = useCreateBookingPageHeader(globalState),
     createHeader = _useCreateBookingPage.createHeader,
     isBookingCreatePage = _useCreateBookingPage.isBookingCreatePage,
@@ -74,7 +78,7 @@ var Info = Provider(function (props) {
       });
     }
   }, []);
-  useEffect(function () {
+  useMemo(function () {
     var _context$appHelper, _context$appHelper$ge, _context$appHelper2, _context$appHelper2$i, _context$appHelper3;
     var isFranchisee = context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.businessUtils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getAppByModal) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper, 'franchisee');
     modal.dispatch({
@@ -152,44 +156,59 @@ var Info = Provider(function (props) {
                 timeoutNumber = 200;
                 modal.dispatch({
                   type: 'setService',
-                  payload: {
+                  payload: _objectSpread(_objectSpread({}, stateRef.current.service), {}, {
                     resourcesOrigin: bookingResourceList.list || [],
                     resourcesOriginMap: bookingResourceList.listMap
-                  }
+                  })
                 });
               }
             }
-            try {
+            return _context2.abrupt("return", new Promise(function (resolve, reject) {
               // 同步最新数据用, 增加延迟为了不和getProduct接口冲突
               setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-                var data;
+                var _stateRef$current, _stateRef$current$map, data;
                 return _regeneratorRuntime().wrap(function _callee$(_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
-                      _context.next = 2;
+                      _context.prev = 0;
+                      _context.next = 3;
                       return getResourceList({
                         date: currentDate
-                      });
-                    case 2:
+                      }, stateRef === null || stateRef === void 0 || (_stateRef$current = stateRef.current) === null || _stateRef$current === void 0 || (_stateRef$current = _stateRef$current.service) === null || _stateRef$current === void 0 || (_stateRef$current = _stateRef$current.value) === null || _stateRef$current === void 0 || (_stateRef$current$map = _stateRef$current.map) === null || _stateRef$current$map === void 0 ? void 0 : _stateRef$current$map.call(_stateRef$current, function (item) {
+                        return item === null || item === void 0 ? void 0 : item.booking_id;
+                      }));
+                    case 3:
                       data = _context.sent;
                       data.date = currentDate;
                       localStorage.setItem('bookingResourceList', JSON.stringify(data));
                       modal.dispatch({
                         type: 'setService',
-                        payload: {
+                        payload: _objectSpread(_objectSpread({}, stateRef.current.service), {}, {
                           resourcesOrigin: data.list || [],
-                          resourcesOriginMap: data.listMap
-                        }
+                          resourcesOriginMap: data.listMap,
+                          reloadResourceModal: false
+                        })
+                      });
+                      resolve(data);
+                      _context.next = 14;
+                      break;
+                    case 10:
+                      _context.prev = 10;
+                      _context.t0 = _context["catch"](0);
+                      modal.dispatch({
+                        type: 'setService',
+                        payload: _objectSpread(_objectSpread({}, stateRef.current.service), {}, {
+                          reloadResourceModal: true
+                        })
                       });
-                    case 6:
+                      reject(_context.t0);
+                    case 14:
                     case "end":
                       return _context.stop();
                   }
-                }, _callee);
+                }, _callee, null, [[0, 10]]);
               })), timeoutNumber);
-            } catch (err) {
-              console.log(err, 'err');
-            }
+            }));
           case 4:
           case "end":
             return _context2.stop();
@@ -200,14 +219,27 @@ var Info = Provider(function (props) {
       return _ref.apply(this, arguments);
     };
   }();
-  useEffect(function () {
+  useDebounceEffect(function () {
     // setTimeout(() => {
     if (currentDate) {
       getResourcesData();
     }
     // }, 20);
-  }, [currentDate]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, !!modal.state.setGlobalState ? /*#__PURE__*/React.createElement(TabPane, _defineProperty(_defineProperty({
+  }, [currentDate], {
+    wait: 300
+  });
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ReloadResourceModal, {
+    modal: modal,
+    onReload: getResourcesData,
+    onCancel: function onCancel() {
+      modal.dispatch({
+        type: 'setService',
+        payload: _objectSpread(_objectSpread({}, stateRef.current.service), {}, {
+          reloadResourceModal: false
+        })
+      });
+    }
+  }), !!modal.state.setGlobalState ? /*#__PURE__*/React.createElement(TabPane, _defineProperty(_defineProperty({
     style: style,
     header: header,
     footer: /*#__PURE__*/React.createElement(Footer, {

package/es/components/booking/info2/serve.d.ts

@@ -1,5 +1,5 @@
-export declare const getResourceList: (params: any) => Promise<{
-    list: any;
+export declare const getResourceList: (params: any, bookingId?: number[]) => Promise<{
+    list: any[];
     listMap: any;
 }>;
 export declare const createBookings: (params: any) => Promise<any>;

package/es/components/booking/info2/serve.js

@@ -3,26 +3,23 @@ function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyri
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { request } from "../utils";
-import { getNoResource2 } from "../mock";
+import { getFormatResourceListAndMap } from "./utils";
 export var getResourceList = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
-    var _yield$request$getReq, data, resourceList;
+    var bookingId,
+      _yield$request$getReq,
+      data,
+      _args = arguments;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          _context.next = 2;
+          bookingId = _args.length > 1 && _args[1] !== undefined ? _args[1] : [];
+          _context.next = 3;
           return request.getRequest().get("/shop/schedule/resource/list", params);
-        case 2:
+        case 3:
           _yield$request$getReq = _context.sent;
           data = _yield$request$getReq.data;
-          resourceList = (data || {}).concat([getNoResource2({})]);
-          return _context.abrupt("return", {
-            list: resourceList,
-            listMap: resourceList.reduce(function (prev, item) {
-              prev[item.id] = item;
-              return prev;
-            }, {})
-          });
+          return _context.abrupt("return", getFormatResourceListAndMap(data, bookingId));
         case 6:
         case "end":
           return _context.stop();

package/es/components/booking/info2/service/actions/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import '../../../info/service/actions/index.less';
 declare const Actions: ({ currentService }: {
     currentService: any;

package/es/components/booking/info2/service/addService/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PisellDrawerProps } from '../../../components/drawer';
 import '../../../info/service/addService/index.less';
 interface AddServiceProps {

package/es/components/booking/info2/service/addService/index.js

@@ -30,12 +30,14 @@ import useEngineContext from "../../../../../hooks/useEngineContext";
 import { getProductDetail } from "../../../info/service/serve";
 import { getIsBundleOrCombination } from "../../../info/utils";
 import { getProductExtend } from "./utils";
-import { formatProductListByCategory, getProductTotalPrice, request } from "../../../utils";
+import { formatProductListByCategory, getIsEject, getIsOnlySession, getProductTotalPrice, isSessionProduct, request } from "../../../utils";
 import { locales, getUniqueId } from '@pisell/utils';
 import { useUpdateEffect } from 'ahooks';
+import { isNormalProductByDurationSchedule } from "../../../info/service2/utils";
+import { getIsShowNumber } from "../../../../ticketBooking/utils";
 var shopList = [2886, 4422, 5538, 6930, 6814, 6813, 6812, 6087, 6303, 6080, 6978, 7386, 6848, 6305];
 var Info = function Info(props) {
-  var _state$service2, _state$service4, _state$service5;
+  var _state$client2, _state$service3, _state$service5, _state$service6;
   var onEdit = props.onEdit,
     drawerProps = props.drawerProps,
     renderMode = props.renderMode;
@@ -56,6 +58,20 @@ var Info = function Info(props) {
   dispatch = dispatch || (props === null || props === void 0 ? void 0 : props.dispatch);
   request.setRequest(context.appHelper.utils.request);
 
+  /**
+   * @title: 客户id
+   * @description:
+   * @param {*} useMemo
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2024-12-24 10:33
+   */
+  var customerId = useMemo(function () {
+    var _state$client;
+    return ((_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id) || undefined;
+  }, [(_state$client2 = state.client) === null || _state$client2 === void 0 || (_state$client2 = _state$client2.value) === null || _state$client2 === void 0 ? void 0 : _state$client2.id]);
+  console.log(customerId, 'customerIdcustomerId');
+
   /**
    * @title: 如果商品只有一个, 则自动设置默认商品
    * @description:
@@ -171,24 +187,20 @@ var Info = function Info(props) {
             return _context2.abrupt("return");
           case 5:
             _context2.next = 7;
-            return state.apis.getServices(_objectSpread({
+            return state.apis.getServices({
               skip: 1,
               num: 500,
-              extension_type: state.renderType === 'eventBooking' ? undefined : ['product_appointment', 'appointment_ticket', 'service_product'],
-              with: ['category'],
+              extension_type: state.renderType === 'eventBooking' ? undefined : ['product_appointment', 'appointment_ticket', 'service_product', 'session_product', 'session_ticket'],
+              with: ['category', 'resourceRelation'],
               ids: state.renderType === 'eventBooking' ? (_state$eventOtherPara2 = state.eventOtherParams) === null || _state$eventOtherPara2 === void 0 ? void 0 : _state$eventOtherPara2.productIds : undefined,
               open_quotation: 1,
               with_schedule: 1,
               with_count: ['bundleGroup', 'optionGroup'],
               order_by_string: 'sort:desc',
-              status: 'published'
-            }, state.isBookingCreatePage ? {
-              schedule_date: params === null || params === void 0 ? void 0 : params.schedule_date
-            } : {
-              _config: {
-                useCache: true
-              }
-            }));
+              status: 'published',
+              schedule_date: params === null || params === void 0 ? void 0 : params.schedule_date,
+              customer_id: params === null || params === void 0 ? void 0 : params.customer_id
+            });
           case 7:
             data = _context2.sent;
             setLoading(false);
@@ -228,8 +240,23 @@ var Info = function Info(props) {
     }
   };
   var handleSelectProduct = function handleSelectProduct(item, type) {
-    // 是否有单规格 组合规格 套餐, 如果没有不需要打开弹窗
-    var isEject = type === 'detail' || item.bundle_group_count > 0;
+    var _state$client3;
+    if (!isNormalProductByDurationSchedule(item)) {
+      var _state$service;
+      if (!Array.isArray((_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.resourcesOrigin) || !state.service.resourcesOrigin.length) {
+        dispatch({
+          type: 'setService',
+          payload: _objectSpread(_objectSpread({}, state.service), {}, {
+            reloadResourceModal: true
+          })
+        });
+        return;
+      }
+    }
+    var isSession = isSessionProduct(item);
+    // 是否有单规格 组合规格 套餐, 或者session商品 如果没有不需要打开弹窗
+    var isEject = getIsEject(item, type);
+    var isOnlySession = getIsOnlySession(item);
     var lock = false;
     state.action({
       type: 'pisell1.handleOpenProductModal',
@@ -237,12 +264,16 @@ var Info = function Info(props) {
         id: item.id,
         date: state.date.value.format('YYYY-MM-DD'),
         showConfig: {
-          option: false,
-          session: false,
-          variant: false,
-          package: true
+          option: true,
+          session: isSession,
+          variant: true,
+          package: true,
+          number: getIsShowNumber(item, state)
         },
-        is_eject: isEject ? 1 : 0
+        is_eject: isEject ? 1 : 0,
+        isOnlySession: isOnlySession,
+        isOS: isSession,
+        customer_id: (_state$client3 = state.client) === null || _state$client3 === void 0 || (_state$client3 = _state$client3.value) === null || _state$client3 === void 0 ? void 0 : _state$client3.id
       },
       callback: function callback(e, extension_type, detail) {
         // 防止选择商品弹窗多次触发callback
@@ -255,19 +286,23 @@ var Info = function Info(props) {
         setTimeout(function () {
           lock = false;
         }, 2000);
-        var cacheItem = _objectSpread(_objectSpread({}, detail || item), {}, {
+        var _detail = detail || item;
+        var other = JSON.parse(JSON.stringify(e));
+        other.session = e.session;
+        var cacheItem = _objectSpread(_objectSpread({}, _detail), {}, {
           product_id: item.id,
           _id: getUniqueId(),
           _key: e.key,
           _extend: {
             start_date: state.date.value,
-            quantity: 1,
-            price: item.price,
+            quantity: (e === null || e === void 0 ? void 0 : e.quantity) || 1,
+            price: _detail.price,
             product_name: item.title,
-            other: JSON.parse(JSON.stringify(e))
+            other: other
           },
           new: 1
         });
+        console.log(cacheItem, 'cacheItem', e);
         var _total = getProductTotalPrice(cacheItem);
         // 用于折扣 可修改
         cacheItem._extend.total = _total;
@@ -293,12 +328,26 @@ var Info = function Info(props) {
         }
         if (cacheItem.autoClose) {
           cacheItem.autoClose = false;
-          var _list = [].concat(_toConsumableArray(state.service.value), [cacheItem]);
+          var newValue = _toConsumableArray(state.service.value);
+          if (!newValue.some(function (item) {
+            return item._id === cacheItem._id;
+          })) {
+            newValue.push(cacheItem);
+          } else {
+            newValue = newValue.map(function (item) {
+              if (item._id === cacheItem._id) {
+                return _objectSpread(_objectSpread({}, cacheItem), {}, {
+                  new: 0
+                });
+              }
+              return item;
+            });
+          }
           dispatch({
             type: 'setService',
             payload: {
               addModal: false,
-              value: _list,
+              value: newValue,
               edit: true,
               changeService: false
             }
@@ -319,20 +368,20 @@ var Info = function Info(props) {
     });
   };
   var renderList = useMemo(function () {
-    var _state$service;
-    var _list = ((_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.services) || [];
+    var _state$service2;
+    var _list = ((_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.services) || [];
     var isIncludes = function isIncludes(str) {
       return str.toLowerCase().indexOf(search.toLowerCase()) !== -1;
     };
     return formatProductListByCategory(_list, search ? function (item) {
       return isIncludes(item.title);
     } : undefined);
-  }, [search, (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.services]);
+  }, [search, (_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : _state$service3.services]);
   var isService = useMemo(function () {
     return state.service.value.length > 0;
   }, [state.service.value]);
   useEffect(function () {
-    var _context$appHelper$ut, _context$appHelper$ut2, _state$service3;
+    var _context$appHelper$ut, _context$appHelper$ut2, _state$service4;
     // Salonip 不要这个
 
     if (shopList.includes((_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.closeAutoOpenService) {
@@ -340,36 +389,43 @@ var Info = function Info(props) {
     }
 
     // 如果弹窗打开,并且是创建, 则自动打开选择服务的弹窗
-    if (state.modalOpen && !state.bookingId && state.renderType !== 'eventBooking' && ((_state$service3 = state.service) === null || _state$service3 === void 0 || (_state$service3 = _state$service3.value) === null || _state$service3 === void 0 ? void 0 : _state$service3.length) === 0) {
+    if (state.modalOpen && !state.bookingId && state.renderType !== 'eventBooking' && ((_state$service4 = state.service) === null || _state$service4 === void 0 || (_state$service4 = _state$service4.value) === null || _state$service4 === void 0 ? void 0 : _state$service4.length) === 0) {
       setTimeout(function () {
         handleSelectService();
       }, 10);
     }
-  }, [state.modalOpen, state.bookingId, (_state$service4 = state.service) === null || _state$service4 === void 0 ? void 0 : _state$service4.value]);
+  }, [state.modalOpen, state.bookingId, (_state$service5 = state.service) === null || _state$service5 === void 0 ? void 0 : _state$service5.value]);
   var showAddButton = useMemo(function () {
     return !state.disabledEdit && !state.channelDisabledEdit;
   }, [state.disabledEdit, state.channelDisabledEdit]);
+  var currentDate = useMemo(function () {
+    return state.date.value.format('YYYY-MM-DD');
+  }, [state.date.value]);
   useUpdateEffect(function () {
     if (state.service.addModal) {
-      getServices();
+      getServices({
+        schedule_date: currentDate,
+        customer_id: customerId
+      });
       setSearch('');
     }
-  }, [state.service.addModal]);
-  var currentDate = useMemo(function () {
-    return state.date.value.format('YYYY-MM-DD');
-  }, [state.date.value]);
+  }, [state.service.addModal, currentDate, customerId]);
   useEffect(function () {
     if (renderMode === 'current') {
       getServices({
-        schedule_date: currentDate
+        schedule_date: currentDate,
+        customer_id: customerId
       });
     }
-  }, [renderMode, currentDate]);
+  }, [renderMode, currentDate, customerId]);
   useEffect(function () {
     if (state.renderType === 'eventBooking' && state.modalOpen) {
-      getServices();
+      getServices({
+        schedule_date: currentDate,
+        customer_id: customerId
+      });
     }
-  }, [state.renderType, state.modalOpen]);
+  }, [state.renderType, state.modalOpen, currentDate, customerId]);
   var addButton = useMemo(function () {
     if (state.isBookingCreatePage) {
       return /*#__PURE__*/React.createElement("div", {
@@ -378,6 +434,7 @@ var Info = function Info(props) {
         }
       });
     }
+    return null;
     if (state.renderType === 'eventBooking') {
       return isService ? /*#__PURE__*/React.createElement("div", {
         style: {
@@ -439,7 +496,7 @@ var Info = function Info(props) {
       }
     }, header, content);
   }
-  return /*#__PURE__*/React.createElement(React.Fragment, null, ((_state$service5 = state.service) === null || _state$service5 === void 0 || (_state$service5 = _state$service5.cacheItem) === null || _state$service5 === void 0 ? void 0 : _state$service5.autoClose) && /*#__PURE__*/React.createElement(Skeleton, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, ((_state$service6 = state.service) === null || _state$service6 === void 0 || (_state$service6 = _state$service6.cacheItem) === null || _state$service6 === void 0 ? void 0 : _state$service6.autoClose) && /*#__PURE__*/React.createElement(Skeleton, {
     loading: true,
     active: true,
     round: true

package/es/components/booking/info2/service/addService/utils.d.ts

@@ -55,11 +55,30 @@ export declare const getTimeObj: ({ cacheItem, useStartTime, currentResource, st
  * @Author: zhiwei.Wang
  * @Date: 2024-01-09 13:38
  */
-export declare const formatResources: ({ cacheItem, resourcesOrigin }: any) => {
-    list: any[];
+export declare const formatResources: ({ cacheItem, resourcesOrigin, id }: any) => {
+    list: any;
     maps: any;
 };
 export declare const setDefaultResource: ({ cacheItem, resources }: any) => any;
+/**
+ * @title: 设置默认容量
+ * @description:
+ * @param {any} param1
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-09-19 20:26
+ */
+export declare const setDefaultCapacitys: ({ capacitys, cacheItem }: any) => any;
+/**
+ * @title: 将商品内关联的资源id还原成数据
+ * @description:
+ * @param {any} resourcesOriginMap
+ * @param {any} cacheItem
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-09-19 20:23
+ */
+export declare const getResourceByIds: (resourcesOriginMap: any, cacheItem: any, extraParams?: any) => any[];
 /**
  * @title: 预生成服务的 extend
  * @description:
@@ -68,4 +87,12 @@ export declare const setDefaultResource: ({ cacheItem, resources }: any) => any;
  * @Author: zhiwei.Wang
  * @Date: 2024-06-01 13:25
  */
-export declare const getProductExtend: ({ cacheItem, state }: any) => any;
+export declare const getProductExtend: ({ cacheItem, state, isDisabledTime }: any) => any;
+/**
+ * @title: 格式化服务列表
+ * @description: 后端列表返回的product_resource.resources 的optional_resource等不是最新数据
+ * 使用with resourceRelation后 返回的resource_relation是实时数据
+ * 这里做一次转换
+ * @param list
+ */
+export declare const transServiceList: (list: any[]) => any[];