I have the experince, Let me

tell you. Must do the extension or changes (old version couldn't extend any more) of passport, this should be done very quickly now in China, maybe 1-2 weeks. The old passport with the visa will returned to you with a corner cut. You won't need re-apply visa if your visa is valid on your trip day, thus you should hold the two passport when getting through customs, Things will be OK.