From 89efe8b2a9ec1ec53067f7a3959e78febeb0dab3 Mon Sep 17 00:00:00 2001 From: Lemon Date: Thu, 19 Mar 2026 10:35:06 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E8=BF=90=E8=90=A5=E7=AB=AF?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=9F=A5=E8=AF=A2=E8=BF=90=E8=90=A5?= =?UTF-8?q?=E5=95=86=E6=8A=A5=E8=A1=A8=E4=BF=A1=E6=81=AF=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/pile/AdapayMemberController.java | 2 +- .../service/impl/BusinessFinancialServiceImpl.java | 12 +++++++++--- .../com/jsowell/pile/vo/web/OrderReportDetail.java | 3 +++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java index 0796ccaf4..98d270964 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java @@ -226,7 +226,7 @@ public class AdapayMemberController extends BaseController { * @param dto * @return */ - @PostMapping("createBankAccount") + @PostMapping("/createBankAccount") public AjaxResult createBankAccount(@RequestBody SettleAccountDTO dto) { AjaxResult result = null; try { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/BusinessFinancialServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/BusinessFinancialServiceImpl.java index 23e007588..a7037faee 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/BusinessFinancialServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/BusinessFinancialServiceImpl.java @@ -41,14 +41,19 @@ public class BusinessFinancialServiceImpl implements BusinessFinancialService { MerchantOrderReportVO result = settleOrderReportService.getMerchantOrderReportV2(dto); // 查询账户余额 + AdapayAccountBalanceVO accountBalanceVO = new AdapayAccountBalanceVO(); BigDecimal acctBalance = BigDecimal.ZERO; BigDecimal pendingAmount = BigDecimal.ZERO; try { - AdapayAccountBalanceVO accountBalanceVO = adapayService.queryAdapayAccountBalance(dto.getMerchantId()); - if (accountBalanceVO != null && accountBalanceVO.getAcctBalance() != null) { + accountBalanceVO = adapayService.queryAdapayAccountBalance(dto.getMerchantId()); + if (accountBalanceVO == null) { + log.error("我的钱包查询异常 查询出accountBalanceVO 为null"); + return result; + } + if (accountBalanceVO.getAcctBalance() != null) { acctBalance = accountBalanceVO.getAcctBalance(); } - if (accountBalanceVO != null && accountBalanceVO.getPendingAmount() != null) { + if (accountBalanceVO.getPendingAmount() != null) { pendingAmount = accountBalanceVO.getPendingAmount(); } } catch (BaseAdaPayException e) { @@ -56,6 +61,7 @@ public class BusinessFinancialServiceImpl implements BusinessFinancialService { } result.getMerchantOrderReport().setAcctBalance(acctBalance); result.getMerchantOrderReport().setPendingAmount(pendingAmount); + result.getMerchantOrderReport().setCanWithdrawAmount(accountBalanceVO.getLastAvlBalance()); // 查询累计提现金额 BigDecimal totalWithdraw = BigDecimal.ZERO; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderReportDetail.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderReportDetail.java index 8d10a1398..1315cb5b4 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderReportDetail.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderReportDetail.java @@ -55,4 +55,7 @@ public class OrderReportDetail { // 在途金额 private BigDecimal pendingAmount; + // 可提现金额 + private BigDecimal canWithdrawAmount; + }