Transition Questions - Do I need a Visa or Transit?

I am flying from Orlando to Shanghai (staying 3 nights) I am then flying from Shanghai to Osaka (staying in Japan for 5 days) then flying back from Osaka to Shanghai to stay 3 more night before flying from Shanghai to Orlando. Technically the total time in Shanghai is 144 hours, would this qualify or since it is not consecutive days, I would need entry permit? Thanks!