@pisell/private-materials 6.4.41 → 6.4.43

package/es/components/checkout/components/AdditionalModule/index.less

@@ -1,5 +1,5 @@
 .additional-module {
-  padding-bottom: 16px; // 底部间距
+  // padding-bottom: 16px; // 底部间距
 
   // 标题样式
   &-title {

package/es/components/checkout/components/AmountSummary/index.js

@@ -8,8 +8,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { useState, useEffect } from 'react';
-import { Button, Dropdown } from 'antd';
+import { useState, useEffect, useMemo } from 'react';
+import { Button, Dropdown, Popover } from 'antd';
 import { CheckCircleOutlined, PieChartOutlined } from '@ant-design/icons';
 import { Edit05 } from '@pisell/icon';
 import { PisellModal } from '@pisell/materials';
@@ -17,7 +17,8 @@ import { locales, formatAmountWithOptions } from '@pisell/utils';
 import Decimal from 'decimal.js';
 import checkoutLocales from "../../locales";
 import PaymentDetailModal from "../PaymentDetailModal";
-import PisellPriceKeyboardPopover from "../../../../pro/pisellPriceKeyboardPopover";
+import PisellPriceKeyboardPopover from "../../../../pro/pisellSimplePriceKeyboardPopover";
+import { PaymentKeyboard } from "../../../../pro/priceKeyboard";
 import "./index.less";
 import classNames from 'classnames';
 import useEngineContext from "../../../../hooks/useEngineContext";
@@ -112,6 +113,12 @@ function AmountSummary(_ref2) {
   // 获取 checkout 模块
   var checkoutModule = pisellos.getModule('checkout');
 
+  // 控制键盘弹窗显示状态
+  var _useState9 = useState(false),
+    _useState10 = _slicedToArray(_useState9, 2),
+    isKeyboardVisible = _useState10[0],
+    setIsKeyboardVisible = _useState10[1];
+
   // 小计标签映射
   var labelMaps = {
     deposit: getText('pisell2.subtotal.deposit') || 'Deposit',
@@ -127,16 +134,16 @@ function AmountSummary(_ref2) {
 
   // 获取右侧Balance Due的金额
   var getBalanceDueAmount = function getBalanceDueAmount() {
-    // 优先使用 pisellos 数据中的 expect_amount
-    var expectAmountItem = summaryData.find(function (item) {
-      return item.key === 'expect_amount';
-    });
-    if (expectAmountItem) {
-      return expectAmountItem.value;
+    // 如果当前订单是定金，则使用 depositAmount
+    if (paymentType === 'deposit') {
+      return (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.depositAmount) || '0';
     }
-
-    // 降级方案：使用硬编码值
-    return 0;
+    return (paymentItems === null || paymentItems === void 0 ? void 0 : paymentItems.reduce(function (acc, item) {
+      if (item.isSynced || !item.voucher_id) {
+        return acc;
+      }
+      return acc.plus(item.amount);
+    }, new Decimal(0)).toNumber()) || 0;
   };
 
   // 解析格式化金额字符串为数字的工具函数
@@ -156,10 +163,10 @@ function AmountSummary(_ref2) {
     }
     return 0;
   };
-  var _useState9 = useState(customAmount && customAmount !== '' ? customAmount : parseFormattedAmount(getBalanceDueAmount())),
-    _useState10 = _slicedToArray(_useState9, 2),
-    currentAmount = _useState10[0],
-    setCurrentAmount = _useState10[1];
+  var _useState11 = useState(customAmount && customAmount !== '' ? customAmount : parseFormattedAmount(getBalanceDueAmount())),
+    _useState12 = _slicedToArray(_useState11, 2),
+    currentAmount = _useState12[0],
+    setCurrentAmount = _useState12[1];
 
   // 响应外部 customAmount 变化
   useEffect(function () {
@@ -176,6 +183,7 @@ function AmountSummary(_ref2) {
         if (Array.isArray(summary)) {
           setSummaryData(summary);
         }
+        setPaymentType(orderInfo.isDeposit ? 'deposit' : 'regular');
       } catch (error) {
         console.warn('Failed to get cart summary:', error);
       }
@@ -257,26 +265,14 @@ function AmountSummary(_ref2) {
     return totalDecimal.toNumber();
   };
 
-  // 获取订单待支付金额
-  var getOrderDueAmount = function getOrderDueAmount() {
-    var expectAmountItem = summaryData.find(function (item) {
-      return item.key === 'expect_amount';
-    });
-    if (expectAmountItem) {
-      return expectAmountItem.value;
-    }
-    // 降级方案：使用硬编码值
-    return paymentType === 'deposit' ? 15.1 : 130.2;
-  };
-
   // 计算键盘输入的最小值和最大值
   var getKeyboardLimits = function getKeyboardLimits() {
     var walletTotal = getWalletTotalAmount();
-    var orderDue = getOrderDueAmount();
+    // const orderDue = getBalanceDueAmount();
 
     // 使用 Decimal.js 进行精确计算，避免浮点数精度问题
     var walletTotalDecimal = new Decimal(walletTotal);
-    var orderDueDecimal = new Decimal(orderDue);
+    var orderDueDecimal = new Decimal(Number(balanceDueAmount || 0));
     var minDecimal = new Decimal(0.01);
 
     // 计算 orderDue - walletTotal
@@ -377,7 +373,7 @@ function AmountSummary(_ref2) {
 
     // 计算含有 voucher_id 的付款项金额合计
     var voucherPaymentAmount = (paymentItems === null || paymentItems === void 0 || (_paymentItems$reduce2 = paymentItems.reduce(function (acc, item) {
-      if (item.voucher_id) {
+      if (item.voucher_id && !item.isSynced) {
         try {
           var _amount = new Decimal(item.amount || '0');
           var roundingAmount = new Decimal(item.rounding_amount || '0');
@@ -390,6 +386,13 @@ function AmountSummary(_ref2) {
     }, new Decimal(0))) === null || _paymentItems$reduce2 === void 0 ? void 0 : _paymentItems$reduce2.toNumber()) || 0;
     var totalPaidAmount = partialPaidAmountDecimal.plus(voucherPaymentAmount).toNumber();
 
+    // 如果已经有除了voucher 以外的其他支付项 isSynced的,并且还没超过订单总金额，则需要显示
+    var syncedPaymentItems = (paymentItems === null || paymentItems === void 0 ? void 0 : paymentItems.filter(function (item) {
+      return item.isSynced && !item.voucher_id;
+    })) || [];
+    if ((syncedPaymentItems === null || syncedPaymentItems === void 0 ? void 0 : syncedPaymentItems.length) > 0 && totalPaidAmount < totalAmount) {
+      return true;
+    }
     // 如果 (部分付款金额 + 含有voucher_id的付款项金额合计) >= 总金额，则不显示
     if (totalPaidAmount >= totalAmount) {
       return false;
@@ -449,9 +452,13 @@ function AmountSummary(_ref2) {
       var _walletPassData$selec, _walletPassData$selec2;
       // 检查是否有支付项
       // if (!paymentItems || paymentItems.length === 0) return false;
+      // 先去除掉已经同步的支付项
+      var unSyncedPaymentItems = paymentItems === null || paymentItems === void 0 ? void 0 : paymentItems.filter(function (item) {
+        return !item.isSynced;
+      });
 
       // 检查所有支付项是否都含有voucher_id
-      var allItemsHaveVoucherId = paymentItems === null || paymentItems === void 0 ? void 0 : paymentItems.every(function (item) {
+      var allItemsHaveVoucherId = unSyncedPaymentItems === null || unSyncedPaymentItems === void 0 ? void 0 : unSyncedPaymentItems.every(function (item) {
         return item.voucher_id;
       });
       return allItemsHaveVoucherId || ((_walletPassData$selec = walletPassData === null || walletPassData === void 0 || (_walletPassData$selec2 = walletPassData.selectedDiscountList) === null || _walletPassData$selec2 === void 0 ? void 0 : _walletPassData$selec2.length) !== null && _walletPassData$selec !== void 0 ? _walletPassData$selec : 0) > 0;
@@ -540,7 +547,7 @@ function AmountSummary(_ref2) {
         className: classNames('partial-paid-card')
       }, /*#__PURE__*/React.createElement("span", {
         className: classNames('partial-paid-label')
-      }, getText('partial.paid') || 'Partial Paid'), /*#__PURE__*/React.createElement("span", {
+      }, paymentType === 'deposit' ? getText('deposit.partial.paid') || 'Deposit Paid' : getText('partial.paid') || 'Partial Paid'), /*#__PURE__*/React.createElement("span", {
         className: classNames('partial-paid-amount')
       }, formatAmountWithOptions(partialPaidAmount, amountSymbol, {
         precision: 2,
@@ -595,11 +602,43 @@ function AmountSummary(_ref2) {
       })));
     }
   };
+  var canSwitch = useMemo(function () {
+    if (Number(orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.totalAmount) === 0) {
+      return false;
+    }
+    // 如果当前是普通支付，并且支付项里已经有了type=default 的数据，则不可以再切换到定金支付
+    // 增加一个逻辑，如果当前是普通支付，并且支付项里有定金支付的钱，并且定金支付的钱已经超过了定金总金额，就不可以再切换了
+    if (paymentType === 'regular') {
+      var depositPaidAmount = paymentItems === null || paymentItems === void 0 ? void 0 : paymentItems.reduce(function (acc, item) {
+        if (item.order_payment_type === 'deposit') {
+          return acc.plus(item.amount).plus(Math.abs(item.rounding_amount));
+        }
+        return acc;
+      }, new Decimal(0)).toNumber();
+      var depositFlag = depositPaidAmount >= new Decimal((orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.depositAmount) || '0').toNumber() && Number(orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.depositAmount) > 0;
+      return !(paymentItems !== null && paymentItems !== void 0 && paymentItems.some(function (item) {
+        return item.order_payment_type === 'normal';
+      })) && !depositFlag;
+    } else {
+      // 如果是定金支付，且定金已付款金额大于等于订单总金额，则不可以再切换到普通支付
+      var _depositPaidAmount = paymentItems === null || paymentItems === void 0 ? void 0 : paymentItems.reduce(function (acc, item) {
+        if (item.order_payment_type === 'deposit') {
+          return acc.plus(item.amount);
+        }
+        return acc;
+      }, new Decimal(0)).toNumber();
+      return _depositPaidAmount < new Decimal(totalAmount).toNumber();
+    }
+  }, [paymentItems, paymentType, totalAmount]);
+  var handleChangeDepositAmount = function handleChangeDepositAmount(value) {
+    console.log('handleChangeDepositAmount', value);
+    checkoutModule === null || checkoutModule === void 0 || checkoutModule.setDepositAmountAsync(value);
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: classNames('amount-summary-module', 'amount-summary-container')
   }, /*#__PURE__*/React.createElement("div", {
     className: classNames('left-section')
-  }, open_deposit ? /*#__PURE__*/React.createElement(Dropdown, {
+  }, open_deposit && canSwitch ? /*#__PURE__*/React.createElement(Dropdown, {
     menu: {
       items: paymentOptions,
       onClick: function onClick(_ref5) {
@@ -644,9 +683,32 @@ function AmountSummary(_ref2) {
   // 如果应该显示确认模式，直接返回确认界面
   shouldShowConfirmMode() ? renderConfirmMode() : /*#__PURE__*/React.createElement("div", {
     className: classNames('balance-due-info')
-  }, /*#__PURE__*/React.createElement("div", {
+  }, paymentType === 'deposit' ? /*#__PURE__*/React.createElement(PisellPriceKeyboardPopover, {
+    value: (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.depositAmount) || '0'
+    // onChange={handleKeyboardChange}
+    ,
+    onConfirm: handleChangeDepositAmount,
+    showCurrencySymbol: true,
+    useThousandsSeparator: true,
+    selectType: "dark",
+    overlayClassName: "cash-payment-keyboard-popover"
+  }, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: classNames('balance-due-label')
+  }, getText('deposit.due') || 'Deposit Due'), /*#__PURE__*/React.createElement("div", {
+    className: classNames('balance-due-amount')
+  }, formatAmountWithOptions(balanceDueAmount, amountSymbol, {
+    precision: 2,
+    hideDecimalForWholeNumbers: false,
+    useThousandsSeparator: true,
+    showCurrencySymbol: true
+  }), /*#__PURE__*/React.createElement(Edit05, {
+    className: classNames('edit-icon'),
+    style: {
+      color: '#7F56DA'
+    }
+  })))) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: classNames('balance-due-label')
-  }, paymentType === 'deposit' ? getText('deposit.due') || 'Deposit Due' : getText('balance.due') || 'Balance Due'), /*#__PURE__*/React.createElement("div", {
+  }, getText('balance.due') || 'Balance Due'), /*#__PURE__*/React.createElement("div", {
     className: classNames('balance-due-amount'),
     onClick: function onClick() {
       onBalanceDueAmountClick === null || onBalanceDueAmountClick === void 0 || onBalanceDueAmountClick('manual-discount');
@@ -661,7 +723,7 @@ function AmountSummary(_ref2) {
     style: {
       color: '#7F56DA'
     }
-  }))), /*#__PURE__*/React.createElement("div", {
+  })))), Number(currentAmount) > 0 && /*#__PURE__*/React.createElement("div", {
     className: classNames('pay-section'),
     style: {
       cursor: 'pointer'
@@ -682,26 +744,71 @@ function AmountSummary(_ref2) {
     hideDecimalForWholeNumbers: false,
     useThousandsSeparator: true,
     showCurrencySymbol: true
-  })))), !shouldShowConfirmMode() && /*#__PURE__*/React.createElement(PisellPriceKeyboardPopover, {
-    value: function () {
-      try {
-        return new Decimal(currentAmount || '0').toNumber();
-      } catch (_unused8) {
-        return 0;
+  })))), !shouldShowConfirmMode() && /*#__PURE__*/React.createElement(Popover, {
+    content: /*#__PURE__*/React.createElement("div", {
+      onClick: function onClick(e) {
+        return e.stopPropagation();
       }
-    }()
-    // onChange={handleKeyboardConfirm}
-    ,
-    onConfirm: handleKeyboardConfirm
-    // onCancel={handleKeyboardCancel}
-    ,
-    showCurrencySymbol: true,
-    useThousandsSeparator: false,
-    selectType: "dark",
-    overlayClassName: "amount-summary-keyboard-popover"
+    }, /*#__PURE__*/React.createElement(PaymentKeyboard
+    // 原始值：此支付阶段的待支付金额，reset时还原为此值
+    , {
+      paymentOriginalValue: balanceDueAmount,
+      paymentDefaultValue: String(customAmount || 0),
+      enableExceedMaxAmount: false,
+      payment: {
+        enable: true
+      },
+      surcharge: {
+        enable: false
+      },
+      surchargeDefaultValue: {
+        percent: '0',
+        fixed: '0'
+      },
+      selectType: "light",
+      onChange: function onChange(value) {
+        console.log(value);
+      },
+      doneText: getText('confirm'),
+      onPay: function onPay(args) {
+        console.log(args);
+        // 处理支付逻辑
+        setIsKeyboardVisible(false);
+        handleKeyboardConfirm(args.amount);
+      }
+    })),
+    trigger: "click",
+    open: isKeyboardVisible,
+    onOpenChange: setIsKeyboardVisible,
+    placement: "bottom",
+    overlayClassName: "payment-keyboard-popover",
+    arrow: true,
+    destroyTooltipOnHide: true
   }, /*#__PURE__*/React.createElement(Button, {
     className: classNames('split-payment-button')
-  }, getText('split.payment') || '拆分支付')), /*#__PURE__*/React.createElement(PisellModal, {
+  }, getText('split.payment') || '拆分支付'))
+  // <PisellPriceKeyboardPopover
+  //   value={(() => {
+  //     try {
+  //       return new Decimal(currentAmount || '0').toNumber();
+  //     } catch {
+  //       return 0;
+  //     }
+  //   })()}
+  //   // onChange={handleKeyboardConfirm}
+  //   onConfirm={handleKeyboardConfirm}
+  //   // onCancel={handleKeyboardCancel}
+  //   showCurrencySymbol={true}
+  //   useThousandsSeparator={false}
+  //   selectType="dark"
+  //   overlayClassName="amount-summary-keyboard-popover"
+  // >
+  //   {/* 右侧： 拆分支付按钮 */}
+  //   <Button className={classNames('split-payment-button')}>
+  //     {getText('split.payment') || '拆分支付'}
+  //   </Button>
+  // </PisellPriceKeyboardPopover>
+  , /*#__PURE__*/React.createElement(PisellModal, {
     open: isPaymentDetailOpen,
     onCancel: handlePaymentDetailClose,
     footer: null,

package/es/components/checkout/components/CashPaymentModule/index.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
-import './index.less';
 import { CurrentOrderInfo } from '../../types';
+import './index.less';
 export interface CashPaymentModuleProps {
     amountSymbol?: string;
     orderInfo?: CurrentOrderInfo;
@@ -13,8 +13,10 @@ export interface CashPaymentModuleProps {
         roundingDifference: number;
     }>;
     balanceDueAmount?: string;
+    syncingLock?: boolean;
 }
-export declare function CashPaymentModule({ amountSymbol, orderInfo, onPaymentComplete, customAmount, amountButtons, // 按钮列表
+export declare function CashPaymentModule({ amountSymbol, orderInfo, onPaymentComplete, customAmount, amountButtons, // 按钮列表，默认5个推荐金额
 disabled, // 禁用状态
-roundingFunction, balanceDueAmount, }: CashPaymentModuleProps): JSX.Element;
+roundingFunction, balanceDueAmount, // 剩余支付金额
+syncingLock, }: CashPaymentModuleProps): JSX.Element;
 export default CashPaymentModule;