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

update 运营端小程序查询运营商报表信息新增参数

Browse Source
This commit is contained in:
Lemon
2026-03-19 10:35:06 +08:00
parent 5c6925b9a3
commit 89efe8b2a9
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java
View File

@@ -226,7 +226,7 @@ public class AdapayMemberController extends BaseController {
* @param dto * @param dto
* @return * @return
*/ */
@PostMapping("createBankAccount") @PostMapping("/createBankAccount")
public AjaxResult createBankAccount(@RequestBody SettleAccountDTO dto) { public AjaxResult createBankAccount(@RequestBody SettleAccountDTO dto) {
AjaxResult result = null; AjaxResult result = null;
try { try {

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

@@ -41,14 +41,19 @@ public class BusinessFinancialServiceImpl implements BusinessFinancialService {
MerchantOrderReportVO result = settleOrderReportService.getMerchantOrderReportV2(dto); MerchantOrderReportVO result = settleOrderReportService.getMerchantOrderReportV2(dto);
// 查询账户余额 // 查询账户余额
AdapayAccountBalanceVO accountBalanceVO = new AdapayAccountBalanceVO();
BigDecimal acctBalance = BigDecimal.ZERO; BigDecimal acctBalance = BigDecimal.ZERO;
BigDecimal pendingAmount = BigDecimal.ZERO; BigDecimal pendingAmount = BigDecimal.ZERO;
try { try {
AdapayAccountBalanceVO accountBalanceVO = adapayService.queryAdapayAccountBalance(dto.getMerchantId()); accountBalanceVO = adapayService.queryAdapayAccountBalance(dto.getMerchantId());
if (accountBalanceVO != null && accountBalanceVO.getAcctBalance() != null) { if (accountBalanceVO == null) {
log.error("我的钱包查询异常 查询出accountBalanceVO 为null");
return result;
}
if (accountBalanceVO.getAcctBalance() != null) {
acctBalance = accountBalanceVO.getAcctBalance(); acctBalance = accountBalanceVO.getAcctBalance();
} }
if (accountBalanceVO != null && accountBalanceVO.getPendingAmount() != null) { if (accountBalanceVO.getPendingAmount() != null) {
pendingAmount = accountBalanceVO.getPendingAmount(); pendingAmount = accountBalanceVO.getPendingAmount();
} }
} catch (BaseAdaPayException e) { } catch (BaseAdaPayException e) {
@@ -56,6 +61,7 @@ public class BusinessFinancialServiceImpl implements BusinessFinancialService {
} }
result.getMerchantOrderReport().setAcctBalance(acctBalance); result.getMerchantOrderReport().setAcctBalance(acctBalance);
result.getMerchantOrderReport().setPendingAmount(pendingAmount); result.getMerchantOrderReport().setPendingAmount(pendingAmount);
result.getMerchantOrderReport().setCanWithdrawAmount(accountBalanceVO.getLastAvlBalance());
// 查询累计提现金额 // 查询累计提现金额
BigDecimal totalWithdraw = BigDecimal.ZERO; BigDecimal totalWithdraw = BigDecimal.ZERO;

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

@@ -55,4 +55,7 @@ public class OrderReportDetail {
// 在途金额 // 在途金额
private BigDecimal pendingAmount; private BigDecimal pendingAmount;
// 可提现金额
private BigDecimal canWithdrawAmount;
} }