visa requirements for American citizen

I will be travelling on a cruise ship which goes from Genoa to Shanghai, stopping less than 24 hours in Shanghai before going on to Japan and then returning to Shanghai a few days later, when I will fly out of Pudong airport within 24 hours. Do I need to get a transit before leaving home? I am an American citizen.