From 7b55dc7e763916be03ff200bc65ed3b30db10410 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Sat, 6 May 2023 15:28:16 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=20new=E6=94=B6=E8=B4=B9=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsowell/service/OrderService.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 7b239062d..01728c6e1 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -804,32 +804,32 @@ public class OrderService { sharp.setElectricityPrice(orderDetail.getSharpElectricityPrice()); sharp.setServicePrice(orderDetail.getSharpServicePrice()); sharp.setUsedElectricity(orderDetail.getSharpUsedElectricity()); - sharp.setElectricityAmount(sharp.getElectricityPrice().multiply(sharp.getUsedElectricity())); - sharp.setServiceAmount(sharp.getServicePrice().multiply(sharp.getUsedElectricity())); + sharp.setElectricityAmount(sharp.getElectricityPrice().multiply(sharp.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN)); + sharp.setServiceAmount(sharp.getServicePrice().multiply(sharp.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN)); OrderDetailInfoVO.ChargeDetail peak = new OrderDetailInfoVO.ChargeDetail(); peak.setPeriodType(BillingTimeEnum.PEAK.getLabel()); peak.setElectricityPrice(orderDetail.getPeakElectricityPrice()); peak.setServicePrice(orderDetail.getPeakServicePrice()); peak.setUsedElectricity(orderDetail.getPeakUsedElectricity()); - peak.setElectricityAmount(peak.getElectricityPrice().multiply(peak.getUsedElectricity())); - peak.setServiceAmount(peak.getServicePrice().multiply(peak.getUsedElectricity())); + peak.setElectricityAmount(peak.getElectricityPrice().multiply(peak.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN)); + peak.setServiceAmount(peak.getServicePrice().multiply(peak.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN)); OrderDetailInfoVO.ChargeDetail flat = new OrderDetailInfoVO.ChargeDetail(); flat.setPeriodType(BillingTimeEnum.PEAK.getLabel()); flat.setElectricityPrice(orderDetail.getFlatElectricityPrice()); flat.setServicePrice(orderDetail.getFlatServicePrice()); flat.setUsedElectricity(orderDetail.getFlatUsedElectricity()); - flat.setElectricityAmount(flat.getElectricityPrice().multiply(flat.getUsedElectricity())); - flat.setServiceAmount(flat.getServicePrice().multiply(flat.getUsedElectricity())); + flat.setElectricityAmount(flat.getElectricityPrice().multiply(flat.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN)); + flat.setServiceAmount(flat.getServicePrice().multiply(flat.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN)); OrderDetailInfoVO.ChargeDetail valley = new OrderDetailInfoVO.ChargeDetail(); valley.setPeriodType(BillingTimeEnum.PEAK.getLabel()); valley.setElectricityPrice(orderDetail.getValleyElectricityPrice()); valley.setServicePrice(orderDetail.getValleyServicePrice()); valley.setUsedElectricity(orderDetail.getValleyUsedElectricity()); - valley.setElectricityAmount(valley.getElectricityPrice().multiply(valley.getUsedElectricity())); - valley.setServiceAmount(valley.getServicePrice().multiply(valley.getUsedElectricity())); + valley.setElectricityAmount(valley.getElectricityPrice().multiply(valley.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN)); + valley.setServiceAmount(valley.getServicePrice().multiply(valley.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN)); vo.setChargeDetails(Lists.newArrayList(sharp, peak, flat, valley)); }