@pisell/private-materials 6.6.32 → 6.6.34

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

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

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

@@ -27,7 +27,7 @@ import { PisellInput, PisellGoodPassCard, PisellToast } from '@pisell/materials'
 import { useIsBooking4Shop } from "../../hooks/useIsBooking4Shop";
 import "./index.less";
 import { useMemoizedFn, useDebounceFn, useDebounceEffect } from 'ahooks';
-import { getServiceAddons } from "./utils";
+import { getServiceAddons, hasEveryBookingId } from "./utils";
 import { useActiveExecute, useCustomer } from "../../../ticketBooking/hooks/pisellos";
 import { getClientVariantClose } from "../../info/clientVariant/utils";
 import { useShopDiscountModule } from "../../../ticketBooking/hooks/pisellos/useShopDiscountModule";
@@ -178,7 +178,7 @@ var VoucherCard = function VoucherCard(props) {
   }, [state.addons.value]);
   var holdersMemo = useMemo(function () {
     if (isBooking4Shop) {
-      var _state$pet;
+      var _state$pet, _shopDiscount$setHold;
       var list = [];
       if ((_state$pet = state.pet) !== null && _state$pet !== void 0 && _state$pet.value) {
         var entries = Object.entries(state.pet.value);
@@ -188,7 +188,7 @@ var VoucherCard = function VoucherCard(props) {
           list = entries[0][1];
         }
       }
-      shopDiscount.setHolders(list);
+      shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$setHold = shopDiscount.setHolders) === null || _shopDiscount$setHold === void 0 || _shopDiscount$setHold.call(shopDiscount, list);
       holderChangedRef.current = true;
       return list || [];
     }
@@ -200,9 +200,7 @@ var VoucherCard = function VoucherCard(props) {
   }, [state.bookingConfig]);
   var disabled = useMemo(function () {
     var _state$bookingDetail;
-    if (['paid', 'partially_paid'].includes((_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : _state$bookingDetail.payment_status) && [].concat(_toConsumableArray(addonsMemo), _toConsumableArray(serviceMemo)).every(function (item) {
-      return item.booking_id;
-    })) {
+    if (['paid', 'partially_paid'].includes((_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : _state$bookingDetail.payment_status) && hasEveryBookingId([].concat(_toConsumableArray(state.addons.value || []), _toConsumableArray(state.service.value || [])))) {
       return true;
     }
     return false;

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

@@ -2,3 +2,4 @@ export declare const getServiceAddons: (list: any[]) => {
     serviceList: any[];
     addonsList: any[];
 };
+export declare const hasEveryBookingId: (list: any[]) => boolean;

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

@@ -12,4 +12,12 @@ export var getServiceAddons = function getServiceAddons(list) {
     serviceList: serviceList,
     addonsList: addonsList
   };
+};
+export var hasEveryBookingId = function hasEveryBookingId(list) {
+  return list.every(function (item) {
+    var _item$_extend, _item$_extend$every;
+    return item.booking_id && ((_item$_extend = item._extend) === null || _item$_extend === void 0 || (_item$_extend = _item$_extend.other) === null || _item$_extend === void 0 || (_item$_extend = _item$_extend.bundle) === null || _item$_extend === void 0 || (_item$_extend$every = _item$_extend.every) === null || _item$_extend$every === void 0 ? void 0 : _item$_extend$every.call(_item$_extend, function (bundle) {
+      return bundle.booking_id;
+    }));
+  });
 };

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

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

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

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

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

@@ -81,7 +81,7 @@ export var createBookingItemsByGroup = function createBookingItemsByGroup(item,
 
   // 根据时长 进行创建多个商品
   for (var i = 0; i < item._extend.duration; i++) {
-    var _extend$multiDayPrice;
+    var _extend$multiDayPrice, _item$_extend;
     var _extend = _objectSpread({}, item._extend);
     var startDate = _extend.start_date.add(i, 'day');
     var endDate = _extend.start_date.add(i + 1, 'day');
@@ -105,8 +105,10 @@ export var createBookingItemsByGroup = function createBookingItemsByGroup(item,
       })
     });
     var totalPrice = getProductTotalPrice(cacheItem);
+    // 跨日预约原始价格从items中获取
+    var origin_total = (_item$_extend = item._extend) === null || _item$_extend === void 0 || (_item$_extend = _item$_extend.items) === null || _item$_extend === void 0 || (_item$_extend = _item$_extend[0]) === null || _item$_extend === void 0 || (_item$_extend = _item$_extend._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.origin_total;
     cacheItem._extend.total = totalPrice;
-    cacheItem._extend.origin_total = totalPrice;
+    cacheItem._extend.origin_total = origin_total !== null && origin_total !== void 0 ? origin_total : totalPrice;
     cacheItem._extend.items = undefined;
     cacheItem._serviceKey = genServiceKey(cacheItem);
     bookings.push(cacheItem);
@@ -131,8 +133,8 @@ export var isGroupBooking = function isGroupBooking(_id) {
 };
 export var getProductByGroupId = function getProductByGroupId(groupId, items) {
   return items.filter(function (item) {
-    var _item$_extend;
-    return ((_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.groupId) === groupId;
+    var _item$_extend2;
+    return ((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.groupId) === groupId;
   }).map(function (item) {
     return item._id;
   });
@@ -143,7 +145,7 @@ export var getGroupBooking = function getGroupBooking(groupId, items) {
 };
 export var filterItemByGroupId = function filterItemByGroupId(groupId, items) {
   return items.filter(function (item) {
-    var _item$_extend2;
-    return ((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.groupId) !== groupId;
+    var _item$_extend3;
+    return ((_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.groupId) !== groupId;
   });
 };

package/es/components/booking/info2/service/editService/DiscountChangeModal/index.d.ts

@@ -0,0 +1,25 @@
+import React from 'react';
+import './index.less';
+/**
+ * 折扣变更弹窗 Props
+ */
+export interface DiscountChangeModalProps {
+    /** 弹窗是否可见 */
+    open: boolean;
+    /** 保留原折扣回调 */
+    onKeepOriginal?: () => void;
+    /** 延续折扣回调 */
+    onContinue?: () => void;
+    /** 移除折扣回调 */
+    onRemove?: () => void;
+    /** 取消回调 */
+    onCancel?: () => void;
+}
+/**
+ * 折扣变更弹窗组件
+ *
+ * @description 当订单中使用的商品折扣已失效时，弹出此弹窗让用户选择处理方式
+ * @author Pisell Team
+ */
+declare const DiscountChangeModal: React.FC<DiscountChangeModalProps>;
+export default DiscountChangeModal;

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

@@ -0,0 +1,61 @@
+import React from 'react';
+import { Button, Space } from 'antd';
+import { PisellModal } from '@pisell/materials';
+import { locales } from '@pisell/utils';
+import "./index.less";
+
+/**
+ * 折扣变更弹窗 Props
+ */
+
+/**
+ * 折扣变更弹窗组件
+ *
+ * @description 当订单中使用的商品折扣已失效时，弹出此弹窗让用户选择处理方式
+ * @author Pisell Team
+ */
+var DiscountChangeModal = function DiscountChangeModal(_ref) {
+  var open = _ref.open,
+    onKeepOriginal = _ref.onKeepOriginal,
+    onContinue = _ref.onContinue,
+    onRemove = _ref.onRemove,
+    onCancel = _ref.onCancel;
+  /**
+   * 渲染自定义底部按钮
+   */
+  var renderFooter = function renderFooter() {
+    return /*#__PURE__*/React.createElement("div", {
+      className: "discount-change-modal__footer"
+    }, /*#__PURE__*/React.createElement(Space, {
+      size: 12,
+      wrap: true
+    }, /*#__PURE__*/React.createElement(Button, {
+      type: "primary",
+      onClick: onContinue
+    }, locales.getText('pisell2.discount-change.continue')), /*#__PURE__*/React.createElement(Button, {
+      onClick: onRemove
+    }, locales.getText('pisell2.discount-change.remove')), /*#__PURE__*/React.createElement(Button, {
+      onClick: onCancel
+    }, locales.getText('pisell2.discount-change.cancel'))));
+  };
+  return /*#__PURE__*/React.createElement(PisellModal, {
+    open: open,
+    title: locales.getText('pisell2.discount-change.title'),
+    onCancel: onCancel,
+    footer: renderFooter(),
+    maskClosable: false,
+    width: 560,
+    destroyOnClose: true
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "discount-change-modal__content"
+  }, /*#__PURE__*/React.createElement("p", {
+    className: "discount-change-modal__desc"
+  }, locales.getText('pisell2.discount-change.desc')), /*#__PURE__*/React.createElement("ul", {
+    className: "discount-change-modal__reasons"
+  }, /*#__PURE__*/React.createElement("li", null, locales.getText('pisell2.discount-change.reason'))), /*#__PURE__*/React.createElement("p", {
+    className: "discount-change-modal__desc"
+  }, locales.getText('pisell2.discount-change.options-title')), /*#__PURE__*/React.createElement("ul", {
+    className: "discount-change-modal__options"
+  }, /*#__PURE__*/React.createElement("li", null, /*#__PURE__*/React.createElement("strong", null, locales.getText('pisell2.discount-change.continue')), "\uFF1A", locales.getText('pisell2.discount-change.continue-desc')), /*#__PURE__*/React.createElement("li", null, /*#__PURE__*/React.createElement("strong", null, locales.getText('pisell2.discount-change.remove')), "\uFF1A", locales.getText('pisell2.discount-change.remove-desc')))));
+};
+export default DiscountChangeModal;

package/es/components/booking/info2/service/editService/DiscountChangeModal/index.less

@@ -0,0 +1,41 @@
+.discount-change-modal {
+  &__content {
+    padding: 8px 0;
+  }
+
+  &__desc {
+    margin-bottom: 8px;
+    color: var(--Gray-900, #101828);
+    font-size: 14px;
+    line-height: 1.6;
+  }
+
+  &__reasons,
+  &__options {
+    margin: 0 0 16px 0;
+    padding-left: 20px;
+    color: var(--Gray-600, #475467);
+    font-size: 14px;
+    line-height: 1.8;
+
+    li {
+      margin-bottom: 4px;
+    }
+
+    strong {
+      color: var(--Gray-900, #101828);
+      font-weight: 600;
+    }
+  }
+
+  &__options {
+    margin-bottom: 0;
+  }
+
+  &__footer {
+    display: flex;
+    justify-content: flex-end;
+    width: 100%;
+  }
+}
+

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

@@ -27,7 +27,7 @@ import Duration from "../../../materiels/duration";
 import Capacity from "./Capacity";
 import Resources from "./Resources";
 import Holder from "./Holder";
-import { Input, Button, Row, Col, Form, InputNumber, DatePicker } from 'antd';
+import { Input, Button, Row, Col, Form, InputNumber, DatePicker, message } from 'antd';
 import "./index.less";
 import CollapsibleList from "../../../components/collapsibleList";
 import { renderBundles } from "../../../components/collapsibleList/utils";
@@ -41,13 +41,15 @@ import { editSessionProduct } from "../../../info/utils";
 import { deleteCacheParams, getDays, getProductTotalPrice, getServiceTimes, isSessionProduct, isWalkIn } from "../../../utils";
 import { getErrorList, getIsNoSpecAndPackage } from "../../utilsByBooking";
 import { formatResources, getDurationProps, getFlexibleOption, getMultiDay, getTimeObj, setDefaultCapacitys } from "../addService/utils";
-import { setProductPrice } from "./utils";
+import { getProductAllDiscountList, setProductPrice } 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 { useShopDiscountModule } from "../../../../ticketBooking/hooks/pisellos/useShopDiscountModule";
+import DiscountChangeModal from "./DiscountChangeModal";
 var submitLock = false;
 var Info = function Info(_, ref) {
   var _state$service4, _state$bookingConfig2, _state$bookingConfig3, _state$service$cacheI5, _state$service$cacheI7, _state$service6, _window$BaseMaterials, _state$service8, _state$service$cacheI12, _state$bookingConfig5, _state$service$cacheI13, _state$service$cacheI14, _state$service9, _state$service$resour2, _state$service$cacheI16, _state$service$cacheI17, _state$client2;
@@ -63,24 +65,34 @@ var Info = function Info(_, ref) {
   var useNote = Form.useWatch('note', form);
   var useStartDate = Form.useWatch('start_date', form);
   var useEndDate = Form.useWatch('end_date', form);
+  var shopDiscount = useShopDiscountModule();
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    discountChangeModalOpen = _useState2[0],
+    setDiscountChangeModalOpen = _useState2[1];
   var _useContext = useContext(Context),
     state = _useContext.state,
     dispatch = _useContext.dispatch;
   var resourcesRef = useRef(null);
   var isChangeTotal = useRef(false);
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    noteModalOpen = _useState2[0],
-    setNoteModalOpen = _useState2[1];
   var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
-    open = _useState4[0],
-    setOpen = _useState4[1];
-  // 当前tab 跨日预约时展示tabs
-  var _useState5 = useState('batch_edit'),
+    noteModalOpen = _useState4[0],
+    setNoteModalOpen = _useState4[1];
+  var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    currentTab = _useState6[0],
-    setCurrentTab = _useState6[1];
+    open = _useState6[0],
+    setOpen = _useState6[1];
+  // 当前tab 跨日预约时展示tabs
+  var _useState7 = useState('batch_edit'),
+    _useState8 = _slicedToArray(_useState7, 2),
+    currentTab = _useState8[0],
+    setCurrentTab = _useState8[1];
+  var valuesRef = useRef({});
+  var noInOriginalDiscountIdsRef = useRef([]);
+
+  /** 标记 handleEdit 是否执行过，用于判断保存时是否需要检查折扣变化 */
+  var isEditedRef = useRef(false);
   useEffect(function () {
     window.openBookingEditModal = function () {
       setOpen(true);
@@ -249,6 +261,41 @@ var Info = function Info(_, ref) {
       discount: discount
     });
   };
+  var onFinishBefore = function onFinishBefore(values) {
+    // 如果没有执行过 handleEdit，直接执行 onFinish
+    if (!isEditedRef.current) {
+      onFinish(values);
+      return;
+    }
+    valuesRef.current = values;
+    var originalDiscountList = shopDiscount.getDiscountList();
+    var productAllDiscountList = getProductAllDiscountList(state.service.cacheItem);
+
+    // 判断有些折扣不在原始折扣列表中
+    var noInOriginalDiscountList = productAllDiscountList.filter(function (item) {
+      return !originalDiscountList.some(function (d) {
+        var _item$discount;
+        return !d.isEditMode && d.id === (item === null || item === void 0 || (_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.resource_id);
+      });
+    });
+
+    // 判断是否有些折扣不在原始折扣列表中
+    var isSomeDiscountNotInOriginalDiscountList = noInOriginalDiscountList.length > 0;
+    if (isSomeDiscountNotInOriginalDiscountList) {
+      noInOriginalDiscountIdsRef.current = noInOriginalDiscountList.map(function (item) {
+        var _item$discount2;
+        return item === null || item === void 0 || (_item$discount2 = item.discount) === null || _item$discount2 === void 0 ? void 0 : _item$discount2.resource_id;
+      });
+      setDiscountChangeModalOpen(true);
+    } else {
+      var _cacheItem2 = _objectSpread({}, state.service.cacheItem);
+      _cacheItem2 = deleteDiscountList(_cacheItem2);
+      onFinish(values, _cacheItem2);
+      if (!!(productAllDiscountList !== null && productAllDiscountList !== void 0 && productAllDiscountList.length)) {
+        message.success(locales.getText('pisell2.text.edit-service-success'));
+      }
+    }
+  };
 
   /**
    * @title: 提交,
@@ -258,8 +305,8 @@ var Info = function Info(_, ref) {
    * @Author: zhiwei.Wang
    * @Date: 2024-01-09 14:04
    */
-  var onFinish = function onFinish(values) {
-    var _resourcesRef$current, _item$_extend, _item$_extend2, _item$_extend3, _item$_extend4, _item2, _item3, _state$service$cacheI3, _window$closeBookingE2, _window2;
+  var onFinish = function onFinish(values, cacheItem) {
+    var _resourcesRef$current, _item$_extend, _item$_extend2, _item$_extend3, _item$_extend4, _item2, _item3, _item$_extend5, _item$_extend6, _state$service$cacheI3, _window$closeBookingE2, _window2;
     var isSuccess = (_resourcesRef$current = resourcesRef.current) === null || _resourcesRef$current === void 0 ? void 0 : _resourcesRef$current.check();
     if (isShowTimeAndResource && !isSuccess) {
       return;
@@ -275,7 +322,7 @@ var Info = function Info(_, ref) {
       submitLock = false;
     }, 1500);
     var _list = _toConsumableArray(state.service.value);
-    var _item = _objectSpread(_objectSpread({}, state.service.cacheItem), {}, {
+    var _item = _objectSpread(_objectSpread({}, cacheItem !== null && cacheItem !== void 0 ? cacheItem : state.service.cacheItem), {}, {
       autoClose: false
     });
     var _extend = _objectSpread(_objectSpread({}, _item._extend), {}, {
@@ -342,18 +389,22 @@ var Info = function Info(_, ref) {
     }
     var _id = (_item2 = _item) === null || _item2 === void 0 ? void 0 : _item2._id;
     var groupId = (_item3 = _item) === null || _item3 === void 0 || (_item3 = _item3._extend) === null || _item3 === void 0 ? void 0 : _item3.groupId;
+    var origin_total = (_item$_extend5 = _item._extend) === null || _item$_extend5 === void 0 || (_item$_extend5 = _item$_extend5.items) === null || _item$_extend5 === void 0 || (_item$_extend5 = _item$_extend5[0]) === null || _item$_extend5 === void 0 || (_item$_extend5 = _item$_extend5._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.origin_total;
+    _item = setProductPrice(_item, {
+      newTotal: values.total,
+      origin_total: origin_total !== null && origin_total !== void 0 ? origin_total : (_item$_extend6 = _item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.origin_total
+    });
     if (groupId) {
+      // 手动改价时移除优惠券使用
+      if (isChangeTotal.current) {
+        _item = deleteDiscountList(_item);
+      }
       _list = _list.filter(function (d) {
         var _d$_extend;
         return ((_d$_extend = d._extend) === null || _d$_extend === void 0 ? void 0 : _d$_extend.groupId) !== groupId;
       });
       _list = _list.concat(createBookingItemsByGroup(_item, true));
     } else {
-      var _item$_extend5;
-      _item = setProductPrice(_item, {
-        newTotal: values.total,
-        origin_total: (_item$_extend5 = _item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.origin_total
-      });
       // 判断是新增还是编辑
       if (!_list.some(function (d) {
         return d._id === _id;
@@ -363,7 +414,7 @@ var Info = function Info(_, ref) {
       } else {
         // 手动改价时移除优惠券使用
         if (isChangeTotal.current) {
-          delete _item.discount_list;
+          _item = deleteDiscountList(_item);
         }
         _list = _list.map(function (d) {
           return d._id === _id ? _objectSpread(_objectSpread({}, _item), {}, {
@@ -421,6 +472,8 @@ var Info = function Info(_, ref) {
     console.log('setEditDatasetEditData', _cacheItem, open);
     setCurrentTab('batch_edit');
     isChangeTotal.current = false;
+    // 重置编辑标记
+    isEditedRef.current = false;
     var cacheItem = _cacheItem || state.service.cacheItem;
     var values = cacheItem._extend;
     var startTime = performance.now();
@@ -579,11 +632,11 @@ var Info = function Info(_, ref) {
     var isSession = isSessionProduct(item);
     var sessionValue = {};
     if (isSession) {
-      var _item$_extend6, _item$_extend7, _item$_extend8;
+      var _item$_extend7, _item$_extend8, _item$_extend9;
       sessionValue.startEndTime = {
-        startDate: item === null || item === void 0 || (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.start_date,
-        endDate: item === null || item === void 0 || (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.end_date,
-        duration: item === null || item === void 0 || (_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.duration
+        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
       };
     }
 
@@ -607,7 +660,9 @@ var Info = function Info(_, ref) {
         })
       },
       callback: function callback(e, extension_type, detail) {
-        var _cacheItem$_extend;
+        var _cacheItem$_extend, _cacheItem$_extend2;
+        // 标记已执行过编辑操作
+        isEditedRef.current = true;
         var _detail = detail || item;
         var other = JSON.parse(JSON.stringify(e));
         other.session = e.session;
@@ -648,6 +703,9 @@ var Info = function Info(_, ref) {
 
         // 用于储存原价
         cacheItem._extend.origin_total = _total;
+        (((_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.items) || []).forEach(function (item) {
+          return item._extend.origin_total = _total;
+        });
 
         // 覆盖商品
         dispatch({
@@ -660,7 +718,7 @@ var Info = function Info(_, ref) {
         // 更新表单内的商品价格
         form.setFieldsValue({
           total: _total,
-          capacity: (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.capacity,
+          capacity: (_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.capacity,
           quantity: (e === null || e === void 0 ? void 0 : e.quantity) || (values === null || values === void 0 ? void 0 : values.quantity) || 1
         });
       }
@@ -993,10 +1051,10 @@ var Info = function Info(_, ref) {
   }, [(_state$service$resour2 = state.service.resourcesOrigin) === null || _state$service$resour2 === void 0 ? void 0 : _state$service$resour2.length, isNormalProduct]);
   console.log('render edit');
   console.log(state.service.editModal && !((_state$service$cacheI16 = state.service.cacheItem) !== null && _state$service$cacheI16 !== void 0 && _state$service$cacheI16.autoClose), performance.now() - window.pp1, '打开商品1');
-  var _useState7 = useState(false),
-    _useState8 = _slicedToArray(_useState7, 2),
-    val = _useState8[0],
-    setVal = _useState8[1];
+  var _useState9 = useState(false),
+    _useState10 = _slicedToArray(_useState9, 2),
+    val = _useState10[0],
+    setVal = _useState10[1];
   useEffect(function () {
     if (isShowTimeAndResource) {
       setTimeout(function () {
@@ -1098,8 +1156,8 @@ var Info = function Info(_, ref) {
 
       // 计算时长
       if (changedValues !== null && changedValues !== void 0 && changedValues.start_date || changedValues !== null && changedValues !== void 0 && changedValues.end_date) {
-        var _cacheItem2 = getCurrentCacheItem();
-        var _duration = getDays(_cacheItem2, 'days');
+        var _cacheItem3 = getCurrentCacheItem();
+        var _duration = getDays(_cacheItem3, 'days');
         var start_date = (changedValues === null || changedValues === void 0 ? void 0 : changedValues.start_date) || useStartDate;
         var _end_date = (changedValues === null || changedValues === void 0 ? void 0 : changedValues.end_date) || useEndDate;
         updateMultiDay({
@@ -1113,6 +1171,51 @@ var Info = function Info(_, ref) {
       }
     }
   };
+  var deleteDiscountList = function deleteDiscountList(cacheItem) {
+    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) {
+      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;
+      bundle === null || bundle === void 0 || delete bundle.bundle_payment_price;
+    });
+    return cacheItem;
+  };
+  var handleKeepOriginal = function handleKeepOriginal() {
+    setDiscountChangeModalOpen(false);
+  };
+  var handleContinue = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var cacheItem;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            cacheItem = _objectSpread({}, state.service.cacheItem);
+            cacheItem = deleteDiscountList(cacheItem);
+            _context2.next = 4;
+            return shopDiscount.batchSearchByProductIds(noInOriginalDiscountIdsRef.current);
+          case 4:
+            onFinish(valuesRef.current, cacheItem);
+            setDiscountChangeModalOpen(false);
+          case 6:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function handleContinue() {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+  var handleRemove = function handleRemove() {
+    setDiscountChangeModalOpen(false);
+    var cacheItem = deleteDiscountList(_objectSpread({}, state.service.cacheItem));
+    onFinish(valuesRef.current, cacheItem);
+  };
+  var handleCancel = function handleCancel() {
+    setDiscountChangeModalOpen(false);
+  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Drawer, {
     titleNoWrap: true
     //通过zIndex的方式控制  添加商品 和 编辑服务弹窗的上下层级
@@ -1139,7 +1242,7 @@ var Info = function Info(_, ref) {
   }, groupDom, /*#__PURE__*/React.createElement(Form, {
     layout: "vertical",
     form: form,
-    onFinish: onFinish,
+    onFinish: onFinishBefore,
     onValuesChange: onValuesChange,
     style: {
       display: currentTab === 'batch_edit' ? 'block' : 'none'
@@ -1158,6 +1261,12 @@ var Info = function Info(_, ref) {
     onConfirm: handleNoteConfirm,
     onDelete: handleNoteDelete,
     onCancel: handleNoteCancel
-  }))), footer)));
+  }))), footer)), /*#__PURE__*/React.createElement(DiscountChangeModal, {
+    open: discountChangeModalOpen,
+    onKeepOriginal: handleKeepOriginal,
+    onContinue: handleContinue,
+    onRemove: handleRemove,
+    onCancel: handleCancel
+  }));
 };
 export default /*#__PURE__*/forwardRef(Info);

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

@@ -26,3 +26,9 @@ export declare const setProductPrice: (cacheItem: any, { newTotal, origin_total
     newTotal: number;
     origin_total: number;
 }) => any;
+/**
+ * 获取商品所有折扣列表 包含子商品
+ * @param cacheItem - 缓存的商品项
+ * @returns 折扣列表
+ */
+export declare const getProductAllDiscountList: (cacheItem: any) => any;

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

@@ -1,4 +1,10 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -17,6 +23,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { isArr } from "@pisell/utils";
 import { isBoolean } from "@pisell/utils";
 import Decimal from "decimal.js";
+import { getBundleDiscountList } from "../../../components/footer/utils";
 var isNewService = function isNewService(service) {
   return !service.new && service._extend.endDate;
 };
@@ -118,4 +125,18 @@ export var setProductPrice = function setProductPrice(cacheItem, _ref2) {
   // 主商品价格 = newTotal - 子商品总价（让主商品吸收精度误差，确保总价精确）
   cacheItem._extend.price = new Decimal(newTotal).sub(subTotal).toNumber();
   return cacheItem;
+};
+
+/**
+ * 获取商品所有折扣列表 包含子商品
+ * @param cacheItem - 缓存的商品项
+ * @returns 折扣列表
+ */
+export var getProductAllDiscountList = function getProductAllDiscountList(cacheItem) {
+  var _cacheItem$_extend, _discountList;
+  var discountList = [];
+  discountList = 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));
+  return discountList;
 };