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