autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 02:55:04 +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;

72
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantOrderReportVO.java
View File

@@ -1,52 +1,46 @@
package com.jsowell.pile.vo.web;
import com.jsowell.common.core.page.PageResponse;
import com.jsowell.pile.domain.SettleOrderReport;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
@Data
public class MerchantOrderReportVO {
private String merchantId;
private MerchantOrderReport merchantOrderReport;
// private List<SettleOrderReportVO> reportList;
private OrderReportDetail merchantOrderReport;
private PageResponse pageResponse;
@Data
public static class MerchantOrderReport{
// 用电度数
private BigDecimal useElectricity;
// 充电次数
private BigDecimal chargeNum;
// 充电时长
private BigDecimal chargeTime;
// 电费金额
private BigDecimal electricityAmount;
// 服务费金额
private BigDecimal serviceAmount;
// 收入金额
private BigDecimal totalAmount;
// 交易金额
private BigDecimal tradeAmount;
// 交易手续费
private BigDecimal tradeFee;
// 虚拟金额
private BigDecimal virtualAmount;
// 白名单支付次数
private BigDecimal whitelistPaymentsNum;
}
// @Data
// public static class MerchantOrderReport{
// // 用电度数
// private BigDecimal useElectricity;
//
// // 充电次数
// private BigDecimal chargeNum;
//
// // 充电时长
// private BigDecimal chargeTime;
//
// // 电费金额
// private BigDecimal electricityAmount;
//
// // 服务费金额
// private BigDecimal serviceAmount;
//
// // 收入金额
// private BigDecimal totalAmount;
//
// // 交易金额
// private BigDecimal tradeAmount;
//
// // 交易手续费
// private BigDecimal tradeFee;
//
// // 虚拟金额
// private BigDecimal virtualAmount;
//
// // 白名单支付次数
// private BigDecimal whitelistPaymentsNum;
// }
}

41
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderReportDetail.java Normal file
View File

@@ -0,0 +1,41 @@
package com.jsowell.pile.vo.web;
import lombok.Data;
import java.math.BigDecimal;
/**
* 订单报告详情
*/
@Data
public class OrderReportDetail {
// 用电度数
private BigDecimal useElectricity;
// 充电次数
private BigDecimal chargeNum;
// 充电时长
private BigDecimal chargeTime;
// 电费金额
private BigDecimal electricityAmount;
// 服务费金额
private BigDecimal serviceAmount;
// 收入金额
private BigDecimal totalAmount;
// 交易金额
private BigDecimal tradeAmount;
// 交易手续费
private BigDecimal tradeFee;
// 虚拟金额
private BigDecimal virtualAmount;
// 白名单支付次数
private BigDecimal whitelistPaymentsNum;
}