Do We Need Visas If On a Cruise from Shanghai Back to Shanghai?

We are flying from Vancouver to Shanghai non-stop and staying in a Hotel one night. Then boarding Spectrum of the Seas cruise ship and sailing around Japan 8 days and returning to Shanghai. Then we are staying one more night in a hotel in Shanghai and then fly to Tokyo for about another week before flying back to Vancouver. Do we need a visa?