|
@@ -35,6 +35,7 @@ import java.time.LocalDate;
|
|
|
import java.util.*;
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
import java.util.function.BiFunction;
|
|
|
+import java.util.function.BiPredicate;
|
|
|
import java.util.function.Function;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
@@ -635,7 +636,7 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
|
|
|
}
|
|
|
}
|
|
|
//如果退出时间大于进入时间就无需再次退出-直接返回
|
|
|
- if (compareDate.apply(roomInfo.getExitRoomTime(), roomInfo.getJoinRoomTime())) {
|
|
|
+ if (compareDate.test(roomInfo.getExitRoomTime(), roomInfo.getJoinRoomTime())) {
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -666,7 +667,7 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
|
|
|
* <p>- date1 时间1
|
|
|
* <p>- date2 时间2
|
|
|
*/
|
|
|
- private final BiFunction<Date, Date, Boolean> compareDate = (date1, date2) -> {
|
|
|
+ private final BiPredicate<Date, Date> compareDate = (date1, date2) -> {
|
|
|
if (Objects.nonNull(date1) && Objects.nonNull(date2)) {
|
|
|
return date1.getTime() > date2.getTime();
|
|
|
} else {
|