This commit is contained in:
Lemon
2023-05-08 10:38:02 +08:00
parent e2d7c984c4
commit ff389a69d7
2 changed files with 9 additions and 2 deletions

View File

@@ -816,7 +816,7 @@ public class OrderService {
peak.setServiceAmount(peak.getServicePrice().multiply(peak.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN));
OrderDetailInfoVO.ChargeDetail flat = new OrderDetailInfoVO.ChargeDetail();
flat.setPeriodType(BillingTimeEnum.PEAK.getLabel());
flat.setPeriodType(BillingTimeEnum.FLAT.getLabel());
flat.setElectricityPrice(orderDetail.getFlatElectricityPrice());
flat.setServicePrice(orderDetail.getFlatServicePrice());
flat.setUsedElectricity(orderDetail.getFlatUsedElectricity());
@@ -824,7 +824,7 @@ public class OrderService {
flat.setServiceAmount(flat.getServicePrice().multiply(flat.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN));
OrderDetailInfoVO.ChargeDetail valley = new OrderDetailInfoVO.ChargeDetail();
valley.setPeriodType(BillingTimeEnum.PEAK.getLabel());
valley.setPeriodType(BillingTimeEnum.VALLEY.getLabel());
valley.setElectricityPrice(orderDetail.getValleyElectricityPrice());
valley.setServicePrice(orderDetail.getValleyServicePrice());
valley.setUsedElectricity(orderDetail.getValleyUsedElectricity());