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 cdbd89dca..c327feeee 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 @@ -6399,10 +6399,20 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { .createTime(order.getCreateTime()) .startMode(order.getStartMode()) .orderCode(order.getOrderCode()) - .orderAmount(StringUtils.isNotBlank(order.getOrderAmount()) - ? new BigDecimal(order.getOrderAmount()) : BigDecimal.ZERO) - .chargingDegree(StringUtils.isNotBlank(order.getChargingDegree()) - ? new BigDecimal(order.getChargingDegree()) : BigDecimal.ZERO) + .orderAmount( + order.getRealTimeAmount() != null + ? order.getRealTimeAmount() + : StringUtils.isNotBlank(order.getOrderAmount()) + ? new BigDecimal(order.getOrderAmount()) + : BigDecimal.ZERO + ) + .chargingDegree( + order.getRealTimeChargingDegree() != null + ? new BigDecimal(order.getRealTimeChargingDegree()) + : StringUtils.isNotBlank(order.getChargingDegree()) + ? new BigDecimal(order.getChargingDegree()) + : BigDecimal.ZERO + ) .orderStatus(order.getOrderStatus()) .build()) .collect(Collectors.toList());