This commit is contained in:
YAS\29473
2026-01-29 14:34:23 +08:00
parent 36f21ee13d
commit 6404ca3d22

View File

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