|
@@ -366,9 +366,9 @@ public class UserReservationServiceImpl extends ServiceImpl<UserReservationMappe
|
|
|
continue;
|
|
continue;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-// if (reservation.getStatus() != null && reservation.getStatus() == 2) {
|
|
|
|
|
-// continue;
|
|
|
|
|
-// }
|
|
|
|
|
|
|
+ if (reservation.getStatus() != null && reservation.getStatus() == 4) {
|
|
|
|
|
+ continue;
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
if (calReservation != null && reservation.getReservationDate() != null) {
|
|
if (calReservation != null && reservation.getReservationDate() != null) {
|
|
|
Calendar cal = calendarOf(reservation.getReservationDate());
|
|
Calendar cal = calendarOf(reservation.getReservationDate());
|