update 电单车协议

This commit is contained in:
Guoqs
2024-09-05 14:16:57 +08:00
parent 4c8362b80c
commit f3d4b13895

View File

@@ -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)