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

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-09-22 11:36:46 +08:00
parent 2100d73d9a
commit 6d13f8ebe7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -345,6 +345,7 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService {
dto.setEndTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, new Date())); dto.setEndTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, new Date()));
} }
MerchantOrderReportVO vo = new MerchantOrderReportVO(); MerchantOrderReportVO vo = new MerchantOrderReportVO();
vo.setMerchantId(dto.getMerchantId());
PageUtils.startPage(pageNum, pageSize); PageUtils.startPage(pageNum, pageSize);
GetClearingBillDTO clearingBillDTO = GetClearingBillDTO.builder() GetClearingBillDTO clearingBillDTO = GetClearingBillDTO.builder()
.merchantId(dto.getMerchantId()) .merchantId(dto.getMerchantId())
@@ -353,11 +354,10 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService {
.pageNum(dto.getPageNum()) .pageNum(dto.getPageNum())
.pageSize(dto.getPageSize()) .pageSize(dto.getPageSize())
.build(); .build();
// 清分账单列表
PageResponse pageResponse = getMerchantClearingBillList(clearingBillDTO); PageResponse pageResponse = getMerchantClearingBillList(clearingBillDTO);
vo.setPageResponse(pageResponse); vo.setPageResponse(pageResponse);
vo.setMerchantId(dto.getMerchantId());
// 进行数据汇总 // 进行数据汇总
MerchantOrderReportVO.MerchantOrderReport report = queryMerchantOrderReport(dto); MerchantOrderReportVO.MerchantOrderReport report = queryMerchantOrderReport(dto);
vo.setMerchantOrderReport(report); vo.setMerchantOrderReport(report);