@pisell/private-materials 6.6.52 → 6.6.54

package/es/components/appointmentBooking/components/Voucher/index.js

@@ -28,8 +28,6 @@ import { PisellInput, PisellGoodPassCard, PisellText, PisellToast } from '@pisel
 import { useAppointmentBooking, useShopDiscount, useAppointmentBookingLogin, useAppointmentBookingAccount } from "../../hooks";
 import "../../../booking/components/voucher/index.less";
 import "./index.less";
-import { useAppointmentBookingContext } from "../../context";
-import { useDebounceFn } from 'ahooks';
 var ShopDiscountHooks = {
   onInited: 'shopDiscount:onInited',
   onDestroy: 'shopDiscount:onDestroy',
@@ -71,19 +69,11 @@ var VoucherCard = function VoucherCard(props) {
     openLoginModal = _useAppointmentBookin.openLoginModal;
   var _useAppointmentBookin2 = useAppointmentBookingAccount(),
     accountLists = _useAppointmentBookin2.accountLists;
-  var _useAppointmentBookin3 = useAppointmentBookingContext(),
-    summary = _useAppointmentBookin3.summary;
-  var originTotal = summary.originTotal,
-    total = summary.total;
   var cart = appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$s = appointmentBooking.store) === null || _appointmentBooking$s === void 0 ? void 0 : _appointmentBooking$s.cart;
   var isUserLoggedIn = useMemo(function () {
     var _utils$token, _utils$token$get;
     return !!(utils !== null && utils !== void 0 && (_utils$token = utils.token) !== null && _utils$token !== void 0 && (_utils$token$get = _utils$token.get) !== null && _utils$token$get !== void 0 && _utils$token$get.call(_utils$token)) || false;
   }, [store]);
-  useEffect(function () {
-    var shopDiscount = pisellos.getModule('shopDiscount');
-    shopDiscount.setOriginTotalAmount(originTotal);
-  }, [originTotal]);
   var availableData = useMemo(function () {
     return discountList.filter(function (item) {
       return !!item.isAvailable;
@@ -120,18 +110,13 @@ var VoucherCard = function VoucherCard(props) {
     });
     appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$b = appointmentBooking.batchUpdateCart) === null || _appointmentBooking$b === void 0 || _appointmentBooking$b.call(appointmentBooking, items);
   };
-
-  // 防抖处理
-  var _useDebounceFn = useDebounceFn(function () {
-      var _shopDiscount$setBook, _appointmentBooking$o;
-      var products = cart === null || cart === void 0 ? void 0 : cart.getItems();
-      shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$setBook = shopDiscount.setBookingSubject) === null || _shopDiscount$setBook === void 0 || _shopDiscount$setBook.call(shopDiscount, appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o = appointmentBooking.otherParams) === null || _appointmentBooking$o === void 0 || (_appointmentBooking$o = _appointmentBooking$o.bookingSetting) === null || _appointmentBooking$o === void 0 ? void 0 : _appointmentBooking$o.bookingSubject);
-      var val = shopDiscount.calcDiscount(products);
-      batchUpdateCart(val.productList);
-    }, {
-      wait: 200
-    }),
-    onCartChange = _useDebounceFn.run;
+  var onCartChange = function onCartChange() {
+    var _shopDiscount$setBook, _appointmentBooking$o;
+    var products = cart === null || cart === void 0 ? void 0 : cart.getItems();
+    shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$setBook = shopDiscount.setBookingSubject) === null || _shopDiscount$setBook === void 0 || _shopDiscount$setBook.call(shopDiscount, appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o = appointmentBooking.otherParams) === null || _appointmentBooking$o === void 0 || (_appointmentBooking$o = _appointmentBooking$o.bookingSetting) === null || _appointmentBooking$o === void 0 ? void 0 : _appointmentBooking$o.bookingSubject);
+    var val = shopDiscount.calcDiscount(products);
+    batchUpdateCart(val.productList);
+  };
   var stringifiedHolders = useMemo(function () {
     var _ret;
     try {

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

@@ -60,15 +60,14 @@ export var formatProducts = function formatProducts(values) {
       discountway: 'num',
       discount_type: 'discount',
       bundle_edit: (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.bundle_edit,
-      product_bundle: formatProductBundle((_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 || (_item$_extend3 = _item$_extend3.other) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.bundle, item.is_price_include_tax),
+      product_bundle: formatProductBundle((_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 || (_item$_extend3 = _item$_extend3.other) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.bundle),
       "product_option_item": formatProductOption((_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 || (_item$_extend4 = _item$_extend4.other) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.option),
       "product_variant_id": ((_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 || (_item$_extend5 = _item$_extend5.other) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.product_variant_id) || 0,
       "source_product_price": getSourceProductPrice(item),
       "main_product_selling_price": (_getMainProductSellin = getMainProductSellingPrice(item)) !== null && _getMainProductSellin !== void 0 ? _getMainProductSellin : formatProductPrice(item),
       "calculated_original_price": formatOriginalPrice(item),
       "calculated_selling_price": formatSellingPrice(item),
-      "tax_fee": item._extend.tax_fee,
-      is_price_include_tax: item.is_price_include_tax
+      "tax_fee": item._extend.tax_fee
     };
   });
   return arr;

package/es/components/booking/components/footer/amount.js

@@ -519,7 +519,8 @@ var processItemsTax = function processItemsTax(items, state, options) {
   }
   return {
     originTax: expectedOriginTax,
-    tax: expectedTax
+    tax: expectedTax,
+    taxDecimal: preciseTax
   };
 };
 
@@ -651,7 +652,7 @@ var getTax = function getTax(state, options) {
         computed: computed
       });
       totalOriginTax = totalOriginTax.plus(serviceResult.originTax);
-      totalTax = totalTax.plus(serviceResult.tax);
+      totalTax = totalTax.plus(serviceResult.taxDecimal);
     }
 
     // 处理附加商品
@@ -662,7 +663,7 @@ var getTax = function getTax(state, options) {
         computed: computed
       });
       totalOriginTax = totalOriginTax.plus(addonsResult.originTax);
-      totalTax = totalTax.plus(addonsResult.tax);
+      totalTax = totalTax.plus(addonsResult.taxDecimal);
     }
   }
   return {
@@ -843,7 +844,7 @@ var getMainProductTotal = function getMainProductTotal(item) {
         // 子商品价格
         var bundleItemPrice = new Decimal((_ref5 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref5 !== void 0 ? _ref5 : 0);
         // todo: 套餐子商品后不需要处理 子商品价格 - 子商品折扣金额
-        var bundleItemTotal = bundleItemPrice;
+        var bundleItemTotal = bundleItemPrice.minus(discountAmount);
         total = total.add(bundleItemTotal);
       }
     }

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

@@ -338,13 +338,6 @@ var Footer = function Footer(props) {
       ScheduleModule: ScheduleModule
     }, getDataFromHost()));
   }, [state, isEdit]);
-  useEffect(function () {
-    window.dispatchEvent(new CustomEvent('onOriginExpectAmountWithoutDiscountChange', {
-      detail: {
-        originExpectAmountWithoutDiscount: total === null || total === void 0 ? void 0 : total.originExpectAmountWithoutDiscount
-      }
-    }));
-  }, [total === null || total === void 0 ? void 0 : total.originExpectAmountWithoutDiscount]);
   useDebounceEffect(function () {
     var _state$service4;
     if (state !== null && state !== void 0 && (_state$service4 = state.service) !== null && _state$service4 !== void 0 && _state$service4.addTimeModal) {

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

@@ -15,7 +15,7 @@ export declare const formatProductOption: (option: any) => any;
  * @Author: zhiwei.Wang
  * @Date: 2024-02-19 09:26
  */
-export declare const formatProductBundle: (bundle: any, is_price_include_tax: number) => any;
+export declare const formatProductBundle: (bundle: any) => any;
 /**
  * 获取子商品折扣信息
  * @param item

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

@@ -93,7 +93,7 @@ var log = function log(data) {
  * @Author: zhiwei.Wang
  * @Date: 2024-02-19 09:26
  */
-export var formatProductBundle = function formatProductBundle(bundle, is_price_include_tax) {
+export var formatProductBundle = function formatProductBundle(bundle) {
   if (!bundle) {
     return;
   }
@@ -108,6 +108,7 @@ export var formatProductBundle = function formatProductBundle(bundle, is_price_i
     }
   } catch (error) {}
   return bundle.map(function (d) {
+    var _d$metadata;
     var option = formatProductOption(d.option);
     var option_price = option.reduce(function (temp, item) {
       return temp + Number(item.num) * item.custom_add_price;
@@ -134,9 +135,8 @@ export var formatProductBundle = function formatProductBundle(bundle, is_price_i
       "option": option,
       "bundle_selling_price": Math.abs(d === null || d === void 0 ? void 0 : d.price),
       // "bundle_sum_price": d?.original_price || d?.original_total,
-      is_price_include_tax: is_price_include_tax,
       "metadata": {
-        custom_product_bundle_map_id: d._id,
+        custom_product_bundle_map_id: (d === null || d === void 0 || (_d$metadata = d.metadata) === null || _d$metadata === void 0 ? void 0 : _d$metadata.custom_product_bundle_map_id) || d._id,
         // 子商品单数量附加费
         "surcharge_fee": d.surcharge_fee,
         // 可选，附加费均摊舍入金额
@@ -324,8 +324,8 @@ export var formatOriginalPrice = function formatOriginalPrice(item) {
 
 /**
  * 获取套餐子商品折扣差价
- * @param item
- * @returns
+ * @param item 
+ * @returns 
  */
 var getBundleProductDiscountDifference = function getBundleProductDiscountDifference(item) {
   var _item$_extend9, _item$_extend10, _item$_extend11;
@@ -478,7 +478,7 @@ export var getMainProductSellingPrice = function getMainProductSellingPrice(item
  * @Author: WangHan
  * @Date: 2024-12-07 14:21
  */
-var formatProducts = function formatProducts(item, quantity) {
+var formatProducts = function formatProducts(item, quantity, options) {
   var _item$_extend36, _getMainProductSellin, _item$_extend37, _item$_extend38, _item$_extend39, _item$_extend40;
   var total = Number(item._extend.total);
   var origin_total = Number(item._extend.origin_total);
@@ -493,6 +493,9 @@ var formatProducts = function formatProducts(item, quantity) {
     d.metadata = _objectSpread(_objectSpread({}, d.metadata), {}, {
       unique_identification_number: "".concat(item._extend.unique_identification_number, "_").concat(d.discount.resource_id)
     });
+    if (options !== null && options !== void 0 && options.isServiceEdit && options !== null && options !== void 0 && options.isMultiDay) {
+      delete d.id;
+    }
   });
 
   // 非手动折扣
@@ -517,7 +520,7 @@ var formatProducts = function formatProducts(item, quantity) {
     "discount_per": item._extend.discount_per,
     "discount_type": item._extend.discount_type || discount_type,
     "order_detail_id": item._extend.order_detail_id || 0,
-    "product_bundle": formatProductBundle((_item$_extend38 = item._extend) === null || _item$_extend38 === void 0 || (_item$_extend38 = _item$_extend38.other) === null || _item$_extend38 === void 0 ? void 0 : _item$_extend38.bundle, item.is_price_include_tax),
+    "product_bundle": formatProductBundle((_item$_extend38 = item._extend) === null || _item$_extend38 === void 0 || (_item$_extend38 = _item$_extend38.other) === null || _item$_extend38 === void 0 ? void 0 : _item$_extend38.bundle),
     "bundle_edit": item._extend.bundle_edit || bundleDiscountList.length ? 1 : 0,
     "product_option_item": formatProductOption((_item$_extend39 = item._extend) === null || _item$_extend39 === void 0 || (_item$_extend39 = _item$_extend39.other) === null || _item$_extend39 === void 0 ? void 0 : _item$_extend39.option),
     "product_variant_id": ((_item$_extend40 = item._extend) === null || _item$_extend40 === void 0 || (_item$_extend40 = _item$_extend40.other) === null || _item$_extend40 === void 0 ? void 0 : _item$_extend40.product_variant_id) || 0,
@@ -527,8 +530,7 @@ var formatProducts = function formatProducts(item, quantity) {
     "calculated_original_price": formatOriginalPrice(item),
     "calculated_selling_price": formatSellingPrice(item),
     "tax_fee": item._extend.tax_fee,
-    "custom_deposit_data": item.custom_deposit_data,
-    is_price_include_tax: item.is_price_include_tax
+    "custom_deposit_data": item.custom_deposit_data
   };
 };
 
@@ -716,7 +718,10 @@ var formatBookings = function formatBookings(data, values) {
       item._extend.unique_identification_number = unique_identification_number;
     }
     var booking = _objectSpread(_objectSpread({
-      product: formatProducts(item),
+      product: formatProducts(item, undefined, {
+        isServiceEdit: data.service.edit,
+        isMultiDay: isMultiDay
+      }),
       relation_products: formatRelationDetails(item._extend.relation_details),
       id: item.booking_id || 0,
       relation_id: item._extend.relation_id || 0,

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

@@ -128,7 +128,7 @@ var VoucherCard = function VoucherCard(props) {
     var val = (_ref = state.service.value || []) === null || _ref === void 0 ? void 0 : _ref.map(function (value) {
       var _value$_extend, _value$_extend2, _value$_extend3;
       return {
-        booking_id: value.booking_id,
+        // booking_id: value.booking_id,
         id: value.id,
         price: value.price,
         total: value === null || value === void 0 || (_value$_extend = value._extend) === null || _value$_extend === void 0 ? void 0 : _value$_extend.total,
@@ -152,17 +152,11 @@ var VoucherCard = function VoucherCard(props) {
     }
     onScanCode(e.detail.code);
   });
-  var onOriginExpectAmountWithoutDiscountChange = useMemoizedFn(function (e) {
-    var _shopDiscount$setOrig;
-    shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$setOrig = shopDiscount.setOriginTotalAmount) === null || _shopDiscount$setOrig === void 0 || _shopDiscount$setOrig.call(shopDiscount, e.detail.originExpectAmountWithoutDiscount);
-  });
   useEffect(function () {
     var wrappedOnScanWallPassCode = executeIfActive(onScanWallPassCode);
     window.addEventListener('onScanWallPassCode', wrappedOnScanWallPassCode);
-    window.addEventListener('onOriginExpectAmountWithoutDiscountChange', onOriginExpectAmountWithoutDiscountChange);
     return function () {
       window.removeEventListener('onScanWallPassCode', wrappedOnScanWallPassCode);
-      window.removeEventListener('onOriginExpectAmountWithoutDiscountChange', onOriginExpectAmountWithoutDiscountChange);
     };
   }, []);
   var addonsMemo = useMemo(function () {

package/es/components/booking/components/voucher/index.less

@@ -1,8 +1,5 @@
 .pisell-lowcode__booking-footer-voucher-container {
   margin-bottom: 8px;
-  width: 100%;
-  display: flex;
-  flex-direction: column;
   .voucher-title {
     display: flex;
     align-items: center;
@@ -50,9 +47,9 @@
     width: 100%;
     transition: 0.2s;
     max-height: 0;
+    overflow: hidden;
     display: flex;
     flex-direction: column;
-    overflow: auto;
 
     &.show {
       max-height: unset;

package/es/components/booking/components/voucherModal/index.less

@@ -6,7 +6,6 @@
   .pisell-voucher-modal-content {
     max-height: 70vh;
     overflow-y: auto;
-    display: flex;
   }
 
   // 隐藏状态下的样式优化

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

@@ -215,12 +215,14 @@ export var handleChangeHolder = function handleChangeHolder(products, currentIte
 var handleAddHolder = function handleAddHolder() {};
 var handleLike = function handleLike(products, currentItem, other) {
   return products.map(function (item) {
+    var _item$_extend3, _item$_extend4;
+    var isSameGroup = (item === null || item === void 0 || (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.groupId) && ((_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.groupId) === (currentItem === null || currentItem === void 0 ? void 0 : currentItem.serviceId);
     if (currentItem.isParallelResource) {
-      if (item._id === currentItem.serviceId) {
-        var _item$_extend3, _item$_extend4;
+      if (item._id === currentItem.serviceId || isSameGroup) {
+        var _item$_extend5, _item$_extend6;
         return _objectSpread(_objectSpread({}, item), {}, {
           _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
-            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) {
+            resource: _objectSpread(_objectSpread({}, (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.resource), {}, _defineProperty({}, currentItem.resourceId, (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.resource[currentItem.resourceId].map(function (item) {
               return _objectSpread(_objectSpread({}, item), {}, {
                 like_status: other.like_status
               });
@@ -230,7 +232,7 @@ var handleLike = function handleLike(products, currentItem, other) {
       }
       return item;
     } else {
-      if (item._id === currentItem._id) {
+      if (item._id === currentItem._id || isSameGroup) {
         return _objectSpread(_objectSpread({}, item), {}, {
           _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
             like_status: other.like_status
@@ -245,14 +247,16 @@ var handleLike = function handleLike(products, currentItem, other) {
 // 更新资源
 var handleChangeResource = function handleChangeResource(products, currentItem, other, state) {
   return products.map(function (item) {
+    var _item$_extend7, _item$_extend8, _currentItem$_origin2;
     var _ref = other || {},
       props = _ref.props,
       value = _ref.value;
     var _ref2 = props || {},
       isParallelResource = _ref2.isParallelResource,
       resourceId = _ref2.resourceId;
+    var isSameGroup = (item === null || item === void 0 || (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.groupId) && ((_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.groupId) === (currentItem === null || currentItem === void 0 || (_currentItem$_origin2 = currentItem._origin) === null || _currentItem$_origin2 === void 0 || (_currentItem$_origin2 = _currentItem$_origin2._extend) === null || _currentItem$_origin2 === void 0 ? void 0 : _currentItem$_origin2.groupId);
     if (isParallelResource) {
-      if (item._id === currentItem._id) {
+      if (item._id === currentItem._id || isSameGroup) {
         var hasDataItem = getProductExtend({
           cacheItem: _objectSpread(_objectSpread({}, item), {}, {
             new: 0
@@ -286,7 +290,7 @@ var handleChangeResource = function handleChangeResource(products, currentItem,
       }
       return item;
     } else {
-      if (item._id === currentItem._id) {
+      if (item._id === currentItem._id || isSameGroup) {
         var _resourceItem$_extend;
         var resourceItem = currentResource(state, other.id, item);
         var _ref3 = (resourceItem === null || resourceItem === void 0 || (_resourceItem$_extend = resourceItem._extend) === null || _resourceItem$_extend === void 0 ? void 0 : _resourceItem$_extend.usableTime) || {},
@@ -345,8 +349,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$_extend5;
-      return (item === null || item === void 0 || (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.holder_id) !== other;
+      var _item$_extend9;
+      return (item === null || item === void 0 || (_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.holder_id) !== other;
     });
   }
 
@@ -560,7 +564,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$_extend7, _item$_extend8, _item$_extend9, _item$_extend10, _item$_extend11;
+  var _state$bookingConfig4, _state$bookingConfig5, _formData$, _item$_extend11, _item$_extend12, _item$_extend13, _item$_extend14, _item$_extend15;
   var pet = state.pet,
     service = state.service;
   var _ref8 = pet || {},
@@ -603,7 +607,7 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
       };
     });
   } else {
-    var _item$_extend6;
+    var _item$_extend10;
     var _ref10 = service || {},
       resourcesOrigin = _ref10.resourcesOrigin;
     var resource = formatResources({
@@ -614,7 +618,7 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
     multiResources = [{
       _id: item._id,
       id: item._extend.resource,
-      status: ((_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.like_status) || 'common',
+      status: ((_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.like_status) || 'common',
       lists: mapListItems(resource)
     }];
   }
@@ -639,10 +643,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$_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)
+    holder_id: item === null || item === void 0 || (_item$_extend11 = item._extend) === null || _item$_extend11 === void 0 ? void 0 : _item$_extend11.holder_id,
+    start_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.startDate : "",
+    end_date: !isNormalProduct ? (item === null || item === void 0 || (_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.endDate) || (item === null || item === void 0 || (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.end_date) : "",
+    rowKey: genRowKey(item === null || item === void 0 || (_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 || (_item$_extend15 = _item$_extend15.other) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.rowKey)
   }, parallelResourceOtherParams);
 };
 var calcAddTimeTotalPrice = function calcAddTimeTotalPrice(total, addTimeProducts) {
@@ -663,18 +667,18 @@ 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$_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 _item$_extend16, _item$_extend17, _item$_extend18, _item$_extend20, _item$_extend21, _item$_extend22, _item$_extend23, _item$_extend24, _item$_extend25, _item$_extend26, _item$_extend27, _item$_extend28, _item$_extend29, _resourceItem, _item$_extend30, _item$_extend31, _item$_extend32, _item$_extend33, _item$_extend34;
     var _isDayBookingProduct = isDayBookingProduct(item, state);
-    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 clientTitle = getHolderName(state, item === null || item === void 0 || (_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.holder_id);
+    var options = formatOptions(item === null || item === void 0 || (_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 || (_item$_extend17 = _item$_extend17.other) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.option);
+    var bundle = formatBundle(item === null || item === void 0 || (_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 || (_item$_extend18 = _item$_extend18.other) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.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 resourceItem = {};
     var errorMessage = '';
     if (_isDayBookingProduct || isGeneral) {
-      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);
+      var _item$_extend19;
+      resourceItem = getResourceItem(item === null || item === void 0 || (_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.resource, state);
       errorMessage = getErrorMessage(item, resourceItem, isDayBooking(state));
     }
     var generalParams = isGeneral ? getGeneralParams(item, state, !!isParallelResource) : {};
@@ -684,26 +688,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$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.price,
+      price: item === null || item === void 0 || (_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.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),
+      total: calcAddTimeTotalPrice(item === null || item === void 0 || (_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.total, item === null || item === void 0 || (_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.relation_details),
+      origin_total: calcAddTimeTotalPrice(item === null || item === void 0 || (_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.origin_total, item === null || item === void 0 || (_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.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$_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,
+      note: (item === null || item === void 0 ? void 0 : item.note) || (item === null || item === void 0 || (_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.note),
+      like_status: item === null || item === void 0 || (_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.like_status,
       bundle: bundle,
       options: options,
       errorMessage: errorMessage,
-      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,
+      product_option_string: item === null || item === void 0 || (_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 || (_item$_extend27 = _item$_extend27.other) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.product_option_string,
+      discount_reason: item === null || item === void 0 || (_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.discount_reason,
+      resource_id: isNormalProduct ? 0 : item === null || item === void 0 || (_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.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$_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,
+      start_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.start_date : '',
+      end_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.end_date : '',
+      holder_id: (item === null || item === void 0 || (_item$_extend32 = item._extend) === null || _item$_extend32 === void 0 ? void 0 : _item$_extend32.holder_id) || 0,
       isNormalProduct: isNormalProduct,
       isCustomItem: item === null || item === void 0 ? void 0 : item.isCustomItem,
       // 添加自定义商品标识
@@ -711,8 +715,8 @@ export var formatProducts = function formatProducts(lists, state) {
       // 是否适用优惠券/折扣
       locale: state.locale,
       symbol: state.amountSymbol,
-      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) || [])
+      relation_products: (item === null || item === void 0 || (_item$_extend33 = item._extend) === null || _item$_extend33 === void 0 ? void 0 : _item$_extend33.relation_details) || [],
+      items: isEventBooking(state) ? [] : formItems((item === null || item === void 0 || (_item$_extend34 = item._extend) === null || _item$_extend34 === void 0 ? void 0 : _item$_extend34.items) || [])
     }, generalParams), {}, {
       _origin: item
     });
@@ -726,15 +730,15 @@ export var formatProducts = function formatProducts(lists, state) {
 
     // 将商品分为组商品和非组商品，并记录索引
     lists.forEach(function (item, index) {
-      var _item$_extend31;
-      if (!(item !== null && item !== void 0 && (_item$_extend31 = item._extend) !== null && _item$_extend31 !== void 0 && _item$_extend31.groupId)) {
+      var _item$_extend35;
+      if (!(item !== null && item !== void 0 && (_item$_extend35 = item._extend) !== null && _item$_extend35 !== void 0 && _item$_extend35.groupId)) {
         normalItemsWithIndex.push({
           item: item,
           index: index
         });
       } else {
-        var _item$_extend32;
-        var groupId = item === null || item === void 0 || (_item$_extend32 = item._extend) === null || _item$_extend32 === void 0 ? void 0 : _item$_extend32.groupId;
+        var _item$_extend36;
+        var groupId = item === null || item === void 0 || (_item$_extend36 = item._extend) === null || _item$_extend36 === void 0 ? void 0 : _item$_extend36.groupId;
         groupItemsWithIndex.push({
           item: item,
           index: index
@@ -748,9 +752,9 @@ export var formatProducts = function formatProducts(lists, state) {
 
     // 根据item._extend.groupId 进行分组
     var groups = groupItemsWithIndex.reduce(function (prev, _ref11) {
-      var _item$_extend33;
+      var _item$_extend37;
       var item = _ref11.item;
-      var groupId = item === null || item === void 0 || (_item$_extend33 = item._extend) === null || _item$_extend33 === void 0 ? void 0 : _item$_extend33.groupId;
+      var groupId = item === null || item === void 0 || (_item$_extend37 = item._extend) === null || _item$_extend37 === void 0 ? void 0 : _item$_extend37.groupId;
       if (!prev[groupId]) {
         prev[groupId] = [];
       }
@@ -947,8 +951,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$_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);
+        var _item$_extend38;
+        return ((_item$_extend38 = item._extend) === null || _item$_extend38 === void 0 ? void 0 : _item$_extend38.holder_id) == d.form_record_id && checkType(item.extension_type);
       })
     });
   });

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

@@ -41,20 +41,19 @@ import { editSessionProduct } from "../../../info/utils";
 import { deleteCacheParams, getDays, getProductOriginTotalPrice, getProductTotalPrice, getServiceTimes, isSessionProduct, isWalkIn } from "../../../utils";
 import { getErrorList, getIsNoSpecAndPackage } from "../../utilsByBooking";
 import { formatResources, getDurationProps, getFlexibleOption, getMultiDay, getTimeObj, setDefaultCapacitys } from "../addService/utils";
-import { getProductAllDiscountList, mergeBundleWithOriginalPrice, setProductPrice } from "./utils";
+import { getProductAllDiscountList, mergeBundles, setProductPrice, mergeBundleWithOriginalPrice } from "./utils";
 import NoteModal from "../../../../../plus/noteModal";
 import { DiscountKeyboard } from "../../../../../pro/priceKeyboard";
 import EditTabs from "../../../info/service/editService/EditTabs";
 import BookingList from "../../../info/service/editService/BookingList";
 import dayjs from "dayjs";
 import { createBookingItemsByGroup, getGroupTotalPrice } from "../../../info/service2/Group/utils";
-import useEngineContext from "../../../../../hooks/useEngineContext";
 import { useShopDiscountModule } from "../../../../ticketBooking/hooks/pisellos/useShopDiscountModule";
 import DiscountChangeModal from "./DiscountChangeModal";
 import Decimal from "decimal.js";
 var submitLock = false;
 var Info = function Info(_, ref) {
-  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$cacheI17, _state$client2;
+  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$cacheI17, _state$client2;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -90,9 +89,6 @@ var Info = function Info(_, ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     currentTab = _useState8[0],
     setCurrentTab = _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;
   var valuesRef = useRef({});
   var noInOriginalDiscountIdsRef = useRef([]);
 
@@ -327,9 +323,7 @@ var Info = function Info(_, ref) {
       submitLock = false;
     }, 1500);
     var _list = _toConsumableArray(state.service.value);
-    var _item = _objectSpread(_objectSpread({
-      is_price_include_tax: getData('is_price_include_tax')
-    }, cacheItem !== null && cacheItem !== void 0 ? cacheItem : state.service.cacheItem), {}, {
+    var _item = _objectSpread(_objectSpread({}, cacheItem !== null && cacheItem !== void 0 ? cacheItem : state.service.cacheItem), {}, {
       autoClose: false
     });
     var _extend = _objectSpread(_objectSpread({}, _item._extend), {}, {
@@ -693,7 +687,9 @@ var Info = function Info(_, ref) {
         },
         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,
-        value: _objectSpread(_objectSpread(_objectSpread({}, item._extend.other), sessionValue), {}, {
+        value: _objectSpread(_objectSpread(_objectSpread({}, item._extend.other), {}, {
+          bundle: mergeBundles(item._extend.other)
+        }, sessionValue), {}, {
           quantity: values.quantity || item._extend.quantity
         })
       },
@@ -1229,6 +1225,8 @@ var Info = function Info(_, ref) {
     var _cacheItem$_extend$ot, _cacheItem$_extend$ot2;
     delete cacheItem.discount_list;
     (_cacheItem$_extend$ot = cacheItem._extend.other) === null || _cacheItem$_extend$ot === void 0 || (_cacheItem$_extend$ot = _cacheItem$_extend$ot.bundle) === null || _cacheItem$_extend$ot === void 0 || (_cacheItem$_extend$ot2 = _cacheItem$_extend$ot.forEach) === null || _cacheItem$_extend$ot2 === void 0 || _cacheItem$_extend$ot2.call(_cacheItem$_extend$ot, function (bundle) {
+      var _bundle$metadata;
+      bundle === null || bundle === void 0 || (_bundle$metadata = bundle.metadata) === null || _bundle$metadata === void 0 || delete _bundle$metadata.custom_product_bundle_map_id;
       bundle === null || bundle === void 0 || delete bundle.discount_list;
       bundle === null || bundle === void 0 || delete bundle.booking_id;
       bundle === null || bundle === void 0 || delete bundle.bundle_selling_price;

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

@@ -32,6 +32,7 @@ export declare const setProductPrice: (cacheItem: any, { newTotal, origin_total
  * @returns 折扣列表
  */
 export declare const getProductAllDiscountList: (cacheItem: any) => any;
+export declare const mergeBundles: (other: any) => any[];
 /**
  * 合并 bundle 数据，基于 id 和 product_id 匹配，price 优先使用 originalOther 中的值
  * @param other - callback 返回的新数据

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

@@ -149,6 +149,22 @@ export var getProductAllDiscountList = function getProductAllDiscountList(cacheI
   (_discountList = discountList).push.apply(_discountList, _toConsumableArray(bundleDiscountList));
   return discountList;
 };
+export var mergeBundles = function mergeBundles(other) {
+  var bundle = (other === null || other === void 0 ? void 0 : other.bundle) || [];
+  var newBundle = [];
+  bundle.forEach(function (item) {
+    var newItem = newBundle.find(function (newItem) {
+      return newItem.id === item.id;
+    });
+    if (newItem) {
+      newItem.num += item.num || 1;
+      newItem.quantity += item.quantity || 1;
+    } else {
+      newBundle.push(_objectSpread({}, item));
+    }
+  });
+  return newBundle;
+};
 
 /**
  * 合并 bundle 数据，基于 id 和 product_id 匹配，price 优先使用 originalOther 中的值

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

@@ -189,7 +189,7 @@ var Payments = Provider(function (props) {
         className: "payment-list-item-surcharge"
       }, "(", locales.getText("pisell2.text.surcharge"), " ", formatAmount(item.service_fee, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || "$"), ")") : null, /*#__PURE__*/React.createElement("div", {
         className: "payment-list-item-date"
-      }, dayjs(item.payment_time).format("HH:mm YYYY/MM/DD"), /*#__PURE__*/React.createElement("span", {
+      }, dayjs(item.payment_time || item.created_at).format("HH:mm YYYY/MM/DD"), /*#__PURE__*/React.createElement("span", {
         className: "payment-list-item-platform-type"
       }, item.platform && locales.getText("pisell2.text.platform.type")(item.platform))))))));
     }