mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-20 19:15:35 +08:00
使用结算金额计算收入金额
This commit is contained in:
@@ -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());
|
||||
}
|
||||
// 用电度数
|
||||
|
||||
Reference in New Issue
Block a user