Vancouver -> Layover in Beijing -> Hongqiao Shanghai 2 day stay -> Tokyo from Pudong ->...

Hello,

I have a complicated itinerary, but my total stay in China is only about 4 days. I'm leaving Vancouver to Shanghai with a layover in Beijing for a few hours. Flight stops at Hongqiao. I will be in Zhejiang for 2 days then fly to Tokyo from Pudong airport. I will be in Tokyo for a week and fly back to Pudong airport in the evening. I will fly back to Vancouver from Hongqiao the next morning. Will I qualify for the 72 hrs visa (probably need to apply twice)?
Thank you so much for your help!!