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 6b1c2f252..4ee1d5ba8 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -775,16 +775,16 @@ public class OrderService { String chargingDegree = dto.getChargingDegree(); // 获取订单结算时间 - Date settlementTime = orderBasicInfo.getSettlementTime(); + // Date settlementTime = orderBasicInfo.getSettlementTime(); // 获取订单停止充电时间 - Date chargeEndTime = orderBasicInfo.getChargeEndTime(); + // Date chargeEndTime = orderBasicInfo.getChargeEndTime(); // 如果订单结算时间与订单停止充电时间都为空,则打印错误信息并返回 - if (settlementTime == null && chargeEndTime == null) { - log.error("人工结算订单 error -订单结算时间与订单停止充电时间都为空"); - return false; - } + // if (settlementTime == null && chargeEndTime == null) { + // log.error("人工结算订单 error -订单结算时间与订单停止充电时间都为空"); + // return false; + // } // LocalDateTime localDateTime = DateUtils.date2LocalDateTime(settlementTime != null ? settlementTime : chargeEndTime); // 开始时间为localDateTime减30秒