Is Visa Necessary for Flight / Cruise trip

I am my wife are U.S. citizens traveling from LAX to PVG on Delta Airlines.

Arriving Shanghai on 08/30 on Delta from US.
Spending the night (08/30) at a hotel in Shanghai.
08/31 taking Royal Caribbean cruise to Japan.
09/06 Returning to Shanghai on cruise ship and departing PVG on Delta back to Los Angeles.

Is a entry permit NECESSARY for this trip?
Can I avail of the 74/144 hour free transit option?

I called the consulate in Los Angeles and got mixed signals

Thank you for your prompt response.