From 3348eda2c33469e9935ae6afcf83ea5c52cea906 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 09 六月 2025 20:07:12 +0800
Subject: [PATCH] 修改bug-初验阶段

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopWithdrawController.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopWithdrawController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopWithdrawController.java
index a246495..b5f7d13 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopWithdrawController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopWithdrawController.java
@@ -40,6 +40,7 @@
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -124,7 +125,7 @@
                                            @ApiParam("手机号") String phone,
                                            @ApiParam("审核状态(0=待审核,1=审核通过,2=审核失败)")Integer auditStatus) {
         //模糊查询手机号
-        List<Integer> shopIds=null;
+        List<Integer> shopIds=new ArrayList<>();
         if (StringUtils.isNotEmpty(phone)) {
             QueryWrapper<Shop> queryWrapper=new QueryWrapper<>();
             queryWrapper.like(StringUtils.isNotEmpty(phone),"phone", phone);
@@ -203,6 +204,7 @@
     }
 
     private void baseWithdrawalApplication(BigDecimal money, Long userId, Integer shopId) {
+        money=money.setScale(2, BigDecimal.ROUND_HALF_DOWN);
         Shop shop = shopService.getById(shopId);
         if (money.compareTo(BigDecimal.ZERO)==0){
             throw new ServiceException("提现金额必须大于零");
@@ -268,7 +270,7 @@
         BigDecimal money = shopWithdraw1.getMoney();
         if(1 == shopWithdraw.getAuditStatus()){
             //通过
-            //先检查账户余额是否充足
+            // 先检查账户余额是否充足  todo 商户编号
             AccountBalanceQueryResult accountBalanceQueryResult = TransferUtil.accountBalanceQuery();
             if(null == accountBalanceQueryResult){
                 return R.fail("查询账户余额出错");

--
Gitblit v1.7.1