diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FeiShuServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FeiShuServiceImpl.java index c10af2681..30ef5c972 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FeiShuServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FeiShuServiceImpl.java @@ -96,9 +96,8 @@ public class FeiShuServiceImpl implements FeiShuService { long endTimeLong = DateUtil.parse(endStr).getTime(); for (UserFreeBusyInfoDTO userFreeBusyInfoDTO : UserFreeBusyInfoList) { - //如果查询结果中的开始时间和结束时间在时间段内,则设置为忙碌 - if (( userFreeBusyInfoDTO.getStartTime()>startTimeLong && userFreeBusyInfoDTO.getStartTime() < endTimeLong) - || (userFreeBusyInfoDTO.getEndTime() > startTimeLong && userFreeBusyInfoDTO.getEndTime() < endTimeLong)) { + //比较两个时间段是否有重叠 + if(!(endTimeLong <= userFreeBusyInfoDTO.getStartTime() || startTimeLong >= userFreeBusyInfoDTO.getEndTime())){ freeBusyInfo.setFree(false); break; }