From acccff9860b271d55c55dc87486f7c20b9896e6c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 16:19:54 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java
index 9b32a24..8039212 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java
@@ -95,7 +95,8 @@
return R.fail("查询账户余额出错");
}
Double useAbleSettAmount = accountBalanceQueryResult.getUseAbleSettAmount();
- if(useAbleSettAmount < withdrawal.getArrivalAmount().doubleValue()){
+ //计算代付手续费
+ if(useAbleSettAmount < (withdrawal.getArrivalAmount().doubleValue() + 1)){
return R.fail("账户可用余额不足，请先补充账户余额");
}
//银行卡转账
@@ -156,7 +157,7 @@
@PostMapping("/withdrawalCallback")
public Object withdrawalCallback(@RequestBody SinglePayCallbackResult singlePayCallbackResult){
Integer status = singlePayCallbackResult.getStatus();
- if(203 == status){
+ if(203 == status || 205 == status){
String merchantOrderNo = singlePayCallbackResult.getMerchantOrderNo();
WithdrawalRequests withdrawalRequests = withdrawalRequestsService.getById(merchantOrderNo);
if(1 == withdrawalRequests.getStatus()){
--
Gitblit v1.7.1