hello, I hold Indian passport and have to transit in Beijing Shanghai airport, all within 7 hours

I will be travelling from Japan to India with first transit at Beijing with transfer from Terminal 3 to Terminal 2. Then from Beijing to India via Shanghai (transit is 2 hrs) by same flight number.
My question; do I need to obtain tourist Visa before departure from japan or can I get TWOV at Beijing airport which can be used at Beijing and Shanghai airports ?. Thank you for the reply.