Transit from cruise to flight

Hi, I'll be arriving in Shanghai by cruise ship and departing by flight. The cruise originates in Japan, but the last port before Shanghai is in South Korea. My flight from Shanghai stops first in Japan. Can I use the free transit because the last port is South Korea, or do I need a visa because the cruise began in Japan and the flight from Shanghai stops in Japan?
Thanks.