

My companion and I plan to visit Shanghai as cruise
My companion and I plan to fly to Shanghai from Los Angeles for 8 days then take a 14 day Asian cruise from Taiwan to Singapore, visiting multiple countries, then return from Singapore to Shanghai for 2 more days to catch our return non stop flight to Los Angles. Under current Chinese immigration policy, there is a “240-hour visa-free transit” policy (which allows eligible travelers to stay up to 10 days) in certain Chinese cities including Shanghai.
My understanding is that this policy requires us to enter China through an eligible port, hold confirmed onward tickets to a third country, and stay within the permitted area.
Our plan to fly from Singapore to Shanghai and then onward to the U.S. satisfies the requirement of returning to a third region (the U.S.) after our stay. This suggests in both our stays (8 days, 2 days) fall under the 240-hour transit waiver rather than needing a full tourist visa, provided that our flights are properly arranged and we meet all conditions (passport validity, entry port, etc.). Am I correct in concluding this, and that we don’t need a L-1 tourist visa? Please confirm. Thank you.