diff --git a/jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java b/jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java index a8e559488..d43d06c4d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java +++ b/jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java @@ -243,9 +243,12 @@ public class WxAppletRemoteService { stopChargingMessage.setEndReason(sendMessageVO.getStopReason()); // 结束原因 stopChargingMessage.setOrderCode(sendMessageVO.getOrderCode()); // 订单号 stopChargingMessage.setChargingDegree(sendMessageVO.getChargingDegree()); // 充电度数 - Date chargeStartTime = DateUtils.parseDate(sendMessageVO.getChargeStartTime(), DateUtils.YYYY_MM_DD_HH_MM_SS); - Date chargeStopTime = DateUtils.parseDate(sendMessageVO.getChargeStopTime(), DateUtils.YYYY_MM_DD_HH_MM_SS); - String chargingTime = DateUtils.getDatePoor(chargeStopTime, chargeStartTime); + String chargingTime = ""; + if (StringUtils.isNotBlank(sendMessageVO.getChargeStartTime()) && StringUtils.isNotBlank(sendMessageVO.getChargeStopTime())) { + Date chargeStartTime = DateUtils.parseDate(sendMessageVO.getChargeStartTime(), DateUtils.YYYY_MM_DD_HH_MM_SS); + Date chargeStopTime = DateUtils.parseDate(sendMessageVO.getChargeStopTime(), DateUtils.YYYY_MM_DD_HH_MM_SS); + chargingTime = DateUtils.getDatePoor(chargeStopTime, chargeStartTime); + } stopChargingMessage.setChargingTime(chargingTime); // 充电时长