|
|
@@ -362,13 +362,13 @@ public class UserReservationServiceImpl extends ServiceImpl<UserReservationMappe
|
|
|
continue;
|
|
|
}
|
|
|
// 校验已取消状态的记录不回显
|
|
|
- if (reservation.getStatus() != null && reservation.getStatus() == STATUS_CANCELLED) {
|
|
|
- continue;
|
|
|
- }
|
|
|
+// if (reservation.getStatus() != null && reservation.getStatus() == STATUS_CANCELLED) {
|
|
|
+// continue;
|
|
|
+// }
|
|
|
|
|
|
- if (reservation.getStatus() != null && reservation.getStatus() == 2) {
|
|
|
- continue;
|
|
|
- }
|
|
|
+// if (reservation.getStatus() != null && reservation.getStatus() == 2) {
|
|
|
+// continue;
|
|
|
+// }
|
|
|
|
|
|
if (calReservation != null && reservation.getReservationDate() != null) {
|
|
|
Calendar cal = calendarOf(reservation.getReservationDate());
|