144 hr transit for US and South Korean Citizens

I will be arriving Shanghai by air from Bangkok and staying 3 days in Shanghai before boarding a 6 days cruiseship Shanghai-Japan-Shanghai. Returning from the cruise into Shanghai I will be staying in Shanghai for 4 days before leaving by air to Korea. We are US Citizen and Republic of Korea Citizen. Do we qualify for the 144 hr free transit in Shanghai?