-
# Conflicts: # dal/src/main/java/com/yohoufo/dal/order/TradeBillsMapper.java # dal/src/main/java/com/yohoufo/dal/order/model/TradeBills.java # dal/src/main/resources/META-INF/mybatis/order/TradeBillsMapper.xml # order/src/main/java/com/yohoufo/order/service/impl/PaymentServiceImpl.java
-
add inbox msg facade use optimized lock 2 update seller order status
-
# Conflicts: # order/src/main/java/com/yohoufo/order/service/impl/SubmitOrderServiceImpl.java
-
Conflicts: order/src/main/java/com/yohoufo/order/service/proxy/ProductProxyService.java
-
# Conflicts: # order/src/main/java/com/yohoufo/order/service/proxy/ProductProxyService.java