-
# Conflicts: # dal/src/main/java/com/yohoufo/dal/order/model/BuyerOrder.java # dal/src/main/java/com/yohoufo/dal/order/model/SellerOrderGoods.java # dal/src/main/resources/META-INF/mybatis/order/BuyerOrderMapper.xml # dal/src/main/resources/META-INF/mybatis/order/SellerOrderGoodsMapper.xml # order/src/main/java/com/yohoufo/order/controller/OrderViewController.java # order/src/main/java/com/yohoufo/order/convert/GoodsInfoConvertor.java # order/src/main/java/com/yohoufo/order/model/OrderBuilderFactory.java # order/src/main/java/com/yohoufo/order/model/request/ShoppingRequest.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/SellerOrderDetailService.java # order/src/main/java/com/yohoufo/order/service/impl/ShoppingServiceImpl.java # order/src/main/java/com/yohoufo/order/service/impl/SubmitOrderServiceImpl.java
