@pisell/private-materials 6.6.80 → 6.6.82

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

@@ -50,6 +50,7 @@ var import_ahooks = require("ahooks");
 var import_utils5 = require("../../../info/service2/utils");
 var import_utils6 = require("../../../../ticketBooking/utils");
 var import_utils7 = require("../../../info/service2/Group/utils");
+var import_productChangeLog = require("../../../utils/productChangeLog");
 var shopList = [
   2886,
   4422,
@@ -67,7 +68,7 @@ var shopList = [
   6305
 ];
 var Info = (props) => {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g;
   const { onEdit, drawerProps, renderMode } = props;
   const [search, setSearch] = (0, import_react.useState)("");
   let { state, dispatch } = (0, import_react.useContext)(import_model.Context);
@@ -76,11 +77,14 @@ var Info = (props) => {
   const context = (0, import_useEngineContext.default)();
   state = state || (props == null ? void 0 : props.state);
   dispatch = dispatch || (props == null ? void 0 : props.dispatch);
+  const sendProductChangeLog = (0, import_productChangeLog.useProductChangeDebugLog)(
+    (state == null ? void 0 : state.editingOrderId) ?? (state == null ? void 0 : state.bookingId) ?? ((_a = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _a.id)
+  );
   import_utils3.request.setRequest(context.appHelper.utils.request);
   const customerId = (0, import_react.useMemo)(() => {
     var _a2, _b2;
     return ((_b2 = (_a2 = state.client) == null ? void 0 : _a2.value) == null ? void 0 : _b2.id) || void 0;
-  }, [(_b = (_a = state.client) == null ? void 0 : _a.value) == null ? void 0 : _b.id]);
+  }, [(_c = (_b = state.client) == null ? void 0 : _b.value) == null ? void 0 : _c.id]);
   console.log(customerId, "customerIdcustomerId");
   const setDefaultService = async (list) => {
     if (state.renderType !== "eventBooking") {
@@ -225,7 +229,7 @@ var Info = (props) => {
         customer_id: (_c2 = (_b2 = state.client) == null ? void 0 : _b2.value) == null ? void 0 : _c2.id
       },
       callback: async (e, extension_type, detail) => {
-        var _a3, _b3;
+        var _a3, _b3, _c3;
         if (lock) {
           return;
         }
@@ -261,6 +265,20 @@ var Info = (props) => {
         if (_isEdit) {
           cacheItem._id = (_a3 = state.service.cacheItem) == null ? void 0 : _a3._id;
           cacheItem.new = 0;
+        } else {
+          sendProductChangeLog({
+            title: "添加更多商品",
+            content: [
+              {
+                key: "添加前购物车商品",
+                value: (0, import_productChangeLog.getCurrentServiceProductData)((_b3 = state == null ? void 0 : state.service) == null ? void 0 : _b3.value)
+              },
+              {
+                key: "当前添加的商品",
+                value: (0, import_productChangeLog.getCurrentServiceProductData)([cacheItem])
+              }
+            ]
+          });
         }
         if (renderMode === "current") {
           cacheItem.currentDefaultTime = state.date.value.format("HH:mm");
@@ -304,7 +322,7 @@ var Info = (props) => {
             }
           });
         } else {
-          (_b3 = window.openBookingEditModal) == null ? void 0 : _b3.call(window);
+          (_c3 = window.openBookingEditModal) == null ? void 0 : _c3.call(window);
           if (isMultiDay) {
             await getMultiDayCacheItem(true);
           }
@@ -332,14 +350,14 @@ var Info = (props) => {
       _list,
       search ? (item) => isIncludes(item.title) : void 0
     );
-  }, [search, (_c = state.service) == null ? void 0 : _c.services]);
+  }, [search, (_d = state.service) == null ? void 0 : _d.services]);
   const isService = (0, import_react.useMemo)(() => {
     return state.service.value.length > 0;
   }, [state.service.value]);
   (0, import_react.useEffect)(() => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g, _h, _i, _j;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h, _i, _j;
     if (shopList.includes(
-      ((_c2 = (_b2 = (_a2 = context.appHelper) == null ? void 0 : _a2.utils) == null ? void 0 : _b2.getData) == null ? void 0 : _c2.call(_b2, "shop_id")) || ((_h = (_g = (_f2 = (_e2 = (_d2 = context.appHelper.utils.store) == null ? void 0 : _d2.getState) == null ? void 0 : _e2.call(_d2)) == null ? void 0 : _f2.global) == null ? void 0 : _g.globalConfig) == null ? void 0 : _h.id)
+      ((_c2 = (_b2 = (_a2 = context.appHelper) == null ? void 0 : _a2.utils) == null ? void 0 : _b2.getData) == null ? void 0 : _c2.call(_b2, "shop_id")) || ((_h = (_g2 = (_f2 = (_e2 = (_d2 = context.appHelper.utils.store) == null ? void 0 : _d2.getState) == null ? void 0 : _e2.call(_d2)) == null ? void 0 : _f2.global) == null ? void 0 : _g2.globalConfig) == null ? void 0 : _h.id)
     ) || state.closeAutoOpenService) {
       return;
     }
@@ -348,7 +366,7 @@ var Info = (props) => {
         handleSelectService();
       }, 10);
     }
-  }, [state.modalOpen, state.bookingId, (_d = state.service) == null ? void 0 : _d.value]);
+  }, [state.modalOpen, state.bookingId, (_e = state.service) == null ? void 0 : _e.value]);
   const showAddButton = (0, import_react.useMemo)(() => {
     return !state.disabledEdit && !state.channelDisabledEdit;
   }, [state.disabledEdit, state.channelDisabledEdit]);
@@ -441,7 +459,7 @@ var Info = (props) => {
       content
     );
   }
-  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, ((_f = (_e = state.service) == null ? void 0 : _e.cacheItem) == null ? void 0 : _f.autoClose) && /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { loading: true, active: true, round: true }), addButton, /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, ((_g = (_f = state.service) == null ? void 0 : _f.cacheItem) == null ? void 0 : _g.autoClose) && /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { loading: true, active: true, round: true }), addButton, /* @__PURE__ */ import_react.default.createElement(
     import_drawer.default,
     {
       titleNoWrap: true,

package/lib/components/booking/info2/service/addTimeModal/index.d.ts

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

package/lib/components/booking/info2/service/contactInfoMode/index.d.ts

@@ -1,2 +1,3 @@
-declare const ContactInfoMode: () => JSX.Element;
+import React from 'react';
+declare const ContactInfoMode: () => React.JSX.Element;
 export default ContactInfoMode;

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

@@ -64,6 +64,8 @@ var import_utils9 = require("../../../info/service2/Group/utils");
 var import_useShopDiscountModule = require("../../../../ticketBooking/hooks/pisellos/useShopDiscountModule");
 var import_DiscountChangeModal = __toESM(require("./DiscountChangeModal"));
 var import_decimal = __toESM(require("decimal.js"));
+var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
+var import_productChangeLog = require("../../../utils/productChangeLog");
 var submitLock = false;
 var isSameBookingServiceItem = (listItem, editItem) => {
   var _a, _b;
@@ -75,7 +77,7 @@ var isSameBookingServiceItem = (listItem, editItem) => {
   return (listItem == null ? void 0 : listItem.booking_id) === bookingId && ((_b = listItem == null ? void 0 : listItem._extend) == null ? void 0 : _b.order_detail_id) === orderDetailId;
 };
 var Info = (_, ref) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L;
   const [form] = import_antd.Form.useForm();
   const useTotal = import_antd.Form.useWatch("total", form);
   const useResource = import_antd.Form.useWatch("resource", form);
@@ -88,6 +90,7 @@ var Info = (_, ref) => {
   const useEndDate = import_antd.Form.useWatch("end_date", form);
   const shopDiscount = (0, import_useShopDiscountModule.useShopDiscountModule)();
   const [discountChangeModalOpen, setDiscountChangeModalOpen] = (0, import_react.useState)(false);
+  const context = (0, import_useEngineContext.default)();
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const resourcesRef = (0, import_react.useRef)(null);
   const isChangeTotal = (0, import_react.useRef)(false);
@@ -98,6 +101,9 @@ var Info = (_, ref) => {
   const valuesRef = (0, import_react.useRef)({});
   const noInOriginalDiscountIdsRef = (0, import_react.useRef)([]);
   const isEditedRef = (0, import_react.useRef)(false);
+  const sendProductChangeLog = (0, import_productChangeLog.useProductChangeDebugLog)(
+    (state == null ? void 0 : state.editingOrderId) ?? (state == null ? void 0 : state.bookingId) ?? ((_a = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _a.id)
+  );
   (0, import_react.useEffect)(() => {
     window.openBookingEditModal = () => {
       setOpen(true);
@@ -112,7 +118,7 @@ var Info = (_, ref) => {
       return true;
     }
     return ((_b2 = state == null ? void 0 : state.service) == null ? void 0 : _b2.cacheItem) && (0, import_utils4.isNormalProductByDurationSchedule)((_c2 = state == null ? void 0 : state.service) == null ? void 0 : _c2.cacheItem);
-  }, [(_a = state == null ? void 0 : state.service) == null ? void 0 : _a.cacheItem]);
+  }, [(_b = state == null ? void 0 : state.service) == null ? void 0 : _b.cacheItem]);
   const getCurrentCacheItem = (0, import_ahooks.useMemoizedFn)((_cacheItem) => {
     let values = form.getFieldsValue();
     let _item = _cacheItem || state.service.cacheItem;
@@ -142,7 +148,7 @@ var Info = (_, ref) => {
     state.service.cacheItem,
     useStartTime,
     useResource,
-    (_d = (_c = (_b = state.bookingConfig) == null ? void 0 : _b.config) == null ? void 0 : _c.basic) == null ? void 0 : _d.service_time
+    (_e = (_d = (_c = state.bookingConfig) == null ? void 0 : _c.config) == null ? void 0 : _d.basic) == null ? void 0 : _e.service_time
   ]);
   const flexibleOption = (0, import_react.useMemo)(() => {
     const op = (0, import_utils7.getFlexibleOption)({
@@ -164,7 +170,7 @@ var Info = (_, ref) => {
     durationProps,
     useStartTime,
     currentResource,
-    (_g = (_f = (_e = state.bookingConfig) == null ? void 0 : _e.config) == null ? void 0 : _f.basic) == null ? void 0 : _g.service_time,
+    (_h = (_g = (_f = state.bookingConfig) == null ? void 0 : _f.config) == null ? void 0 : _g.basic) == null ? void 0 : _h.service_time,
     useDuration
   ]);
   (0, import_react.useEffect)(() => {
@@ -181,14 +187,28 @@ var Info = (_, ref) => {
     }
   }, [useDuration, flexibleOption]);
   const handleDeleteProduct = (0, import_ahooks.useMemoizedFn)(() => {
-    var _a2, _b2;
+    var _a2, _b2, _c2, _d2;
     if (state.channelDisabledEdit) {
       return;
     }
     let _list = [...state.service.value];
     let _id = (_a2 = state.service.cacheItem) == null ? void 0 : _a2._id;
     _list = _list.filter((d) => d._id !== _id);
-    (_b2 = window.closeBookingEditModal) == null ? void 0 : _b2.call(window);
+    sendProductChangeLog({
+      title: "编辑商品弹窗内删除商品",
+      content: [
+        {
+          key: "被删除商品",
+          value: (0, import_productChangeLog.getCurrentServiceProductData)([(_b2 = state == null ? void 0 : state.service) == null ? void 0 : _b2.cacheItem])
+        },
+        {
+          key: "删除前页面商品",
+          value: (0, import_productChangeLog.getCurrentServiceProductData)((_c2 = state == null ? void 0 : state.service) == null ? void 0 : _c2.value)
+        },
+        { key: "删除后页面商品", value: (0, import_productChangeLog.getCurrentServiceProductData)(_list) }
+      ]
+    });
+    (_d2 = window.closeBookingEditModal) == null ? void 0 : _d2.call(window);
     dispatch({
       type: "setService",
       payload: {
@@ -459,7 +479,7 @@ var Info = (_, ref) => {
     let oPrice = Number(((_a2 = state.service.cacheItem) == null ? void 0 : _a2._extend.origin_total) || 0);
     let cPrice = Number(useTotal || 0);
     return cPrice !== oPrice;
-  }, [useTotal, (_i = (_h = state.service.cacheItem) == null ? void 0 : _h._extend) == null ? void 0 : _i.origin_total]);
+  }, [useTotal, (_j = (_i = state.service.cacheItem) == null ? void 0 : _i._extend) == null ? void 0 : _j.origin_total]);
   const getResources = () => {
     var _a2, _b2;
     let res = (0, import_utils7.formatResources)({
@@ -523,23 +543,29 @@ var Info = (_, ref) => {
   }, [state.service.editModal, state.isBookingCreatePage]);
   (0, import_react.useEffect)(() => {
     getDiscount();
-  }, [useTotal, (_k = (_j = state.service.cacheItem) == null ? void 0 : _j._extend) == null ? void 0 : _k.origin_total]);
+  }, [useTotal, (_l = (_k = state.service.cacheItem) == null ? void 0 : _k._extend) == null ? void 0 : _l.origin_total]);
   const bundles = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2;
     return ((_d2 = (_c2 = (_b2 = (_a2 = state.service) == null ? void 0 : _a2.cacheItem) == null ? void 0 : _b2._extend) == null ? void 0 : _c2.other) == null ? void 0 : _d2.bundle) || [];
-  }, [(_o = (_n = (_m = (_l = state.service) == null ? void 0 : _l.cacheItem) == null ? void 0 : _m._extend) == null ? void 0 : _n.other) == null ? void 0 : _o.bundle]);
+  }, [(_p = (_o = (_n = (_m = state.service) == null ? void 0 : _m.cacheItem) == null ? void 0 : _n._extend) == null ? void 0 : _o.other) == null ? void 0 : _p.bundle]);
   const handleEdit = (0, import_ahooks.useMemoizedFn)((e) => {
-    var _a2, _b2, _c2, _d2, _e2;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
     const item = state.service.cacheItem;
     let values = form.getFieldsValue();
     const isSession = (0, import_utils6.isSessionProduct)(item);
     const sessionValue = {};
+    let oldSession = {};
     if (isSession) {
       sessionValue.startEndTime = {
         startDate: (_a2 = item == null ? void 0 : item._extend) == null ? void 0 : _a2.start_date,
         endDate: (_b2 = item == null ? void 0 : item._extend) == null ? void 0 : _b2.end_date,
         duration: (_c2 = item == null ? void 0 : item._extend) == null ? void 0 : _c2.duration
       };
+      oldSession = {
+        start_date: (0, import_dayjs.default)((_d2 = item == null ? void 0 : item._extend) == null ? void 0 : _d2.start_date).format("YYYY-MM-DD"),
+        end_date: (0, import_dayjs.default)((_e2 = item == null ? void 0 : item._extend) == null ? void 0 : _e2.end_date).format("YYYY-MM-DD"),
+        duration: (_f2 = item == null ? void 0 : item._extend) == null ? void 0 : _f2.duration
+      };
     }
     state.action({
       type: "pisell1.handleOpenProductModal",
@@ -554,21 +580,30 @@ var Info = (_, ref) => {
           number: (0, import_utils3.getIsShowNumber)(item, state)
         },
         isOS: isSession,
-        customer_id: (_e2 = (_d2 = state.client) == null ? void 0 : _d2.value) == null ? void 0 : _e2.id,
+        customer_id: (_h2 = (_g2 = state.client) == null ? void 0 : _g2.value) == null ? void 0 : _h2.id,
         value: {
           ...item._extend.other,
+          bundle: (0, import_utils8.mergeBundles)(item._extend.other),
           ...sessionValue,
           quantity: values.quantity || item._extend.quantity
         }
       },
       callback: (e2, extension_type, detail) => {
-        var _a3, _b3, _c3, _d3, _e3, _f2, _g2;
+        var _a3, _b3, _c3, _d3, _e3, _f3, _g3, _h3, _i2, _j2, _k2, _l2, _m2, _n2, _o2, _p2, _q2, _r2, _s2, _t2, _u2;
         isEditedRef.current = true;
         shouldReallocateBundlePriceRef.current = false;
         const _detail = detail || item;
         let other = JSON.parse(JSON.stringify(e2));
-        if (item.discount_amount) {
-          other = (0, import_utils8.mergeBundleWithOriginalPrice)(other, ((_a3 = item._extend) == null ? void 0 : _a3.other) || {});
+        const previousOriginTotal = Number((_a3 = item == null ? void 0 : item._extend) == null ? void 0 : _a3.origin_total);
+        const previousTotal = Number((_b3 = item == null ? void 0 : item._extend) == null ? void 0 : _b3.total);
+        const discountAmount = Number(item == null ? void 0 : item.discount_amount);
+        const priceOverride = (_c3 = item == null ? void 0 : item._extend) == null ? void 0 : _c3.priceOverride;
+        const hasNonManualDiscount = (0, import_utils8.getProductAllDiscountList)(item).some(
+          (discountItem) => (discountItem == null ? void 0 : discountItem.type) !== "product"
+        );
+        const hasManualPriceAdjustment = !hasNonManualDiscount && (Number.isFinite(discountAmount) && discountAmount !== 0 || Number.isFinite(previousOriginTotal) && Number.isFinite(previousTotal) && !new import_decimal.default(previousTotal).eq(previousOriginTotal) || priceOverride != null && priceOverride !== "");
+        if (hasManualPriceAdjustment) {
+          other = (0, import_utils8.mergeBundleWithOriginalPrice)(other, ((_d3 = item._extend) == null ? void 0 : _d3.other) || {});
         }
         other.session = e2.session;
         let cacheItem = {
@@ -587,8 +622,8 @@ var Info = (_, ref) => {
           },
           new: 0
         };
-        if (cacheItem.discount_amount && ((_b3 = cacheItem == null ? void 0 : cacheItem.metadata) == null ? void 0 : _b3.main_product_selling_price)) {
-          cacheItem._extend.price = (_c3 = cacheItem == null ? void 0 : cacheItem.metadata) == null ? void 0 : _c3.main_product_selling_price;
+        if (hasManualPriceAdjustment && ((_e3 = cacheItem == null ? void 0 : cacheItem.metadata) == null ? void 0 : _e3.main_product_selling_price)) {
+          cacheItem._extend.price = (_f3 = cacheItem == null ? void 0 : cacheItem.metadata) == null ? void 0 : _f3.main_product_selling_price;
         }
         let _total = (0, import_utils6.getProductTotalPrice)(cacheItem);
         cacheItem._extend.total = _total;
@@ -600,6 +635,29 @@ var Info = (_, ref) => {
         } catch (err) {
         }
         const sessionDetail = (0, import_utils5.editSessionProduct)(cacheItem, e2.session);
+        try {
+          (0, import_utils.sendWarningLog)({
+            title: "修改商品数据",
+            content: [
+              { key: "productId", value: item.id },
+              { key: "isSession", value: isSession },
+              { key: "oldSession", value: JSON.stringify(oldSession) },
+              { key: "sessionValue", value: JSON.stringify({
+                startTime: (_g3 = e2.session) == null ? void 0 : _g3.start_time,
+                endTime: (_h3 = e2.session) == null ? void 0 : _h3.end_time,
+                startDate: (0, import_dayjs.default)((_i2 = e2.session) == null ? void 0 : _i2.start_at).format("YYYY-MM-DD"),
+                endDate: (0, import_dayjs.default)((_j2 = e2.session) == null ? void 0 : _j2.end_at).format("YYYY-MM-DD"),
+                duration: (_k2 = e2.session) == null ? void 0 : _k2.duration
+              }) },
+              { key: "日期", value: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm") },
+              {
+                key: "店铺id",
+                value: (_r2 = (_q2 = (_p2 = (_o2 = (_n2 = (_m2 = (_l2 = context.appHelper) == null ? void 0 : _l2.utils) == null ? void 0 : _m2.store) == null ? void 0 : _n2.getState) == null ? void 0 : _o2.call(_n2)) == null ? void 0 : _p2.global) == null ? void 0 : _q2.globalConfig) == null ? void 0 : _r2.id
+              }
+            ]
+          });
+        } catch (err) {
+        }
         if (sessionDetail) {
           setTimeout(() => {
             form.setFieldsValue({
@@ -608,24 +666,16 @@ var Info = (_, ref) => {
             });
           }, 200);
         }
-        let origin_total = _total;
-        if (item.discount_amount) {
-          origin_total = (0, import_utils6.getProductOriginTotalPrice)(cacheItem);
-          const previousOriginTotal = Number(((_d3 = item == null ? void 0 : item._extend) == null ? void 0 : _d3.origin_total) || 0);
-          const previousTotal = Number(((_e3 = item == null ? void 0 : item._extend) == null ? void 0 : _e3.total) || 0);
-          const productAllDiscountList = (0, import_utils8.getProductAllDiscountList)(item);
-          const hasNonManualDiscount = productAllDiscountList.some(
-            (discountItem) => (discountItem == null ? void 0 : discountItem.type) !== "product"
-          );
-          if (previousOriginTotal > 0 && Number.isFinite(previousOriginTotal) && Number.isFinite(previousTotal) && !hasNonManualDiscount) {
-            const sellingRatio = new import_decimal.default(previousTotal).div(previousOriginTotal);
-            _total = new import_decimal.default(origin_total).mul(sellingRatio).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
-            cacheItem._extend.total = _total;
-            shouldReallocateBundlePriceRef.current = true;
-          }
+        const hasSourcePriceSnapshot = ((_s2 = cacheItem == null ? void 0 : cacheItem.metadata) == null ? void 0 : _s2.source_product_price) != null;
+        const origin_total = hasSourcePriceSnapshot || hasManualPriceAdjustment ? (0, import_utils6.getProductOriginTotalPrice)(cacheItem) : _total;
+        if (hasManualPriceAdjustment && previousOriginTotal > 0 && Number.isFinite(previousTotal)) {
+          const sellingRatio = new import_decimal.default(previousTotal).div(previousOriginTotal);
+          _total = new import_decimal.default(origin_total).mul(sellingRatio).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
+          cacheItem._extend.total = _total;
+          shouldReallocateBundlePriceRef.current = true;
         }
         cacheItem._extend.origin_total = origin_total;
-        (((_f2 = cacheItem._extend) == null ? void 0 : _f2.items) || []).forEach((item2) => item2._extend.origin_total = origin_total);
+        (((_t2 = cacheItem._extend) == null ? void 0 : _t2.items) || []).forEach((item2) => item2._extend.origin_total = origin_total);
         dispatch({
           type: "setService",
           payload: {
@@ -634,19 +684,32 @@ var Info = (_, ref) => {
         });
         form.setFieldsValue({
           total: _total,
-          capacity: (_g2 = cacheItem._extend) == null ? void 0 : _g2.capacity,
+          capacity: (_u2 = cacheItem._extend) == null ? void 0 : _u2.capacity,
           quantity: (e2 == null ? void 0 : e2.quantity) || (values == null ? void 0 : values.quantity) || 1
         });
       }
     });
   });
   const handleChange = (0, import_ahooks.useMemoizedFn)((e) => {
-    var _a2;
+    var _a2, _b2, _c2;
     if (state.channelDisabledEdit) {
       return;
     }
+    sendProductChangeLog({
+      title: "点击更换预约商品",
+      content: [
+        {
+          key: "更换前商品",
+          value: (0, import_productChangeLog.getCurrentServiceProductData)([(_a2 = state == null ? void 0 : state.service) == null ? void 0 : _a2.cacheItem])
+        },
+        {
+          key: "当前页面商品",
+          value: (0, import_productChangeLog.getCurrentServiceProductData)((_b2 = state == null ? void 0 : state.service) == null ? void 0 : _b2.value)
+        }
+      ]
+    });
     form.resetFields();
-    (_a2 = window.closeBookingEditModal) == null ? void 0 : _a2.call(window);
+    (_c2 = window.closeBookingEditModal) == null ? void 0 : _c2.call(window);
     dispatch({
       type: "setService",
       payload: {
@@ -671,7 +734,7 @@ var Info = (_, ref) => {
     }
     return false;
   }, [state.renderType, isNormalProduct]);
-  const SelectTime = (_p = window.BaseMaterials) == null ? void 0 : _p.SelectTime;
+  const SelectTime = (_q = window.BaseMaterials) == null ? void 0 : _q.SelectTime;
   const isNoSpecAndPackage = (0, import_utilsByBooking.getIsNoSpecAndPackage)(state.service.cacheItem);
   const items = (0, import_react.useMemo)(() => {
     var _a2, _b2;
@@ -708,7 +771,7 @@ var Info = (_, ref) => {
       }
     ))));
   }, [
-    (_s = (_r = (_q = state.service) == null ? void 0 : _q.cacheItem) == null ? void 0 : _r._extend) == null ? void 0 : _s.product_name,
+    (_t = (_s = (_r = state.service) == null ? void 0 : _r.cacheItem) == null ? void 0 : _s._extend) == null ? void 0 : _t.product_name,
     bundles,
     state.amountSymbol,
     state.isBookingCreatePage
@@ -753,7 +816,7 @@ var Info = (_, ref) => {
     ));
   }, [
     useTotal,
-    (_u = (_t = state.service.cacheItem) == null ? void 0 : _t._extend) == null ? void 0 : _u.origin_total,
+    (_v = (_u = state.service.cacheItem) == null ? void 0 : _u._extend) == null ? void 0 : _v.origin_total,
     state.amountSymbol,
     state.channelDisabledEdit
   ]);
@@ -801,7 +864,7 @@ var Info = (_, ref) => {
         }
       ) : null
     ));
-  }, [SelectTime, (_y = (_x = (_w = (_v = state.bookingConfig) == null ? void 0 : _v.config) == null ? void 0 : _w.basic) == null ? void 0 : _x.service_time) == null ? void 0 : _y.value, isEditGroup]);
+  }, [SelectTime, (_z = (_y = (_x = (_w = state.bookingConfig) == null ? void 0 : _w.config) == null ? void 0 : _x.basic) == null ? void 0 : _y.service_time) == null ? void 0 : _z.value, isEditGroup]);
   const endTime = (0, import_react.useMemo)(() => {
     if (!isEditGroup) {
       return null;
@@ -840,8 +903,8 @@ var Info = (_, ref) => {
     ));
   }, [
     state.renderType,
-    (_A = (_z = state.service.cacheItem) == null ? void 0 : _z._data) == null ? void 0 : _A.resources,
-    (_C = (_B = state.service.cacheItem) == null ? void 0 : _B._data) == null ? void 0 : _C.resourceMaps
+    (_B = (_A = state.service.cacheItem) == null ? void 0 : _A._data) == null ? void 0 : _B.resources,
+    (_D = (_C = state.service.cacheItem) == null ? void 0 : _C._data) == null ? void 0 : _D.resourceMaps
   ]);
   const holder = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
@@ -879,7 +942,7 @@ var Info = (_, ref) => {
   }, [
     state.locale,
     state.isTerminal,
-    (_F = (_E = (_D = state.service) == null ? void 0 : _D.cacheItem) == null ? void 0 : _E._data) == null ? void 0 : _F.capacitys
+    (_G = (_F = (_E = state.service) == null ? void 0 : _E.cacheItem) == null ? void 0 : _F._data) == null ? void 0 : _G.capacitys
   ]);
   const hiddenQuantity = (0, import_react.useMemo)(() => {
     return /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { hidden: true, name: "quantity" }, /* @__PURE__ */ import_react.default.createElement(import_antd.InputNumber, null));
@@ -959,10 +1022,10 @@ var Info = (_, ref) => {
         import_utils.locales.getText("pisell2.text.apply")
       )
     );
-  }, [(_G = state.service.resourcesOrigin) == null ? void 0 : _G.length, isNormalProduct]);
+  }, [(_H = state.service.resourcesOrigin) == null ? void 0 : _H.length, isNormalProduct]);
   console.log("render edit");
   console.log(
-    state.service.editModal && !((_H = state.service.cacheItem) == null ? void 0 : _H.autoClose),
+    state.service.editModal && !((_I = state.service.cacheItem) == null ? void 0 : _I.autoClose),
     performance.now() - window.pp1,
     "打开商品1"
   );
@@ -1120,7 +1183,7 @@ var Info = (_, ref) => {
       zIndex: state.service.changeService ? 999 : 1e3,
       forceRender: true,
       mask: state.drawerMask,
-      open: !isNoSpecAndPackage && state.service.editModal && !((_I = state.service.cacheItem) == null ? void 0 : _I.autoClose),
+      open: !isNoSpecAndPackage && state.service.editModal && !((_J = state.service.cacheItem) == null ? void 0 : _J.autoClose),
       title: import_utils.locales.getText("pisell2.text.edit-service"),
       onClose: () => {
         var _a2;
@@ -1146,7 +1209,7 @@ var Info = (_, ref) => {
           display: currentTab === "batch_edit" ? "block" : "none"
         }
       },
-      /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, productName, price, reason, val && isShowTimeAndResource && /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, startTime, endTime, duration, resource, capacity, hiddenQuantity), isNormalProduct && quantity, !(0, import_utils4.isNormalProductByDurationSchedule)(state.service.cacheItem) && !(0, import_utils6.isWalkIn)((_K = (_J = state.client) == null ? void 0 : _J.value) == null ? void 0 : _K.id) && holder),
+      /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, productName, price, reason, val && isShowTimeAndResource && /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, startTime, endTime, duration, resource, capacity, hiddenQuantity), isNormalProduct && quantity, !(0, import_utils4.isNormalProductByDurationSchedule)(state.service.cacheItem) && !(0, import_utils6.isWalkIn)((_L = (_K = state.client) == null ? void 0 : _K.value) == null ? void 0 : _L.id) && holder),
       /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { noStyle: true, name: "note" }, noteModalOpen && /* @__PURE__ */ import_react.default.createElement(
         import_noteModal.default,
         {

package/lib/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/lib/components/booking/info2/service/editService/utils.js

@@ -32,6 +32,7 @@ __export(utils_exports, {
   getAutoAllocationStorage: () => getAutoAllocationStorage,
   getProductAllDiscountList: () => getProductAllDiscountList,
   mergeBundleWithOriginalPrice: () => mergeBundleWithOriginalPrice,
+  mergeBundles: () => mergeBundles,
   setAutoAllocationStorage: () => setAutoAllocationStorage,
   setProductPrice: () => setProductPrice
 });
@@ -90,12 +91,25 @@ var setProductPrice = (cacheItem, { newTotal, origin_total }) => {
 };
 var getProductAllDiscountList = (cacheItem) => {
   var _a, _b;
-  let discountList = [];
-  discountList = cacheItem.discount_list || [];
+  const discountList = [...cacheItem.discount_list || []];
   const bundleDiscountList = (0, import_utils3.getBundleDiscountList)(((_b = (_a = cacheItem._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) || []) || [];
   discountList.push(...bundleDiscountList);
   return discountList;
 };
+var mergeBundles = (other) => {
+  const bundle = (other == null ? void 0 : other.bundle) || [];
+  const newBundle = [];
+  bundle.forEach((item) => {
+    const newItem = newBundle.find((newItem2) => newItem2.id === item.id);
+    if (newItem) {
+      newItem.num += item.num || 1;
+      newItem.quantity += item.quantity || 1;
+    } else {
+      newBundle.push({ ...item });
+    }
+  });
+  return newBundle;
+};
 var mergeBundleWithOriginalPrice = (other, originalOther) => {
   var _a, _b;
   if (!((_a = other == null ? void 0 : other.bundle) == null ? void 0 : _a.length) || !((_b = originalOther == null ? void 0 : originalOther.bundle) == null ? void 0 : _b.length)) return other;
@@ -115,6 +129,7 @@ var mergeBundleWithOriginalPrice = (other, originalOther) => {
   getAutoAllocationStorage,
   getProductAllDiscountList,
   mergeBundleWithOriginalPrice,
+  mergeBundles,
   setAutoAllocationStorage,
   setProductPrice
 });

package/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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;