Travelling UK to Shanghai to arrive 27 December, at Shanghai airport,

stay Shanghai 2 nights then cruise from Boashan cruise terminal (Shanghai) for 4 day cruise to South Korea and Japan before returning Boashan (Shanghai) cruise terminal on 2 January for flight from Shanghai back to UK that day. Will 144 free transit obtained on arrival at airport work or will we have to get 24hr free transit visa on arrival back at Boashan cruise terminal as well, for the entry back into Shanghai. Thanks