- 18 Nov, 2021 1 commit
-
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed
-
- 17 Nov, 2021 1 commit
-
-
蒋小洋 committed
-
- 16 Nov, 2021 8 commits
-
-
Merge branches 'ka-券包资金分账-20211020-jxy' and 'master' of http://gitlab.freemud.com/order-group-application/order-group into ka-券包资金分账-20211020-jxy Conflicts: order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
蒋小洋 committed -
查志伟 committed
-
查志伟 committed
-
Merge branches 'feature/20211103_取消支付冲正库存幂等_wuping' and 'pre' of http://gitlab.freemud.com/order-group-application/order-group into pre
ping.wu committed -
Merge branches 'feature/20211103_取消支付冲正库存幂等_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
ping.wu committed
-
Merge branches 'master' and 'pre' of http://gitlab.freemud.com/order-group-application/order-group into pre
ping.wu committed -
Merge branches 'feature/20211103_取消支付冲正库存幂等_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group # Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/OrderQueueService.java
ping.wu committed
-
- 15 Nov, 2021 7 commits
- 12 Nov, 2021 4 commits
- 11 Nov, 2021 2 commits
- 10 Nov, 2021 7 commits
-
-
徐光兴 committed
-
查志伟 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 # 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/ShoppingCartNewServiceImpl.java
查志伟 committed -
徐光兴 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
周晓航 committed -
周晓航 committed
-
- 09 Nov, 2021 9 commits
-
-
ping.wu committed
-
徐光兴 committed
-
ping.wu committed
-
ping.wu committed
-
周晓航 committed
-
Merge branches 'feature/20211104_买m赠n券商品id问题_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
ping.wu committed
-
# Conflicts: # 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
周晓航 committed -
ping.wu committed
-
- 08 Nov, 2021 1 commit
-
-
查志伟 committed
-
