Planning a week trip to japan from Shanghai and back to Shanghai ok?

Hi, we are entering China into Beijing on a 10 day tour which departs home from Shanghai. We wish to
extend our leaving time after the tour leaves and fly to Japan for a week before flying back to Shanghai to fly back home on the Tour pre arranged extended flight.
This would be two entries into China ? please advise.Thanks.