Hi My wife and I are doing a China Tour and 3 night river cruise then on to japan

Hi My wife and I are doing an escorted 10 day China Tour and 3 night river cruise then on to japan on a cruise ship We fly from UK to Beijing but when we return from Japan to Shanghai we are transported straight to the airport for our flight home Could you please tell me what visa will we need