I am an Indian Citizen travelling from Kolkata India to Tokyo, Japan via Kunming & Shanghai Pudong.

My transit at Kunming is from 15:50 arrival to 07:30 next day departure for Shanghai. I shall arrive Shanghai Pudong at 10:30 and leave for Tokyo at 13:00 for Tokyo.
On the return journey, I shall arraive Shanghai Pudong at 16:40 from Tokyo and leave at 21:00 for Kunming. I shall arrive at Kunming at 00:50 next day and leave Kunming for Kolkata at 10:05. I have reserved a hotel at Kunming for my journey Kolkata-Kunming-Shanghai-Tokyo. On the return I have not booked any accommodation at Kunming. Shall I get a 24-hour transit visa at Kunming on my way out and at Shanghai Pudong on my retirn journey?