@pisell/private-materials 6.1.7 → 6.1.8

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

@@ -33,7 +33,7 @@ import { getSumTotal, is_price_include_tax } from "./amount";
 import "./index.less";
 import { createEventBooking, editEventBooking } from "./serve";
 import { checkHolderIsError, formatValues } from "./utils";
-import VoucherCard from "../voucher";
+import NoteModal from "../../../../plus/noteModal";
 import { SubTotal } from "../../../../index";
 import { useIsBooking4Shop } from "../../hooks/useIsBooking4Shop";
 import { sendWarningLog } from '@pisell/utils';
@@ -47,7 +47,7 @@ import dayjs from 'dayjs';
  * @Date: 2024-01-30 16:51
  */
 var Footer = function Footer(props) {
-  var _context$appHelper, _state$bookingConfig2, _state$bookingConfig4, _state$addons2, _businessUtils$getApp, _businessUtils$getApp2, _state$addons4, _state$bookingDetail12, _state$bookingDetail13;
+  var _context$appHelper, _state$bookingConfig2, _state$bookingConfig4, _state$addons2, _state$bookingDetail8, _state$addons4, _state$bookingDetail16, _state$bookingDetail17, _state$notes2;
   var state = props.state,
     buttons = props.buttons,
     dispatch = props.dispatch,
@@ -67,10 +67,15 @@ 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),
-    isShowPaymentLink = _useState8[0],
-    setIsShowPaymentLink = _useState8[1];
+    noteModalOpen = _useState8[0],
+    setNoteModalOpen = _useState8[1];
+  var _useState9 = useState(false),
+    _useState10 = _slicedToArray(_useState9, 2),
+    isShowPaymentLink = _useState10[0],
+    setIsShowPaymentLink = _useState10[1];
   var isBooking4Shop = useIsBooking4Shop(state);
   var appointmentProductRef = useRef(null);
   var context = useEngineContext();
@@ -238,11 +243,9 @@ var Footer = function Footer(props) {
 
     return false;
   }, [state, params]);
-
-  // 是否安装商品券应用
-  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);
+  var isDisabledCheckOutForNegativeOrder = useMemo(function () {
+    return total.expectAmount < 0 && state.isBookingTicket2;
+  }, [total, state.isBookingTicket2]);
 
   /**
    * @title: 跳转到 checkout页面
@@ -253,7 +256,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, totalAmount) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(order_id, isNewOrder, totalAmount) {
       var _interaction$utils, _interaction$utils$po;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -296,7 +299,9 @@ var Footer = function Footer(props) {
               key: 'booking_checkout',
               data: {
                 order_id: order_id,
-                callbackType: 'pisell2'
+                callbackType: 'pisell2',
+                // 是新创建订单传递newOrder terminal内会执行弃单逻辑 编辑订单时不走弃单逻辑
+                newOrder: isNewOrder
               }
             }));
           case 7:
@@ -315,7 +320,7 @@ var Footer = function Footer(props) {
         }
       }, _callee);
     }));
-    return function goCheckout(_x, _x2) {
+    return function goCheckout(_x, _x2, _x3) {
       return _ref.apply(this, arguments);
     };
   }();
@@ -329,37 +334,38 @@ var Footer = function Footer(props) {
    */
   var handleCheckout = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var isHasDayProducts, res;
+      var isNewOrder, isHasDayProducts, res;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
+            isNewOrder = !state.bookingId; // 如果有编辑内容, 则先保存
             if (!isEdit) {
-              _context2.next = 10;
+              _context2.next = 11;
               break;
             }
             if (!isDayBooking(state)) {
-              _context2.next = 5;
+              _context2.next = 6;
               break;
             }
             isHasDayProducts = handleDaySubmit();
             if (!isHasDayProducts) {
-              _context2.next = 5;
+              _context2.next = 6;
               break;
             }
             return _context2.abrupt("return");
-          case 5:
-            _context2.next = 7;
+          case 6:
+            _context2.next = 8;
             return handleSave({
               type: 'checkout',
               messageShow: !(isTerminal !== null && isTerminal !== void 0 && isTerminal())
             });
-          case 7:
+          case 8:
             res = _context2.sent;
-            goCheckout((res === null || res === void 0 ? void 0 : res.order_id) || state.bookingId, res.total_amount);
+            goCheckout((res === null || res === void 0 ? void 0 : res.order_id) || state.bookingId, isNewOrder, res.total_amount);
             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();
         }
@@ -495,7 +501,7 @@ var Footer = function Footer(props) {
           case 20:
             _context4.prev = 20;
             callbackData = null; // 格式化提交的参数
-            values = formatValues(_objectSpread(_objectSpread({}, state), saveOtherValue)); // 区分是新增还是编辑
+            values = formatValues(_objectSpread(_objectSpread({}, state), saveOtherValue), context); // 区分是新增还是编辑
             api = state.bookingId ? editApi : createApi; // 增加日志记录
             sendWarningLog({
               title: 'saveBooking',
@@ -576,7 +582,7 @@ var Footer = function Footer(props) {
         }
       }, _callee4, null, [[20, 38]]);
     }));
-    return function handleSave(_x3) {
+    return function handleSave(_x4) {
       return _ref5.apply(this, arguments);
     };
   }();
@@ -616,7 +622,7 @@ var Footer = function Footer(props) {
         }
       }, _callee5);
     }));
-    return function onSelect(_x4) {
+    return function onSelect(_x5) {
       return _ref6.apply(this, arguments);
     };
   }();
@@ -652,6 +658,10 @@ var Footer = function Footer(props) {
       }
     });
   };
+  var paymentRefundedStatus = useMemo(function () {
+    var _state$bookingDetail;
+    return ['partially_refunded', 'refunded'].includes(state === null || state === void 0 || (_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : _state$bookingDetail.payment_status);
+  }, [state === null || state === void 0 ? void 0 : state.bookingDetail]);
 
   /**
    * @title: checkout按钮
@@ -687,12 +697,12 @@ var Footer = function Footer(props) {
       onClick: function onClick() {
         handleCheckout();
       },
-      disabled: isDisabled
+      disabled: isDisabled || isDisabledCheckOutForNegativeOrder
     }, locales.getText('pisell2.text.checkout')));
   }, [isEdit, checkoutLoading, isDisabled, state, source]);
   var handleMenuClick = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(e) {
-      var id, customer, res, _state$bookingDetail, _state$bookingDetail2;
+      var id, customer, res, _state$bookingDetail2, _state$bookingDetail3;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
@@ -720,10 +730,10 @@ var Footer = function Footer(props) {
                 type: 'pisell1.sendPayLinkEmail',
                 data: {
                   id: id,
-                  is_deposit: state.bookingDetail.is_deposit || Number((_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : _state$bookingDetail.deposit_amount),
+                  is_deposit: state.bookingDetail.is_deposit || Number((_state$bookingDetail2 = state.bookingDetail) === null || _state$bookingDetail2 === void 0 ? void 0 : _state$bookingDetail2.deposit_amount),
                   deposit_payment_time: state.bookingDetail.deposit_payment_time,
                   customer: customer,
-                  contacts: (_state$bookingDetail2 = state.bookingDetail) === null || _state$bookingDetail2 === void 0 ? void 0 : _state$bookingDetail2.contacts
+                  contacts: (_state$bookingDetail3 = state.bookingDetail) === null || _state$bookingDetail3 === void 0 ? void 0 : _state$bookingDetail3.contacts
                 },
                 callback: function callback() {}
               });
@@ -743,7 +753,7 @@ var Footer = function Footer(props) {
         }
       }, _callee6);
     }));
-    return function handleMenuClick(_x5) {
+    return function handleMenuClick(_x6) {
       return _ref7.apply(this, arguments);
     };
   }();
@@ -849,6 +859,38 @@ 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: 完成按钮
@@ -924,6 +966,19 @@ 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.notes')));
+  }, []);
   var buttonMap = {
     checkout: checkoutButton,
     save: saveButton,
@@ -931,7 +986,8 @@ var Footer = function Footer(props) {
     refund: refundButton,
     paymentLink: paymentLinkButton,
     rebook: rebookButton,
-    clearAll: clearAllButton
+    clearAll: clearAllButton,
+    note: noteButton
   };
   var isShowClearAll = useMemo(function () {
     // 目前新建状态时展示清除全部按钮
@@ -949,10 +1005,10 @@ var Footer = function Footer(props) {
    * @Date: 2024-01-30 16:58
    */
   var isCheckout = useMemo(function () {
-    var _state$bookingDetail3, _state$bookingDetail4;
+    var _state$bookingDetail4, _state$bookingDetail5;
     var list = ['unfulfilled', 'partially_paid', 'unpaid', 'payment_processing'];
     // (支付状态 = 已支付 || 部分付款 || 未付款 || 支付处理中) && 预约状态 !== 已取消
-    if (!state.bookingId || ((_state$bookingDetail3 = state.bookingDetail) === null || _state$bookingDetail3 === void 0 || (_state$bookingDetail3 = _state$bookingDetail3.bookings) === null || _state$bookingDetail3 === void 0 ? void 0 : _state$bookingDetail3.appointment_status) !== 'cancelled' && list.includes(state === null || state === void 0 || (_state$bookingDetail4 = state.bookingDetail) === null || _state$bookingDetail4 === void 0 ? void 0 : _state$bookingDetail4.payment_status) && !state.disabledEdit) {
+    if (!state.bookingId || ((_state$bookingDetail4 = state.bookingDetail) === null || _state$bookingDetail4 === void 0 || (_state$bookingDetail4 = _state$bookingDetail4.bookings) === null || _state$bookingDetail4 === void 0 ? void 0 : _state$bookingDetail4.appointment_status) !== 'cancelled' && list.includes(state === null || state === void 0 || (_state$bookingDetail5 = state.bookingDetail) === null || _state$bookingDetail5 === void 0 ? void 0 : _state$bookingDetail5.payment_status) && !state.disabledEdit) {
       return true;
     } else {
       if (total.notPaidAmount > 0) {
@@ -963,7 +1019,8 @@ var Footer = function Footer(props) {
   }, [state.bookingDetail, total.notPaidAmount]);
   var _buttons = useMemo(function () {
     // 如果预约是取消状态,则不展示任何按钮
-    if (state.appointment_status === 'cancelled') {
+    // 如果订单已退款 | 部分退款，则展示再次预约按钮
+    if (state.appointment_status === 'cancelled' || paymentRefundedStatus) {
       return [buttonMap.rebook];
     }
 
@@ -1004,12 +1061,16 @@ var Footer = function Footer(props) {
     // info
     if (source === 'info') {
       var _arr2 = [];
-      if (isShowClearAll) {
-        _arr2.push(buttonMap.clearAll);
-      }
+      // 注释掉清空按钮
+      // if (isShowClearAll) {
+      //   arr.push(buttonMap.clearAll);
+      // }
       // if (state.bookingId && isShowPaymentLink) {
       // 	arr.push(buttonMap.paymentLink);
       // }
+      if (state.isBookingTicket2) {
+        _arr2.push(buttonMap.note);
+      }
       // 有未支付金额 展示checkout
       if (isCheckout) {
         // 有未支付金额 展示checkout
@@ -1042,6 +1103,7 @@ var Footer = function Footer(props) {
     return [];
   }, [buttons, total, isEdit, checkoutLoading, isDisabled, source, buttonMap, loading, isCheckout, state, isTeam, isShowClearAll]);
   var moreButton = useMemo(function () {
+    var _state$bookingDetail6;
     var arr = [];
     if (!state.bookingId) {
       return [];
@@ -1053,10 +1115,16 @@ var Footer = function Footer(props) {
       return [];
     }
 
+    // 如果订单已退款, 则不展示任何按钮
+    if ((state === null || state === void 0 || (_state$bookingDetail6 = state.bookingDetail) === null || _state$bookingDetail6 === void 0 ? void 0 : _state$bookingDetail6.payment_status) === 'refunded') {
+      return [];
+    }
+
     // 如果外部没有按钮, 则rebook按钮放在外面
     if (_buttons.length !== 0) {
-      // 支付链接
-      if (state.bookingId && isShowPaymentLink) {
+      var _state$bookingDetail7;
+      // 支付链接, 部分退款时, 不展示支付链接
+      if (state.bookingId && isShowPaymentLink && (state === null || state === void 0 || (_state$bookingDetail7 = state.bookingDetail) === null || _state$bookingDetail7 === void 0 ? void 0 : _state$bookingDetail7.payment_status) !== 'partially_refunded') {
         arr.push(actionMap.paymentLink);
       }
     }
@@ -1090,14 +1158,14 @@ var Footer = function Footer(props) {
     // 取消订单
     // arr.push(actionMap.cancelOrder);
     return arr;
-  }, [state, total, isShowPaymentLink, source, _buttons.length]);
+  }, [state, total, isShowPaymentLink, source, _buttons.length, state === null || state === void 0 || (_state$bookingDetail8 = state.bookingDetail) === null || _state$bookingDetail8 === void 0 ? void 0 : _state$bookingDetail8.payment_status]);
 
   /**
    * 是否只有定金支付
    */
   var isOnlyDeposit = useMemo(function () {
-    var _state$bookingDetail5, _state$bookingDetail6, _state$bookingDetail7;
-    if (state !== null && state !== void 0 && (_state$bookingDetail5 = state.bookingDetail) !== null && _state$bookingDetail5 !== void 0 && _state$bookingDetail5.deposit_payment_time && state !== null && state !== void 0 && (_state$bookingDetail6 = state.bookingDetail) !== null && _state$bookingDetail6 !== void 0 && (_state$bookingDetail6 = _state$bookingDetail6.payment_types) !== null && _state$bookingDetail6 !== void 0 && (_state$bookingDetail7 = _state$bookingDetail6.every) !== null && _state$bookingDetail7 !== void 0 && _state$bookingDetail7.call(_state$bookingDetail6, function (item) {
+    var _state$bookingDetail9, _state$bookingDetail10, _state$bookingDetail11;
+    if (state !== null && state !== void 0 && (_state$bookingDetail9 = state.bookingDetail) !== null && _state$bookingDetail9 !== void 0 && _state$bookingDetail9.deposit_payment_time && state !== null && state !== void 0 && (_state$bookingDetail10 = state.bookingDetail) !== null && _state$bookingDetail10 !== void 0 && (_state$bookingDetail10 = _state$bookingDetail10.payment_types) !== null && _state$bookingDetail10 !== void 0 && (_state$bookingDetail11 = _state$bookingDetail10.every) !== null && _state$bookingDetail11 !== void 0 && _state$bookingDetail11.call(_state$bookingDetail10, function (item) {
       return item === 'deposit';
     })) {
       return true;
@@ -1118,8 +1186,8 @@ var Footer = function Footer(props) {
 
     // 只有定金支付时，直接展示
     if (isOnlyDeposit) {
-      var _state$bookingDetail8;
-      return "".concat(locales.getText('pisell2.text.deposit-paid'), " ").concat(formatAmount(state === null || state === void 0 || (_state$bookingDetail8 = state.bookingDetail) === null || _state$bookingDetail8 === void 0 ? void 0 : _state$bookingDetail8.deposit_paid_amount, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || '$'), " ").concat(total.duration ? "(".concat(total.duration, ")") : '');
+      var _state$bookingDetail12;
+      return "".concat(locales.getText('pisell2.text.deposit-paid'), " ").concat(formatAmount(state === null || state === void 0 || (_state$bookingDetail12 = state.bookingDetail) === null || _state$bookingDetail12 === void 0 ? void 0 : _state$bookingDetail12.deposit_paid_amount, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || '$'), " ").concat(total.duration ? "(".concat(total.duration, ")") : '');
     }
 
     // 有退款金额时, 直接展示 退款:$8.00
@@ -1241,8 +1309,8 @@ var Footer = function Footer(props) {
     }
   };
   var subTotalList = useMemo(function () {
-    var _state$bookingDetail9, _state$bookingDetail10, _state$bookingDetail11;
-    var surcharge = (((_state$bookingDetail9 = state.bookingDetail) === null || _state$bookingDetail9 === void 0 ? void 0 : _state$bookingDetail9.surcharge) || []).map(function (d, index) {
+    var _state$bookingDetail13, _state$bookingDetail14, _state$bookingDetail15;
+    var surcharge = (((_state$bookingDetail13 = state.bookingDetail) === null || _state$bookingDetail13 === void 0 ? void 0 : _state$bookingDetail13.surcharge) || []).map(function (d, index) {
       return {
         key: "custom_surcharge_".concat(index),
         label: d.name[state.locale],
@@ -1261,21 +1329,29 @@ var Footer = function Footer(props) {
       key: 'tax',
       value: total.tax,
       tax: {
-        rate: state === null || state === void 0 || (_state$bookingDetail10 = state.bookingDetail) === null || _state$bookingDetail10 === void 0 ? void 0 : _state$bookingDetail10.tax_rate,
+        rate: state === null || state === void 0 || (_state$bookingDetail14 = state.bookingDetail) === null || _state$bookingDetail14 === void 0 ? void 0 : _state$bookingDetail14.tax_rate,
         is_price_include_tax: is_price_include_tax(state),
-        title: state === null || state === void 0 || (_state$bookingDetail11 = state.bookingDetail) === null || _state$bookingDetail11 === void 0 ? void 0 : _state$bookingDetail11.tax_title
+        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: 'total',
-      value: total.expectAmount
+      key: 'expect_amount',
+      value: total.expectAmount,
+      label: locales.getText('pisell2.subtotal.total')
     },
     // 舍入金额
     {
@@ -1284,7 +1360,7 @@ var Footer = function Footer(props) {
       value: total.roundingAmount,
       label: locales.getText('pisell1.text.rounding')
     }]);
-  }, [total, (_state$bookingDetail12 = state.bookingDetail) === null || _state$bookingDetail12 === void 0 ? void 0 : _state$bookingDetail12.surcharge, state, state.bookingId]);
+  }, [total, (_state$bookingDetail16 = state.bookingDetail) === null || _state$bookingDetail16 === void 0 ? void 0 : _state$bookingDetail16.surcharge, state, state.bookingId]);
   var orderTotalList = useMemo(function () {
     return [
     // 订单已付金额
@@ -1315,21 +1391,13 @@ var Footer = function Footer(props) {
       value: total.totalRefundAmount,
       label: locales.getText('pisell2.text.refunded-amount')
     }];
-  }, [total, (_state$bookingDetail13 = state.bookingDetail) === null || _state$bookingDetail13 === void 0 ? void 0 : _state$bookingDetail13.surcharge, state, state.bookingId]);
-  var paymentRefundedStatus = useMemo(function () {
-    var _state$bookingDetail14;
-    return ['partially_refunded', 'refunded'].includes(state === null || state === void 0 || (_state$bookingDetail14 = state.bookingDetail) === null || _state$bookingDetail14 === void 0 ? void 0 : _state$bookingDetail14.payment_status);
-  }, [state === null || state === void 0 ? void 0 : state.bookingDetail]);
+  }, [total, (_state$bookingDetail17 = state.bookingDetail) === null || _state$bookingDetail17 === void 0 ? void 0 : _state$bookingDetail17.surcharge, state, state.bookingId]);
   return /*#__PURE__*/React.createElement(Skeleton, {
     title: false,
     round: true,
     loading: showFooter,
     active: true
-  }, (hasGoodPassApp || hasDiscountCardApp) && ['addons', 'info'].includes(source) && !paymentRefundedStatus ? /*#__PURE__*/React.createElement(VoucherCard, {
-    state: state,
-    dispatch: dispatch,
-    source: source
-  }) : null, /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-footer-total"
   }, /*#__PURE__*/React.createElement("span", {
     className: "pisell-lowcode__booking-footer-left"
@@ -1393,6 +1461,13 @@ 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/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 } from "../../info/service2/utils";
+import { isDaysBooking, formatDayTime, isEventBooking, isNormalProductByDurationSchedule, genRowKey } 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.payment_price || 0,
+      price: item.original_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;
+  var _item$_extend15, _item$_extend16, _item$_extend17, _item$_extend18;
   var total = Number(item._extend.total);
   var origin_total = Number(item._extend.origin_total);
   var discount_amount = origin_total - total;
@@ -324,23 +324,27 @@ 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 ? void 0 : item.product_id) || item.id,
+    "product_id": item !== null && item !== void 0 && item.product_id || item.product_id === 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 === null || item === void 0 ? void 0 : item.note) || '',
+    "note": ((_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.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$_extend15 = item._extend) === null || _item$_extend15 === void 0 || (_item$_extend15 = _item$_extend15.other) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.bundle),
+    "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),
     "bundle_edit": item._extend.bundle_edit,
-    "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,
+    "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,
     "discount_list": notManualDiscount,
     metadata: formatMetaData(item)
   };
@@ -360,8 +364,8 @@ var formatDayRelationProducts = function formatDayRelationProducts(data, booking
 
   // 过滤出卡片中的普通商品
   var relation_products = list === null || list === void 0 ? void 0 : list.filter(function (item) {
-    var _item$_extend18;
-    var holderId = (_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.holder_id;
+    var _item$_extend19;
+    var holderId = (_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.holder_id;
     var bookingHolderId = booking_item._extend.holder_id;
     var isDayBookingProduct = appointmentTypes.includes(item.extension_type);
     return holderId && holderId === bookingHolderId && !isDayBookingProduct;
@@ -387,15 +391,15 @@ var formatAppointmentProductLists = function formatAppointmentProductLists(data)
 
     // 找出预约商品
     list = list.filter(function (item) {
-      var _item$_extend19;
-      return ((_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.holder_id) && !isNormalProductByDurationSchedule(item);
+      var _item$_extend20;
+      return ((_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.holder_id) && !isNormalProductByDurationSchedule(item);
     });
 
     // 对预约商品列表根据holder_id进行分组
     var groupMap = new Map();
     list.forEach(function (item) {
-      var _item$_extend20;
-      var key = (_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.holder_id; // 分组键
+      var _item$_extend21;
+      var key = (_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.holder_id; // 分组键
       if (!groupMap.has(key)) {
         groupMap.set(key, []);
       }
@@ -455,6 +459,13 @@ 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");
@@ -468,9 +479,9 @@ var formatBookings = function formatBookings(data, values) {
 
     // 跨日预约下的普通商品
     if (isDay) {
-      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 _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 _formatDayTime = formatDayTime({
           startDate: startDate,
           endDate: endDate
@@ -512,7 +523,8 @@ var formatBookings = function formatBookings(data, values) {
         cacheItem: item
       }) : item._extend.number || 1,
       "resources": formatResource(item),
-      "metadata": formatMetaData(item)
+      "metadata": formatMetaData(item),
+      "note": item._extend.note
     }, eventOtherParams || {}), dayParams);
     if (isDay) {
       bookings.push(booking);
@@ -606,7 +618,7 @@ export var formatValues = function formatValues(state) {
   var _values, _values3;
   var values = {
     type: state.renderType === 'eventBooking' ? "event_booking_v2" : "appointment_booking",
-    platform: "shop",
+    platform: state.isBookingTicket2 ? "pos" : "shop",
     sales_channel: "my_pisel",
     bookings: [],
     customer_id: 1,
@@ -621,9 +633,11 @@ export var formatValues = function formatValues(state) {
     // 备注
     values.shop_note = formatNote(state);
   }
-  if (state.bookingId) {
-    values.shop_discount = state.bookingDetail.shop_discount;
-    values.shop_discount_reason = state.bookingDetail.shop_discount_reason;
+
+  // 提交手动价格调整（shop_discount）
+  if (state.shop_discount && Number(state.shop_discount) > 0) {
+    values.shop_discount = state.shop_discount;
+    values.shop_discount_reason = '';
   }
   if (state.contacts) {
     var _state$contacts;
@@ -672,21 +686,35 @@ 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$_extend25;
+    var _item$_extend27;
     // 普通商品不需要检测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$_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) {
+    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);
       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')

package/es/components/booking/components/reloadResourceModal/index.d.ts

@@ -0,0 +1,8 @@
+import './index.less';
+interface IProps {
+    modal: any;
+    onReload: () => Promise<any>;
+    onCancel: () => void;
+}
+declare const ReloadResourceModal: ({ modal, onReload, onCancel }: IProps) => JSX.Element;
+export default ReloadResourceModal;