- 24 Feb, 2020 2 commits
- 20 Feb, 2020 1 commit
-
-
# Conflicts: # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java # assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/ShoppingCartAdapter.java # order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java # order-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java # order-application-service/src/main/java/cn/freemud/enums/OrderSourceType.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
dingkai committed
-
- 19 Feb, 2020 3 commits
-
-
# Conflicts: # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java # assortment-shoppingcart-sdk/assortment-shoppingcart-sdk.iml # assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/ShoppingCartAdapter.java # order-application-service/src/main/java/cn/freemud/controller/OrderController.java # order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java # order-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java # order-application-service/src/main/java/cn/freemud/enums/OrderSourceType.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java
dingkai committed -
shuhu.hou committed
-
shuhu.hou committed
-
- 18 Feb, 2020 2 commits
- 14 Feb, 2020 3 commits
- 13 Feb, 2020 1 commit
-
-
huvchao@126.com committed
-
- 12 Feb, 2020 4 commits
-
-
shuhu.hou committed
-
姜海波 committed
-
姜海波 committed
-
huvchao@126.com committed
-
- 11 Feb, 2020 4 commits
-
-
huvchao@126.com committed
-
huvchao@126.com committed
-
shuhu.hou committed
-
shuhu.hou committed
-
- 10 Feb, 2020 1 commit
-
-
shuhu.hou committed
-
- 07 Feb, 2020 1 commit
-
-
shuhu.hou committed
-
- 06 Feb, 2020 8 commits
-
-
shuhu.hou committed
-
# Conflicts: # assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/request/CheckCartRequest.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AssortmentSdkService.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuyAndGiftsPromotionService.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
shuhu.hou committed -
shuhu.hou committed
-
姜海波 committed
-
姜海波 committed
-
shuhu.hou committed
-
huvchao@126.com committed
-
shuhu.hou@freemud.cn committed
-
- 05 Feb, 2020 2 commits
-
-
huvchao@126.com committed
-
huvchao@126.com committed
-
- 18 Jan, 2020 3 commits
-
-
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
- 17 Jan, 2020 3 commits
-
-
ping.wu committed
-
Merge branches 'feature/20200103_支付宝支付下单_wuping' and 'feature/20200117_支付宝下单_wuping' of http://gitlab.freemud.com/order-group-application/order-group into feature/20200117_支付宝下单_wuping # Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderResponseVo.java
ping.wu committed -
shuhu.hou@freemud.cn committed
-
- 15 Jan, 2020 2 commits
-
-
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
