This reverts commit 2d993cb6.
This reverts commit 990d2170.
This reverts commit 6c00e758.
This reverts commit 15b856c9.
# Conflicts: # order/src/main/java/com/yohoufo/order/service/impl/BuyerOrderServiceImpl.java