I have a flight that lands 19:55 at PVG from NRT, overnight layover, then flight out of PVG the next day at 08:30. Might do the airport hotel for convenience since I have luggage though I wonder if they can check it through (both flights are Air China).
Anything to do near the airport or should I bother going into the city?