It appears a U.S.-China trade deal will happen, at least partially. Here’s a rundown.