autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-12 19:29:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 订单详情 new收费明细

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-05-06 15:28:16 +08:00
parent f75e32d4f4
commit 7b55dc7e76
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -804,32 +804,32 @@ public class OrderService {
sharp.setElectricityPrice(orderDetail.getSharpElectricityPrice()); sharp.setElectricityPrice(orderDetail.getSharpElectricityPrice());
sharp.setServicePrice(orderDetail.getSharpServicePrice()); sharp.setServicePrice(orderDetail.getSharpServicePrice());
sharp.setUsedElectricity(orderDetail.getSharpUsedElectricity()); sharp.setUsedElectricity(orderDetail.getSharpUsedElectricity());
sharp.setElectricityAmount(sharp.getElectricityPrice().multiply(sharp.getUsedElectricity())); sharp.setElectricityAmount(sharp.getElectricityPrice().multiply(sharp.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN));
sharp.setServiceAmount(sharp.getServicePrice().multiply(sharp.getUsedElectricity())); sharp.setServiceAmount(sharp.getServicePrice().multiply(sharp.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN));
OrderDetailInfoVO.ChargeDetail peak = new OrderDetailInfoVO.ChargeDetail(); OrderDetailInfoVO.ChargeDetail peak = new OrderDetailInfoVO.ChargeDetail();
peak.setPeriodType(BillingTimeEnum.PEAK.getLabel()); peak.setPeriodType(BillingTimeEnum.PEAK.getLabel());
peak.setElectricityPrice(orderDetail.getPeakElectricityPrice()); peak.setElectricityPrice(orderDetail.getPeakElectricityPrice());
peak.setServicePrice(orderDetail.getPeakServicePrice()); peak.setServicePrice(orderDetail.getPeakServicePrice());
peak.setUsedElectricity(orderDetail.getPeakUsedElectricity()); peak.setUsedElectricity(orderDetail.getPeakUsedElectricity());
peak.setElectricityAmount(peak.getElectricityPrice().multiply(peak.getUsedElectricity())); peak.setElectricityAmount(peak.getElectricityPrice().multiply(peak.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN));
peak.setServiceAmount(peak.getServicePrice().multiply(peak.getUsedElectricity())); peak.setServiceAmount(peak.getServicePrice().multiply(peak.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN));
OrderDetailInfoVO.ChargeDetail flat = new OrderDetailInfoVO.ChargeDetail(); OrderDetailInfoVO.ChargeDetail flat = new OrderDetailInfoVO.ChargeDetail();
flat.setPeriodType(BillingTimeEnum.PEAK.getLabel()); flat.setPeriodType(BillingTimeEnum.PEAK.getLabel());
flat.setElectricityPrice(orderDetail.getFlatElectricityPrice()); flat.setElectricityPrice(orderDetail.getFlatElectricityPrice());
flat.setServicePrice(orderDetail.getFlatServicePrice()); flat.setServicePrice(orderDetail.getFlatServicePrice());
flat.setUsedElectricity(orderDetail.getFlatUsedElectricity()); flat.setUsedElectricity(orderDetail.getFlatUsedElectricity());
flat.setElectricityAmount(flat.getElectricityPrice().multiply(flat.getUsedElectricity())); flat.setElectricityAmount(flat.getElectricityPrice().multiply(flat.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN));
flat.setServiceAmount(flat.getServicePrice().multiply(flat.getUsedElectricity())); flat.setServiceAmount(flat.getServicePrice().multiply(flat.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN));
OrderDetailInfoVO.ChargeDetail valley = new OrderDetailInfoVO.ChargeDetail(); OrderDetailInfoVO.ChargeDetail valley = new OrderDetailInfoVO.ChargeDetail();
valley.setPeriodType(BillingTimeEnum.PEAK.getLabel()); valley.setPeriodType(BillingTimeEnum.PEAK.getLabel());
valley.setElectricityPrice(orderDetail.getValleyElectricityPrice()); valley.setElectricityPrice(orderDetail.getValleyElectricityPrice());
valley.setServicePrice(orderDetail.getValleyServicePrice()); valley.setServicePrice(orderDetail.getValleyServicePrice());
valley.setUsedElectricity(orderDetail.getValleyUsedElectricity()); valley.setUsedElectricity(orderDetail.getValleyUsedElectricity());
valley.setElectricityAmount(valley.getElectricityPrice().multiply(valley.getUsedElectricity())); valley.setElectricityAmount(valley.getElectricityPrice().multiply(valley.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN));
valley.setServiceAmount(valley.getServicePrice().multiply(valley.getUsedElectricity())); valley.setServiceAmount(valley.getServicePrice().multiply(valley.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN));
vo.setChargeDetails(Lists.newArrayList(sharp, peak, flat, valley)); vo.setChargeDetails(Lists.newArrayList(sharp, peak, flat, valley));
} }