Travelling from Kolkata to Osaka via Kunming (technical halt at Shanghai). Do I need visa?

Travelling from Kolkata to Osaka through Kunming with a technical halt at Shanghai on China Eastern Airline. and also from Osaka to Kolkata via Shanghai 1 then Shanghai T2 to Kunming to Kolkata. Whether I need prior transit G for Shanghai T1 to Shanghai T2? Transit G can be obtained at the Airport. i wonder if there is any arrangement for Airport Transfer by the eastern Airline at Shanghai airport.