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 0f4e558c6..23e007588 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 @@ -42,15 +42,20 @@ public class BusinessFinancialServiceImpl implements BusinessFinancialService { // 查询账户余额 BigDecimal acctBalance = BigDecimal.ZERO; + BigDecimal pendingAmount = BigDecimal.ZERO; try { AdapayAccountBalanceVO accountBalanceVO = adapayService.queryAdapayAccountBalance(dto.getMerchantId()); if (accountBalanceVO != null && accountBalanceVO.getAcctBalance() != null) { acctBalance = accountBalanceVO.getAcctBalance(); } + if (accountBalanceVO != null && accountBalanceVO.getPendingAmount() != null) { + pendingAmount = accountBalanceVO.getPendingAmount(); + } } catch (BaseAdaPayException e) { log.error("查询汇付账户余额异常 merchantId:{}", dto.getMerchantId(), e); } result.getMerchantOrderReport().setAcctBalance(acctBalance); + result.getMerchantOrderReport().setPendingAmount(pendingAmount); // 查询累计提现金额 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 3d61fd276..8d10a1398 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 @@ -52,4 +52,7 @@ public class OrderReportDetail { */ private BigDecimal totalWithdraw; + // 在途金额 + private BigDecimal pendingAmount; + }