@pisell/private-materials 6.2.30 → 6.3.1

package/es/components/Sales/Cart/index.js

@@ -508,7 +508,6 @@ export var CartProvider = function CartProvider(_ref) {
     var productId = (_item$_originData = item._originData) === null || _item$_originData === void 0 || (_item$_originData = _item$_originData.product) === null || _item$_originData === void 0 ? void 0 : _item$_originData.product_id;
     var relationId = (_item$_originData2 = item._originData) === null || _item$_originData2 === void 0 ? void 0 : _item$_originData2.relation_id;
     var eventUniqueIdentifier = (_item$_originData3 = item._originData) === null || _item$_originData3 === void 0 ? void 0 : _item$_originData3.event_unique_identifier;
-    debugger;
     // 根据检测项过滤检测结果
     return list.find(function (res) {
       var _res$details;

package/es/components/Sales/Summary/utils.d.ts

@@ -30,7 +30,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组

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

@@ -552,10 +552,7 @@ var Addons = Provider(function (props) {
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TabPane, {
     loading: loading,
     header: locales.getText('pisell2.text.addons'),
-    footer: footer,
-    state: state,
-    dispatch: dispatch,
-    source: "addons"
+    footer: footer
   }, !state.bookingId ? /*#__PURE__*/React.createElement(EmptyBooking, null) : /*#__PURE__*/React.createElement(React.Fragment, null, state.addons.value.length ? /*#__PURE__*/React.createElement("div", {
     className: "",
     style: {

package/es/components/booking/components/TabProduct/tabs/index.js

@@ -2,7 +2,7 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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 _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 _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 _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useMemo, useState, useEffect, forwardRef, useImperativeHandle } from "react";
 import classNames from "classnames";
@@ -13,10 +13,6 @@ import "./index.less";
 
 // tabs 子组件定义
 
-// 定义主键类型
-
-// Tabs 可传递的参数
-
 var Tabs = function Tabs(_ref, ref) {
   var renderTab = _ref.renderTab,
     rowKey = _ref.rowKey,

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

@@ -29,7 +29,7 @@ var BrowserSelect = function BrowserSelect(props) {
     onChange: function onChange(e) {
       var _resetProps$onChange;
       e.persist();
-      (_resetProps$onChange = resetProps.onChange) === null || _resetProps$onChange === void 0 || _resetProps$onChange.call(resetProps, e);
+      (_resetProps$onChange = resetProps.onChange) === null || _resetProps$onChange === void 0 ? void 0 : _resetProps$onChange.call(resetProps, e);
     }
   }), _options);
 };

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

@@ -21,5 +21,4 @@ export declare const getSumTotal: (state: any, isEdit: boolean) => {
     totalRefundAmount: number;
     dueAmount: number;
     roundingAmount: number;
-    originExpectAmount: number;
 };

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

@@ -18,7 +18,7 @@ export var getRelationDetailsTotal = function getRelationDetailsTotal(relation_d
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var item = _step.value;
       var number = item.product_quantity || item.num;
-      var price = item.selling_price || item.payment_price || item.price;
+      var price = item.payment_price || item.price;
       total += Number(price) * Number(number);
     }
   } catch (err) {
@@ -286,8 +286,7 @@ var getTotalRefundAmount = function getTotalRefundAmount(state) {
 };
 var getShopDiscount = function getShopDiscount(state) {
   var _state$bookingDetail8;
-  // 优先使用手动设置的折扣（字符串格式），否则使用bookingDetail中的折扣
-  return Number(state.shop_discount) || Number((_state$bookingDetail8 = state.bookingDetail) === null || _state$bookingDetail8 === void 0 ? void 0 : _state$bookingDetail8.shop_discount) || 0;
+  return Number((_state$bookingDetail8 = state.bookingDetail) === null || _state$bookingDetail8 === void 0 ? void 0 : _state$bookingDetail8.shop_discount) || 0;
 };
 var getRoundingAmount = function getRoundingAmount(state) {
   var _state$bookingDetail9;
@@ -344,16 +343,6 @@ export var getSumTotal = function getSumTotal(state, isEdit) {
     isEdit: isEdit
   });
 
-  // 订单原价（不包含整单折扣的价格）
-  var originExpectAmount = getExpectAmount({
-    price: price,
-    tax: tax,
-    shopDiscount: 0,
-    otherAmount: otherAmount,
-    state: state,
-    isEdit: isEdit
-  });
-
   // 总支付金额  总计
   var sumTotalAmount = getSumTotalAmount({
     expectAmount: expectAmount,
@@ -384,7 +373,6 @@ export var getSumTotal = function getSumTotal(state, isEdit) {
     orderPaidAmount: orderPaidAmount,
     totalRefundAmount: totalRefundAmount,
     dueAmount: dueAmount,
-    roundingAmount: roundingAmount,
-    originExpectAmount: originExpectAmount
+    roundingAmount: roundingAmount
   };
 };

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

@@ -33,12 +33,11 @@ import { getSumTotal, is_price_include_tax } from "./amount";
 import "./index.less";
 import { createEventBooking, editEventBooking } from "./serve";
 import { checkHolderIsError, formatValues } from "./utils";
-import NoteModal from "../../../../plus/noteModal";
+import VoucherCard from "../voucher";
 import { SubTotal } from "../../../../index";
 import { useIsBooking4Shop } from "../../hooks/useIsBooking4Shop";
 import { sendWarningLog } from '@pisell/utils';
 import dayjs from 'dayjs';
-import useScanManager from "../../../ticketBooking/hooks/pisellos/useScanManager";
 /**
  * @title: 底部
  * @description:
@@ -48,7 +47,7 @@ import useScanManager from "../../../ticketBooking/hooks/pisellos/useScanManager
  * @Date: 2024-01-30 16:51
  */
 var Footer = function Footer(props) {
-  var _context$appHelper, _state$bookingConfig2, _state$bookingConfig4, _state$addons2, _state$bookingDetail8, _state$addons4, _state$bookingDetail16, _state$bookingDetail17, _state$notes2;
+  var _context$appHelper, _state$bookingConfig2, _state$bookingConfig4, _state$addons2, _businessUtils$getApp, _businessUtils$getApp2, _state$bookingDetail8, _state$addons4, _state$bookingDetail16, _state$bookingDetail17;
   var state = props.state,
     buttons = props.buttons,
     dispatch = props.dispatch,
@@ -68,20 +67,13 @@ var Footer = function Footer(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     checkoutLoading = _useState6[0],
     setCheckoutLoading = _useState6[1];
-  // note modal state
   var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
-    noteModalOpen = _useState8[0],
-    setNoteModalOpen = _useState8[1];
-  var _useState9 = useState(false),
-    _useState10 = _slicedToArray(_useState9, 2),
-    isShowPaymentLink = _useState10[0],
-    setIsShowPaymentLink = _useState10[1];
+    isShowPaymentLink = _useState8[0],
+    setIsShowPaymentLink = _useState8[1];
   var isBooking4Shop = useIsBooking4Shop(state);
   var appointmentProductRef = useRef(null);
   var context = useEngineContext();
-  var _useScanManager = useScanManager(),
-    disableAllScanListeners = _useScanManager.disableAllScanListeners;
   var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
     isTerminal = _context$appHelper$ut.isTerminal,
     interaction = _context$appHelper$ut.interaction,
@@ -245,9 +237,11 @@ var Footer = function Footer(props) {
 
     return false;
   }, [state, params]);
-  var isDisabledCheckOutForNegativeOrder = useMemo(function () {
-    return total.expectAmount < 0 && state.isBookingTicket2;
-  }, [total, state.isBookingTicket2]);
+
+  // 是否安装商品券应用
+  var hasGoodPassApp = !!(businessUtils !== null && businessUtils !== void 0 && (_businessUtils$getApp = businessUtils.getAppByModal) !== null && _businessUtils$getApp !== void 0 && _businessUtils$getApp.call(businessUtils, 'goodpass'));
+  var hasDiscountCardApp = !!(businessUtils !== null && businessUtils !== void 0 && (_businessUtils$getApp2 = businessUtils.getAppByModal) !== null && _businessUtils$getApp2 !== void 0 && _businessUtils$getApp2.call(businessUtils, 'discountcard'));
+  console.log('has goodpass app:', hasGoodPassApp);
 
   /**
    * @title: 跳转到 checkout页面
@@ -258,7 +252,7 @@ var Footer = function Footer(props) {
    * @Date: 2024-01-30 16:53
    */
   var goCheckout = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(order_id, isNewOrder) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(order_id) {
       var _interaction$utils, _interaction$utils$po;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -270,21 +264,18 @@ var Footer = function Footer(props) {
             return _context.abrupt("return");
           case 2:
             if (!(isTerminal !== null && isTerminal !== void 0 && isTerminal())) {
-              _context.next = 5;
+              _context.next = 4;
               break;
             }
-            disableAllScanListeners();
             return _context.abrupt("return", interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$po = _interaction$utils.postMessageToApp) === null || _interaction$utils$po === void 0 ? void 0 : _interaction$utils$po.call(_interaction$utils, {
               module: 'booking',
               key: 'booking_checkout',
               data: {
                 order_id: order_id,
-                callbackType: 'pisell2',
-                // 是新创建订单传递newOrder terminal内会执行弃单逻辑 编辑订单时不走弃单逻辑
-                newOrder: isNewOrder
+                callbackType: 'pisell2'
               }
             }));
-          case 5:
+          case 4:
             state.action({
               type: 'pisell1.handlePayment',
               data: {
@@ -294,13 +285,13 @@ var Footer = function Footer(props) {
                 state === null || state === void 0 || state.callback();
               }
             });
-          case 6:
+          case 5:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
-    return function goCheckout(_x, _x2) {
+    return function goCheckout(_x) {
       return _ref.apply(this, arguments);
     };
   }();
@@ -314,38 +305,37 @@ var Footer = function Footer(props) {
    */
   var handleCheckout = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var isNewOrder, isHasDayProducts, res;
+      var isHasDayProducts, res;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            isNewOrder = !state.bookingId; // 如果有编辑内容, 则先保存
             if (!isEdit) {
-              _context2.next = 11;
+              _context2.next = 10;
               break;
             }
             if (!isDayBooking(state)) {
-              _context2.next = 6;
+              _context2.next = 5;
               break;
             }
             isHasDayProducts = handleDaySubmit();
             if (!isHasDayProducts) {
-              _context2.next = 6;
+              _context2.next = 5;
               break;
             }
             return _context2.abrupt("return");
-          case 6:
-            _context2.next = 8;
+          case 5:
+            _context2.next = 7;
             return handleSave({
               type: 'checkout',
               messageShow: !(isTerminal !== null && isTerminal !== void 0 && isTerminal())
             });
-          case 8:
+          case 7:
             res = _context2.sent;
-            goCheckout((res === null || res === void 0 ? void 0 : res.order_id) || state.bookingId, isNewOrder);
+            goCheckout((res === null || res === void 0 ? void 0 : res.order_id) || state.bookingId);
             return _context2.abrupt("return");
+          case 10:
+            return _context2.abrupt("return", goCheckout(state.bookingId));
           case 11:
-            return _context2.abrupt("return", goCheckout(state.bookingId, isNewOrder));
-          case 12:
           case "end":
             return _context2.stop();
         }
@@ -481,7 +471,7 @@ var Footer = function Footer(props) {
           case 20:
             _context4.prev = 20;
             callbackData = null; // 格式化提交的参数
-            values = formatValues(_objectSpread(_objectSpread({}, state), saveOtherValue), context); // 区分是新增还是编辑
+            values = formatValues(_objectSpread(_objectSpread({}, state), saveOtherValue)); // 区分是新增还是编辑
             api = state.bookingId ? editApi : createApi; // 增加日志记录
             sendWarningLog({
               title: 'saveBooking',
@@ -562,7 +552,7 @@ var Footer = function Footer(props) {
         }
       }, _callee4, null, [[20, 38]]);
     }));
-    return function handleSave(_x3) {
+    return function handleSave(_x2) {
       return _ref5.apply(this, arguments);
     };
   }();
@@ -602,7 +592,7 @@ var Footer = function Footer(props) {
         }
       }, _callee5);
     }));
-    return function onSelect(_x4) {
+    return function onSelect(_x3) {
       return _ref6.apply(this, arguments);
     };
   }();
@@ -677,7 +667,7 @@ var Footer = function Footer(props) {
       onClick: function onClick() {
         handleCheckout();
       },
-      disabled: isDisabled || isDisabledCheckOutForNegativeOrder
+      disabled: isDisabled
     }, locales.getText('pisell2.text.checkout')));
   }, [isEdit, checkoutLoading, isDisabled, state, source]);
   var handleMenuClick = /*#__PURE__*/function () {
@@ -733,7 +723,7 @@ var Footer = function Footer(props) {
         }
       }, _callee6);
     }));
-    return function handleMenuClick(_x5) {
+    return function handleMenuClick(_x4) {
       return _ref7.apply(this, arguments);
     };
   }();
@@ -839,38 +829,6 @@ var Footer = function Footer(props) {
       loading: loading
     }, locales.getText('pisell2.text.save')));
   }, [loading, isDisabled, isEdit, infoEdit, addonsEdit, state]);
-  var handleNote = function handleNote() {
-    setNoteModalOpen(true);
-  };
-
-  // 备注弹窗确认回调
-  var handleNoteConfirm = function handleNoteConfirm(noteValue) {
-    dispatch({
-      type: 'setNotes',
-      payload: {
-        orderNote: noteValue,
-        edit: true
-      }
-    });
-    setNoteModalOpen(false);
-  };
-
-  // 备注弹窗删除回调
-  var handleNoteDelete = function handleNoteDelete() {
-    dispatch({
-      type: 'setNotes',
-      payload: {
-        orderNote: '',
-        edit: true
-      }
-    });
-    setNoteModalOpen(false);
-  };
-
-  // 备注弹窗取消回调
-  var handleNoteCancel = function handleNoteCancel() {
-    setNoteModalOpen(false);
-  };
 
   /**
    * @title: 完成按钮
@@ -946,19 +904,6 @@ var Footer = function Footer(props) {
       // style={{ backgroundColor: '#f04438', color: '#fff' }}
     }, locales.getText('pisell2.booking.info.text.clear-all')));
   }, []);
-  var noteButton = useMemo(function () {
-    return /*#__PURE__*/React.createElement(ConfigProvider, {
-      theme: {
-        token: {
-          colorPrimary: '#0d7fa9'
-        }
-      }
-    }, /*#__PURE__*/React.createElement(Button, {
-      className: "pisell-lowcode__booking-footer-buttons-item",
-      type: "primary",
-      onClick: handleNote
-    }, locales.getText('pisell2.ticket-booking.note')));
-  }, []);
   var buttonMap = {
     checkout: checkoutButton,
     save: saveButton,
@@ -966,8 +911,7 @@ var Footer = function Footer(props) {
     refund: refundButton,
     paymentLink: paymentLinkButton,
     rebook: rebookButton,
-    clearAll: clearAllButton,
-    note: noteButton
+    clearAll: clearAllButton
   };
   var isShowClearAll = useMemo(function () {
     // 目前新建状态时展示清除全部按钮
@@ -1041,16 +985,12 @@ var Footer = function Footer(props) {
     // info
     if (source === 'info') {
       var _arr2 = [];
-      // 注释掉清空按钮
-      // if (isShowClearAll) {
-      //   arr.push(buttonMap.clearAll);
-      // }
+      if (isShowClearAll) {
+        _arr2.push(buttonMap.clearAll);
+      }
       // if (state.bookingId && isShowPaymentLink) {
       // 	arr.push(buttonMap.paymentLink);
       // }
-      if (state.isBookingTicket2) {
-        _arr2.push(buttonMap.note);
-      }
       // 有未支付金额 展示checkout
       if (isCheckout) {
         // 有未支付金额 展示checkout
@@ -1314,24 +1254,16 @@ var Footer = function Footer(props) {
         title: state === null || state === void 0 || (_state$bookingDetail15 = state.bookingDetail) === null || _state$bookingDetail15 === void 0 ? void 0 : _state$bookingDetail15.tax_title
       }
     },
-    // 订单折扣（优惠券等）
+    // 订单折扣
     {
       hidden: !state.bookingId,
       key: 'discount',
       value: total.shopDiscount
     },
-    // 手动折扣
-    {
-      hidden: !state.shop_discount || !!state.bookingId,
-      key: 'shop_discount',
-      value: Number(state.shop_discount) || 0,
-      label: locales.getText('pisell2.text.manual-price-adjustment')
-    },
     // 总计
     {
-      key: 'expect_amount',
-      value: total.expectAmount,
-      label: locales.getText('pisell2.subtotal.total')
+      key: 'total',
+      value: total.expectAmount
     },
     // 舍入金额
     {
@@ -1377,7 +1309,11 @@ var Footer = function Footer(props) {
     round: true,
     loading: showFooter,
     active: true
-  }, /*#__PURE__*/React.createElement("div", {
+  }, (hasGoodPassApp || hasDiscountCardApp) && ['addons', 'info'].includes(source) && !paymentRefundedStatus ? /*#__PURE__*/React.createElement(VoucherCard, {
+    state: state,
+    dispatch: dispatch,
+    source: source
+  }) : null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-footer-total"
   }, /*#__PURE__*/React.createElement("span", {
     className: "pisell-lowcode__booking-footer-left"
@@ -1441,13 +1377,6 @@ var Footer = function Footer(props) {
     className: "pisell-lowcode__booking-footer-buttons-item"
   }, actionMap.orderDetail.label)) : null, contextHolder, /*#__PURE__*/React.createElement(AppointmentProductModal, {
     ref: appointmentProductRef
-  }), noteModalOpen && /*#__PURE__*/React.createElement(NoteModal, {
-    open: noteModalOpen,
-    title: locales.getText('pisell2.text.add-order-notes'),
-    value: ((_state$notes2 = state.notes) === null || _state$notes2 === void 0 ? void 0 : _state$notes2.orderNote) || '',
-    onConfirm: handleNoteConfirm,
-    onDelete: handleNoteDelete,
-    onCancel: handleNoteCancel
   }));
 };
 export default Footer;

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

@@ -1,6 +1,6 @@
 .pisell-lowcode__booking-footer-total {
   width: 100%;
-  padding-bottom: 8px;
+  padding-bottom: 16px;
   display: flex;
   align-items: flex-start;
   justify-content: space-between;
@@ -15,8 +15,7 @@
     display: flex;
     flex-direction: column;
 
-    .pisell-lowcode__booking-footer-left-total {
-    }
+    .pisell-lowcode__booking-footer-left-total {}
 
     .pisell-lowcode__booking-footer-left-arrears {
       font-size: 14px;

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

@@ -10,7 +10,7 @@ import { isWalkIn } from "../../utils";
 import { getSumCapacity } from "../../info2/utilsByBooking";
 import { getDays } from "../../utils";
 import { appointmentTypes } from "../../info/service2/status";
-import { isDaysBooking, formatDayTime, isEventBooking, isNormalProductByDurationSchedule, genRowKey } from "../../info/service2/utils";
+import { isDaysBooking, formatDayTime, isEventBooking, isNormalProductByDurationSchedule } from "../../info/service2/utils";
 import { isArr, locales, sendWarningLog } from '@pisell/utils';
 import { PisellToast } from "@pisell/materials";
 var formatNote = function formatNote(data) {
@@ -125,7 +125,7 @@ var formatRelationDetails = function formatRelationDetails(list) {
   return (list || []).map(function (item) {
     return {
       num: item.product_quantity,
-      price: item.original_price || 0,
+      price: item.payment_price || 0,
       product_id: item.product_id,
       is_charge_tax: item.is_charge_tax,
       order_detail_id: item.order_detail_id
@@ -311,7 +311,7 @@ var getSourceProductPrice = function getSourceProductPrice(item) {
  * @Date: 2024-12-07 14:21
  */
 var formatProducts = function formatProducts(item, quantity) {
-  var _item$_extend15, _item$_extend16, _item$_extend17, _item$_extend18;
+  var _item$_extend15, _item$_extend16, _item$_extend17;
   var total = Number(item._extend.total);
   var origin_total = Number(item._extend.origin_total);
   var discount_amount = origin_total - total;
@@ -324,27 +324,23 @@ var formatProducts = function formatProducts(item, quantity) {
   var notManualDiscount = discount_list.filter(function (item) {
     return item.type !== 'product';
   });
-  if (item.isCustomItem) {
-    item.product_id = 0;
-  }
   return {
-    "name": item.name,
     "num": quantity || item._extend.quantity,
     "price": formatProductPrice(item),
     "source_product_price": getSourceProductPrice(item),
-    "product_id": item !== null && item !== void 0 && item.product_id || item.product_id === 0 ? item.product_id : item.id,
+    "product_id": (item === null || item === void 0 ? void 0 : item.product_id) || item.id,
     "discount_amount": notManualDiscount.length > 0 ? 0 : discount_amount,
     "product_discount_reason": item._extend.discount_reason || '',
     "is_charge_tax": item.is_charge_tax,
-    "note": ((_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.note) || '',
+    "note": (item === null || item === void 0 ? void 0 : item.note) || '',
     "discountway": item._extend.discountway || "num",
     "discount_per": item._extend.discount_per,
     "discount_type": item._extend.discount_type || discount_type,
     "order_detail_id": item._extend.order_detail_id || 0,
-    "product_bundle": formatProductBundle((_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 || (_item$_extend16 = _item$_extend16.other) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.bundle),
+    "product_bundle": formatProductBundle((_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 || (_item$_extend15 = _item$_extend15.other) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.bundle),
     "bundle_edit": item._extend.bundle_edit,
-    "product_option_item": formatProductOption((_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 || (_item$_extend17 = _item$_extend17.other) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.option),
-    "product_variant_id": ((_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 || (_item$_extend18 = _item$_extend18.other) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.product_variant_id) || 0,
+    "product_option_item": formatProductOption((_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 || (_item$_extend16 = _item$_extend16.other) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.option),
+    "product_variant_id": ((_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 || (_item$_extend17 = _item$_extend17.other) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.product_variant_id) || 0,
     "discount_list": notManualDiscount,
     metadata: formatMetaData(item)
   };
@@ -364,8 +360,8 @@ var formatDayRelationProducts = function formatDayRelationProducts(data, booking
 
   // 过滤出卡片中的普通商品
   var relation_products = list === null || list === void 0 ? void 0 : list.filter(function (item) {
-    var _item$_extend19;
-    var holderId = (_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.holder_id;
+    var _item$_extend18;
+    var holderId = (_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.holder_id;
     var bookingHolderId = booking_item._extend.holder_id;
     var isDayBookingProduct = appointmentTypes.includes(item.extension_type);
     return holderId && holderId === bookingHolderId && !isDayBookingProduct;
@@ -391,15 +387,15 @@ var formatAppointmentProductLists = function formatAppointmentProductLists(data)
 
     // 找出预约商品
     list = list.filter(function (item) {
-      var _item$_extend20;
-      return ((_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.holder_id) && !isNormalProductByDurationSchedule(item);
+      var _item$_extend19;
+      return ((_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.holder_id) && !isNormalProductByDurationSchedule(item);
     });
 
     // 对预约商品列表根据holder_id进行分组
     var groupMap = new Map();
     list.forEach(function (item) {
-      var _item$_extend21;
-      var key = (_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.holder_id; // 分组键
+      var _item$_extend20;
+      var key = (_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.holder_id; // 分组键
       if (!groupMap.has(key)) {
         groupMap.set(key, []);
       }
@@ -459,13 +455,6 @@ var formatBookings = function formatBookings(data, values) {
   var eventOtherParams = data.eventOtherParams;
   var bookings = [];
   list.forEach(function (item) {
-    // 自定义商品直接使用 _extend 中的数据，并将 id 转换为 0 提交给后端
-    if (item.isCustomItem) {
-      bookings.push(_objectSpread(_objectSpread({}, item._extend), {}, {
-        product_id: 0 // 确保后端接收到的 product_id 为 0
-      }));
-      return;
-    }
     var start_date = item._extend.startDate.format('YYYY-MM-DD');
     var end_date = item._extend.endDate.format('YYYY-MM-DD');
     var end_time = item._extend.endDate.format("HH:mm");
@@ -479,9 +468,9 @@ var formatBookings = function formatBookings(data, values) {
 
     // 跨日预约下的普通商品
     if (isDay) {
-      var _item$_extend22, _item$_extend23, _item$_extend24, _item$_extend25;
-      var startDate = ((_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.startDate) || ((_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.start_date);
-      var endDate = ((_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.endDate) || ((_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.end_date);
+      var _item$_extend21, _item$_extend22, _item$_extend23, _item$_extend24;
+      var startDate = ((_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.startDate) || ((_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.start_date);
+      var endDate = ((_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.endDate) || ((_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.end_date);
       var _formatDayTime = formatDayTime({
           startDate: startDate,
           endDate: endDate
@@ -523,8 +512,7 @@ var formatBookings = function formatBookings(data, values) {
         cacheItem: item
       }) : item._extend.number || 1,
       "resources": formatResource(item),
-      "metadata": formatMetaData(item),
-      "note": item._extend.note
+      "metadata": formatMetaData(item)
     }, eventOtherParams || {}), dayParams);
     if (isDay) {
       bookings.push(booking);
@@ -634,11 +622,9 @@ export var formatValues = function formatValues(state) {
     // 备注
     values.shop_note = formatNote(state);
   }
-
-  // 提交手动价格调整（shop_discount）
-  if (state.shop_discount && Number(state.shop_discount) > 0) {
-    values.shop_discount = state.shop_discount;
-    values.shop_discount_reason = '';
+  if (state.bookingId) {
+    values.shop_discount = state.bookingDetail.shop_discount;
+    values.shop_discount_reason = state.bookingDetail.shop_discount_reason;
   }
   if (state.contacts) {
     var _state$contacts;
@@ -687,35 +673,21 @@ export var formatValues = function formatValues(state) {
 // 检测预约主体是否为空
 export var checkHolderIsError = function checkHolderIsError(state) {
   var _state$client;
-  var errorRowKey = "";
   var holderError = state.service.value.some(function (item) {
-    var _item$_extend27;
+    var _item$_extend25;
     // 普通商品不需要检测holder
     if (isNormalProductByDurationSchedule(item)) {
       return false;
     }
     if (item._extend.quantity === 1 && !item._extend.holder_id) {
-      var _item$_extend26;
-      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 || (_item$_extend26 = _item$_extend26.other) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.rowKey);
       return true;
     }
-    if (item._extend.quantity > 1 && ((_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 || (_item$_extend27 = _item$_extend27.holder_id) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.length) !== item._extend.quantity) {
-      var _item$_extend28;
-      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 || (_item$_extend28 = _item$_extend28.other) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.rowKey);
+    if (item._extend.quantity > 1 && ((_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 || (_item$_extend25 = _item$_extend25.holder_id) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.length) !== item._extend.quantity) {
       return true;
     }
     return false;
   });
   var clientId = (_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id;
-  if (holderError) {
-    var dom = document.getElementById(errorRowKey);
-    if (dom) {
-      dom.scrollIntoView({
-        behavior: 'smooth',
-        block: 'start'
-      });
-    }
-  }
   if (holderError && (!clientId || clientId === 0 || clientId === 1)) {
     PisellToast({
       content: locales.getText('pisell2.text.please-select-the-customer-first')