diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/UProductServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/UProductServiceImpl.java index 0a514067..fb4f32ad 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/UProductServiceImpl.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/UProductServiceImpl.java @@ -201,8 +201,15 @@ public class UProductServiceImpl extends ServiceImpl imp String today = getWeekDayEnName(); List dayList = StrUtil.split(days, ","); LocalTime now = LocalTime.now().withNano(0); - if (CollUtil.contains(dayList, today) && now.isAfter(startTime) && now.isBefore(endTime)) { - return YesNoEnum.YES.value(); + boolean inDays = CollUtil.contains(dayList, today); + if (startTime.isBefore(endTime)) { + if (inDays && now.isAfter(startTime) && now.isBefore(endTime)) { + return YesNoEnum.YES.value(); + } + } else { + if (inDays && (now.isAfter(startTime) || now.isBefore(endTime))) { + return YesNoEnum.YES.value(); + } } return YesNoEnum.NO.value(); } @@ -224,8 +231,14 @@ public class UProductServiceImpl extends ServiceImpl imp return YesNoEnum.NO.value(); } LocalTime now = LocalTime.now().withNano(0); - if (now.isAfter(startTime) && now.isBefore(endTime)) { - return YesNoEnum.YES.value(); + if (startTime.isBefore(endTime)) { + if (now.isAfter(startTime) && now.isBefore(endTime)) { + return YesNoEnum.YES.value(); + } + } else { + if (now.isAfter(startTime) || now.isBefore(endTime)) { + return YesNoEnum.YES.value(); + } } return YesNoEnum.NO.value(); }