Arriving from US for cruise starting and ending in Shanghai.

We arrive in Shanghai via a non-stop flight from the US on 8/17/19. We leave the following day (approx 28 hrs) on a cruise, returning to Shanghai 8 days later on 8/26/19 after visiting 4 port stops in Japan only. At that time, we then have a non-stop flight from Shanghai back to the US. Do we need a visa for this travel? Thank you!