Akl to Shanghai to Kumning to Kathmandu

I'm flying into Shanghai, arriving 5:55 am May 13th, departing to Kumning 9:55 the same day, arriving in Kumning at 14:45 where I'm layed over until May 14th at 14:30 when I depart Kumning for Kathmandu. So I'm technically in China for 32 hours? I'm Canadian, which visa would work for me? Thank you