Canada-Shanghai-Japan-Shanghai-Canada

Hi. Do we need a visa if we travel from Canada to Shanghai (going and return) for like 2 weeks, but we only gonna stay in Shanghai for 2 days. From Shanghai, we are going to fly to Japan for the rest of our 2 weeks and return back to Shanghai to just take the plane to going back to Canada.

I hope it's clear

Thanks!