Finland (EU)-Shanghai int'l airport-1 night in a hotel-Cruise from Shanghai to Japan-and back

We take a trip in one month from Finland (EU)-Shanghai int'l airport-1 night in a hotel-Cruise from Shanghai to Japan-and back to Shanghai-1 night in a hotel-back home. Do I qualify? When I called the Chinese embassy, they said yes, but another official said by e-mail that we do not as we leave from different port for the cruise?!? Therefore we should have a dual entry visa.......