From 21fad5bb63b6e5daae1ed4f4c543705588f64fe8 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 26 十一月 2025 17:14:48 +0800
Subject: [PATCH] update

---
 DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/UserWithdrawalController.java |   57 ++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/UserWithdrawalController.java b/DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/UserWithdrawalController.java
index f002b4f..7a6ff2c 100644
--- a/DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/UserWithdrawalController.java
+++ b/DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/UserWithdrawalController.java
@@ -145,6 +145,7 @@
             }
             String tokenNo = (String) map.get("token_no");
             userWithdrawal.setTokenNo(tokenNo);
+            userWithdrawal.setType(1);
             userWithdrawalService.insert(userWithdrawal);
 
             // 通过司机进件信息封装银行卡信息进行数据库存储
@@ -246,6 +247,7 @@
             userWithdrawal.setBankCode(bankCode);
             userWithdrawal.setBankBranchCode(bankBranchCode);
             userWithdrawal.setCode(code);
+            userWithdrawal.setType(1);
             System.out.println(userWithdrawal);
             Map<String, Object> resultMap = douGongBasicDataBiz.userBasicDataIndvModify(userWithdrawal);
             //CusApplicationResp renew = CusApplicationExample.renew(userWithdrawal);
@@ -352,10 +354,13 @@
             if(Objects.isNull(userWithdrawal)){
                 return ResultUtil.success(new Object());
             }
-            Region province = regionService.getRegionByCode(userWithdrawal.getBankCardProvinceCode());
-            Region city = regionService.getRegionByCode(userWithdrawal.getBankCardCityCode());
-            userWithdrawal.setBankCardProvince(province == null ? "" : province.getName());
-            userWithdrawal.setBankCardCity(city == null ? "" : city.getName());
+            if(userWithdrawal!=null){
+                Region province = regionService.getRegionByCode(userWithdrawal.getBankCardProvinceCode());
+                Region city = regionService.getRegionByCode(userWithdrawal.getBankCardCityCode());
+                userWithdrawal.setBankCardProvince(province == null ? "" : province.getName());
+                userWithdrawal.setBankCardCity(city == null ? "" : city.getName());
+            }
+
             return ResultUtil.success(userWithdrawal);
         }catch (Exception e){
             e.printStackTrace();
@@ -476,29 +481,35 @@
             if(Objects.isNull(userWithdrawal)){
                 return ResultUtil.error("该司机开户信息为空");
             }
-            BalanceAcctReq balanceAcctReq = new BalanceAcctReq();
-            balanceAcctReq.setCusId(userWithdrawal.getCusId());
-            balanceAcctListResp = BalanceAcctExample.retrieveByUserId(balanceAcctReq);
-            System.err.println(balanceAcctListResp);
+            BigDecimal bigDecimal = douGongBasicDataBiz.balanceQuery(userWithdrawal.getHuifuId());
+
+            return ResultUtil.success(bigDecimal);
+//            BalanceAcctReq balanceAcctReq = new BalanceAcctReq();
+//            balanceAcctReq.setCusId(userWithdrawal.getCusId());
+//            balanceAcctListResp = BalanceAcctExample.retrieveByUserId(balanceAcctReq);
+//
+//
+//
+//            System.err.println(balanceAcctListResp);
         } catch (Exception e) {
             log.error("电子账簿可提现余额查询失败:{}",e.getMessage());
             e.printStackTrace();
         }
-        if(Objects.isNull(balanceAcctListResp)){
-            log.error("电子账簿可提现余额查询失败");
-            return ResultUtil.error("电子账簿可提现余额查询失败");
-        }
-        log.info("电子账簿可提现余额查询完成=========:{}",balanceAcctListResp);
-        List<BalanceAcctItem> balanceAccts = balanceAcctListResp.getBalanceAccts();
-        if(CollectionUtils.isEmpty(balanceAccts)){
-            log.error("电子账簿可提现余额查询失败");
-            return ResultUtil.error("电子账簿可提现余额查询失败");
-        }
-        for (BalanceAcctItem balanceAcct : balanceAccts) {
-            if(userWithdrawal.getBalanceAcctId().equals(balanceAcct.getBalanceAcctId())){
-                return ResultUtil.success(new BigDecimal(balanceAcct.getSettledAmount()).divide(new BigDecimal(100)));
-            }
-        }
+//        if(Objects.isNull(balanceAcctListResp)){
+//            log.error("电子账簿可提现余额查询失败");
+//            return ResultUtil.error("电子账簿可提现余额查询失败");
+//        }
+//        log.info("电子账簿可提现余额查询完成=========:{}",balanceAcctListResp);
+//        List<BalanceAcctItem> balanceAccts = balanceAcctListResp.getBalanceAccts();
+//        if(CollectionUtils.isEmpty(balanceAccts)){
+//            log.error("电子账簿可提现余额查询失败");
+//            return ResultUtil.error("电子账簿可提现余额查询失败");
+//        }
+//        for (BalanceAcctItem balanceAcct : balanceAccts) {
+//            if(userWithdrawal.getBalanceAcctId().equals(balanceAcct.getBalanceAcctId())){
+//                return ResultUtil.success(new BigDecimal(balanceAcct.getSettledAmount()).divide(new BigDecimal(100)));
+//            }
+//        }
         return ResultUtil.success(BigDecimal.ZERO);
     }
 

--
Gitblit v1.7.1