Transit Visa for Beijing and Shanghai

Hi, I'm planning to take a flight from Tokyo - Shanghai and Beijing.

Do I need to apply for the visa transit? As I believe it should be covered by Free Transit if the layover is under 24 hours. Also, while waiting for the transit time, is that possible if me to go somewhere near the airport? Walking around the city maybe? Or do I need to apply visa for this?

Thankyou