Canadian flying to Shanghai, overnight and cruise to Japan, returns for PVG flt to Canada, Visa?

Hey, for the journey from Canada to SH, you can apply for a 24 hour stay permit And then you will be able to go out the airport and reach the cruise terminal.
For the journey from Japan to SH, if you do not go out the airport, no visa is needed within 24 hours transit.