- 17 Sep, 2020 4 commits
-
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
zhiheng.zhang committed -
zhiheng.zhang committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
- 16 Sep, 2020 11 commits
-
-
孙昱 committed
-
孙昱 committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
zhiheng.zhang committed -
zhiheng.zhang committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
vega committed -
vega committed
-
- 15 Sep, 2020 9 commits
-
-
Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
ping.wu committed -
ping.wu committed
-
yu.sun committed
-
yu.sun committed
-
yu.sun committed
-
yu.sun committed
-
yu.sun committed
-
ping.wu committed
-
vega committed
-
- 14 Sep, 2020 4 commits
- 12 Sep, 2020 1 commit
-
-
孙昱 committed
-
- 11 Sep, 2020 8 commits
-
-
ping.wu committed
-
孙昱 committed
-
张洪旺 committed
-
Merge branches 'feature/20200910_商品券锁定校验不能添加购物车_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
ping.wu committed -
Merge branches 'feature/20200910_商品券已加入购物车提示_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
ping.wu committed
-
孙昱 committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml
徐康 committed
-
- 10 Sep, 2020 3 commits
-
-
ping.wu committed
-
Merge branches 'feature/20200910_商品券已加入购物车提示_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # .gitignore # assortment-ordercenter-sdk/pom.xml # 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/OrderApplication.java # 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/pom.xml # order-management/src/main/java/cn/freemud/management/service/impl/McCafeMangerServiceImpl.java # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md # shopping-cart-application-service/pom.xml # shopping-cart-application-service/src/main/java/cn/freemud/enums/GoodsTypeEnum.java
ping.wu committed -
徐康 committed
-
