@pisell/private-materials 6.6.80 → 6.6.82

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

@@ -19,7 +19,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import Delete_wght300_24px from '@pisell/icon/es/Delete_wght300_24px';
-import { formatAmount, getUniqueId, locales } from '@pisell/utils';
+import { formatAmount, getUniqueId, locales, sendWarningLog } from '@pisell/utils';
 import React, { forwardRef, useContext, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import Drawer from "../../../components/drawer";
 import { Context } from "../../../info/model";
@@ -41,7 +41,7 @@ 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";
@@ -51,6 +51,8 @@ import { createBookingItemsByGroup, getGroupTotalPrice } from "../../../info/ser
 import { useShopDiscountModule } from "../../../../ticketBooking/hooks/pisellos/useShopDiscountModule";
 import DiscountChangeModal from "./DiscountChangeModal";
 import Decimal from "decimal.js";
+import useEngineContext from "../../../../../hooks/useEngineContext";
+import { getCurrentServiceProductData, useProductChangeDebugLog } from "../../../utils/productChangeLog";
 var submitLock = false;
 
 /**
@@ -67,7 +69,7 @@ var isSameBookingServiceItem = function isSameBookingServiceItem(listItem, editI
   return (listItem === null || listItem === void 0 ? void 0 : listItem.booking_id) === bookingId && (listItem === null || listItem === void 0 || (_listItem$_extend = listItem._extend) === null || _listItem$_extend === void 0 ? void 0 : _listItem$_extend.order_detail_id) === orderDetailId;
 };
 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$cacheI17, _state$client2;
+  var _ref, _state$editingOrderId, _state$bookingDetail, _state$service4, _state$bookingConfig2, _state$bookingConfig3, _state$service$cacheI5, _state$service$cacheI7, _state$service8, _window$BaseMaterials, _state$service12, _state$service$cacheI12, _state$bookingConfig5, _state$service$cacheI13, _state$service$cacheI14, _state$service13, _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];
@@ -85,6 +87,7 @@ var Info = function Info(_, ref) {
     _useState2 = _slicedToArray(_useState, 2),
     discountChangeModalOpen = _useState2[0],
     setDiscountChangeModalOpen = _useState2[1];
+  var context = useEngineContext();
   var _useContext = useContext(Context),
     state = _useContext.state,
     dispatch = _useContext.dispatch;
@@ -109,6 +112,7 @@ var Info = function Info(_, ref) {
 
   /** 标记 handleEdit 是否执行过，用于判断保存时是否需要检查折扣变化 */
   var isEditedRef = useRef(false);
+  var sendProductChangeLog = useProductChangeDebugLog((_ref = (_state$editingOrderId = state === null || state === void 0 ? void 0 : state.editingOrderId) !== null && _state$editingOrderId !== void 0 ? _state$editingOrderId : state === null || state === void 0 ? void 0 : state.bookingId) !== null && _ref !== void 0 ? _ref : state === null || state === void 0 || (_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : _state$bookingDetail.id);
   useEffect(function () {
     window.openBookingEditModal = function () {
       setOpen(true);
@@ -227,7 +231,7 @@ var Info = function Info(_, ref) {
    * @Date: 2024-01-09 13:59
    */
   var handleDeleteProduct = useMemoizedFn(function () {
-    var _state$service$cacheI, _window$closeBookingE, _window;
+    var _state$service$cacheI, _state$service5, _state$service6, _window$closeBookingE, _window;
     if (state.channelDisabledEdit) {
       return;
     }
@@ -236,6 +240,19 @@ var Info = function Info(_, ref) {
     _list = _list.filter(function (d) {
       return d._id !== _id;
     });
+    sendProductChangeLog({
+      title: '编辑商品弹窗内删除商品',
+      content: [{
+        key: '被删除商品',
+        value: getCurrentServiceProductData([state === null || state === void 0 || (_state$service5 = state.service) === null || _state$service5 === void 0 ? void 0 : _state$service5.cacheItem])
+      }, {
+        key: '删除前页面商品',
+        value: getCurrentServiceProductData(state === null || state === void 0 || (_state$service6 = state.service) === null || _state$service6 === void 0 ? void 0 : _state$service6.value)
+      }, {
+        key: '删除后页面商品',
+        value: getCurrentServiceProductData(_list)
+      }]
+    });
     (_window$closeBookingE = (_window = window).closeBookingEditModal) === null || _window$closeBookingE === void 0 || _window$closeBookingE.call(_window);
     dispatch({
       type: 'setService',
@@ -681,9 +698,9 @@ var Info = function Info(_, ref) {
     getDiscount();
   }, [useTotal, (_state$service$cacheI7 = state.service.cacheItem) === null || _state$service$cacheI7 === void 0 || (_state$service$cacheI7 = _state$service$cacheI7._extend) === null || _state$service$cacheI7 === void 0 ? void 0 : _state$service$cacheI7.origin_total]);
   var bundles = useMemo(function () {
-    var _state$service5;
-    return ((_state$service5 = state.service) === null || _state$service5 === void 0 || (_state$service5 = _state$service5.cacheItem) === null || _state$service5 === void 0 || (_state$service5 = _state$service5._extend) === null || _state$service5 === void 0 || (_state$service5 = _state$service5.other) === null || _state$service5 === void 0 ? void 0 : _state$service5.bundle) || [];
-  }, [(_state$service6 = state.service) === null || _state$service6 === void 0 || (_state$service6 = _state$service6.cacheItem) === null || _state$service6 === void 0 || (_state$service6 = _state$service6._extend) === null || _state$service6 === void 0 || (_state$service6 = _state$service6.other) === null || _state$service6 === void 0 ? void 0 : _state$service6.bundle]);
+    var _state$service7;
+    return ((_state$service7 = state.service) === null || _state$service7 === void 0 || (_state$service7 = _state$service7.cacheItem) === null || _state$service7 === void 0 || (_state$service7 = _state$service7._extend) === null || _state$service7 === void 0 || (_state$service7 = _state$service7.other) === null || _state$service7 === void 0 ? void 0 : _state$service7.bundle) || [];
+  }, [(_state$service8 = state.service) === null || _state$service8 === void 0 || (_state$service8 = _state$service8.cacheItem) === null || _state$service8 === void 0 || (_state$service8 = _state$service8._extend) === null || _state$service8 === void 0 || (_state$service8 = _state$service8.other) === null || _state$service8 === void 0 ? void 0 : _state$service8.bundle]);
 
   /**
    * @title: 编辑商品
@@ -702,13 +719,19 @@ var Info = function Info(_, ref) {
     var values = form.getFieldsValue();
     var isSession = isSessionProduct(item);
     var sessionValue = {};
+    var oldSession = {};
     if (isSession) {
-      var _item$_extend7, _item$_extend8, _item$_extend9;
+      var _item$_extend7, _item$_extend8, _item$_extend9, _item$_extend10, _item$_extend11, _item$_extend12;
       sessionValue.startEndTime = {
         startDate: item === null || item === void 0 || (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.start_date,
         endDate: item === null || item === void 0 || (_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.end_date,
         duration: item === null || item === void 0 || (_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.duration
       };
+      oldSession = {
+        start_date: dayjs(item === null || item === void 0 || (_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.start_date).format('YYYY-MM-DD'),
+        end_date: dayjs(item === null || item === void 0 || (_item$_extend11 = item._extend) === null || _item$_extend11 === void 0 ? void 0 : _item$_extend11.end_date).format('YYYY-MM-DD'),
+        duration: item === null || item === void 0 || (_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.duration
+      };
     }
 
     // 打开商品详情弹窗
@@ -726,22 +749,33 @@ 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
         })
       },
       callback: function callback(e, extension_type, detail) {
-        var _cacheItem$metadata, _cacheItem$_extend, _cacheItem$_extend2;
+        var _item$_extend13, _item$_extend14, _item$_extend15, _cacheItem$metadata, _cacheItem$metadata3, _cacheItem$_extend, _cacheItem$_extend2;
         // 标记已执行过编辑操作
         isEditedRef.current = true;
         shouldReallocateBundlePriceRef.current = false;
         var _detail = detail || item;
         var other = JSON.parse(JSON.stringify(e));
+        var previousOriginTotal = Number(item === null || item === void 0 || (_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.origin_total);
+        var previousTotal = Number(item === null || item === void 0 || (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.total);
+        var discountAmount = Number(item === null || item === void 0 ? void 0 : item.discount_amount);
+        var priceOverride = item === null || item === void 0 || (_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.priceOverride;
+        var hasNonManualDiscount = getProductAllDiscountList(item).some(function (discountItem) {
+          return (discountItem === null || discountItem === void 0 ? void 0 : discountItem.type) !== 'product';
+        });
+        // discount_amount 可能为 0 或缺失，手动价应由价格快照判断。
+        var hasManualPriceAdjustment = !hasNonManualDiscount && (Number.isFinite(discountAmount) && discountAmount !== 0 || Number.isFinite(previousOriginTotal) && Number.isFinite(previousTotal) && !new Decimal(previousTotal).eq(previousOriginTotal) || priceOverride != null && priceOverride !== '');
 
         // 手动折扣时 合并 bundle price，优先使用编辑前的价格
-        if (item.discount_amount) {
-          var _item$_extend10;
-          other = mergeBundleWithOriginalPrice(other, ((_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.other) || {});
+        if (hasManualPriceAdjustment) {
+          var _item$_extend16;
+          other = mergeBundleWithOriginalPrice(other, ((_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.other) || {});
         }
         other.session = e.session;
 
@@ -759,7 +793,7 @@ var Info = function Info(_, ref) {
         });
 
         // 手动折扣编辑时保留原有折扣
-        if (cacheItem.discount_amount && cacheItem !== null && cacheItem !== void 0 && (_cacheItem$metadata = cacheItem.metadata) !== null && _cacheItem$metadata !== void 0 && _cacheItem$metadata.main_product_selling_price) {
+        if (hasManualPriceAdjustment && cacheItem !== null && cacheItem !== void 0 && (_cacheItem$metadata = cacheItem.metadata) !== null && _cacheItem$metadata !== void 0 && _cacheItem$metadata.main_product_selling_price) {
           var _cacheItem$metadata2;
           cacheItem._extend.price = cacheItem === null || cacheItem === void 0 || (_cacheItem$metadata2 = cacheItem.metadata) === null || _cacheItem$metadata2 === void 0 ? void 0 : _cacheItem$metadata2.main_product_selling_price;
         }
@@ -776,6 +810,37 @@ var Info = function Info(_, ref) {
           });
         } catch (err) {}
         var sessionDetail = editSessionProduct(cacheItem, e.session);
+        try {
+          var _e$session, _e$session2, _e$session3, _e$session4, _e$session5, _context$appHelper, _context$appHelper$ge;
+          sendWarningLog({
+            title: '修改商品数据',
+            content: [{
+              key: 'productId',
+              value: item.id
+            }, {
+              key: "isSession",
+              value: isSession
+            }, {
+              key: 'oldSession',
+              value: JSON.stringify(oldSession)
+            }, {
+              key: 'sessionValue',
+              value: JSON.stringify({
+                startTime: (_e$session = e.session) === null || _e$session === void 0 ? void 0 : _e$session.start_time,
+                endTime: (_e$session2 = e.session) === null || _e$session2 === void 0 ? void 0 : _e$session2.end_time,
+                startDate: dayjs((_e$session3 = e.session) === null || _e$session3 === void 0 ? void 0 : _e$session3.start_at).format('YYYY-MM-DD'),
+                endDate: dayjs((_e$session4 = e.session) === null || _e$session4 === void 0 ? void 0 : _e$session4.end_at).format('YYYY-MM-DD'),
+                duration: (_e$session5 = e.session) === null || _e$session5 === void 0 ? void 0 : _e$session5.duration
+              })
+            }, {
+              key: '日期',
+              value: dayjs().format('YYYY-MM-DD HH:mm')
+            }, {
+              key: '店铺id',
+              value: (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.store) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getState) === null || _context$appHelper$ge === void 0 || (_context$appHelper$ge = _context$appHelper$ge.call(_context$appHelper)) === null || _context$appHelper$ge === void 0 || (_context$appHelper$ge = _context$appHelper$ge.global) === null || _context$appHelper$ge === void 0 || (_context$appHelper$ge = _context$appHelper$ge.globalConfig) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.id
+            }]
+          });
+        } catch (err) {}
         if (sessionDetail) {
           setTimeout(function () {
             form.setFieldsValue({
@@ -784,24 +849,16 @@ var Info = function Info(_, ref) {
             });
           }, 200);
         }
-        var origin_total = _total;
-        if (item.discount_amount) {
-          var _item$_extend11, _item$_extend12;
-          origin_total = getProductOriginTotalPrice(cacheItem);
-          var previousOriginTotal = Number((item === null || item === void 0 || (_item$_extend11 = item._extend) === null || _item$_extend11 === void 0 ? void 0 : _item$_extend11.origin_total) || 0);
-          var previousTotal = Number((item === null || item === void 0 || (_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.total) || 0);
-          var productAllDiscountList = getProductAllDiscountList(item);
-          var hasNonManualDiscount = productAllDiscountList.some(function (discountItem) {
-            return (discountItem === null || discountItem === void 0 ? void 0 : discountItem.type) !== 'product';
-          });
-          if (previousOriginTotal > 0 && Number.isFinite(previousOriginTotal) && Number.isFinite(previousTotal) && !hasNonManualDiscount) {
-            // 手动折扣编辑套餐时延续旧折后比例，保存时再按新原价分摊，避免重复折扣。
-            var sellingRatio = new Decimal(previousTotal).div(previousOriginTotal);
-            _total = new Decimal(origin_total).mul(sellingRatio).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
-            cacheItem._extend.total = _total;
-            // 套餐变化后，即使折后总价未触发 onChange，也需要重新分摊子商品售价。
-            shouldReallocateBundlePriceRef.current = true;
-          }
+        var hasSourcePriceSnapshot = (cacheItem === null || cacheItem === void 0 || (_cacheItem$metadata3 = cacheItem.metadata) === null || _cacheItem$metadata3 === void 0 ? void 0 : _cacheItem$metadata3.source_product_price) != null;
+        // 有 source 快照或手动价时才重算原价，避免历史商品受当前目录价影响。
+        var origin_total = hasSourcePriceSnapshot || hasManualPriceAdjustment ? getProductOriginTotalPrice(cacheItem) : _total;
+        if (hasManualPriceAdjustment && previousOriginTotal > 0 && Number.isFinite(previousTotal)) {
+          // 手动折扣编辑套餐时延续旧折后比例，保存时再按新原价分摊，避免重复折扣。
+          var sellingRatio = new Decimal(previousTotal).div(previousOriginTotal);
+          _total = new Decimal(origin_total).mul(sellingRatio).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
+          cacheItem._extend.total = _total;
+          // 套餐变化后，即使折后总价未触发 onChange，也需要重新分摊子商品售价。
+          shouldReallocateBundlePriceRef.current = true;
         }
 
         // 用于储存原价
@@ -837,10 +894,20 @@ var Info = function Info(_, ref) {
    * @Date: 2024-08-28 17:10
    */
   var handleChange = useMemoizedFn(function (e) {
-    var _window$closeBookingE3, _window3;
+    var _state$service9, _state$service10, _window$closeBookingE3, _window3;
     if (state.channelDisabledEdit) {
       return;
     }
+    sendProductChangeLog({
+      title: '点击更换预约商品',
+      content: [{
+        key: '更换前商品',
+        value: getCurrentServiceProductData([state === null || state === void 0 || (_state$service9 = state.service) === null || _state$service9 === void 0 ? void 0 : _state$service9.cacheItem])
+      }, {
+        key: '当前页面商品',
+        value: getCurrentServiceProductData(state === null || state === void 0 || (_state$service10 = state.service) === null || _state$service10 === void 0 ? void 0 : _state$service10.value)
+      }]
+    });
     form.resetFields();
     (_window$closeBookingE3 = (_window3 = window).closeBookingEditModal) === null || _window$closeBookingE3 === void 0 || _window$closeBookingE3.call(_window3);
     dispatch({
@@ -899,7 +966,7 @@ var Info = function Info(_, ref) {
   };
   console.log(isShowTimeAndResource, 'isShowTimeAndResource');
   var productName = useMemo(function () {
-    var _state$service7;
+    var _state$service11;
     return /*#__PURE__*/React.createElement(Col, {
       span: 24
     }, /*#__PURE__*/React.createElement(Form.Item, {
@@ -910,7 +977,7 @@ var Info = function Info(_, ref) {
       className: "current-service-info-name-wrap"
     }, /*#__PURE__*/React.createElement("div", {
       className: "current-service-info-name"
-    }, ((_state$service7 = state.service) === null || _state$service7 === void 0 || (_state$service7 = _state$service7.cacheItem) === null || _state$service7 === void 0 || (_state$service7 = _state$service7._extend) === null || _state$service7 === void 0 ? void 0 : _state$service7.product_name) || '-'), /*#__PURE__*/React.createElement(Button, {
+    }, ((_state$service11 = state.service) === null || _state$service11 === void 0 || (_state$service11 = _state$service11.cacheItem) === null || _state$service11 === void 0 || (_state$service11 = _state$service11._extend) === null || _state$service11 === void 0 ? void 0 : _state$service11.product_name) || '-'), /*#__PURE__*/React.createElement(Button, {
       onClick: handleEdit
     }, locales.getText('pisell2.text.edit')), !state.isBookingCreatePage && /*#__PURE__*/React.createElement(Button, {
       onClick: handleChange
@@ -923,7 +990,7 @@ var Info = function Info(_, ref) {
         return renderBundles(item, state.amountSymbol);
       }
     }))));
-  }, [(_state$service8 = state.service) === null || _state$service8 === void 0 || (_state$service8 = _state$service8.cacheItem) === null || _state$service8 === void 0 || (_state$service8 = _state$service8._extend) === null || _state$service8 === void 0 ? void 0 : _state$service8.product_name, bundles, state.amountSymbol, state.isBookingCreatePage]);
+  }, [(_state$service12 = state.service) === null || _state$service12 === void 0 || (_state$service12 = _state$service12.cacheItem) === null || _state$service12 === void 0 || (_state$service12 = _state$service12._extend) === null || _state$service12 === void 0 ? void 0 : _state$service12.product_name, bundles, state.amountSymbol, state.isBookingCreatePage]);
   var price = useMemo(function () {
     var _state$service$cacheI8, _state$service$cacheI9, _state$service$cacheI10, _state$service$cacheI11;
     return /*#__PURE__*/React.createElement(Col, {
@@ -1076,7 +1143,7 @@ var Info = function Info(_, ref) {
       cacheItem: state.service.cacheItem
     }));
     // 只监听Capacity 内部使用的 state.locale state.isTerminal, state.service?.cacheItem?._data?.capacitys
-  }, [state.locale, state.isTerminal, (_state$service9 = state.service) === null || _state$service9 === void 0 || (_state$service9 = _state$service9.cacheItem) === null || _state$service9 === void 0 || (_state$service9 = _state$service9._data) === null || _state$service9 === void 0 ? void 0 : _state$service9.capacitys]);
+  }, [state.locale, state.isTerminal, (_state$service13 = state.service) === null || _state$service13 === void 0 || (_state$service13 = _state$service13.cacheItem) === null || _state$service13 === void 0 || (_state$service13 = _state$service13._data) === null || _state$service13 === void 0 ? void 0 : _state$service13.capacitys]);
   var hiddenQuantity = useMemo(function () {
     return /*#__PURE__*/React.createElement(Form.Item, {
       hidden: true,
@@ -1184,12 +1251,12 @@ var Info = function Info(_, ref) {
     })));
   }, [isEditGroup, currentTab, items]);
   var updateMultiDay = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
       var start_date, end_date, duration, cacheItem, fieldsValues;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            start_date = _ref.start_date, end_date = _ref.end_date, duration = _ref.duration;
+            start_date = _ref2.start_date, end_date = _ref2.end_date, duration = _ref2.duration;
             _context.next = 3;
             return getMultiDay({
               start_date: start_date,
@@ -1223,7 +1290,7 @@ var Info = function Info(_, ref) {
       }, _callee);
     }));
     return function updateMultiDay(_x) {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   var onValuesChange = function onValuesChange(changedValues) {
@@ -1306,8 +1373,8 @@ var Info = function Info(_, ref) {
    * const price = getBundleOriginalSellingPrice({ bundle_sum_price: '8.00', price: 7.2 });
    */
   var getBundleOriginalSellingPrice = function getBundleOriginalSellingPrice(bundle) {
-    var _ref3, _ref4, _ref5, _bundle$bundle_sum_pr;
-    var priceSource = (_ref3 = (_ref4 = (_ref5 = (_bundle$bundle_sum_pr = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_sum_price) !== null && _bundle$bundle_sum_pr !== void 0 ? _bundle$bundle_sum_pr : bundle === null || bundle === void 0 ? void 0 : bundle.original_total) !== null && _ref5 !== void 0 ? _ref5 : bundle === null || bundle === void 0 ? void 0 : bundle.original_price) !== null && _ref4 !== void 0 ? _ref4 : bundle === null || bundle === void 0 ? void 0 : bundle.product_price) !== null && _ref3 !== void 0 ? _ref3 : bundle === null || bundle === void 0 ? void 0 : bundle.price;
+    var _ref4, _ref5, _ref6, _bundle$bundle_sum_pr;
+    var priceSource = (_ref4 = (_ref5 = (_ref6 = (_bundle$bundle_sum_pr = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_sum_price) !== null && _bundle$bundle_sum_pr !== void 0 ? _bundle$bundle_sum_pr : bundle === null || bundle === void 0 ? void 0 : bundle.original_total) !== null && _ref6 !== void 0 ? _ref6 : bundle === null || bundle === void 0 ? void 0 : bundle.original_price) !== null && _ref5 !== void 0 ? _ref5 : bundle === null || bundle === void 0 ? void 0 : bundle.product_price) !== null && _ref4 !== void 0 ? _ref4 : bundle === null || bundle === void 0 ? void 0 : bundle.price;
     var price = Number(priceSource);
     if (!Number.isFinite(price)) {
       return undefined;
@@ -1321,7 +1388,7 @@ var Info = function Info(_, ref) {
     setDiscountChangeModalOpen(false);
   };
   var handleContinue = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var cacheItem;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -1340,7 +1407,7 @@ var Info = function Info(_, ref) {
       }, _callee2);
     }));
     return function handleContinue() {
-      return _ref6.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
   var handleRemove = function handleRemove() {

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

@@ -31,7 +31,8 @@ export declare const setProductPrice: (cacheItem: any, { newTotal, origin_total
  * @param cacheItem - 缓存的商品项
  * @returns 折扣列表
  */
-export declare const getProductAllDiscountList: (cacheItem: any) => any;
+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

@@ -142,13 +142,28 @@ export var setProductPrice = function setProductPrice(cacheItem, _ref2) {
  * @returns 折扣列表
  */
 export var getProductAllDiscountList = function getProductAllDiscountList(cacheItem) {
-  var _cacheItem$_extend, _discountList;
-  var discountList = [];
-  discountList = cacheItem.discount_list || [];
+  var _cacheItem$_extend;
+  var discountList = _toConsumableArray(cacheItem.discount_list || []);
   var bundleDiscountList = getBundleDiscountList(((_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 || (_cacheItem$_extend = _cacheItem$_extend.other) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.bundle) || []) || [];
-  (_discountList = discountList).push.apply(_discountList, _toConsumableArray(bundleDiscountList));
+  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/info2/service/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import '../../info/service/index.less';
-declare const _default: React.MemoExoticComponent<() => JSX.Element>;
+declare const _default: React.MemoExoticComponent<() => React.JSX.Element>;
 export default _default;

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

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
-declare const ServiceItem: ({ d, handleEditService, state, handleLike, errorMessage, handleDeleteService, }: any) => JSX.Element;
+declare const ServiceItem: ({ d, handleEditService, state, handleLike, errorMessage, handleDeleteService, }: any) => React.JSX.Element;
 export default ServiceItem;

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

@@ -1,5 +1,6 @@
+import React from 'react';
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default ServiceList;

package/es/components/booking/materiels/contacts/index.d.ts

@@ -1,3 +1,4 @@
+import React from "react";
 import "./index.less";
 declare type ContactType = {
     country_calling_code: string;
@@ -11,5 +12,5 @@ declare type ContactsPropsType = {
     value: ContactType[];
     onChange: (value: ContactType[]) => void;
 };
-declare const Contacts: (props: ContactsPropsType) => JSX.Element;
+declare const Contacts: (props: ContactsPropsType) => React.JSX.Element;
 export default Contacts;

package/es/components/booking/materiels/duration/index.d.ts

@@ -1,4 +1,5 @@
 import { SelectProps } from 'antd';
+import React from 'react';
 interface DurationProps extends SelectProps {
     locale?: string;
     slice?: number;
@@ -9,5 +10,5 @@ interface DurationProps extends SelectProps {
     startDate?: any;
     timeObj?: any;
 }
-declare const Duration: (props: DurationProps) => JSX.Element;
+declare const Duration: (props: DurationProps) => React.JSX.Element;
 export default Duration;

package/es/components/booking/materiels/holder/index.d.ts

@@ -1,6 +1,7 @@
 import { SelectProps } from 'antd';
+import React from 'react';
 interface HolderProps extends SelectProps {
     selectProps?: SelectProps;
 }
-declare const Holder: (props: HolderProps) => JSX.Element;
+declare const Holder: (props: HolderProps) => React.JSX.Element;
 export default Holder;

package/es/components/booking/materiels/startTime/index.d.ts

@@ -1,9 +1,10 @@
 import { SelectProps } from "antd";
+import React from "react";
 interface StartTimeProps extends SelectProps {
     locale?: string;
     slice?: number;
     selectProps?: SelectProps;
     timeObjChange?: any;
 }
-declare const StartTime: (props: StartTimeProps) => JSX.Element;
+declare const StartTime: (props: StartTimeProps) => React.JSX.Element;
 export default StartTime;

package/es/components/booking/notes/NoteBlock/NoteItem/index.d.ts

@@ -1,3 +1,4 @@
+import React from "react";
 import "./index.less";
 export interface InfoProps {
     isEdit: boolean;
@@ -5,5 +6,5 @@ export interface InfoProps {
     onChange?: (item: any, type: "edit" | "remove") => void;
     menus?: any[];
 }
-declare const NoteItem: (props: InfoProps) => JSX.Element;
+declare const NoteItem: (props: InfoProps) => React.JSX.Element;
 export default NoteItem;

package/es/components/booking/notes/NoteBlock/index.d.ts

@@ -1,3 +1,4 @@
+import React from "react";
 import "./index.less";
 export interface InfoProps {
     title?: string;
@@ -12,5 +13,5 @@ export interface InfoProps {
     maxLength?: number;
     noteType: string;
 }
-declare const NoteBlock: (props: InfoProps) => JSX.Element;
+declare const NoteBlock: (props: InfoProps) => React.JSX.Element;
 export default NoteBlock;

package/es/components/booking/notes/addNote/index.d.ts

@@ -1,3 +1,4 @@
+import React from "react";
 import "./index.less";
-declare const AddNote: ({ value, onChange, title, placeholder }: any) => JSX.Element;
+declare const AddNote: ({ value, onChange, title, placeholder }: any) => React.JSX.Element;
 export default AddNote;

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))))))));
     }

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

@@ -0,0 +1,27 @@
+export declare const isProductChangeDebugShop: (shopId: unknown) => boolean;
+export declare const getCurrentServiceProductData: (products: any[]) => {
+    id: any;
+    order_detail_id: any;
+    booking_id: any;
+    title: any;
+    quantity: any;
+    product_variant_id: any;
+    unique_identification_number: any;
+}[];
+export declare const getOriginalOrderProductData: (bookingDetail: any) => {
+    bookings: any;
+    booking_relation_products: any;
+    relation_products: any;
+};
+export declare const getSubmittedOrderProductData: (values: any) => {
+    bookings: any;
+    booking_relation_products: any;
+    relation_products: any;
+};
+export declare const useProductChangeDebugLog: (orderId?: unknown) => ({ title, content, }: {
+    title: string;
+    content?: {
+        key: string;
+        value: unknown;
+    }[] | undefined;
+}) => void;