Visa free to china tour

Hi, We are going to a cruise in December from Dec 9-15, 2017, we are flying from Manila to Shanghai on Dec. 9 and board the ship at the same day. We are Canadian citizens. The ship will go back to Shanghai on Dec 15, 2017 but we will stay in Shanghai for a tour on Dec 15-16, 2017 then go to Beijing in the afternoon of Dec. 16. We will tour Beijing from Dec 16-18, 2017 and leave Beijing Dec. 18 at night and connecting flight is to Shanghai where we leave at past 12:00AM on Dec 19, 2017 to Manila. Do we need China Visa for these tours?
Thank you, Bet from Canada