- 29 Oct, 2021 6 commits
- 28 Oct, 2021 13 commits
-
-
查志伟 committed
-
查志伟 committed
-
查志伟 committed
-
查志伟 committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
查志伟 committed -
查志伟 committed
-
Merge branches 'feature/20211028_取消支付删除订单_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
ping.wu committed
-
ping.wu committed
-
Merge branches 'feature/20211028_取消支付删除订单_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # order-application-service/src/main/java/cn/freemud/controller/OrderController.java
ping.wu committed -
ping.wu committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
胡博文 committed
-
- 27 Oct, 2021 10 commits
-
-
Merge branches 'feature/20211027_餐盒费规则保存订单_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
ping.wu committed
-
Merge branches 'feature/20211027_餐盒费规则保存订单_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # order-application-service/src/main/java/cn/freemud/service/thirdparty/MicroOpenplatformClient.java # shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/calculate/SendGoods.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/AdditionSharingService.java
ping.wu committed -
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
周晓航 committed -
ping.wu committed
-
ping.wu committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/adapter/ActivityAdapter.java # shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/calculate/ActivityCalculationDiscountResponseDto.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/AdditionSharingService.java
周晓航 committed -
周晓航 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed
-
- 26 Oct, 2021 11 commits
-
-
Merge branches 'feature/20211014_餐盒费规则配置_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
Merge branches 'feature/20211014_餐盒费规则配置_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
ping.wu committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Merge branches 'feature/20211018_商品券支持套餐_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
Merge branches 'feature/20211018_商品券支持套餐_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/service/impl/calculate/CalculationSharingDiscountService.java
ping.wu committed -
# Conflicts: # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
查志伟 committed -
ping.wu committed
-
查志伟 committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/constant/KgdRedisKeyConstant.java
查志伟 committed -
Merge branches 'feature/20211014_餐盒费规则配置_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed
-
