I fly into Shanghai for less than 24 hours and join a cruise from Shanghai

to South Korea and Japan for 5 days before returning to Shanghai for 2 nights before flights home to U.K. Via Germany. Do I qualify for the 144 hr visa both ways, should I get a 24 hour direct transit on the way out?