US -> shanghai -> Tokyo-> Shanghai -> US

Hey,

I'm a US citizen and got round trip tickets to Shanghai and back, but will be in Tokyo for the majority of my trip. My itinerary looks like this:

US --> shanghai (3 days)
Shanghai --> Tokyo (7 days)
Tokyo --> Shanghai (1 day)
Shanghai back to US.

Would this work for visa free transit? My round trip booking from US to Shanghai is in one booking and my round trip tickets from Shanghai to Tokyo are also within the same booking.

Thanks,
Kevin