We are Canadians, flying from Vancouver with a layover/change plane in Hong Kong

Then arriving in Shanghai May 20 and stay there for 5 days and go on a cruise to Japan on May 24 and disembark (coming from Japan) on May 31 and fly out of Shanghai in the evening. Do we need to apply for China visa or is the 144 hour visa free transit applicable to us?