Free transit visa Shanghai

Hi, we are going to stay in Shanghai for two days then boarding a cruise to Japan for seven nights. On return we transfer from Shanghai port to Pudong Airport to fly back to Heathrow. Can we get the free transit visa for 72 hours for our stay in Shanghai and do we need to get another one e.g. 24hours to transfer from the port to the airport?