@pisell/private-materials 6.5.4 → 6.5.6

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/actionButtons/index.js

@@ -16,11 +16,11 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useMemo, useState, useEffect } from 'react';
-import { createPortal } from 'react-dom';
 import { Button } from 'antd';
+import Decimal from 'decimal.js';
 import { Trash01, Calculator, PlusCircle, Sale03 } from '@pisell/icon';
 import { locales } from '@pisell/utils';
-import { PisellAdjustPrice, useToast } from '@pisell/materials';
+import { useToast } from '@pisell/materials';
 import dayjs from 'dayjs';
 import ClearCartModal from "../clearCartModal";
 import CustomiseItemModal from "../customiseItemModal";
@@ -32,6 +32,7 @@ import { useMemoizedFn } from 'ahooks';
 import useEngineContext, { usePisellOS } from "../../../../hooks/useEngineContext";
 import useScanManager from "../../../ticketBooking/hooks/pisellos/useScanManager";
 import { useShopDiscount } from "../../../appointmentBooking/hooks";
+import { DiscountKeyboard } from "../../../../pro/priceKeyboard";
 // Toast 内容包装器，统一设置行高
 var createToastContent = function createToastContent(text) {
   return /*#__PURE__*/React.createElement("div", {
@@ -174,6 +175,11 @@ var ActionButtons = function ActionButtons(_ref) {
     }
   }, [state, hasCartItems]);
 
+  // 手动折扣后订单总价
+  var currentTotalPriceAfterDiscount = useMemo(function () {
+    return new Decimal(currentTotalPrice).minus(state.shop_discount || 0).toNumber();
+  }, [state.shop_discount, currentTotalPrice]);
+
   // 折扣券列表状态
   var _useState9 = useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
@@ -264,6 +270,14 @@ var ActionButtons = function ActionButtons(_ref) {
         shop_discount: '0'
       }
     });
+
+    // 清空部分支付
+    dispatch({
+      type: 'setPaymentPaid',
+      payload: {
+        value: {}
+      }
+    });
     setShowClearModal(false);
     Toast === null || Toast === void 0 || Toast.success(createToastContent(locales.getText('pisell2.action-buttons.clear-success')));
   };
@@ -327,6 +341,14 @@ var ActionButtons = function ActionButtons(_ref) {
       }
     });
 
+    // 清空部分支付
+    dispatch({
+      type: 'setPaymentPaid',
+      payload: {
+        value: {}
+      }
+    });
+
     // TODO: 如果需要重置更多信息，可以在这里添加
     // 比如重置优惠券、表单数据、宠物信息等
 
@@ -359,28 +381,7 @@ var ActionButtons = function ActionButtons(_ref) {
   }, [(_state$service8 = state.service) === null || _state$service8 === void 0 ? void 0 : _state$service8.value, (_state$addons4 = state.addons) === null || _state$addons4 === void 0 ? void 0 : _state$addons4.value]);
 
   // 处理价格调整完成
-  var handlePriceAdjustConfirm = function handlePriceAdjustConfirm(newPrice) {
-    // 使用 getSumTotal 计算商品总金额
-    var _getSumTotal2 = getSumTotal(state, _objectSpread({
-        isEdit: true,
-        ScheduleModule: ScheduleModule
-      }, getDataFromHost())),
-      productAmount = _getSumTotal2.productAmount;
-
-    // 计算折扣金额（商品总金额 - 新价格）
-    // 存储正数：正数表示折扣，0表示无折扣
-    var discountAmount = Math.max(0, productAmount - newPrice);
-
-    // 转换为金额字符串格式（2位小数）
-    // const discountAmountStr = formatAmount(discountAmount, 2, '');
-
-    // console.log('=== 价格调整调试信息 ===');
-    // console.log('商品总金额 (productAmount):', productAmount);
-    // console.log('用户输入新价格 (newPrice):', newPrice);
-    // console.log('折扣金额 (discountAmount):', discountAmount);
-    // console.log('折扣金额字符串 (discountAmountStr):', discountAmountStr);
-    // console.log('当前 state.shop_discount:', state.shop_discount);
-
+  var handlePriceAdjustConfirm = function handlePriceAdjustConfirm(discountAmount) {
     // 更新 shop_discount 到 state 根级别（存储为字符串）
     dispatch({
       type: 'setState',
@@ -388,9 +389,6 @@ var ActionButtons = function ActionButtons(_ref) {
         shop_discount: discountAmount
       }
     });
-
-    // console.log('dispatch 已调用');
-
     setShowPriceAdjustModal(false);
 
     // 显示成功提示
@@ -515,22 +513,19 @@ var ActionButtons = function ActionButtons(_ref) {
     },
     onClearItemsOnly: handleClearItemsOnly,
     onClearAllAndReset: handleClearAllAndReset
-  }), showPriceAdjustModal && /*#__PURE__*/createPortal( /*#__PURE__*/React.createElement("div", {
-    className: "pisell-price-adjust-overlay"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "pisell-price-adjust-backdrop",
-    onMouseDown: function onMouseDown(e) {
-      e.preventDefault();
-      setShowPriceAdjustModal(false);
-    }
-  }), /*#__PURE__*/React.createElement("div", {
-    className: "pisell-price-adjust-container"
-  }, /*#__PURE__*/React.createElement(PisellAdjustPrice, {
+  }), /*#__PURE__*/React.createElement(DiscountKeyboard, {
+    containerProps: {
+      renderType: 'modal',
+      open: showPriceAdjustModal,
+      onCancel: function onCancel() {
+        return setShowPriceAdjustModal(false);
+      }
+    },
     selectType: "dark",
-    originValue: currentTotalPrice,
-    value: currentTotalPrice,
-    onChange: handlePriceAdjustConfirm
-  }))), document.body), /*#__PURE__*/React.createElement(CustomiseItemModal, {
+    originalValue: currentTotalPrice,
+    defaultValue: currentTotalPriceAfterDiscount,
+    onEnter: handlePriceAdjustConfirm
+  }), /*#__PURE__*/React.createElement(CustomiseItemModal, {
     visible: showCustomiseModal,
     onClose: function onClose() {
       return setShowCustomiseModal(false);

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

@@ -185,31 +185,3 @@
   font-weight: 400 !important;
   color: inherit !important;
 }
-
-// 价格调整覆盖层样式 - 现在通过 Portal 渲染到 document.body
-.pisell-price-adjust-overlay {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: 9999; // 由于现在渲染到 document.body，使用更高的 z-index
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.pisell-price-adjust-backdrop {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: transparent; // 纯透明遮罩
-  cursor: pointer; // 显示点击手势
-}
-
-.pisell-price-adjust-container {
-  position: relative;
-  z-index: 10000; // 确保键盘在遮罩之上
-} 

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

@@ -23,12 +23,12 @@ export declare const getSumTotal: (state: any, options: {
     surcharge: any;
     otherAmount: any;
     sumTotalAmount: number;
-    paidAmount: number;
+    paidAmount: any;
     notPaidAmount: number;
     paySurchargeFee: number;
     expectAmount: number;
-    actualPaidAmount: number;
-    orderPaidAmount: number;
+    actualPaidAmount: any;
+    orderPaidAmount: any;
     totalRefundAmount: number;
     dueAmount: number;
     roundingAmount: number;

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

@@ -12,22 +12,22 @@ import { formatAmount } from '@pisell/utils';
 import Decimal from 'decimal.js';
 import { isDayBooking, isDayBookingProduct, isNormalProductByDurationSchedule } from "../../info/service2/utils";
 export var getRelationDetailsTotal = function getRelationDetailsTotal(relation_details) {
-  var total = 0;
+  var total = new Decimal(0);
   var _iterator = _createForOfIteratorHelper(relation_details),
     _step;
   try {
     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;
-      total += Number(price) * Number(number);
+      var number = new Decimal(item.product_quantity || item.num || 0);
+      var price = new Decimal(item.selling_price || item.payment_price || item.price || 0);
+      total = total.add(price.mul(number));
     }
   } catch (err) {
     _iterator.e(err);
   } finally {
     _iterator.f();
   }
-  return total;
+  return total.toNumber();
 };
 /**
  * 总金额
@@ -35,8 +35,8 @@ export var getRelationDetailsTotal = function getRelationDetailsTotal(relation_d
  * @returns
  */
 var getProductExpectAmount = function getProductExpectAmount(state, isEdit) {
-  var price = 0;
-  var duration = 0;
+  var price = new Decimal(0);
+  var duration = new Decimal(0);
   // 是否是跨日预约
   var isDay = isDayBooking(state);
   if (isEdit) {
@@ -52,19 +52,23 @@ var getProductExpectAmount = function getProductExpectAmount(state, isEdit) {
             var item = _step2.value;
             // 跨日预约
             if (isDay || isNormalProductByDurationSchedule(item)) {
-              var quantity = item._extend.quantity || 1;
-              price += Number(item._extend.total) * Number(quantity);
+              var quantity = new Decimal(item._extend.quantity || 1);
+              var itemTotal = new Decimal(item._extend.total || 0);
+              price = price.add(itemTotal.mul(quantity));
 
               // 普通商品不能加到时长上
-              var _duration = isDayBookingProduct(item, state) ? item._extend.duration : 0;
-              duration += _duration;
+              var _duration = isDayBookingProduct(item, state) ? new Decimal(item._extend.duration || 0) : new Decimal(0);
+              duration = duration.add(_duration);
             } else {
-              var _quantity = item._extend.quantity || 1;
-              price += Number(item._extend.total) * Number(_quantity);
+              var _quantity = new Decimal(item._extend.quantity || 1);
+              var _itemTotal = new Decimal(item._extend.total || 0);
+              price = price.add(_itemTotal.mul(_quantity));
 
               // 附加商品
-              price += getRelationDetailsTotal(item._extend.relation_details || []);
-              duration += flexibleObj.getValue(item._extend.duration);
+              var relationTotal = new Decimal(getRelationDetailsTotal(item._extend.relation_details || []));
+              price = price.add(relationTotal);
+              var itemDuration = new Decimal(flexibleObj.getValue(item._extend.duration) || 0);
+              duration = duration.add(itemDuration);
             }
           }
         } catch (err) {
@@ -81,8 +85,9 @@ var getProductExpectAmount = function getProductExpectAmount(state, isEdit) {
         try {
           for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
             var _item = _step3.value;
-            var _quantity2 = _item._extend.quantity || 1;
-            price += Number(_item._extend.total) * Number(_quantity2);
+            var _quantity2 = new Decimal(_item._extend.quantity || 1);
+            var _itemTotal2 = new Decimal(_item._extend.total || 0);
+            price = price.add(_itemTotal2.mul(_quantity2));
           }
         } catch (err) {
           _iterator3.e(err);
@@ -93,24 +98,24 @@ var getProductExpectAmount = function getProductExpectAmount(state, isEdit) {
     }
   } else {
     var _state$bookingDetail, _state$service2;
-    price = Number((_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : _state$bookingDetail.product_expect_amount);
+    price = new Decimal(((_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : _state$bookingDetail.product_expect_amount) || 0);
     var services = (state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value) || [];
     duration = services.reduce(function (pre, cur) {
-      var current = 0;
+      var current = new Decimal(0);
       if (isDay) {
         // 普通商品不能加到时长上
-        var _duration2 = isDayBookingProduct(cur, state) ? cur._extend.duration : 0;
-        current = _duration2 || 0;
+        var _duration2 = isDayBookingProduct(cur, state) ? new Decimal(cur._extend.duration || 0) : new Decimal(0);
+        current = _duration2;
       } else {
         var _cur$_extend;
-        current = flexibleObj.getValue(((_cur$_extend = cur._extend) === null || _cur$_extend === void 0 ? void 0 : _cur$_extend.duration) || 0);
+        current = new Decimal(flexibleObj.getValue(((_cur$_extend = cur._extend) === null || _cur$_extend === void 0 ? void 0 : _cur$_extend.duration) || 0) || 0);
       }
-      return pre + current;
-    }, 0);
+      return pre.add(current);
+    }, new Decimal(0));
   }
   return {
-    productExpectAmount: Number(price),
-    duration: getDiscountTime(duration, isDay)
+    productExpectAmount: price.toNumber(),
+    duration: getDiscountTime(duration.toNumber(), isDay)
   };
 };
 var getProductItemTax = function getProductItemTax(item, state, options) {
@@ -337,7 +342,9 @@ var getPaySurchargeFee = function getPaySurchargeFee(state) {
 
   // 新增为 0
   if (!bookingDetail || !bookingId) return 0;
-  return Number(bookingDetail.pay_processing_fee) + Number(bookingDetail.gateway_fee);
+  var processingFee = new Decimal(bookingDetail.pay_processing_fee || 0);
+  var gatewayFee = new Decimal(bookingDetail.gateway_fee || 0);
+  return processingFee.add(gatewayFee).toNumber();
 };
 
 /**
@@ -617,9 +624,15 @@ var getSurchargeAmount = function getSurchargeAmount(state, surcharge, options)
  * @returns
  */
 var getPaidAmount = function getPaidAmount(state) {
-  var _state$bookingDetail4;
+  var _state$paymentPaid, _state$bookingDetail4;
   var bookingDetail = state.bookingDetail,
     bookingId = state.bookingId;
+
+  // 检测是否有 checkout 编辑订单已付金额
+  if ((_state$paymentPaid = state.paymentPaid) !== null && _state$paymentPaid !== void 0 && (_state$paymentPaid = _state$paymentPaid.value) !== null && _state$paymentPaid !== void 0 && _state$paymentPaid.paidAmount) {
+    var _state$paymentPaid2;
+    return (_state$paymentPaid2 = state.paymentPaid) === null || _state$paymentPaid2 === void 0 || (_state$paymentPaid2 = _state$paymentPaid2.value) === null || _state$paymentPaid2 === void 0 ? void 0 : _state$paymentPaid2.paidAmount;
+  }
   // 新增为 0
   if (!bookingDetail || !bookingId) return 0;
   return Number((_state$bookingDetail4 = state.bookingDetail) === null || _state$bookingDetail4 === void 0 ? void 0 : _state$bookingDetail4.paid_amount) || 0;
@@ -631,9 +644,14 @@ var getPaidAmount = function getPaidAmount(state) {
  * @returns
  */
 var getOrderPaidAmount = function getOrderPaidAmount(state) {
-  var _state$bookingDetail5;
+  var _state$paymentPaid3, _state$bookingDetail5;
   var bookingDetail = state.bookingDetail,
     bookingId = state.bookingId;
+  // 检测是否有 checkout 编辑订单已付金额
+  if ((_state$paymentPaid3 = state.paymentPaid) !== null && _state$paymentPaid3 !== void 0 && (_state$paymentPaid3 = _state$paymentPaid3.value) !== null && _state$paymentPaid3 !== void 0 && _state$paymentPaid3.paidAmountWithoutSurcharge) {
+    var _state$paymentPaid4;
+    return (_state$paymentPaid4 = state.paymentPaid) === null || _state$paymentPaid4 === void 0 || (_state$paymentPaid4 = _state$paymentPaid4.value) === null || _state$paymentPaid4 === void 0 ? void 0 : _state$paymentPaid4.paidAmountWithoutSurcharge;
+  }
   // 新增为 0
   if (!bookingDetail || !bookingId) return 0;
   return Number((_state$bookingDetail5 = state.bookingDetail) === null || _state$bookingDetail5 === void 0 ? void 0 : _state$bookingDetail5.order_paid_amount) || 0;
@@ -751,13 +769,15 @@ export var getSumTotal = function getSumTotal(state, options) {
   });
 
   // 未支付的金额  负数代表着欠款
-  var notPaidAmount = Number(formatAmount(sumTotalAmount, 2, '')) - orderPaidAmount;
+  var sumTotalAmountDecimal = new Decimal(formatAmount(sumTotalAmount, 2, '') || 0);
+  var orderPaidAmountDecimal = new Decimal(orderPaidAmount || 0);
+  var notPaidAmount = sumTotalAmountDecimal.sub(orderPaidAmountDecimal).toNumber();
 
   // 实付金额    已付金额
   var actualPaidAmount = paidAmount;
 
   // 欠款金额
-  var dueAmount = notPaidAmount < 0 ? Number(formatAmount(notPaidAmount + totalRefundAmount, 2, '')) : 0;
+  var dueAmount = notPaidAmount < 0 ? Number(formatAmount(new Decimal(notPaidAmount).add(new Decimal(totalRefundAmount)).toNumber(), 2, '')) : 0;
   return {
     productAmount: productExpectAmount,
     duration: duration,