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 3a6ce413c..cdbd89dca 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 @@ -5749,7 +5749,9 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { vo.setPileSn(orderVO.getPileSn()); vo.setPileConnectorCode(orderVO.getPileConnectorCode()); vo.setEndSOC(orderVO.getEndSoc()); - vo.setChargeTime(DateUtils.getDatePoor(DateUtils.parseDate(orderVO.getEndTime()), DateUtils.parseDate(orderVO.getStartTime()))); + if (StringUtils.isNotBlank(orderVO.getEndTime()) && StringUtils.isNotBlank(orderVO.getStartTime())) { + vo.setChargeTime(DateUtils.getDatePoor(DateUtils.parseDate(orderVO.getEndTime()), DateUtils.parseDate(orderVO.getStartTime()))); + } vo.setChargeDegree(orderVO.getTotalPower()); vo.setReason(orderVO.getReason());