mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-20 11:05:18 +08:00
update
This commit is contained in:
@@ -57,6 +57,7 @@ import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalTime;
|
||||
@@ -1793,8 +1794,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
|
||||
sharp.setServicePrice(orderDetail.getSharpServicePrice());
|
||||
BigDecimal sharpUsedElectricity = orderDetail.getSharpUsedElectricity() == null ? BigDecimal.ZERO : orderDetail.getSharpUsedElectricity();
|
||||
sharp.setUsedElectricity(sharpUsedElectricity);
|
||||
sharp.setElectricityAmount(sharp.getElectricityPrice().multiply(sharp.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN));
|
||||
sharp.setServiceAmount(sharp.getServicePrice().multiply(sharp.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN));
|
||||
sharp.setElectricityAmount(sharp.getElectricityPrice().multiply(sharp.getUsedElectricity()).setScale(2, RoundingMode.DOWN));
|
||||
sharp.setServiceAmount(sharp.getServicePrice().multiply(sharp.getUsedElectricity()).setScale(2, RoundingMode.DOWN));
|
||||
|
||||
// 峰时段
|
||||
OrderPeriodAmountVO peak = new OrderPeriodAmountVO();
|
||||
@@ -1803,8 +1804,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
|
||||
peak.setServicePrice(orderDetail.getPeakServicePrice());
|
||||
BigDecimal peakUsedElectricity = orderDetail.getPeakUsedElectricity() == null ? BigDecimal.ZERO : orderDetail.getPeakUsedElectricity();
|
||||
peak.setUsedElectricity(peakUsedElectricity);
|
||||
peak.setElectricityAmount(peak.getElectricityPrice().multiply(peak.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN));
|
||||
peak.setServiceAmount(peak.getServicePrice().multiply(peak.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN));
|
||||
peak.setElectricityAmount(peak.getElectricityPrice().multiply(peak.getUsedElectricity()).setScale(2, RoundingMode.DOWN));
|
||||
peak.setServiceAmount(peak.getServicePrice().multiply(peak.getUsedElectricity()).setScale(2, RoundingMode.DOWN));
|
||||
|
||||
// 平时段
|
||||
OrderPeriodAmountVO flat = new OrderPeriodAmountVO();
|
||||
@@ -1813,8 +1814,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
|
||||
flat.setServicePrice(orderDetail.getFlatServicePrice());
|
||||
BigDecimal flatUsedElectricity = orderDetail.getFlatUsedElectricity() == null ? BigDecimal.ZERO : orderDetail.getFlatUsedElectricity();
|
||||
flat.setUsedElectricity(flatUsedElectricity);
|
||||
flat.setElectricityAmount(flat.getElectricityPrice().multiply(flat.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN));
|
||||
flat.setServiceAmount(flat.getServicePrice().multiply(flat.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN));
|
||||
flat.setElectricityAmount(flat.getElectricityPrice().multiply(flat.getUsedElectricity()).setScale(2, RoundingMode.DOWN));
|
||||
flat.setServiceAmount(flat.getServicePrice().multiply(flat.getUsedElectricity()).setScale(2, RoundingMode.DOWN));
|
||||
|
||||
// 谷时段
|
||||
OrderPeriodAmountVO valley = new OrderPeriodAmountVO();
|
||||
@@ -1823,8 +1824,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
|
||||
valley.setServicePrice(orderDetail.getValleyServicePrice());
|
||||
BigDecimal valleyUsedElectricity = orderDetail.getValleyUsedElectricity() == null ? BigDecimal.ZERO : orderDetail.getValleyUsedElectricity();
|
||||
valley.setUsedElectricity(valleyUsedElectricity);
|
||||
valley.setElectricityAmount(valley.getElectricityPrice().multiply(valley.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN));
|
||||
valley.setServiceAmount(valley.getServicePrice().multiply(valley.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN));
|
||||
valley.setElectricityAmount(valley.getElectricityPrice().multiply(valley.getUsedElectricity()).setScale(2, RoundingMode.DOWN));
|
||||
valley.setServiceAmount(valley.getServicePrice().multiply(valley.getUsedElectricity()).setScale(2, RoundingMode.DOWN));
|
||||
|
||||
return Lists.newArrayList(sharp, peak, flat, valley);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user