-
Conflicts: order/src/main/java/com/yohoufo/order/service/BuyerOrderPaymentService.java order/src/main/java/com/yohoufo/order/service/cache/CacheKeyBuilder.java order/src/main/java/com/yohoufo/order/service/impl/BuyerOrderDetailService.java order/src/main/java/com/yohoufo/order/service/impl/BuyerOrderServiceImpl.java order/src/main/java/com/yohoufo/order/service/impl/SellerOrderDetailService.java order/src/main/java/com/yohoufo/order/service/impl/ShoppingServiceImpl.java order/src/main/java/com/yohoufo/order/service/pay/alipay/AlipayServiceAbstract.java order/src/main/java/com/yohoufo/order/service/support/ShoppingSupport.java
-
# Conflicts: # order/src/main/java/com/yohoufo/order/service/impl/DepositServiceImpl.java
