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; + }