From 6d13f8ebe722c74f701a48c96a514da5fb452d03 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 22 Sep 2023 11:36:46 +0800 Subject: [PATCH] update --- .../pile/service/impl/SettleOrderReportServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 95975a6df..ad1fc4bb1 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 @@ -345,6 +345,7 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService { dto.setEndTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, new Date())); } MerchantOrderReportVO vo = new MerchantOrderReportVO(); + vo.setMerchantId(dto.getMerchantId()); PageUtils.startPage(pageNum, pageSize); GetClearingBillDTO clearingBillDTO = GetClearingBillDTO.builder() .merchantId(dto.getMerchantId()) @@ -353,11 +354,10 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService { .pageNum(dto.getPageNum()) .pageSize(dto.getPageSize()) .build(); + // 清分账单列表 PageResponse pageResponse = getMerchantClearingBillList(clearingBillDTO); vo.setPageResponse(pageResponse); - vo.setMerchantId(dto.getMerchantId()); - // 进行数据汇总 MerchantOrderReportVO.MerchantOrderReport report = queryMerchantOrderReport(dto); vo.setMerchantOrderReport(report);