Start and End point?

I will be living in Shanghai with a visa, and a friend will be visiting without a visa from the United States. Can he fly into Shanghai, stay two nights, then we both leave for Japan, then come back to Shanghai in a week and stay another two nights in Shanghai before flying back to the US?