- 24 Jun, 2021 8 commits
-
-
Merge branches 'feature/20210618_优惠总金额回滚_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
ping.wu committed
-
Merge branches 'feature/20210618_优惠总金额回滚_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
ping.wu committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java # order-application-service/src/main/java/cn/freemud/entities/dto/delivery/CallbackUrlRequestDto.java
周晓航 committed -
Merge branches 'featur/20210602-券码接口调整-zy' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
ping.wu committed
-
- 23 Jun, 2021 3 commits
- 22 Jun, 2021 13 commits
-
-
Merge branches 'featur/20210609-订单调getMemberExtendInfo接口优化-zy' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
ping.wu committed
-
ping.wu committed
-
Merge branches 'featur/20210527-配送服务异常回调' and 'master' of http://gitlab.freemud.com/order-group-application/order-group # Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
ping.wu committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
bing.liu committed
-
Merge branches 'feature/20210621_支付回调取消订单优化_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Merge branches 'featur/20210609-订单调getMemberExtendInfo接口优化-zy' and 'master' of http://gitlab.freemud.com/order-group-application/order-group # Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
ping.wu committed
-
- 21 Jun, 2021 12 commits
-
-
张跃 committed
-
张跃 committed
-
张跃 committed
-
Merge branches 'feature/20210618_优惠总金额回滚_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
ping.wu committed
-
ping.wu committed
-
张跃 committed
-
张跃 committed
-
张跃 committed
-
bing.liu committed
-
张跃 committed
-
ping.wu committed
-
- 18 Jun, 2021 2 commits
- 17 Jun, 2021 2 commits
-
-
徐康 committed
-
# Conflicts: # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
徐康 committed
-
