Beijing and Pu Dong Layovers

I am traveling back from Viet Nam to USA, with a stopover at Beijing for 6 hours and then Shanghai Pu Dong for 21 hours. Do I need a visa prior to flying due to being in China for over 24 hours, or can I get the 144 hour twov when I arrive at both airports.

Any insights are appreciated, thank you.