Hello, Can I have 2 stops in China on my way home to Canada. Kunming & Shanghai

Hi I am a New Zealand National traveling home to Canada where I live as a Permanent Resident. I am leaving from Ho Chi Minh City, Vietnam going through China with 2 stops first one in Kunming and second stop in Shanghai. I arrive in kunming at 8:55pm leaving to Shanghai the next day at 10:30am then leaving from Shanghai to Vancouver Canada at 1:30pm. Do I need a transit Visa as I'm not understanding this.