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

结算订单时计算金额, 最后保留2位小数

Browse Source
This commit is contained in:
Guoqs
2025-06-23 11:38:45 +08:00
parent b0cdb5ada1
commit 1eab1ac647
2 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -399,6 +399,12 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
return vo;
}
/**
* 查询运营商订单报告
* 财务中心-财务详情-运营汇总
* @param dto
* @return
*/
private OrderReportDetail queryMerchantOrderReport(MerchantOrderReportDTO dto) {
// 进行数据汇总
OrderReportDetail report = new OrderReportDetail();
@@ -420,6 +426,10 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
BigDecimal amount = settleOrderReportVO.getSettleAmount() != null
? settleOrderReportVO.getSettleAmount()
: settleOrderReportVO.getTotalAmount();
// 2025年6月19日15点11分 修改逻辑, 使用实收金额进行计算
totalAmount = totalAmount.add(amount);
virtualAmount = virtualAmount.add(settleOrderReportVO.getVirtualAmount());
}
@@ -437,10 +447,6 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
report.setTotalAmount(totalAmount);
// 虚拟金额
report.setVirtualAmount(virtualAmount);
// 交易金额
// report.setTradeAmount(list.stream().map(SettleOrderReportVO::getTradeAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
// 交易手续费
// report.setTradeFee(list.stream().map(SettleOrderReportVO::getTradeFee).reduce(BigDecimal.ZERO, BigDecimal::add));
// 从清分账单中计算交易金额，交易手续费
GetClearingBillDTO clearingBillDTO = GetClearingBillDTO.builder()