autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 11:05:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
YAS\29473
2026-02-03 14:07:51 +08:00
parent 543f989ff9
commit 84a6477e1e
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/BusinessFinancialServiceImpl.java
View File

@@ -42,15 +42,20 @@ public class BusinessFinancialServiceImpl implements BusinessFinancialService {
// 查询账户余额 // 查询账户余额
BigDecimal acctBalance = BigDecimal.ZERO; BigDecimal acctBalance = BigDecimal.ZERO;
BigDecimal pendingAmount = BigDecimal.ZERO;
try { try {
AdapayAccountBalanceVO accountBalanceVO = adapayService.queryAdapayAccountBalance(dto.getMerchantId()); AdapayAccountBalanceVO accountBalanceVO = adapayService.queryAdapayAccountBalance(dto.getMerchantId());
if (accountBalanceVO != null && accountBalanceVO.getAcctBalance() != null) { if (accountBalanceVO != null && accountBalanceVO.getAcctBalance() != null) {
acctBalance = accountBalanceVO.getAcctBalance(); acctBalance = accountBalanceVO.getAcctBalance();
} }
if (accountBalanceVO != null && accountBalanceVO.getPendingAmount() != null) {
pendingAmount = accountBalanceVO.getPendingAmount();
}
} catch (BaseAdaPayException e) { } catch (BaseAdaPayException e) {
log.error("查询汇付账户余额异常 merchantId:{}", dto.getMerchantId(), e); log.error("查询汇付账户余额异常 merchantId:{}", dto.getMerchantId(), e);
} }
result.getMerchantOrderReport().setAcctBalance(acctBalance); result.getMerchantOrderReport().setAcctBalance(acctBalance);
result.getMerchantOrderReport().setPendingAmount(pendingAmount);
// 查询累计提现金额 // 查询累计提现金额
BigDecimal totalWithdraw = BigDecimal.ZERO; BigDecimal totalWithdraw = BigDecimal.ZERO;

3
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderReportDetail.java
View File

@@ -52,4 +52,7 @@ public class OrderReportDetail {
*/ */
private BigDecimal totalWithdraw; private BigDecimal totalWithdraw;
// 在途金额
private BigDecimal pendingAmount;
} }