@pisell/private-materials 3.3.68 → 3.3.69

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

@@ -20,7 +20,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 { getNoResource } from "../../mock";
 import { getErrorList, getProductTotalPrice } from "../../utils";
-import { locales } from '@pisell/utils';
+import { isArr, locales } from '@pisell/utils';
 import dayjs from 'dayjs';
 import { appointmentTypes, openingTime } from "./status";
 import { postMultiDay } from "../service/serve";
@@ -199,7 +199,9 @@ export var handleChangeHolder = function handleChangeHolder(products, currentIte
     if (item._id === currentItem._id) {
       return _objectSpread(_objectSpread({}, item), {}, {
         _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
-          holder_id: other.id
+          holder_id: isArr(other) ? other.map(function (item) {
+            return item.id;
+          }) : item._extend.quantity > 1 ? [other.id] : other.id
         })
       });
     }
@@ -610,6 +612,8 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
     actionText: locales.getText('page.booking.text.add-time'),
     isMultipleResource: true,
     multiResources: multiResources,
+    holderMaxCount: item === null || item === void 0 ? void 0 : item._extend.quantity,
+    holderMode: (item === null || item === void 0 ? void 0 : item._extend.quantity) > 1 ? 'multiple' : undefined,
     isErrorHolder: getIsSubjectRequire(state),
     addHolderButtonText: (formData === null || formData === void 0 || (_formData$ = formData[0]) === null || _formData$ === void 0 || (_formData$ = _formData$.form) === null || _formData$ === void 0 ? void 0 : _formData$.title) || "",
     holder_id: item === null || item === void 0 || (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.holder_id,

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

@@ -31,6 +31,7 @@ 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,
@@ -164,7 +165,7 @@ var Info = Provider(function (props) {
             try {
               // 同步最新数据用, 增加延迟为了不和getProduct接口冲突
               setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-                var _stateRef$current;
+                var _stateRef$current, _stateRef$current$map;
                 var data;
                 return _regeneratorRuntime().wrap(function _callee$(_context) {
                   while (1) switch (_context.prev = _context.next) {
@@ -172,7 +173,9 @@ var Info = Provider(function (props) {
                       _context.next = 2;
                       return getResourceList({
                         date: currentDate
-                      }, stateRef === null || stateRef === void 0 || (_stateRef$current = stateRef.current) === null || _stateRef$current === void 0 ? void 0 : _stateRef$current.bookingId);
+                      }, 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 2:
                       data = _context.sent;
                       data.date = currentDate;
@@ -203,13 +206,15 @@ var Info = Provider(function (props) {
       return _ref.apply(this, arguments);
     };
   }();
-  useEffect(function () {
+  useDebounceEffect(function () {
     // setTimeout(() => {
     if (currentDate) {
       getResourcesData();
     }
     // }, 20);
-  }, [currentDate]);
+  }, [currentDate], {
+    wait: 300
+  });
   return /*#__PURE__*/React.createElement(React.Fragment, null, !!modal.state.setGlobalState ? /*#__PURE__*/React.createElement(TabPane, _defineProperty(_defineProperty({
     style: style,
     header: header,

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

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

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

@@ -5,24 +5,28 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 import { request } from "../utils";
 import { getFormatResourceListAndMap } from "./utils";
 export var getResourceList = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params, bookingId) {
-    var _yield$request$getReq, data;
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
+    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;
           return _context.abrupt("return", getFormatResourceListAndMap(data, bookingId));
-        case 5:
+        case 6:
         case "end":
           return _context.stop();
       }
     }, _callee);
   }));
-  return function getResourceList(_x, _x2) {
+  return function getResourceList(_x) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -44,7 +48,7 @@ export var createBookings = /*#__PURE__*/function () {
       }
     }, _callee2);
   }));
-  return function createBookings(_x3) {
+  return function createBookings(_x2) {
     return _ref2.apply(this, arguments);
   };
 }();
@@ -66,7 +70,7 @@ export var editBookings = /*#__PURE__*/function () {
       }
     }, _callee3);
   }));
-  return function editBookings(_x4, _x5) {
+  return function editBookings(_x3, _x4) {
     return _ref3.apply(this, arguments);
   };
 }();

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

@@ -33,7 +33,7 @@ import { getProductExtend } 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$client2, _state$service2, _state$service4, _state$service5;
@@ -255,7 +255,7 @@ var Info = function Info(props) {
           session: isSession,
           variant: true,
           package: true,
-          number: isNormalProductByDurationSchedule(item)
+          number: getIsShowNumber(item, state)
         },
         is_eject: isEject ? 1 : 0,
         isOnlySession: isOnlySession,

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

@@ -35,6 +35,7 @@ import { formatResources, getDurationProps, getFlexibleOption, getTimeObj, setDe
 import { PisellAdjustPriceInputNumber } from '@pisell/materials';
 import { editSessionProduct } from "../../../info/utils";
 import { isNormalProductByDurationSchedule } from "../../../info/service2/utils";
+import { addService, genServiceKey, getIsShowNumber } from "../../../../ticketBooking/utils";
 var submitLock = false;
 var Info = function Info(_, ref) {
   var _state$service3, _state$bookingConfig2, _state$service$cacheI4, _state$service$cacheI5, _state$service6, _state$service8, _window$BaseMaterials, _state$service$cacheI6, _state$service9, _state$service$cacheI7, _state$service$cacheI8, _state$service$cacheI9, _state$service$cacheI10, _state$bookingConfig3, _state$service$resour;
@@ -244,13 +245,15 @@ var Info = function Info(_, ref) {
     }
     _item._extend = _extend;
     _item._time = new Date().getTime();
+    _item._serviceKey = genServiceKey(_item);
     var _id = _item === null || _item === void 0 ? void 0 : _item._id;
 
     // 判断是新增还是编辑
     if (!_list.some(function (d) {
       return d._id === _id;
     })) {
-      _list.push(_item);
+      var detail = addService(_list, _item, state);
+      _list = detail.list;
     } else {
       // 手动改价时移除优惠券使用
       if (isChangeTotal.current) {
@@ -428,7 +431,7 @@ var Info = function Info(_, ref) {
           session: isSession,
           variant: true,
           package: true,
-          number: isNormalProductByDurationSchedule(item)
+          number: getIsShowNumber(item, state)
         },
         isOS: isSession,
         customer_id: (_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id,

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

@@ -1,4 +1,4 @@
-export declare const getFormatResourceListAndMap: (data: any[], bookingId?: number) => {
+export declare const getFormatResourceListAndMap: (data: any[], bookingId?: number[]) => {
     list: any[];
     listMap: any;
 };

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

@@ -5,7 +5,8 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 { getNoResource2 } from "../mock";
-export var getFormatResourceListAndMap = function getFormatResourceListAndMap(data, bookingId) {
+export var getFormatResourceListAndMap = function getFormatResourceListAndMap(data) {
+  var bookingId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var resourceList = (data || {}).concat([getNoResource2({})]);
   var map = resourceList.reduce(function (prev, item) {
     prev[item.id] = item;
@@ -20,7 +21,7 @@ export var getFormatResourceListAndMap = function getFormatResourceListAndMap(da
         var pax = 0;
         (((_map$cur = map[cur]) === null || _map$cur === void 0 ? void 0 : _map$cur.times) || []).forEach(function (time) {
           time.event_list.forEach(function (event) {
-            if (event.id !== bookingId) {
+            if (!bookingId.includes(event.id)) {
               pax += (event === null || event === void 0 ? void 0 : event.pax) || 0;
             }
           });

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

@@ -1,5 +1,5 @@
 export declare const getResourceTimeIsUsable: (item: any, cacheItem: any, resourceItem: any) => any;
-export declare const getSumCapacity: ({ cacheItem }: any) => number;
+export declare const getSumCapacity: ({ cacheItem }: any, isCalcQuantity?: boolean) => number;
 /**
  * @title: 查找是否有可用的time
  * @description:

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

@@ -162,7 +162,9 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
   return time;
 };
 export var getSumCapacity = function getSumCapacity(_ref) {
+  var _cacheItem$_extend;
   var cacheItem = _ref.cacheItem;
+  var isCalcQuantity = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
   var sum = 0;
   var _iterator = _createForOfIteratorHelper(cacheItem._extend.capacity || []),
     _step;
@@ -176,7 +178,7 @@ export var getSumCapacity = function getSumCapacity(_ref) {
   } finally {
     _iterator.f();
   }
-  return sum;
+  return sum * (isCalcQuantity ? (cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.quantity) || 1 : 1);
 };
 
 /**
@@ -302,7 +304,7 @@ export var getAppointmentTimingPreference = function getAppointmentTimingPrefere
  * @Date: 2024-01-26 14:09
  */
 export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTime(state, cacheItem, timeObj) {
-  var _cacheItem$duration, _cacheItem$_extend;
+  var _cacheItem$duration, _cacheItem$_extend2;
   var appointmentTimingPreference = getAppointmentTimingPreference(state);
 
   // 获取上一个服务商品
@@ -370,7 +372,7 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
     endDate = _getServiceTimes2.endDate;
   _extend.startDate = startDate;
   _extend.endDate = endDate;
-  var session = cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 || (_cacheItem$_extend = _cacheItem$_extend.other) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.session;
+  var session = cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 || (_cacheItem$_extend2 = _cacheItem$_extend2.other) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.session;
   if (isSessionProduct(cacheItem) && session) {
     _extend.start_date = session.start_at;
     _extend.startDate = session.start_at;

package/es/components/booking/locales.d.ts

@@ -261,6 +261,7 @@ declare const _default: {
         'pisell2.text.goodpass.code': string;
         'pisell2.text.goodpass.enter-code': string;
         'pisell2.text.goodpass.code-invalid': string;
+        'pisell2.text.goodpass.code-invalid-cart': string;
         'pisell2.text.status.valid': string;
         'pisell2.text.status.expired': string;
         'pisell2.text.validity.expired': (str: string) => string;
@@ -531,6 +532,7 @@ declare const _default: {
         'pisell2.text.goodpass.code': string;
         'pisell2.text.goodpass.enter-code': string;
         'pisell2.text.goodpass.code-invalid': string;
+        'pisell2.text.goodpass.code-invalid-cart': string;
         'pisell2.text.status.valid': string;
         'pisell2.text.status.expired': string;
         'pisell2.text.validity.expired': (str: string) => string;
@@ -801,6 +803,7 @@ declare const _default: {
         'pisell2.text.goodpass.code': string;
         'pisell2.text.goodpass.enter-code': string;
         'pisell2.text.goodpass.code-invalid': string;
+        'pisell2.text.goodpass.code-invalid-cart': string;
         'pisell2.text.status.valid': string;
         'pisell2.text.status.expired': string;
         'pisell2.text.validity.expired': (str: string) => string;

package/es/components/booking/locales.js

@@ -292,12 +292,13 @@ export default {
     'pisell2.text.send-form-reminder-tooltip': 'Refresh forms',
     'pisell2.text.send-form-reminder-refresh': 'Forms refreshed successfully',
     'pisell2.text.send-form-reminder-error-message': 'Please select at least one reminder method',
-    'pisell2.text.goodpass': "GoodPass",
+    'pisell2.text.goodpass': "Promotion",
     'pisell2.text.goodpass.product-vouchers': "Product Vouchers",
     'pisell2.text.goodpass.view-more': "View More",
     'pisell2.text.goodpass.code': "Code",
     'pisell2.text.goodpass.enter-code': "Enter Code",
     'pisell2.text.goodpass.code-invalid': "Current code is invalid",
+    'pisell2.text.goodpass.code-invalid-cart': "No eligible items in the cart",
     'pisell2.text.status.valid': 'Valid',
     'pisell2.text.status.expired': 'Expired',
     'pisell2.text.validity.expired': function pisell2TextValidityExpired(str) {
@@ -609,12 +610,13 @@ export default {
     'pisell2.text.send-form-reminder-tooltip': '刷新表单',
     'pisell2.text.send-form-reminder-refresh': '已刷新表单',
     'pisell2.text.send-form-reminder-error-message': '请至少选择一种提醒方式',
-    'pisell2.text.goodpass': "商品券",
+    'pisell2.text.goodpass': "促销",
     'pisell2.text.goodpass.product-vouchers': "商品兑换券",
     'pisell2.text.goodpass.view-more': "查看更多",
     'pisell2.text.goodpass.code': "券码",
     'pisell2.text.goodpass.enter-code': "请输入券码",
     'pisell2.text.goodpass.code-invalid': "当前券码不可用",
+    'pisell2.text.goodpass.code-invalid-cart': "当前购物车中无可用商品",
     'pisell2.text.status.valid': '有效',
     'pisell2.text.status.expired': '已过期',
     'pisell2.text.validity.expired': function pisell2TextValidityExpired(str) {
@@ -926,12 +928,13 @@ export default {
     'pisell2.text.send-form-reminder-tooltip': '刷新表單',
     'pisell2.text.send-form-reminder-refresh': '已刷新表單',
     'pisell2.text.send-form-reminder-error-message': '請至少選擇一種提醒方式',
-    'pisell2.text.goodpass': "商品券",
+    'pisell2.text.goodpass': "促銷",
     'pisell2.text.goodpass.product-vouchers': "商品兌換券",
     'pisell2.text.goodpass.view-more': "查看更多",
     'pisell2.text.goodpass.code': "券碼",
     'pisell2.text.goodpass.enter-code': "請輸入券碼",
     'pisell2.text.goodpass.code-invalid': "當前券碼不可用",
+    'pisell2.text.goodpass.code-invalid-cart': "當前購物車中無可用商品",
     'pisell2.text.status.valid': '有效',
     'pisell2.text.status.expired': '已過期',
     'pisell2.text.validity.expired': function pisell2TextValidityExpired(str) {

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

@@ -165,10 +165,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | {
+}) => number | "flexible" | {
     type: string;
     value: number;
-} | "flexible";
+};
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

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

@@ -8,7 +8,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "fail" | "print" | "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/device.d.ts

@@ -10,7 +10,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" | "fail" | "print" | "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/hooks.d.ts

@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"success" | "loading" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave">;
+    readonly eftposRef: React.MutableRefObject<"tyro" | "windcave" | "stripe" | "payo">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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: "loading" | "success" | "warn" | "fail" | "question";
+        status: "success" | "loading" | "warn" | "fail" | "question";
     };
 };
 /**
@@ -295,10 +295,10 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "pay" | "fullPay" | "refund" | "query" | undefined;
+        mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | undefined;
-        action?: "amount" | "deviceList" | "pay" | undefined;
+        eftpos?: "tyro" | "windcave" | "stripe" | "payo" | undefined;
+        action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
@@ -308,7 +308,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "success" | "loading" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

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

@@ -24,13 +24,13 @@ import useEngineContext from "../../../../hooks/useEngineContext";
 import { isSessionProduct, request, getProductTotalPrice, getIsEject, getIsOnlySession } from "../../../booking/utils";
 import { getProductExtend } from "../../../booking/info2/service/addService/utils";
 import { appointmentTypes } from "../../../booking/info/service2/status";
-import { holderId, isDaysBooking, isNormalProductByDurationSchedule } from "../../../booking/info/service2/utils";
+import { holderId, isDaysBooking } from "../../../booking/info/service2/utils";
 import { getIsBundleOrCombination, isBooking4Shop } from "../../../booking/info/utils";
 import { getProductDetail } from "../../../booking/info/service/serve";
 import { useService } from "../../../booking/info/service/serviceManager";
 import ProductSelect from "../../../productSelect";
 import "./index.less";
-import { addService, addServiceScroll } from "../../utils";
+import { addService, addServiceScroll, genServiceKey, getIsShowNumber } from "../../utils";
 import NotAvailable from "../notAvailable";
 var AddSerivce = function AddSerivce(props) {
   var _context$appHelper, _context$appHelper$ut, _context$appHelper$ut2, _state$bookingConfig2, _state$client2, _state$service3, _state$service4;
@@ -279,7 +279,7 @@ var AddSerivce = function AddSerivce(props) {
           session: isSession,
           variant: true,
           package: true,
-          number: isNormalProductByDurationSchedule(item)
+          number: getIsShowNumber(item, state)
         },
         isOnlySession: isOnlySession,
         is_eject: isEject ? 1 : 0,
@@ -368,7 +368,8 @@ var AddSerivce = function AddSerivce(props) {
                 }
                 if (cacheItem.autoClose) {
                   cacheItem.autoClose = false;
-                  _addService = addService(state.service.value, cacheItem), _list = _addService.list, quantity = _addService.quantity;
+                  cacheItem._serviceKey = genServiceKey(cacheItem);
+                  _addService = addService(_toConsumableArray(state.service.value), cacheItem, state), _list = _addService.list, quantity = _addService.quantity;
                   Toast === null || Toast === void 0 || (_Toast$success = Toast.success) === null || _Toast$success === void 0 || _Toast$success.call(Toast, /*#__PURE__*/React.createElement("div", {
                     className: "add-toast-wrap"
                   }, /*#__PURE__*/React.createElement("div", {

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

@@ -892,7 +892,8 @@ var TicketBooking = function TicketBooking() {
       addTimeProducts: state.addTimeProducts,
       isBookingCreatePage: true,
       closeAutoOpenService: true,
-      productExtensionType: state.productExtensionType
+      productExtensionType: state.productExtensionType,
+      isBookingTicket2: true
     }),
     setGlobalState: _setModalState
   })), /*#__PURE__*/React.createElement(TimeBar, {
@@ -936,7 +937,8 @@ var TicketBooking = function TicketBooking() {
       refreshData: _refreshData,
       setActiveTab: _setActiveTab,
       clearAllValue: _clearAllValue,
-      drawerMask: true
+      drawerMask: true,
+      isBookingTicket2: true
     }),
     setGlobalState: _setModalState,
     setState: setState,

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

@@ -12,8 +12,12 @@ export declare const restoreProductOtherData: (data: any) => {
     product_variant_id: number;
     quantity: number;
 } | undefined;
-export declare const addService: (list: any[], addItem: any) => {
+export declare const addService: (list: any[], addItem: any, state: any) => {
     list: any[];
     quantity: any;
 };
 export declare const addServiceScroll: (rowKey: string, cacheItem: any) => void;
+export declare const getCartProductOverlay: (state: any) => any;
+export declare const getIsOverlayProduct: (item: any, state: any) => any;
+export declare const getIsShowNumber: (item: any, state: any) => any;
+export declare const genServiceKey: (item: any) => string;

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

@@ -104,14 +104,18 @@ export var restoreProductOtherData = function restoreProductOtherData(data) {
 
 // 是相同的商品
 var isSameProduct = function isSameProduct(a, b) {
-  var _a$_extend, _b$_extend;
-  return ((_a$_extend = a._extend) === null || _a$_extend === void 0 || (_a$_extend = _a$_extend.other) === null || _a$_extend === void 0 ? void 0 : _a$_extend.rowKey) === ((_b$_extend = b._extend) === null || _b$_extend === void 0 || (_b$_extend = _b$_extend.other) === null || _b$_extend === void 0 ? void 0 : _b$_extend.rowKey);
+  var _a$_extend2, _b$_extend2;
+  if (isNormalProductByDurationSchedule(a) && isNormalProductByDurationSchedule(b)) {
+    var _a$_extend, _b$_extend;
+    return ((_a$_extend = a._extend) === null || _a$_extend === void 0 || (_a$_extend = _a$_extend.other) === null || _a$_extend === void 0 ? void 0 : _a$_extend.rowKey) === ((_b$_extend = b._extend) === null || _b$_extend === void 0 || (_b$_extend = _b$_extend.other) === null || _b$_extend === void 0 ? void 0 : _b$_extend.rowKey);
+  }
+  return ((_a$_extend2 = a._extend) === null || _a$_extend2 === void 0 || (_a$_extend2 = _a$_extend2.other) === null || _a$_extend2 === void 0 ? void 0 : _a$_extend2.rowKey) === ((_b$_extend2 = b._extend) === null || _b$_extend2 === void 0 || (_b$_extend2 = _b$_extend2.other) === null || _b$_extend2 === void 0 ? void 0 : _b$_extend2.rowKey) && a._serviceKey === b._serviceKey;
 };
-export var addService = function addService(list, addItem) {
+export var addService = function addService(list, addItem, state) {
   var value = list;
   var count;
-  // 预约商品直接添加
-  if (!isNormalProductByDurationSchedule(addItem)) {
+  // 预约商品 并且配置商品卡片不叠加 直接添加
+  if (!isNormalProductByDurationSchedule(addItem) && !getIsOverlayProduct(addItem, state)) {
     value.push(addItem);
     count = addItem._extend.quantity;
   } else {
@@ -164,4 +168,45 @@ export var addServiceScroll = function addServiceScroll(rowKey, cacheItem) {
       }, 100);
     }
   });
+};
+
+// 获取购物车商品覆盖规则
+export var getCartProductOverlay = function getCartProductOverlay(state) {
+  var _state$bookingConfig;
+  return (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.basic) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.cart_product_overlay) || {
+    type: "product_all"
+  };
+};
+
+// 获取购物车商品是否覆盖
+export var getIsOverlayProduct = function getIsOverlayProduct(item, state) {
+  var _getCartProductOverla = getCartProductOverlay(state),
+    type = _getCartProductOverla.type,
+    product_ids = _getCartProductOverla.product_ids;
+  if (type === 'product_all') {
+    return true;
+  }
+  return product_ids.includes(item.product_id || item.id);
+};
+
+// 获取购物车商品是否显示数量
+export var getIsShowNumber = function getIsShowNumber(item, state) {
+  var isBookingTicket2 = state.isBookingTicket2;
+  return isNormalProductByDurationSchedule(item) || isBookingTicket2 && getIsOverlayProduct(item, state);
+};
+
+// 生成服务key
+export var genServiceKey = function genServiceKey(item) {
+  var _item$_extend3, _item$_extend4, _item$_extend5;
+  var product_id = item.product_id;
+  var durationKey = (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.duration;
+  var start_time = (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.start_time;
+  var total = (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.total;
+  var resourceKey = '';
+  Object.values(item._extend.resource).forEach(function (resources) {
+    resources.forEach(function (resource) {
+      resourceKey += "".concat(resource.relation_id);
+    });
+  });
+  return "".concat(product_id, "-").concat(durationKey, "-").concat(resourceKey, "-").concat(start_time, "-").concat(total);
 };

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

@@ -46,7 +46,7 @@ var import_Deposit = __toESM(require("../../Deposit"));
 var import_utils3 = require("../utils");
 var import_index = require("./index.less");
 var CartItem = ({ onNext }) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   const appointmentBooking = (0, import_hooks.useAppointmentBooking)();
   const {
     carts,
@@ -78,6 +78,7 @@ var CartItem = ({ onNext }) => {
     return (0, import_utils2.formatHolder)(accountLists);
   }, [accountLists, isFormSubject]);
   const hasGoodPassApp = !!((_a = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _a.call(businessUtils, "goodpass"));
+  const hasDiscountCardApp = !!((_b = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _b.call(businessUtils, "discountcard"));
   const handleClickCard = (e, type, val) => {
     console.log(e, type, val, "handleClickCard");
     if (type === "note") {
@@ -187,8 +188,8 @@ var CartItem = ({ onNext }) => {
           hideAddBtn: false,
           holders,
           disabledEdit: isLastStep,
-          isShowChangeResource: (_c = (_b = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _b.key) == null ? void 0 : _c.startsWith("select-resource"),
-          isShowDelete: ((_d = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _d.key) === "select-service",
+          isShowChangeResource: (_d = (_c = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _c.key) == null ? void 0 : _d.startsWith("select-resource"),
+          isShowDelete: ((_e = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _e.key) === "select-service",
           isShowPackageNote: false,
           isShowChangeHolder: isLastStep ? false : isFormSubject && isLogin,
           isShowHolder: isFormSubject,
@@ -205,7 +206,7 @@ var CartItem = ({ onNext }) => {
         onChange: (e, type, key) => handleClickCard(e, type, key)
       }
     )),
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-footer" }, hasGoodPassApp ? /* @__PURE__ */ import_react.default.createElement(import_Voucher.default, { currentUser, products: carts }) : null, /* @__PURE__ */ import_react.default.createElement(import_Total.default, null), (carts == null ? void 0 : carts.length) > 0 && (deposit == null ? void 0 : deposit.hasDeposit) ? /* @__PURE__ */ import_react.default.createElement(import_Deposit.default, null) : null, /* @__PURE__ */ import_react.default.createElement(import_ContinueButton.default, { onNext }))
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-footer" }, hasGoodPassApp || hasDiscountCardApp ? /* @__PURE__ */ import_react.default.createElement(import_Voucher.default, { currentUser, products: carts }) : null, /* @__PURE__ */ import_react.default.createElement(import_Total.default, null), (carts == null ? void 0 : carts.length) > 0 && (deposit == null ? void 0 : deposit.hasDeposit) ? /* @__PURE__ */ import_react.default.createElement(import_Deposit.default, null) : null, /* @__PURE__ */ import_react.default.createElement(import_ContinueButton.default, { onNext }))
   ));
 };
 var Item_default = CartItem;