diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 64fcf9df3..ef52be396 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -3772,14 +3772,30 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { BigDecimal valleyElectricityPrice = BigDecimal.ZERO; // 谷时段电费单价 BigDecimal valleyServicePrice = BigDecimal.ZERO; // 谷时段服务费单价 if (billingTemplate != null) { - sharpElectricityPrice = billingTemplate.getSharpElectricityPrice() != null ? billingTemplate.getSharpElectricityPrice() : BigDecimal.ZERO; - sharpServicePrice = billingTemplate.getSharpServicePrice() != null ? billingTemplate.getSharpServicePrice() : BigDecimal.ZERO; - peakElectricityPrice = billingTemplate.getPeakElectricityPrice() != null ? billingTemplate.getPeakElectricityPrice() : BigDecimal.ZERO; - peakServicePrice = billingTemplate.getPeakServicePrice() != null ? billingTemplate.getPeakServicePrice() : BigDecimal.ZERO; - flatElectricityPrice = billingTemplate.getFlatElectricityPrice() != null ? billingTemplate.getFlatElectricityPrice() : BigDecimal.ZERO; - flatServicePrice = billingTemplate.getFlatServicePrice() != null ? billingTemplate.getFlatServicePrice() : BigDecimal.ZERO; - valleyElectricityPrice = billingTemplate.getValleyElectricityPrice() != null ? billingTemplate.getValleyElectricityPrice() : BigDecimal.ZERO; - valleyServicePrice = billingTemplate.getValleyServicePrice() != null ? billingTemplate.getValleyServicePrice() : BigDecimal.ZERO; + sharpElectricityPrice = billingTemplate.getSharpElectricityPrice() != null + ? billingTemplate.getSharpElectricityPrice() + : BigDecimal.ZERO; + sharpServicePrice = billingTemplate.getSharpServicePrice() != null + ? billingTemplate.getSharpServicePrice() + : BigDecimal.ZERO; + peakElectricityPrice = billingTemplate.getPeakElectricityPrice() != null + ? billingTemplate.getPeakElectricityPrice() + : BigDecimal.ZERO; + peakServicePrice = billingTemplate.getPeakServicePrice() != null + ? billingTemplate.getPeakServicePrice() + : BigDecimal.ZERO; + flatElectricityPrice = billingTemplate.getFlatElectricityPrice() != null + ? billingTemplate.getFlatElectricityPrice() + : BigDecimal.ZERO; + flatServicePrice = billingTemplate.getFlatServicePrice() != null + ? billingTemplate.getFlatServicePrice() + : BigDecimal.ZERO; + valleyElectricityPrice = billingTemplate.getValleyElectricityPrice() != null + ? billingTemplate.getValleyElectricityPrice() + : BigDecimal.ZERO; + valleyServicePrice = billingTemplate.getValleyServicePrice() != null + ? billingTemplate.getValleyServicePrice() + : BigDecimal.ZERO; } OrderDetail orderDetail = OrderDetail.builder() .orderCode(orderCode)