New Zealand to South Korea via Shanghai

Hi ! Im vietnamese passport holder travelling from NZ to South Korea transit Pudong airport 3-4 hours . Am I eligible for 24 TWOV ? Im flying with China Eastern Airlines.
And on my way return from Korea to New Zealand . While transit in Pudong, I have to claim my luggage and check in again . Do i need a transit visa to claim my luggage ? Or the 24 TWOV shoule be ok with this ?

Thank you