@pisell/private-materials 6.9.1 → 6.9.3

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

@@ -30,7 +30,7 @@ import { isShowAddTime } from "../utils";
 import { formatResources } from "../service/addService/utils";
 import { getProductExtend, isMultiDayProduct } from "../../info2/service/addService/utils";
 import { getErrorList as getErrorListInfo2 } from "../../info2/utilsByBooking";
-import { getRelationDetailsTotal } from "../../components/footer/amount";
+import { getProductDiscountProductDiscountDifference, getRelationDetailsTotal } from "../../components/footer/amount";
 locales.init(localeTexts, localStorage.getItem('umi_locale') || 'en');
 export var formatActiveKey = function formatActiveKey(lists, platform, isEdit) {
   if (!(lists !== null && lists !== void 0 && lists.length)) return [];
@@ -196,12 +196,14 @@ var currentResource = function currentResource(state, useResource, cacheItem) {
 // 更新holder
 export var handleChangeHolder = function handleChangeHolder(products, currentItem, other) {
   return products.map(function (item) {
-    if (item._id === currentItem._id) {
+    var _item$_extend, _item$_extend2, _currentItem$_origin;
+    var isSameGroup = (item === null || item === void 0 || (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.groupId) && ((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.groupId) === (currentItem === null || currentItem === void 0 || (_currentItem$_origin = currentItem._origin) === null || _currentItem$_origin === void 0 || (_currentItem$_origin = _currentItem$_origin._extend) === null || _currentItem$_origin === void 0 ? void 0 : _currentItem$_origin.groupId);
+    if (item._id === currentItem._id || isSameGroup) {
       return _objectSpread(_objectSpread({}, item), {}, {
         _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
           holder_id: isArr(other) ? other.map(function (item) {
             return item.id;
-          }) : item._extend.quantity > 1 ? [other.id] : other.id
+          }) : item._extend.quantity > 1 ? [other.id] : other === null || other === void 0 ? void 0 : other.id
         })
       });
     }
@@ -215,10 +217,10 @@ var handleLike = function handleLike(products, currentItem, other) {
   return products.map(function (item) {
     if (currentItem.isParallelResource) {
       if (item._id === currentItem.serviceId) {
-        var _item$_extend, _item$_extend2;
+        var _item$_extend3, _item$_extend4;
         return _objectSpread(_objectSpread({}, item), {}, {
           _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
-            resource: _objectSpread(_objectSpread({}, (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.resource), {}, _defineProperty({}, currentItem.resourceId, (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.resource[currentItem.resourceId].map(function (item) {
+            resource: _objectSpread(_objectSpread({}, (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.resource), {}, _defineProperty({}, currentItem.resourceId, (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.resource[currentItem.resourceId].map(function (item) {
               return _objectSpread(_objectSpread({}, item), {}, {
                 like_status: other.like_status
               });
@@ -343,8 +345,8 @@ export var updateServices = function updateServices(state, currentItem, type, ot
   if (type === 'delete_holders') {
     var _products2;
     products = (_products2 = products) === null || _products2 === void 0 ? void 0 : _products2.filter(function (item) {
-      var _item$_extend3;
-      return (item === null || item === void 0 || (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.holder_id) !== other;
+      var _item$_extend5;
+      return (item === null || item === void 0 || (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.holder_id) !== other;
     });
   }
 
@@ -558,7 +560,7 @@ export var genRowKey = function genRowKey(key) {
   return "rowKey-".concat(key);
 };
 var getGeneralParams = function getGeneralParams(item, state, isParallelResource) {
-  var _state$bookingConfig4, _state$bookingConfig5, _formData$, _item$_extend5, _item$_extend6, _item$_extend7, _item$_extend8, _item$_extend9;
+  var _state$bookingConfig4, _state$bookingConfig5, _formData$, _item$_extend7, _item$_extend8, _item$_extend9, _item$_extend10, _item$_extend11;
   var pet = state.pet,
     service = state.service;
   var _ref8 = pet || {},
@@ -606,7 +608,7 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
       };
     });
   } else {
-    var _item$_extend4;
+    var _item$_extend6;
     var _ref10 = service || {},
       resourcesOrigin = _ref10.resourcesOrigin;
     var resource = formatResources({
@@ -617,7 +619,7 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
     multiResources = [{
       _id: item._id,
       id: item._extend.resource,
-      status: ((_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.like_status) || 'common',
+      status: ((_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.like_status) || 'common',
       lists: mapListItems(resource)
     }];
   }
@@ -631,6 +633,7 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
     holders: formatHolders(holders),
     isShowChangeHolder: !isNormalProduct,
     isShowAction: isShowAddTime(state, item),
+    allowClearHolder: true,
     actionText: locales.getText('page.booking.text.add-time'),
     actionIcon: 'pisell2-clock-plus',
     isMultipleResource: true,
@@ -641,10 +644,10 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
     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,
-    start_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.startDate : "",
-    end_date: !isNormalProduct ? (item === null || item === void 0 || (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.endDate) || (item === null || item === void 0 || (_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.end_date) : "",
-    rowKey: genRowKey(item === null || item === void 0 || (_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 || (_item$_extend9 = _item$_extend9.other) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.rowKey)
+    holder_id: item === null || item === void 0 || (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.holder_id,
+    start_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.startDate : "",
+    end_date: !isNormalProduct ? (item === null || item === void 0 || (_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.endDate) || (item === null || item === void 0 || (_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.end_date) : "",
+    rowKey: genRowKey(item === null || item === void 0 || (_item$_extend11 = item._extend) === null || _item$_extend11 === void 0 || (_item$_extend11 = _item$_extend11.other) === null || _item$_extend11 === void 0 ? void 0 : _item$_extend11.rowKey)
   }, parallelResourceOtherParams);
 };
 var calcAddTimeTotalPrice = function calcAddTimeTotalPrice(total, addTimeProducts) {
@@ -665,11 +668,11 @@ export var formatProducts = function formatProducts(lists, state) {
   var isParallelResource = arguments.length > 4 ? arguments[4] : undefined;
   if (!(lists !== null && lists !== void 0 && lists.length)) return [];
   var formItem = function formItem(item) {
-    var _item$_extend10, _item$_extend11, _item$_extend12, _item$_extend14, _item$_extend15, _item$_extend16, _item$_extend17, _item$_extend18, _item$_extend19, _item$_extend20, _item$_extend21, _item$_extend22, _item$_extend23, _resourceItem, _item$_extend24, _item$_extend25, _item$_extend26, _item$_extend27, _item$_extend28;
+    var _item$_extend12, _item$_extend13, _item$_extend14, _item$_extend16, _item$_extend17, _item$_extend18, _item$_extend19, _item$_extend20, _item$_extend21, _item$_extend22, _item$_extend23, _item$_extend24, _item$_extend25, _resourceItem, _item$_extend26, _item$_extend27, _item$_extend28, _item$_extend29, _item$_extend30;
     var _isDayBookingProduct = isDayBookingProduct(item, state);
-    var clientTitle = getHolderName(state, item === null || item === void 0 || (_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.holder_id);
-    var options = formatOptions(item === null || item === void 0 || (_item$_extend11 = item._extend) === null || _item$_extend11 === void 0 || (_item$_extend11 = _item$_extend11.other) === null || _item$_extend11 === void 0 ? void 0 : _item$_extend11.option);
-    var bundle = formatBundle(item === null || item === void 0 || (_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 || (_item$_extend12 = _item$_extend12.other) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.bundle);
+    var clientTitle = getHolderName(state, item === null || item === void 0 || (_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.holder_id);
+    var options = formatOptions(item === null || item === void 0 || (_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 || (_item$_extend13 = _item$_extend13.other) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.option);
+    var bundle = formatBundle(item === null || item === void 0 || (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 || (_item$_extend14 = _item$_extend14.other) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.bundle);
     // 是否是普通商品
     var isNormalProduct = !appointmentTypes.includes(item === null || item === void 0 ? void 0 : item.extension_type) || (state === null || state === void 0 ? void 0 : state.renderType) === 'eventBooking';
     var isNormalProductByDurationScheduleVal = isNormalProductByDurationSchedule(item);
@@ -677,8 +680,8 @@ export var formatProducts = function formatProducts(lists, state) {
     var errorMessage = '';
     // 普通商品没有
     if ((_isDayBookingProduct || isGeneral) && !isNormalProductByDurationScheduleVal) {
-      var _item$_extend13;
-      resourceItem = getResourceItem(item === null || item === void 0 || (_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.resource, state);
+      var _item$_extend15;
+      resourceItem = getResourceItem(item === null || item === void 0 || (_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.resource, state);
       errorMessage = getErrorMessage(item, resourceItem, isDayBooking(state));
     }
 
@@ -693,25 +696,26 @@ export var formatProducts = function formatProducts(lists, state) {
       name: item === null || item === void 0 ? void 0 : item.title,
       title: item === null || item === void 0 ? void 0 : item.title,
       // 购物车显示需要 title 字段
-      price: item === null || item === void 0 || (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.price,
-      total: calcAddTimeTotalPrice(item === null || item === void 0 || (_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.total, item === null || item === void 0 || (_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.relation_details),
-      origin_total: calcAddTimeTotalPrice(item === null || item === void 0 || (_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.origin_total, item === null || item === void 0 || (_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.relation_details),
+      price: item === null || item === void 0 || (_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.price,
+      totalDifference: getProductDiscountProductDiscountDifference(item),
+      total: calcAddTimeTotalPrice(item === null || item === void 0 || (_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.total, item === null || item === void 0 || (_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.relation_details),
+      origin_total: calcAddTimeTotalPrice(item === null || item === void 0 || (_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.origin_total, item === null || item === void 0 || (_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.relation_details),
       num: item === null || item === void 0 ? void 0 : item._extend.quantity,
       image: item === null || item === void 0 ? void 0 : item.cover,
       isShowNote: true,
-      note: (item === null || item === void 0 ? void 0 : item.note) || (item === null || item === void 0 || (_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.note),
-      like_status: item === null || item === void 0 || (_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.like_status,
+      note: (item === null || item === void 0 ? void 0 : item.note) || (item === null || item === void 0 || (_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.note),
+      like_status: item === null || item === void 0 || (_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.like_status,
       bundle: bundle,
       options: options,
       errorMessage: errorMessage,
-      product_option_string: item === null || item === void 0 || (_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 || (_item$_extend21 = _item$_extend21.other) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.product_option_string,
-      discount_reason: item === null || item === void 0 || (_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.discount_reason,
-      resource_id: isNormalProduct ? 0 : item === null || item === void 0 || (_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.resource,
+      product_option_string: item === null || item === void 0 || (_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 || (_item$_extend23 = _item$_extend23.other) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.product_option_string,
+      discount_reason: item === null || item === void 0 || (_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.discount_reason,
+      resource_id: isNormalProduct ? 0 : item === null || item === void 0 || (_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.resource,
       relation_form_name: isNormalProduct ? '' : ((_resourceItem = resourceItem) === null || _resourceItem === void 0 ? void 0 : _resourceItem.labelText) || item.relation_form_name,
       holder_title: clientTitle,
-      start_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.start_date : '',
-      end_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.end_date : '',
-      holder_id: (item === null || item === void 0 || (_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.holder_id) || 0,
+      start_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.start_date : '',
+      end_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.end_date : '',
+      holder_id: (item === null || item === void 0 || (_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.holder_id) || 0,
       isNormalProduct: isNormalProduct,
       isCustomItem: item === null || item === void 0 ? void 0 : item.isCustomItem,
       // 添加自定义商品标识
@@ -719,8 +723,8 @@ export var formatProducts = function formatProducts(lists, state) {
       // 是否适用优惠券/折扣
       locale: state.locale,
       symbol: state.amountSymbol,
-      relation_products: (item === null || item === void 0 || (_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.relation_details) || [],
-      items: isEventBooking(state) ? [] : formItems((item === null || item === void 0 || (_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.items) || [])
+      relation_products: (item === null || item === void 0 || (_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.relation_details) || [],
+      items: isEventBooking(state) ? [] : formItems((item === null || item === void 0 || (_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.items) || [])
     }, generalParams), {}, {
       _origin: item
     });
@@ -734,15 +738,15 @@ export var formatProducts = function formatProducts(lists, state) {
 
     // 将商品分为组商品和非组商品，并记录索引
     lists.forEach(function (item, index) {
-      var _item$_extend29;
-      if (!(item !== null && item !== void 0 && (_item$_extend29 = item._extend) !== null && _item$_extend29 !== void 0 && _item$_extend29.groupId)) {
+      var _item$_extend31;
+      if (!(item !== null && item !== void 0 && (_item$_extend31 = item._extend) !== null && _item$_extend31 !== void 0 && _item$_extend31.groupId)) {
         normalItemsWithIndex.push({
           item: item,
           index: index
         });
       } else {
-        var _item$_extend30;
-        var groupId = item === null || item === void 0 || (_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.groupId;
+        var _item$_extend32;
+        var groupId = item === null || item === void 0 || (_item$_extend32 = item._extend) === null || _item$_extend32 === void 0 ? void 0 : _item$_extend32.groupId;
         groupItemsWithIndex.push({
           item: item,
           index: index
@@ -756,9 +760,9 @@ export var formatProducts = function formatProducts(lists, state) {
 
     // 根据item._extend.groupId 进行分组
     var groups = groupItemsWithIndex.reduce(function (prev, _ref11) {
-      var _item$_extend31;
+      var _item$_extend33;
       var item = _ref11.item;
-      var groupId = item === null || item === void 0 || (_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.groupId;
+      var groupId = item === null || item === void 0 || (_item$_extend33 = item._extend) === null || _item$_extend33 === void 0 ? void 0 : _item$_extend33.groupId;
       if (!prev[groupId]) {
         prev[groupId] = [];
       }
@@ -955,8 +959,8 @@ export var isHasDayAppointmentProduct = function isHasDayAppointmentProduct(stat
       // 如果该购物车中没选择任何商品，则不需要验证，所以直接用1来填充
       // services: !holderProducts?.length ? [1] : holderProducts?.filter((d: any) => appointmentTypes.includes(d.extension_type))
       services: services.filter(function (item) {
-        var _item$_extend32;
-        return ((_item$_extend32 = item._extend) === null || _item$_extend32 === void 0 ? void 0 : _item$_extend32.holder_id) == d.form_record_id && checkType(item.extension_type);
+        var _item$_extend34;
+        return ((_item$_extend34 = item._extend) === null || _item$_extend34 === void 0 ? void 0 : _item$_extend34.holder_id) == d.form_record_id && checkType(item.extension_type);
       })
     });
   });

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

@@ -35,7 +35,7 @@ import { useIsActive } from "../../../ticketBooking/context/IsActiveContext";
 // 导出类型
 
 var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
-  var _context$appHelper, _state$client;
+  var _context$appHelper, _state$bookingConfig2, _state$client;
   var _ref$clientCardProps = _ref.clientCardProps,
     clientCardProps = _ref$clientCardProps === void 0 ? {} : _ref$clientCardProps,
     beforeSwitchModalOpen = _ref.beforeSwitchModalOpen,
@@ -70,6 +70,10 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
     closeScan = _useScanCustomer.closeScan;
   var context = useEngineContext();
   locales.init(localeTexts, ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.storage) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.get('umi_locale')) || 'en');
+  var boardConfig = useMemo(function () {
+    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.appointment_subject) || {};
+  }, [state === null || state === void 0 || (_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.config) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.basic]);
   var _useCustomer = useCustomer({}),
     customers = _useCustomer.customers,
     loading = _useCustomer.loading,
@@ -90,7 +94,7 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return initLoad(keyword);
+            return initLoad(keyword, boardConfig === null || boardConfig === void 0 ? void 0 : boardConfig.form_id);
           case 2:
             (_clientSearchRef$curr = clientSearchRef.current) === null || _clientSearchRef$curr === void 0 || (_clientSearchRef$curr2 = _clientSearchRef$curr.resetScrollPosition) === null || _clientSearchRef$curr2 === void 0 || _clientSearchRef$curr2.call(_clientSearchRef$curr);
           case 3:
@@ -106,13 +110,13 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
   // keyword 变动时触发
   var _debouncedSearch = useDebounceFn( /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_keyword) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_keyword, formId) {
       var _clientSearchRef$curr3, _clientSearchRef$curr4;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.next = 2;
-            return initLoad(keyword);
+            return initLoad(keyword, formId);
           case 2:
             (_clientSearchRef$curr3 = clientSearchRef.current) === null || _clientSearchRef$curr3 === void 0 || (_clientSearchRef$curr4 = _clientSearchRef$curr3.resetScrollPosition) === null || _clientSearchRef$curr4 === void 0 || _clientSearchRef$curr4.call(_clientSearchRef$curr3);
           case 3:
@@ -121,15 +125,15 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
         }
       }, _callee2);
     }));
-    return function (_x2) {
+    return function (_x2, _x3) {
       return _ref4.apply(this, arguments);
     };
   }(), {
     wait: 500
   });
   useEffect(function () {
-    _debouncedSearch.run(keyword);
-  }, [keyword]);
+    _debouncedSearch.run(keyword, boardConfig === null || boardConfig === void 0 ? void 0 : boardConfig.form_id);
+  }, [keyword, boardConfig === null || boardConfig === void 0 ? void 0 : boardConfig.form_id]);
   useEffect(function () {
     if (state.action) {
       state.action({
@@ -309,7 +313,7 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
         }
       }, _callee3, null, [[13, 21]]);
     }));
-    return function (_x3, _x4) {
+    return function (_x4, _x5) {
       return _ref5.apply(this, arguments);
     };
   }());
@@ -392,14 +396,16 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
       open: searchModalVisible,
       onCancel: handleModalCancel,
       // 同时存在两个搜索弹窗时，内部的无限滚动组件会发生冲突
-      destroyOnClose: true
+      destroyOnClose: true,
+      width: 880
     },
     isShowNewButton: false // 在模态框中隐藏新增按钮
     ,
     resultProps: resultProps,
     onAddClient: handleAddClientSuccess,
     onLoadMore: loadMore,
-    hasMore: hasMore
+    hasMore: hasMore,
+    state: state
   }), /*#__PURE__*/React.createElement(PisellModal, {
     className: "cart-client-card_switch-modal",
     open: switchModalVisible,

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

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

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

@@ -11,6 +11,7 @@ import { Context } from "../../../info/model";
 import { setProductPrice } from "../editService/utils";
 import { formatDataKey } from "../../../../ticketBooking/components/addServiceVariant/utils";
 import { getProductTotalPrice } from "../../../utils";
+import { cloneDeep } from 'lodash';
 var EditNormalService = /*#__PURE__*/forwardRef(function (props, ref) {
   var _ref = useContext(Context),
     state = _ref.state,
@@ -63,10 +64,10 @@ var EditNormalService = /*#__PURE__*/forwardRef(function (props, ref) {
     });
   });
   var handleConfirm = useMemoizedFn(function (data) {
-    var _ref3, _state$service2;
+    var _data8, _ref3, _state$service2;
     // create 模式：将结果回传给 addServiceVariant 的 callback，后续走原有 addService 流程
     if (createPayloadRef.current) {
-      var _data, _data2, _data3, _data4;
+      var _data, _data2, _data3, _data$_extend$origin_, _data4, _data5, _data6, _data7, _data$_extend;
       var payload = createPayloadRef.current;
       createPayloadRef.current = null;
       var skuValue = ((_data = data) === null || _data === void 0 || (_data = _data._extend) === null || _data === void 0 ? void 0 : _data.skuValue) || {
@@ -83,34 +84,36 @@ var EditNormalService = /*#__PURE__*/forwardRef(function (props, ref) {
         id: payload.productId,
         product_id: payload.productId,
         _extend: _objectSpread(_objectSpread({}, ((_data3 = data) === null || _data3 === void 0 ? void 0 : _data3._extend) || {}), {}, {
-          origin_total: (_data4 = data) === null || _data4 === void 0 || (_data4 = _data4._extend) === null || _data4 === void 0 ? void 0 : _data4.total,
-          quantity: quantity
-        }),
-        origin_total: data.total
+          origin_total: (_data$_extend$origin_ = (_data4 = data) === null || _data4 === void 0 || (_data4 = _data4._extend) === null || _data4 === void 0 ? void 0 : _data4.origin_total) !== null && _data$_extend$origin_ !== void 0 ? _data$_extend$origin_ : (_data5 = data) === null || _data5 === void 0 || (_data5 = _data5._extend) === null || _data5 === void 0 ? void 0 : _data5.total,
+          quantity: quantity,
+          skuValue: cloneDeep(((_data6 = data) === null || _data6 === void 0 || (_data6 = _data6._extend) === null || _data6 === void 0 ? void 0 : _data6.skuValue) || {})
+        })
       });
-      var e = {
-        product_id: payload.productId,
-        price: skuValue.price || 0,
-        product_variant_id: skuValue.product_variant_id || 0,
-        bundle: skuValue.bundle || [],
-        option: skuValue.option || [],
-        quantity: quantity
-      };
+      data._extend.total = getProductTotalPrice(data);
+      detail = setProductPrice(detail, {
+        newTotal: (_data7 = data) === null || _data7 === void 0 || (_data7 = _data7._extend) === null || _data7 === void 0 ? void 0 : _data7.total,
+        origin_total: (_data$_extend = data._extend) === null || _data$_extend === void 0 ? void 0 : _data$_extend.origin_total
+      });
+      var e = _objectSpread({}, detail._extend.other);
       e = formatDataKey(e);
       payload.callback(e, undefined, detail, false);
       return;
     }
+    console.log('handleConfirm', data, (_data8 = data) === null || _data8 === void 0 || (_data8 = _data8._extend) === null || _data8 === void 0 ? void 0 : _data8.origin_total);
     var newProducts = (_ref3 = (state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value) || []) === null || _ref3 === void 0 ? void 0 : _ref3.map(function (item) {
       if (item._id == data._id) {
-        var _data$_extend, _data$_extend2;
+        var _data$_extend$origin_2, _data$_extend2, _data9, _data$_extend3, _data$_extend4;
         var total = getProductTotalPrice(data);
         data._extend.total = total;
-        data._extend.origin_total = total;
+        data._extend.origin_total = (_data$_extend$origin_2 = (_data$_extend2 = data._extend) === null || _data$_extend2 === void 0 ? void 0 : _data$_extend2.origin_total) !== null && _data$_extend$origin_2 !== void 0 ? _data$_extend$origin_2 : total;
+        // 用于在购物车里唤醒 sku 弹窗时，复原商品的选择数据
+        // 因为下面 setProduct 可能会去修改option 之类的 price 字段，所以这里必须先 cloneDeep 一次，再次打开 SKU 弹窗时，应该使用没有修改的价格才对
+        data._extend._skuValue = cloneDeep(((_data9 = data) === null || _data9 === void 0 || (_data9 = _data9._extend) === null || _data9 === void 0 ? void 0 : _data9.skuValue) || {});
         data = setProductPrice(data, {
           newTotal: total,
-          origin_total: (_data$_extend = data._extend) === null || _data$_extend === void 0 ? void 0 : _data$_extend.origin_total
+          origin_total: (_data$_extend3 = data._extend) === null || _data$_extend3 === void 0 ? void 0 : _data$_extend3.origin_total
         });
-        data.note = (_data$_extend2 = data._extend) === null || _data$_extend2 === void 0 ? void 0 : _data$_extend2.note;
+        data.note = (_data$_extend4 = data._extend) === null || _data$_extend4 === void 0 ? void 0 : _data$_extend4.note;
         return data;
       }
       return item;

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

@@ -49,9 +49,11 @@ import BookingList from "../../../info/service/editService/BookingList";
 import dayjs from "dayjs";
 import { createBookingItemsByGroup, getGroupTotalPrice } from "../../../info/service2/Group/utils";
 import { getOpenNormalServiceHandler } from "../openNormalService";
+import Decimal from 'decimal.js';
+import useEngineContext from "../../../../../hooks/useEngineContext";
 var submitLock = false;
 var Info = function Info(_, ref) {
-  var _state$service4, _state$bookingConfig2, _state$bookingConfig3, _state$service$cacheI5, _state$service$cacheI7, _state$service6, _window$BaseMaterials, _state$service8, _state$service$cacheI12, _state$bookingConfig5, _state$service$cacheI13, _state$service$cacheI14, _state$service9, _state$service$resour2, _state$service$cacheI16, _state$service$cacheI18, _state$client2;
+  var _context$appHelper, _state$service4, _state$bookingConfig2, _state$bookingConfig3, _state$service$cacheI5, _state$service$cacheI7, _state$service6, _window$BaseMaterials, _state$service8, _state$service$cacheI12, _state$bookingConfig5, _state$service$cacheI13, _state$service$cacheI14, _state$service9, _state$service$resour2, _state$service$cacheI16, _state$service$cacheI18, _state$client2;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -86,6 +88,9 @@ var Info = function Info(_, ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     maskClosable = _useState8[0],
     setMaskClosable = _useState8[1];
+  var context = useEngineContext();
+  var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
+    getData = _context$appHelper$ut.getData;
   useEffect(function () {
     window.openBookingEditModal = function () {
       setOpen(true);
@@ -280,7 +285,9 @@ var Info = function Info(_, ref) {
       submitLock = false;
     }, 1500);
     var _list = _toConsumableArray(state.service.value);
-    var _item = _objectSpread(_objectSpread({}, state.service.cacheItem), {}, {
+    var _item = _objectSpread(_objectSpread({
+      is_price_include_tax: getData('is_price_include_tax')
+    }, state.service.cacheItem), {}, {
       autoClose: false
     });
     var _extend = _objectSpread(_objectSpread({}, _item._extend), {}, {
@@ -304,6 +311,30 @@ var Info = function Info(_, ref) {
       _extend.startDate = startDate;
       _extend.endDate = endDate;
     }
+    if (isChangeTotal.current) {
+      var _extend$other, _extend$other2;
+      // 计算折扣比例
+      var discountRatio = new Decimal(values.total).div(_item._extend.origin_total);
+
+      // 处理子商品
+      var _bundles = (_extend === null || _extend === void 0 || (_extend$other = _extend.other) === null || _extend$other === void 0 ? void 0 : _extend$other.bundle) || [];
+      var childProductsTotal = new Decimal(0);
+      if (_bundles.length > 0) {
+        _bundles.forEach(function (bundle) {
+          // 计算子商品折扣后的单价（保留两位小数）
+          var discountedPrice = new Decimal(bundle.original_price).mul(discountRatio).toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
+          bundle.bundle_selling_price = discountedPrice.toNumber();
+
+          // 累计子商品折扣后总价
+          childProductsTotal = childProductsTotal.add(discountedPrice.mul(bundle.quantity));
+        });
+      }
+
+      // 计算主商品折扣后的单价
+      var mainProductTotal = new Decimal(values.total).sub(childProductsTotal);
+      var mainProductQuantity = ((_extend$other2 = _extend.other) === null || _extend$other2 === void 0 ? void 0 : _extend$other2.quantity) || _extend.quantity || 1;
+      _extend.main_product_selling_price = mainProductTotal.div(mainProductQuantity).toNumber();
+    }
     if (_extend.bundle_edit !== undefined) {
       _extend.bundle_edit = 1;
     }

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

@@ -68,7 +68,7 @@ export var setAutoAllocationStorage = function setAutoAllocationStorage(data) {
  * @param origin_total - 原始总价
  */
 export var setProductPrice = function setProductPrice(cacheItem, _ref2) {
-  var _cacheItem$_extend$ot, _cacheItem$_extend$ot2, _cacheItem$_extend$ot4, _cacheItem$_extend$ot5, _cacheItem$_extend;
+  var _cacheItem$_extend$ot, _cacheItem$_extend$ot2, _cacheItem$_extend$ot4, _cacheItem$_extend$ot5, _cacheItem$_extend, _cacheItem$_extend2;
   var newTotal = _ref2.newTotal,
     origin_total = _ref2.origin_total;
   // 计算折扣比例
@@ -102,7 +102,7 @@ export var setProductPrice = function setProductPrice(cacheItem, _ref2) {
     (_cacheItem$_extend$ot6 = cacheItem._extend.other) === null || _cacheItem$_extend$ot6 === void 0 || (_cacheItem$_extend$ot6 = _cacheItem$_extend$ot6.option) === null || _cacheItem$_extend$ot6 === void 0 || _cacheItem$_extend$ot6.forEach(function (option) {
       var _ref4, _option$num;
       // 计算新价格，直接截取两位小数（不四舍五入）
-      var newPrice = new Decimal(option.price).mul(discountRatio).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
+      var newPrice = new Decimal(option.original_price || option.price).mul(discountRatio).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
 
       // 获取数量，优先取 num，再取 quantity，默认为 1
       var quantity = (_ref4 = (_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity) !== null && _ref4 !== void 0 ? _ref4 : 1;
@@ -117,10 +117,14 @@ export var setProductPrice = function setProductPrice(cacheItem, _ref2) {
 
   // 主商品价格 = newTotal - 子商品总价（让主商品吸收精度误差，确保总价精确）
   cacheItem._extend.price = new Decimal(newTotal).sub(subTotal).toNumber();
+  // 如果有 variant_id,则修改 other 下的价格
+  if ((_cacheItem$_extend = cacheItem._extend) !== null && _cacheItem$_extend !== void 0 && (_cacheItem$_extend = _cacheItem$_extend.other) !== null && _cacheItem$_extend !== void 0 && _cacheItem$_extend.product_variant_id) {
+    cacheItem._extend.other.price = cacheItem._extend.price;
+  }
   // 如果有 priceOverride，则强制使用 priceOverride，不受规则约束
-  if ((_cacheItem$_extend = cacheItem._extend) !== null && _cacheItem$_extend !== void 0 && _cacheItem$_extend.priceOverride) {
-    var _cacheItem$_extend2;
-    cacheItem._extend.total = new Decimal(((_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.priceOverride) || 0).toNumber();
+  if ((_cacheItem$_extend2 = cacheItem._extend) !== null && _cacheItem$_extend2 !== void 0 && _cacheItem$_extend2.priceOverride) {
+    var _cacheItem$_extend3;
+    cacheItem._extend.total = new Decimal(((_cacheItem$_extend3 = cacheItem._extend) === null || _cacheItem$_extend3 === void 0 ? void 0 : _cacheItem$_extend3.priceOverride) || 0).toNumber();
   }
   return cacheItem;
 };

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

@@ -301,6 +301,7 @@ declare const _default: {
         'pisell2.text.goodpass.enter-code': string;
         'pisell2.text.goodpass.code-invalid': string;
         'pisell2.text.goodpass.code-invalid-cart': string;
+        'pisell2.text.goodpass.code-invalid-expired': string;
         'pisell2.text.status.valid': string;
         'pisell2.text.status.expired': string;
         'pisell2.text.validity.expired': (str: string) => string;
@@ -617,6 +618,7 @@ declare const _default: {
         'pisell2.text.goodpass.enter-code': string;
         'pisell2.text.goodpass.code-invalid': string;
         'pisell2.text.goodpass.code-invalid-cart': string;
+        'pisell2.text.goodpass.code-invalid-expired': string;
         'pisell2.text.status.valid': string;
         'pisell2.text.status.expired': string;
         'pisell2.text.validity.expired': (str: string) => string;
@@ -933,6 +935,7 @@ declare const _default: {
         'pisell2.text.goodpass.enter-code': string;
         'pisell2.text.goodpass.code-invalid': string;
         'pisell2.text.goodpass.code-invalid-cart': string;
+        'pisell2.text.goodpass.code-invalid-expired': string;
         'pisell2.text.status.valid': string;
         'pisell2.text.status.expired': string;
         'pisell2.text.validity.expired': (str: string) => string;

package/es/components/booking/locales.js

@@ -349,6 +349,7 @@ export default {
     '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.goodpass.code-invalid-expired': "Current coupon is not valid in use",
     'pisell2.text.status.valid': 'Valid',
     'pisell2.text.status.expired': 'Expired',
     'pisell2.text.validity.expired': function pisell2TextValidityExpired(str) {
@@ -367,7 +368,7 @@ export default {
     'pisell2.text.form.link.to.another.record.more': 'View More',
     // 联系信息
     'pisell2.booking.text.contact-info.title': 'Contact info',
-    'pisell2.booking.text.search-placeholder': 'Search Customers / Contacts',
+    'pisell2.booking.text.search-placeholder': 'Customers / Contacts / Holder',
     'pisell-select-holder-please-select': 'Please Select',
     'pisell-select-holder-selected': 'Selected: '
   },
@@ -725,6 +726,7 @@ export default {
     'pisell2.text.goodpass.enter-code': "请输入券码",
     'pisell2.text.goodpass.code-invalid': "当前券码不可用",
     'pisell2.text.goodpass.code-invalid-cart': "当前购物车中无可用商品",
+    'pisell2.text.goodpass.code-invalid-expired': "当前优惠券不在使用期限内",
     'pisell2.text.status.valid': '有效',
     'pisell2.text.status.expired': '已过期',
     'pisell2.text.validity.expired': function pisell2TextValidityExpired(str) {
@@ -743,7 +745,7 @@ export default {
     'pisell2.text.form.link.to.another.record.more': '查看更多',
     // 联系信息
     'pisell2.booking.text.contact-info.title': '联系信息',
-    'pisell2.booking.text.search-placeholder': '搜索客户/联系信息',
+    'pisell2.booking.text.search-placeholder': '搜索客户/联系信息/持有人',
     'pisell-select-holder-please-select': '请选择',
     'pisell-select-holder-selected': '已选择：'
   },
@@ -1101,6 +1103,7 @@ export default {
     'pisell2.text.goodpass.enter-code': "請輸入券碼",
     'pisell2.text.goodpass.code-invalid': "當前券碼不可用",
     'pisell2.text.goodpass.code-invalid-cart': "當前購物車中無可用商品",
+    'pisell2.text.goodpass.code-invalid-expired': "當前優惠券不在使用期限內",
     'pisell2.text.status.valid': '有效',
     'pisell2.text.status.expired': '已過期',
     'pisell2.text.validity.expired': function pisell2TextValidityExpired(str) {
@@ -1119,7 +1122,7 @@ export default {
     'pisell2.text.form.link.to.another.record.more': '查看更多',
     // 联系信息
     'pisell2.booking.text.contact-info.title': '聯繫信息',
-    'pisell2.booking.text.search-placeholder': '搜索客戶/聯系信息',
+    'pisell2.booking.text.search-placeholder': '搜索客戶/聯系信息/持有人',
     'pisell-select-holder-please-select': '請選擇',
     'pisell-select-holder-selected': '已選擇：'
   }

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -111,11 +110,4 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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

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

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

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