Does a US Citizen need a visa to fly into Shanghai and take a cruise to Japan and back

We are US Citizens
We will be flying into Shanghai from US and then leaving on a 5 day cruise to Japan
We will return to Shanghai at the end of the Cruise
We will then fly out of Shanghai to US
Do we need a Visa? or will the 144hr visa free transit cover this?