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

update 数据展示从清分账单取值

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-09-21 17:16:59 +08:00
parent 0633bd2a21
commit 6816f88b71
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
View File

@@ -358,6 +358,13 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService {
vo.setMerchantId(dto.getMerchantId());
// 进行数据汇总
MerchantOrderReportVO.MerchantOrderReport report = queryMerchantOrderReport(dto);
vo.setMerchantOrderReport(report);
return vo;
}
private MerchantOrderReportVO.MerchantOrderReport queryMerchantOrderReport(MerchantOrderReportDTO dto) {
// 进行数据汇总
MerchantOrderReportVO.MerchantOrderReport report = new MerchantOrderReportVO.MerchantOrderReport();
List<SettleOrderReportVO> list = settleOrderReportMapper.getMerchantOrderReport(dto);
@@ -397,6 +404,13 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService {
// report.setTradeFee(list.stream().map(SettleOrderReportVO::getTradeFee).reduce(BigDecimal.ZERO, BigDecimal::add));
// 从清分账单中计算交易金额，交易手续费
GetClearingBillDTO clearingBillDTO = GetClearingBillDTO.builder()
.merchantId(dto.getMerchantId())
.startTime(dto.getStartTime())
.endTime(dto.getEndTime())
.pageNum(dto.getPageNum())
.pageSize(dto.getPageSize())
.build();
List<MerchantClearingBillVO> merchantClearingBillList = clearingBillInfoService.getMerchantClearingBillList(clearingBillDTO);
BigDecimal tradeAmount = BigDecimal.ZERO;
BigDecimal tradeFee = BigDecimal.ZERO;
@@ -408,9 +422,7 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService {
report.setTradeAmount(tradeAmount);
// 交易手续费
report.setTradeFee(tradeFee);
vo.setMerchantOrderReport(report);
return vo;
return report;
}
/**