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

新增derReportDetail订单报告详情

Browse Source
This commit is contained in:
Guoqs
2025-01-13 15:34:34 +08:00
parent 095166e17c
commit 76ebd65c05
3 changed files with 82 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -284,7 +284,8 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
dto.setEndTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, new Date()));
}
MerchantOrderReportVO vo = new MerchantOrderReportVO();
MerchantOrderReportVO.MerchantOrderReport report = new MerchantOrderReportVO.MerchantOrderReport();
// MerchantOrderReportVO.MerchantOrderReport report = new MerchantOrderReportVO.MerchantOrderReport();
OrderReportDetail report = new OrderReportDetail();
PageUtils.startPage(pageNum, pageSize);
List<SettleOrderReportVO> pageList = settleOrderReportMapper.getMerchantOrderReport(dto);
if (CollectionUtils.isEmpty(pageList)) {
@@ -359,7 +360,8 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
vo.setPageResponse(pageResponse);
// 进行数据汇总
MerchantOrderReportVO.MerchantOrderReport report = queryMerchantOrderReport(dto);
// MerchantOrderReportVO.MerchantOrderReport report = queryMerchantOrderReport(dto);
OrderReportDetail report = queryMerchantOrderReport(dto);
vo.setMerchantOrderReport(report);
return vo;
}
@@ -389,14 +391,15 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
vo.setPageResponse(pageResponse);
// 进行数据汇总
MerchantOrderReportVO.MerchantOrderReport report = queryMerchantOrderReport(dto);
// MerchantOrderReportVO.MerchantOrderReport report = queryMerchantOrderReport(dto);
OrderReportDetail report = queryMerchantOrderReport(dto);
vo.setMerchantOrderReport(report);
return vo;
}
private MerchantOrderReportVO.MerchantOrderReport queryMerchantOrderReport(MerchantOrderReportDTO dto) {
private OrderReportDetail queryMerchantOrderReport(MerchantOrderReportDTO dto) {
// 进行数据汇总
MerchantOrderReportVO.MerchantOrderReport report = new MerchantOrderReportVO.MerchantOrderReport();
OrderReportDetail report = new OrderReportDetail();
List<SettleOrderReportVO> list = settleOrderReportMapper.getMerchantOrderReport(dto);
BigDecimal useElectricity = BigDecimal.ZERO;
BigDecimal chargeNum = BigDecimal.ZERO;