From 6816f88b71a7b6fac00c0010ef8e906d5953186e Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Thu, 21 Sep 2023 17:16:59 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E4=BB=8E=E6=B8=85=E5=88=86=E8=B4=A6=E5=8D=95=E5=8F=96=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SettleOrderReportServiceImpl.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java index 55c5635af..95975a6df 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java @@ -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 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 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; } /**