diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java index 04f1c31ae..9a28335dd 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java @@ -692,10 +692,15 @@ public class CommonService { // 判断订单创建时间,是否在优惠时间段内 LocalTime createLocalTime = DateUtils.date2LocalDateTime(orderBasicInfo.getCreateTime()).toLocalTime(); - if (createLocalTime.isBefore(chargeParkingDiscount.getStartTime()) || createLocalTime.isAfter(chargeParkingDiscount.getEndTime())) { - // 不在优惠时间段内 - log.info("{}该订单不在优惠时间段({}-{})内", orderBasicInfo.getOrderCode(), chargeParkingDiscount.getStartTime(), chargeParkingDiscount.getEndTime()); - return; + LocalTime startTime = chargeParkingDiscount.getStartTime(); + LocalTime endTime = chargeParkingDiscount.getEndTime(); + // startTime等于endTime,shuo则不需要判断, 如果startTime不等于endTime,则需要判断订单创建时间是否在优惠时间段内 + if (!StringUtils.equals(startTime.toString(), endTime.toString())) { + if (createLocalTime.isBefore(startTime) || createLocalTime.isAfter(endTime)) { + // 不在优惠时间段内 + log.info("{}该订单不在优惠时间段({}-{})内", orderBasicInfo.getOrderCode(), startTime, endTime); + return; + } } // 如果conditionType为1判断充电度数, 如果为2判断充电时长