144 Hour Visa Eligibility when taking cruise roundtrip trip to Shanghai

We are UK nationals and are due to fly to Shanghai PVG on 11th September 2018.

From here we are staying at Shanghai Disney for 3 nights and depart on a cruise from Shanghai cruise port on the 15th of September 2018.

The cruise does not stop anywhere in China and departs directly to Japan returning to Shanghai 23rd September 2018.

On our arrival back into Shanghai on 23rd September we plan to fly back to the UK on the same day.

Please can you advise whether we are covered under the 144 hour free transit policy given our limited time in Shanghai before our cruise and then a 24 hour twov to transit on return.

Many thanks in advance.