From 2a4f0972408e27b8ef7afdc3a9195e301e06deb4 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期五, 17 一月 2025 10:53:31 +0800 Subject: [PATCH] 12.18 --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java | 2 +- ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java index 5dc7b75..fbf8840 100644 --- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java +++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java @@ -53,7 +53,7 @@ @Override public void withdrawalApply(WithdrawalRequestsDTO params) { BigDecimal withdrawalAmount = params.getWithdrawalAmount(); - if (withdrawalAmount.compareTo(MAX_WITHDRAWAL_AMOUNT) > 0) { + if (withdrawalAmount.compareTo(MAX_WITHDRAWAL_AMOUNT) > 0 && params.getWithdrawalMethod().equals(1)) { throw new ServiceException("提现失败,单次提现金额不能超过200元!"); } diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java index fafbf08..87690b2 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java @@ -114,7 +114,7 @@ if(!order.getAppUserId().equals(userid)){ return R.fail("权限不足"); } - if(Arrays.asList(2, 3).contains(refundPass.getStatus())){ + if(refundPass.getStatus().equals(2)){ return R.fail("售后取消失败"); } refundPass.setDelFlag(1); -- Gitblit v1.7.1