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

update

Browse Source
This commit is contained in:
YAS\29473
2026-01-19 10:11:22 +08:00
parent 5f6631e3b9
commit 2bdee20eea
5 changed files with 19 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-pile/src/main/java/com/jsowell/pile/service/BusinessFinancialService.java
View File

@@ -1,8 +1,8 @@
package com.jsowell.pile.service;
import com.jsowell.pile.dto.MerchantOrderReportDTO;
import com.jsowell.pile.vo.uniapp.business.BusinessFinancialQueryResultVO;
import com.jsowell.pile.vo.web.MerchantOrderReportVO;
public interface BusinessFinancialService {
BusinessFinancialQueryResultVO getMyWallet(MerchantOrderReportDTO dto);
MerchantOrderReportVO getMyWallet(MerchantOrderReportDTO dto);
}

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

@@ -7,9 +7,7 @@ import com.jsowell.pile.dto.MerchantOrderReportDTO;
import com.jsowell.pile.service.BusinessFinancialService;
import com.jsowell.pile.service.ClearingWithdrawInfoService;
import com.jsowell.pile.service.SettleOrderReportService;
import com.jsowell.pile.vo.uniapp.business.BusinessFinancialQueryResultVO;
import com.jsowell.pile.vo.web.MerchantOrderReportVO;
import com.jsowell.pile.vo.web.OrderReportDetail;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -38,24 +36,9 @@ public class BusinessFinancialServiceImpl implements BusinessFinancialService {
* @return
*/
@Override
public BusinessFinancialQueryResultVO getMyWallet(MerchantOrderReportDTO dto) {
public MerchantOrderReportVO getMyWallet(MerchantOrderReportDTO dto) {
// 查询运营商订单报表
MerchantOrderReportVO merchantOrderReportVO = settleOrderReportService.getMerchantOrderReportV2(dto);
// 构建返回结果
BusinessFinancialQueryResultVO result = new BusinessFinancialQueryResultVO();
// 从订单报表中获取收入金额、交易金额、交易手续费
if (merchantOrderReportVO != null && merchantOrderReportVO.getMerchantOrderReport() != null) {
OrderReportDetail report = merchantOrderReportVO.getMerchantOrderReport();
result.setTotalAmount(report.getTotalAmount() != null ? report.getTotalAmount() : BigDecimal.ZERO);
result.setTradeAmount(report.getTradeAmount() != null ? report.getTradeAmount() : BigDecimal.ZERO);
result.setTradeFee(report.getTradeFee() != null ? report.getTradeFee() : BigDecimal.ZERO);
} else {
result.setTotalAmount(BigDecimal.ZERO);
result.setTradeAmount(BigDecimal.ZERO);
result.setTradeFee(BigDecimal.ZERO);
}
MerchantOrderReportVO result = settleOrderReportService.getMerchantOrderReportV2(dto);
// 查询账户余额
BigDecimal acctBalance = BigDecimal.ZERO;
@@ -67,7 +50,7 @@ public class BusinessFinancialServiceImpl implements BusinessFinancialService {
} catch (BaseAdaPayException e) {
log.error("查询汇付账户余额异常 merchantId:{}", dto.getMerchantId(), e);
}
result.setAcctBalance(acctBalance);
result.getMerchantOrderReport().setAcctBalance(acctBalance);
// 查询累计提现金额
BigDecimal totalWithdraw = BigDecimal.ZERO;
@@ -79,7 +62,7 @@ public class BusinessFinancialServiceImpl implements BusinessFinancialService {
} catch (Exception e) {
log.error("查询累计提现金额异常 merchantId:{}", dto.getMerchantId(), e);
}
result.setTotalWithdraw(totalWithdraw);
result.getMerchantOrderReport().setTotalWithdraw(totalWithdraw);
return result;
}