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

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<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);
-
+        return report;
-        vo.setMerchantOrderReport(report);
-        return vo;
     }
 
     /**