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 530cd3138..6a6f38b5c 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 @@ -3555,7 +3555,26 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { */ @Override public OrderDetail getOrderDetailByOrderCode(String orderCode) { - return orderBasicInfoMapper.getOrderDetailByOrderCode(orderCode); + OrderDetail orderDetail = orderBasicInfoMapper.getOrderDetailByOrderCode(orderCode); + if (orderDetail != null) { + // 如果尖时段耗电量为null, 则设置为0 + if (orderDetail.getSharpUsedElectricity() == null) { + orderDetail.setSharpUsedElectricity(BigDecimal.ZERO); + } + // 如果峰时段耗电量为null, 则设置为0 + if (orderDetail.getPeakUsedElectricity() == null) { + orderDetail.setPeakUsedElectricity(BigDecimal.ZERO); + } + // 如果谷时段耗电量为null, 则设置为0 + if (orderDetail.getValleyUsedElectricity() == null) { + orderDetail.setValleyUsedElectricity(BigDecimal.ZERO); + } + // 如果平时段耗电量为null, 则设置为0 + if (orderDetail.getFlatUsedElectricity() == null) { + orderDetail.setFlatUsedElectricity(BigDecimal.ZERO); + } + } + return orderDetail; } @Override