使用结算金额计算收入金额

This commit is contained in:
Guoqs
2024-11-12 14:35:43 +08:00
parent 923bffbf89
commit 0df0e610fd

View File

@@ -378,7 +378,11 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
chargeTime = chargeTime.add(new BigDecimal(settleOrderReportVO.getChargeTime()));
electricityAmount = electricityAmount.add(settleOrderReportVO.getElectricityAmount());
serviceAmount = serviceAmount.add(settleOrderReportVO.getServiceAmount());
totalAmount = totalAmount.add(settleOrderReportVO.getSettleAmount()); // 2024年11月12日14点30分使用结算金额计算收入金额
// 2024年11月12日14点30分使用结算金额计算收入金额
BigDecimal amount = settleOrderReportVO.getSettleAmount() != null
? settleOrderReportVO.getSettleAmount()
: settleOrderReportVO.getTotalAmount();
totalAmount = totalAmount.add(amount);
virtualAmount = virtualAmount.add(settleOrderReportVO.getVirtualAmount());
}
// 用电度数