What kind of Visa is required for my travel : Osaka to Kolkata, via Shanghai and Kunming

Hello. I am an India, currently in Japan for studies.

I am travelling from Osaka to Kolkata via China Eastern Airlines. My ticket takes me from Osaka to Shanghai where there is a layover of 2hrs and 40mins; then from Shanghai to Kunming where I have a layover of 23hrs and 15mins. Therefore my connection time in China is over 24hours in total. Do I need a Transit visa for this layover? If not a transit visa, what do I need, if anything at all? Please advise.