Re entry to China after cruise to Japan

Traveling from Australia to Beijing for 8 days have a visa for one month for this but will be cruising from Shangahi to Japan return for five days after the land tour of China. Will I have trouble getting back into China and immediately going to Shanghai airport as I have only a one visit visa.