- 25 Sep, 2020 7 commits
-
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/adapter/DeliveryAdapter.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
徐康 committed -
徐康 committed
-
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
huiyang.chen committed -
huiyang.chen committed
-
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
huiyang.chen committed -
huiyang.chen committed
-
huiyang.chen committed
-
- 24 Sep, 2020 4 commits
-
-
huiyang.chen committed
-
徐康 committed
-
huiyang.chen committed
-
徐康 committed
-
- 23 Sep, 2020 6 commits
-
-
徐康 committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
zhiheng.zhang committed -
zhiheng.zhang committed
-
- 22 Sep, 2020 8 commits
-
-
vega committed
-
xiaoer.li@freemud.com committed
-
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop Conflicts: .gitignore assortment-ordercenter-sdk/readme.md assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderProductAddInfoDto.java assortment-shoppingcart-sdk/pom.xml order-application-service/pom.xml order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java order-application-service/src/main/java/cn/freemud/service/thirdparty/DeliveryFeiginClient.java order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java ordercenter-sdk/readme.md shopping-cart-application-service/pom.xml shopping-cart-application-service/src/main/java/cn/freemud/enums/GoodsTypeEnum.java
xiaoer.li@freemud.com committed -
vega committed
-
vega committed
-
vega committed
-
vega committed
-
vega committed
-
- 21 Sep, 2020 15 commits
-
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
zhiheng.zhang committed -
zhiheng.zhang committed
-
zhiheng.zhang committed
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
vega committed
-
vega committed
-
徐康 committed
-
徐康 committed
-
zhiheng.zhang committed
-
