diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index bfae60e7d..bd4f4c280 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -625,7 +625,11 @@ public class OrderService { BeanUtils.copyBeanProp(billingDetails, orderDetail); vo.setBillingDetails(billingDetails); if (StringUtils.equals(OrderStatusEnum.ORDER_COMPLETE.getValue(), orderStatus)) { - vo.setChargingDegree(String.valueOf(orderDetail.getTotalUsedElectricity())); + BigDecimal totalUsedElectricity = orderDetail.getTotalUsedElectricity(); + if (totalUsedElectricity != null && StringUtils.isNotBlank(vo.getChargingAmount()) + && totalUsedElectricity.compareTo(new BigDecimal(vo.getChargingAmount())) > 0) { + vo.setChargingDegree(String.valueOf(totalUsedElectricity)); + } } }