Travel by Aeroflot with Russian passport to Shanghai, stay over for 2 nights,

then go to Hoshimin Vietnam with China Southern, back after 5 days to Shanghai one more stay for 1 night and back to Russia with Aeroflot. Is that fine for both transits without visa? Thank you