@pisell/private-materials 6.4.50 → 6.4.52

package/es/components/appointmentBooking/components/Services/index.js

@@ -99,7 +99,7 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
               },
               callback: function () {
                 var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
-                  var product, session, startDate, endDate, _data$origin, resources, activeStatus, index, stepList, hasResourceStep, description;
+                  var product, res, session, startDate, endDate, _res, _data$origin, resources, activeStatus, _res2, index, stepList, hasResourceStep, description;
                   return _regeneratorRuntime().wrap(function _callee$(_context) {
                     while (1) switch (_context.prev = _context.next) {
                       case 0:
@@ -117,7 +117,7 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
 
                         // 零售模版，直接加入购物车
                         if (!isRetailTemplate) {
-                          _context.next = 10;
+                          _context.next = 12;
                           break;
                         }
                         if (!(data !== null && data !== void 0 && data.isCancel)) {
@@ -126,51 +126,69 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                         }
                         return _context.abrupt("return");
                       case 8:
-                        appointmentBooking.storeProduct(product);
+                        res = appointmentBooking.storeProduct(product);
+                        if (!(!res.success && res.errorCode === 'not_enough_stock')) {
+                          _context.next = 11;
+                          break;
+                        }
+                        return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.unuse.stock')));
+                      case 11:
                         return _context.abrupt("return");
-                      case 10:
+                      case 12:
                         session = data === null || data === void 0 ? void 0 : data.session;
                         if (!session) {
-                          _context.next = 19;
+                          _context.next = 24;
                           break;
                         }
                         startDate = dayjs(session === null || session === void 0 ? void 0 : session.start_at).format('YYYY-MM-DD');
                         endDate = dayjs(session === null || session === void 0 ? void 0 : session.end_at).format('YYYY-MM-DD');
-                        appointmentBooking.addProductToCart({
+                        _res = appointmentBooking.addProductToCart({
                           product: _objectSpread({}, product),
                           date: {
                             startTime: "".concat(startDate, " ").concat(session === null || session === void 0 ? void 0 : session.start_time),
                             endTime: "".concat(endDate, " ").concat(session === null || session === void 0 ? void 0 : session.end_time)
                           }
                         });
-                        _context.next = 17;
+                        if (!(!_res.success && _res.errorCode === 'not_enough_stock')) {
+                          _context.next = 19;
+                          break;
+                        }
+                        return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.unuse.stock')));
+                      case 19:
+                        appointmentBooking.closeProductDetail();
+                        _context.next = 22;
                         return appointmentBooking.getAvailableDate({
                           startDate: startDate,
                           endDate: endDate
                         });
-                      case 17:
-                        _context.next = 27;
+                      case 22:
+                        _context.next = 34;
                         break;
-                      case 19:
+                      case 24:
                         resources = (data === null || data === void 0 || (_data$origin = data.origin) === null || _data$origin === void 0 || (_data$origin = _data$origin.product_resource) === null || _data$origin === void 0 ? void 0 : _data$origin.resources) || [];
                         activeStatus = resources.find(function (item) {
                           return item.status === 1;
                         });
                         if (!(!activeStatus && !appointmentBooking.isTargetNormalProduct(data === null || data === void 0 ? void 0 : data.origin))) {
-                          _context.next = 23;
+                          _context.next = 28;
                           break;
                         }
                         return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.no.available.service')));
-                      case 23:
-                        appointmentBooking.storeProduct(product);
-                        // duration 类型的商品，要获取一下资源，在先选日期的 duration 步骤里目前只能通过这个动作拉取
+                      case 28:
+                        _res2 = appointmentBooking.storeProduct(product);
+                        if (!(!_res2.success && _res2.errorCode === 'not_enough_stock')) {
+                          _context.next = 31;
+                          break;
+                        }
+                        return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.unuse.stock')));
+                      case 31:
                         if (!(type === 'duration')) {
-                          _context.next = 27;
+                          _context.next = 34;
                           break;
                         }
-                        _context.next = 27;
+                        _context.next = 34;
                         return appointmentBooking.getAvailableDate();
-                      case 27:
+                      case 34:
                         appointmentBooking.closeProductDetail();
 
                         // 先选择日期流程
@@ -199,7 +217,7 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                             removeStep('select-time');
                           }
                         }
-                      case 29:
+                      case 36:
                       case "end":
                         return _context.stop();
                     }

package/es/components/appointmentBooking/hooks.js

@@ -206,6 +206,12 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
       if (!result) {
         return Toast(locales.getText('pisell2.appointment.unuse.date'));
       }
+      var capacityResult = appointmentBooking.checkMaxDurationCapacity();
+      if (!capacityResult.success) {
+        var getMessage = locales.getText('pisell2.appointment.unuse.capacity');
+        var message = typeof getMessage === 'function' ? getMessage(capacityResult.minAvailableCount) : getMessage;
+        return Toast(message);
+      }
     }
     if (!isRetailTemplate && currentKey !== null && currentKey !== void 0 && currentKey.startsWith('select-resource')) {
       var _currentSelectedResou;

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

@@ -845,7 +845,7 @@ var Footer = function Footer(props) {
    */
   var handleSave = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref6) {
-      var type, _ref6$messageShow, messageShow, _ref6$noSubmit, noSubmit, isHasDayProducts, _setLoading, _getApis, createBooking, editBooking, editApi, createApi, saveOtherValue, _state$onSave, callbackData, values, checkout, subtotal_info, res, isNeedDeposit, api;
+      var type, _ref6$messageShow, messageShow, _ref6$noSubmit, noSubmit, isHasDayProducts, _setLoading, _getApis, createBooking, editBooking, editApi, createApi, saveOtherValue, _state$onSave, _store$getState, _window7, callbackData, values, checkout, subtotal_info, res, isNeedDeposit, api;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
@@ -953,6 +953,17 @@ var Footer = function Footer(props) {
               }, {
                 key: '日期',
                 value: dayjs().format('YYYY-MM-DD HH:mm')
+              }, {
+                key: '店铺id',
+                value: store === null || store === void 0 || (_store$getState = store.getState) === null || _store$getState === void 0 || (_store$getState = _store$getState.call(store)) === null || _store$getState === void 0 || (_store$getState = _store$getState.global) === null || _store$getState === void 0 || (_store$getState = _store$getState.globalConfig) === null || _store$getState === void 0 ? void 0 : _store$getState.id
+              }, {
+                key: 'shopApi',
+                value: JSON.stringify((_window7 = window) === null || _window7 === void 0 ? void 0 : _window7.shopApi, function (key, value) {
+                  if (typeof value === 'function') {
+                    return 'function';
+                  }
+                  return value;
+                })
               }]
             });
 

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

@@ -71,7 +71,7 @@ var EditBookingModal = function EditBookingModal(props, ref) {
   var getInitData = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
       var _data$fromResource, _data$toResource;
-      var mockProps, _data, _initResourceVal, fromResourceFormId, toResourceFormId, _form_id, _data$toResource2, _formatResources, list, maps, currentForm, relation_id, _currentForm$renderLi, _currentForm$renderLi2, _currentForm$renderLi3, _currentForm$renderLi4, _targetResource, _cloned, _idx, _sameResource;
+      var mockProps, _data, _initResourceVal, fromResourceFormId, toResourceFormId, _form_id, _data$toResource2, _formatResources, list, maps, currentForm, relation_id, _currentForm$renderLi, _currentForm$renderLi2, _currentForm$renderLi3, _currentForm$renderLi4, _targetResource, _cloned, _idx, _sameResource, _targetIdx;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -129,7 +129,13 @@ var EditBookingModal = function EditBookingModal(props, ref) {
                       _cloned[_idx] = _targetResource; // 替换现有对象
                     }
                   } else {
-                    _cloned.push(_targetResource); // 添加新对象
+                    // 未发现原资源位置（短时间内通过其它渠道修改过资源）
+                    _targetIdx = _cloned.findIndex(function (rs) {
+                      return rs.relation_id == (_targetResource === null || _targetResource === void 0 ? void 0 : _targetResource.relation_id);
+                    }); // 判断是否已经包含了目标资源，不包含则加入进来
+                    if (_targetIdx === -1) {
+                      _cloned.push(_targetResource); // 添加新对象
+                    }
                   }
                   _initResourceVal = _objectSpread(_objectSpread({}, _initResourceVal), {}, _defineProperty({}, _form_id, _cloned));
                 } else {

package/es/components/booking/info/service/addService/utils.d.ts

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

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

@@ -7,7 +7,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

package/es/components/booking/locales.d.ts

@@ -156,6 +156,8 @@ declare const _default: {
         'pisell2.text.deposit-delete-message': string;
         'pisell2.text.deposit-paid': string;
         "pisell2.text.stock": string;
+        'pisell2.appointment.unuse.stock': string;
+        'pisell2.appointment.unuse.capacity': (count: number) => string;
         'pisell2.text.payment-link': string;
         'pisell2.text.send-mail': string;
         'pisell2.text.copy-to-clipboard': string;
@@ -458,6 +460,8 @@ declare const _default: {
         'pisell2.text.deposit-delete-message': string;
         'pisell2.text.deposit-paid': string;
         "pisell2.text.stock": string;
+        'pisell2.appointment.unuse.stock': string;
+        'pisell2.appointment.unuse.capacity': (count: number) => string;
         'pisell2.text.payment-link': string;
         'pisell2.text.send-mail': string;
         'pisell2.text.copy-to-clipboard': string;
@@ -760,6 +764,8 @@ declare const _default: {
         'pisell2.text.deposit-delete-message': string;
         'pisell2.text.deposit-paid': string;
         "pisell2.text.stock": string;
+        'pisell2.appointment.unuse.stock': string;
+        'pisell2.appointment.unuse.capacity': (count: number) => string;
         'pisell2.text.payment-link': string;
         'pisell2.text.send-mail': string;
         'pisell2.text.copy-to-clipboard': string;

package/es/components/booking/locales.js

@@ -174,6 +174,10 @@ export default {
     'pisell2.text.deposit-delete-message': "It cannot be restored after deletion. Please confirm the operation.",
     'pisell2.text.deposit-paid': "Deposit paid",
     "pisell2.text.stock": "Stock",
+    'pisell2.appointment.unuse.stock': "Not enough stock",
+    'pisell2.appointment.unuse.capacity': function pisell2AppointmentUnuseCapacity(count) {
+      return "Only ".concat(count, " spots available. Please reduce quantity.");
+    },
     'pisell2.text.payment-link': "Payment link",
     'pisell2.text.send-mail': "Send email",
     'pisell2.text.copy-to-clipboard': "Copy to clipboard",
@@ -531,6 +535,10 @@ export default {
     'pisell2.text.deposit-delete-message': "删除后不可恢复，请确认操作",
     'pisell2.text.deposit-paid': "已付定金",
     "pisell2.text.stock": "库存",
+    'pisell2.appointment.unuse.stock': "库存不足",
+    'pisell2.appointment.unuse.capacity': function pisell2AppointmentUnuseCapacity(count) {
+      return "\u4EC5\u53EF\u9884\u7EA6 ".concat(count, " \u4E2A\uFF0C\u8BF7\u51CF\u5C11\u6570\u91CF");
+    },
     'pisell2.text.payment-link': "付款链接",
     'pisell2.text.send-mail': "发送邮件",
     'pisell2.text.copy-to-clipboard': "复制到剪切板",
@@ -888,6 +896,10 @@ export default {
     'pisell2.text.deposit-delete-message': "刪除後不可恢復，請確認操作",
     'pisell2.text.deposit-paid': "已付定金",
     "pisell2.text.stock": "庫存",
+    'pisell2.appointment.unuse.stock': "庫存不足",
+    'pisell2.appointment.unuse.capacity': function pisell2AppointmentUnuseCapacity(count) {
+      return "\u50C5\u53EF\u9810\u7D04 ".concat(count, " \u500B\uFF0C\u8ACB\u6E1B\u5C11\u6578\u91CF");
+    },
     'pisell2.text.payment-link': "付款鏈接",
     'pisell2.text.send-mail': "發送郵件",
     'pisell2.text.copy-to-clipboard': "複製到剪切板",

package/es/components/checkout/PaymentModal.js

@@ -112,39 +112,44 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     balanceDueAmount = _useState4[0],
     setBalanceDueAmount = _useState4[1];
-  var _useState5 = useState([]),
+  // 剩余待付金额-跟定金无关的一个订单总体待付金额，上面这个 balanceDueAmount 是会收到订单影响的，下面这个不会
+  var _useState5 = useState(''),
     _useState6 = _slicedToArray(_useState5, 2),
-    recommendAmounts = _useState6[0],
-    setRecommendAmounts = _useState6[1];
-  var paymentMethodsRef = useRef(null);
+    balanceDueTotalAmount = _useState6[0],
+    setBalanceDueTotalAmount = _useState6[1];
   var _useState7 = useState([]),
     _useState8 = _slicedToArray(_useState7, 2),
-    paymentMethods = _useState8[0],
-    setPaymentMethods = _useState8[1];
-  var _useState9 = useState(false),
+    recommendAmounts = _useState8[0],
+    setRecommendAmounts = _useState8[1];
+  var paymentMethodsRef = useRef(null);
+  var _useState9 = useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
-    showCashPayment = _useState10[0],
-    setShowCashPayment = _useState10[1];
-  var _useState11 = useState(locales.getText('cards.and.digitals') || 'Cards & Digitals'),
+    paymentMethods = _useState10[0],
+    setPaymentMethods = _useState10[1];
+  var _useState11 = useState(false),
     _useState12 = _slicedToArray(_useState11, 2),
-    paymentOptionsTitle = _useState12[0],
-    setPaymentOptionsTitle = _useState12[1];
+    showCashPayment = _useState12[0],
+    setShowCashPayment = _useState12[1];
+  var _useState13 = useState(locales.getText('cards.and.digitals') || 'Cards & Digitals'),
+    _useState14 = _slicedToArray(_useState13, 2),
+    paymentOptionsTitle = _useState14[0],
+    setPaymentOptionsTitle = _useState14[1];
   var clientChangedRef = useRef(false);
   var walletPassRef = useRef(null);
   // 已保存的支付项数据
-  var _useState13 = useState([]),
-    _useState14 = _slicedToArray(_useState13, 2),
-    paymentItems = _useState14[0],
-    setPaymentItems = _useState14[1];
-  // 钱包卡券数据
-  var _useState15 = useState({}),
+  var _useState15 = useState([]),
     _useState16 = _slicedToArray(_useState15, 2),
-    walletPassData = _useState16[0],
-    setWalletPassData = _useState16[1];
-  var _useState17 = useState(false),
+    paymentItems = _useState16[0],
+    setPaymentItems = _useState16[1];
+  // 钱包卡券数据
+  var _useState17 = useState({}),
     _useState18 = _slicedToArray(_useState17, 2),
-    syncingLock = _useState18[0],
-    setSyncingLock = _useState18[1];
+    walletPassData = _useState18[0],
+    setWalletPassData = _useState18[1];
+  var _useState19 = useState(false),
+    _useState20 = _slicedToArray(_useState19, 2),
+    syncingLock = _useState20[0],
+    setSyncingLock = _useState20[1];
   var isOrderFree = useMemo(function () {
     if (!customAmount) return false;
     var amount = parseFloat(customAmount);
@@ -152,14 +157,14 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
   }, [customAmount]);
 
   // 新增状态：订单备注和手动折扣
-  var _useState19 = useState(false),
-    _useState20 = _slicedToArray(_useState19, 2),
-    paymentLinkModalOpen = _useState20[0],
-    setPaymentLinkModalOpen = _useState20[1];
   var _useState21 = useState(false),
     _useState22 = _slicedToArray(_useState21, 2),
-    showPriceAdjustModal = _useState22[0],
-    setShowPriceAdjustModal = _useState22[1];
+    paymentLinkModalOpen = _useState22[0],
+    setPaymentLinkModalOpen = _useState22[1];
+  var _useState23 = useState(false),
+    _useState24 = _slicedToArray(_useState23, 2),
+    showPriceAdjustModal = _useState24[0],
+    setShowPriceAdjustModal = _useState24[1];
   var logger = usePaymentLogger();
   var currency = getData('shop_currency_code') || 'USD';
 
@@ -415,6 +420,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
           var _cartData$order_info;
           setCustomAmount(currentAmount);
           setBalanceDueAmount(currentAmount);
+          setBalanceDueTotalAmount(orderInfo.totalAmount || '0');
           // 设置订单备注默认值 - 优先从 checkoutModule 获取，如果没有则从购物车数据获取
           var currentNote = checkoutModule.getOrderNote();
           if (currentNote) {
@@ -517,6 +523,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
           }());
           var amountChangedUnsubscribe = core.effects.on(CheckoutHooks.OnBalanceDueAmountChanged, function (data) {
             setBalanceDueAmount(data.newAmount);
+            setBalanceDueTotalAmount(data.totalAmount || '0');
           });
           var orderSubmitStartUnsubscribe = core.effects.on(CheckoutHooks.OnOrderSubmitStart, function () {
             var _Toast$loading;
@@ -581,9 +588,9 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                         var itemAmount = new Decimal(item.amount || 0);
                         var itemServiceCharge = chargeAmount.add(chargePercentage.mul(itemAmount));
                         // 如果支付项的 rounding_amount 是正数，需要减掉rounding_amount
-                        if (Number(item.rounding_amount) > 0) {
-                          itemServiceCharge = itemServiceCharge.sub(new Decimal(item.rounding_amount));
-                        }
+                        // if (Number(item.rounding_amount) > 0) {
+                        //   itemServiceCharge = itemServiceCharge.sub(new Decimal(item.rounding_amount));
+                        // }
                         console.log(itemServiceCharge);
                         return acc.add(itemServiceCharge);
                       }, new Decimal(0));
@@ -1290,7 +1297,8 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     amountButtons: recommendAmounts,
     customAmount: customAmount,
     roundingFunction: roundingFunction,
-    balanceDueAmount: balanceDueAmount
+    balanceDueAmount: balanceDueAmount,
+    balanceDueTotalAmount: balanceDueTotalAmount
   })), moduleConfig.showPaymentOptions && /*#__PURE__*/React.createElement("div", {
     className: showCashPayment ? '' : 'payment-options-module-container',
     style: showCashPayment ? {
@@ -1372,30 +1380,30 @@ var PaymentModal = function PaymentModal(_ref18) {
     getData = _ref19.getData,
     interaction = _ref19.interaction,
     isWebPos = _ref19.isWebPos;
-  var _useState23 = useState(null),
-    _useState24 = _slicedToArray(_useState23, 2),
-    orderInfo = _useState24[0],
-    setOrderInfo = _useState24[1];
-  var _useState25 = useState(0),
+  var _useState25 = useState(null),
     _useState26 = _slicedToArray(_useState25, 2),
-    totalAmount = _useState26[0],
-    setTotalAmount = _useState26[1];
-  var _useState27 = useState(true),
+    orderInfo = _useState26[0],
+    setOrderInfo = _useState26[1];
+  var _useState27 = useState(0),
     _useState28 = _slicedToArray(_useState27, 2),
-    actualShowCashPayment = _useState28[0],
-    setActualShowCashPayment = _useState28[1];
-  var _useState29 = useState(0),
+    totalAmount = _useState28[0],
+    setTotalAmount = _useState28[1];
+  var _useState29 = useState(true),
     _useState30 = _slicedToArray(_useState29, 2),
-    windowHeight = _useState30[0],
-    setWindowHeight = _useState30[1];
-  var _useState31 = useState(false),
+    actualShowCashPayment = _useState30[0],
+    setActualShowCashPayment = _useState30[1];
+  var _useState31 = useState(0),
     _useState32 = _slicedToArray(_useState31, 2),
-    showRetryModal = _useState32[0],
-    setShowRetryModal = _useState32[1];
-  var _useState33 = useState(editOrderId || 0),
+    windowHeight = _useState32[0],
+    setWindowHeight = _useState32[1];
+  var _useState33 = useState(false),
     _useState34 = _slicedToArray(_useState33, 2),
-    currentEditOrderId = _useState34[0],
-    _setCurrentEditOrderId = _useState34[1];
+    showRetryModal = _useState34[0],
+    setShowRetryModal = _useState34[1];
+  var _useState35 = useState(editOrderId || 0),
+    _useState36 = _slicedToArray(_useState35, 2),
+    currentEditOrderId = _useState36[0],
+    _setCurrentEditOrderId = _useState36[1];
   var Toast = useToast();
 
   // 重试处理函数（逻辑由用户自己实现）
@@ -1528,18 +1536,18 @@ var PaymentModal = function PaymentModal(_ref18) {
   }, []);
 
   // 订单备注相关状态
-  var _useState35 = useState(false),
-    _useState36 = _slicedToArray(_useState35, 2),
-    noteModalOpen = _useState36[0],
-    setNoteModalOpen = _useState36[1];
-  var _useState37 = useState(''),
+  var _useState37 = useState(false),
     _useState38 = _slicedToArray(_useState37, 2),
-    orderNote = _useState38[0],
-    setOrderNote = _useState38[1];
-  var _useState39 = useState('payment-content'),
+    noteModalOpen = _useState38[0],
+    setNoteModalOpen = _useState38[1];
+  var _useState39 = useState(''),
     _useState40 = _slicedToArray(_useState39, 2),
-    noteModalSource = _useState40[0],
-    setNoteModalSource = _useState40[1];
+    orderNote = _useState40[0],
+    setOrderNote = _useState40[1];
+  var _useState41 = useState('payment-content'),
+    _useState42 = _slicedToArray(_useState41, 2),
+    noteModalSource = _useState42[0],
+    setNoteModalSource = _useState42[1];
 
   // 订单备注相关处理函数
   var handleNoteConfirm = /*#__PURE__*/function () {

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

@@ -503,8 +503,8 @@ function AmountSummary(_ref2) {
     var syncedVoucherAmount = paymentItems === null || paymentItems === void 0 ? void 0 : paymentItems.reduce(function (acc, item) {
       // 如果当前是普通支付，则减去order_payment_type不为 deposit的支付项
       // 如果当前是定金支付，则减去order_payment_type为 deposit的支付项
-      if (item.voucher_id && item.isSynced && (paymentType === 'regular' && item.order_payment_type !== 'deposit' || paymentType === 'deposit' && item.order_payment_type === 'deposit')) {
-        return acc.plus(item.amount).plus(item.rounding_amount);
+      if (item.isSynced && (paymentType === 'regular' && item.order_payment_type !== 'deposit' || paymentType === 'deposit' && item.order_payment_type === 'deposit')) {
+        return acc.plus(item.amount).plus(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0);
       }
       return acc;
     }, new Decimal(0)).toNumber();
@@ -615,7 +615,7 @@ function AmountSummary(_ref2) {
     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.plus(item.amount).plus(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0);
         }
         return acc;
       }, new Decimal(0)).toNumber();
@@ -627,7 +627,7 @@ function AmountSummary(_ref2) {
       // 如果是定金支付，且定金已付款金额大于等于订单总金额，则不可以再切换到普通支付
       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.plus(item.amount).plus(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0);
         }
         return acc;
       }, new Decimal(0)).toNumber();

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

@@ -13,10 +13,12 @@ export interface CashPaymentModuleProps {
         roundingDifference: number;
     }>;
     balanceDueAmount?: string;
+    balanceDueTotalAmount?: string;
     syncingLock?: boolean;
 }
 export declare function CashPaymentModule({ amountSymbol, orderInfo, onPaymentComplete, customAmount, amountButtons, // 按钮列表，默认5个推荐金额
 disabled, // 禁用状态
-roundingFunction, balanceDueAmount, // 剩余支付金额
+roundingFunction, balanceDueAmount, // 当前阶段剩余支付金额（定金或普通支付）
+balanceDueTotalAmount, // 完整订单剩余待付金额
 syncingLock, }: CashPaymentModuleProps): JSX.Element;
 export default CashPaymentModule;

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

@@ -29,6 +29,8 @@ export function CashPaymentModule(_ref) {
     roundingFunction = _ref.roundingFunction,
     _ref$balanceDueAmount = _ref.balanceDueAmount,
     balanceDueAmount = _ref$balanceDueAmount === void 0 ? '0' : _ref$balanceDueAmount,
+    _ref$balanceDueTotalA = _ref.balanceDueTotalAmount,
+    balanceDueTotalAmount = _ref$balanceDueTotalA === void 0 ? '0' : _ref$balanceDueTotalA,
     _ref$syncingLock = _ref.syncingLock,
     syncingLock = _ref$syncingLock === void 0 ? false : _ref$syncingLock;
   var _useState = useState(customAmount || ''),
@@ -56,7 +58,7 @@ export function CashPaymentModule(_ref) {
   };
   useEffect(function () {
     handleKeyboardConfirm(customAmount || '');
-  }, [customAmount, balanceDueAmount]);
+  }, [customAmount, balanceDueAmount, orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.isDeposit]);
 
   // 检查是否应该禁用按钮：原本disabled为true 或者 订单金额为0
   var isAmountButtonsDisabled = disabled || Number(customAmount || 0) === 0;
@@ -119,33 +121,35 @@ export function CashPaymentModule(_ref) {
               break;
             }
             setAmount('');
-            _context.next = 32;
+            _context.next = 33;
             break;
           case 13:
             // 移除可能的货币符号和多余空格
             cleanValue = finalValue.replace(/[$\s]/g, '');
             numValue = parseFloat(cleanValue); // 检查当前金额是否等于剩余支付金额
-            balanceDue = parseFloat(balanceDueAmount);
+            debugger;
+            // 需要确认当前是否是定金模式，如果是定金模式则 balanceDue 应该为完整订单剩余待付金额
+            balanceDue = parseFloat(orderInfo !== null && orderInfo !== void 0 && orderInfo.isDeposit ? balanceDueTotalAmount || '0' : balanceDueAmount);
             shouldApplyRounding = Math.abs(numValue - balanceDue) < 0.01; // 使用小数精度比较
             finalAmount = numValue;
             roundingDiff = 0;
             if (!(shouldApplyRounding && roundingFunction)) {
-              _context.next = 29;
+              _context.next = 30;
               break;
             }
-            _context.next = 22;
+            _context.next = 23;
             return roundingFunction(numValue);
-          case 22:
+          case 23:
             _result = _context.sent;
             _ref3 = _result || {}, _ref3$roundedAmount = _ref3.roundedAmount, roundedAmount = _ref3$roundedAmount === void 0 ? numValue : _ref3$roundedAmount, _ref3$roundingDiffere = _ref3.roundingDifference, roundingDifference = _ref3$roundingDiffere === void 0 ? 0 : _ref3$roundingDiffere;
             finalAmount = roundedAmount;
             roundingDiff = roundingDifference;
             console.log('应用抹零：', numValue, '->', roundedAmount, '差额:', roundingDifference);
-            _context.next = 30;
+            _context.next = 31;
             break;
-          case 29:
-            console.log('不应用抹零，用户输入金额:', numValue, '剩余支付金额:', balanceDue);
           case 30:
+            console.log('不应用抹零，用户输入金额:', numValue, '剩余支付金额:', balanceDue);
+          case 31:
             setRoundingAmount(roundingDiff);
             if (isNaN(numValue)) {
               setAmount('');
@@ -153,7 +157,7 @@ export function CashPaymentModule(_ref) {
               setAmount(finalAmount.toString());
               console.log('设置金额为:', finalAmount);
             }
-          case 32:
+          case 33:
           case "end":
             return _context.stop();
         }

package/es/components/eftposPay/linkly/hooks/normal.js

@@ -74,7 +74,7 @@ export var useLinklyPayOrRefund = function useLinklyPayOrRefund(handleCheck) {
     var status = res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.status;
 
     // 继续查询交易状态
-    if (status === 0) {
+    if (status == 0) {
       var _res$data2;
       // 交易流水号
       numRef.current = res === null || res === void 0 || (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.session_id;
@@ -89,7 +89,7 @@ export var useLinklyPayOrRefund = function useLinklyPayOrRefund(handleCheck) {
       setTimeout(function () {
         var _resultQueryRef$curre;
         (_resultQueryRef$curre = resultQueryRef.current) === null || _resultQueryRef$curre === void 0 || _resultQueryRef$curre.call(resultQueryRef);
-      });
+      }, 300);
       return;
     }
 
@@ -99,7 +99,7 @@ export var useLinklyPayOrRefund = function useLinklyPayOrRefund(handleCheck) {
     }));
 
     // 交易成功
-    if (status === 1) {
+    if (status == 1) {
       var _handleLinklySuccessR;
       (_handleLinklySuccessR = handleLinklySuccessRef.current) === null || _handleLinklySuccessR === void 0 || _handleLinklySuccessR.call(handleLinklySuccessRef, res);
       return;