Leave China and then re-enter

Hi,

Thank you SO much for taking the time to answer these questions.

I think the following is OK, but your conformation would be greatly appreciated.

US-Beijing-Japan-Shanghai-US

My understanding is that even though I would be returning to China after a brief stay in Japan, that as far immigration is concerned, they view it as two distinct trips:

US-Beijing-Japan and Japan-Shanghai-US, correct?

No need to add another country after Japan before heading to Shanghai?

Many thanks!