From 11ade824e0abb0c42d6346c9b808666aaff99c9a Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 26 十一月 2025 21:26:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/ElectronicLedgerController.java | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/ElectronicLedgerController.java b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/ElectronicLedgerController.java
index 848c9a4..c58cbc0 100644
--- a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/ElectronicLedgerController.java
+++ b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/ElectronicLedgerController.java
@@ -360,10 +360,13 @@
}
UserInfo userInfo = userInfoService.selectById(id);
UserWithdrawal userWithdrawal = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>().eq("phone", userInfo.getPhone()).eq("type",1));
- 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==null?new UserWithdrawal():userWithdrawal);
}catch (Exception e){
e.printStackTrace();
@@ -402,30 +405,31 @@
UserInfo user = userInfoService.selectById(userInfoService.getUserIdFormRedis(request));
UserWithdrawal driverWith = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>()
- .eq("phone", user.getPhone())
+ .eq("phone", user.getPhone()).eq("type",1)
.last("LIMIT 1"));
if(driverWith==null){
return ResultUtil.error("请先进行进件操作");
}
try {
- BalanceAcctReq balanceAcctReq = new BalanceAcctReq();
- balanceAcctReq.setCusId(driverWith.getCusId());
- BalanceAcctListResp balanceAcctListResp = BalanceAcctExample.retrieveByUserId(balanceAcctReq);
- List<BalanceAcctItem> balanceAccts = balanceAcctListResp.getBalanceAccts();
- for (BalanceAcctItem balanceAcct : balanceAccts) {
- if(balanceAcct.getBalanceAcctId().equals(driverWith.getBalanceAcctId())){
- if(balanceAcct.getSettledAmount().doubleValue()==0){
- return ResultUtil.success(new BigDecimal(0));
- }
- return ResultUtil.success(new BigDecimal(balanceAcct.getSettledAmount()).divide(new BigDecimal(100)));
- }
- }
+ BigDecimal bigDecimal = douGongBasicDataBiz.balanceQuery(driverWith.getHuifuId());
+ return ResultUtil.success(bigDecimal);
+// BalanceAcctReq balanceAcctReq = new BalanceAcctReq();
+// balanceAcctReq.setCusId(driverWith.getCusId());
+// BalanceAcctListResp balanceAcctListResp = BalanceAcctExample.retrieveByUserId(balanceAcctReq);
+// List<BalanceAcctItem> balanceAccts = balanceAcctListResp.getBalanceAccts();
+// for (BalanceAcctItem balanceAcct : balanceAccts) {
+// if(balanceAcct.getBalanceAcctId().equals(driverWith.getBalanceAcctId())){
+// if(balanceAcct.getSettledAmount().doubleValue()==0){
+// return ResultUtil.success(new BigDecimal(0));
+// }
+// return ResultUtil.success(new BigDecimal(balanceAcct.getSettledAmount()).divide(new BigDecimal(100)));
+// }
+// }
} catch (UpyztException e) {
e.printStackTrace();
System.out.println("用户获取可提现余额:"+e);
return ResultUtil.error(e.getMessage());
}
- return ResultUtil.success(new BigDecimal(0));
}
--
Gitblit v1.7.1