- 26 Aug, 2021 3 commits
-
-
Merge branches 'master-20210826' and 'pre' of http://gitlab.freemud.com/order-group-application/order-group into pre # 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/enums/OldOrderAccountType.java # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/QueryOrderAccountType.java # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
ping.wu committed -
Merge branches 'feature/20210818_购物车新增积分商品_wuping' and 'master-20210826' of http://gitlab.freemud.com/order-group-application/order-group into master-20210826 # Conflicts: # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java # shopping-cart-application-service/src/main/java/cn/freemud/adapter/ActivityAdapter.java # shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/bo/goods/CalculationDiscountBO.java # shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.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/ShoppingCartNewService.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMallServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMealServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/CouponSharingService.java
ping.wu committed -
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/enums/ShoppingCartPromotionEnum.java
查志伟 committed
-
- 25 Aug, 2021 3 commits
- 23 Aug, 2021 5 commits
- 21 Aug, 2021 3 commits
- 20 Aug, 2021 3 commits
- 19 Aug, 2021 5 commits
- 15 Aug, 2021 1 commit
-
-
hanghang.wang committed
-
- 25 Aug, 2021 1 commit
-
-
Merge branches 'feature/20210817_拼单报错修改_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed
-
- 24 Aug, 2021 15 commits
-
-
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 -
Merge branches 'feature/20210806_积分商城重构_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
ping.wu committed
-
王世昌 committed
-
Merge branches 'feature/20210806_积分商城重构_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group # Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponPromotionService.java
ping.wu committed -
Merge branches 'feature/20210816_买M赠N券_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group # Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java
ping.wu committed -
ping.wu committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
周晓航 committed
-
Merge branch 'KA-2.0.41-爱马哥预订单开发-zxh' of gitlab.freemud.com:order-group-application/order-group into KA-2.0.41-爱马哥预订单开发-zxh
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
ping.wu committed
-
- 23 Aug, 2021 1 commit
-
-
ping.wu committed
-
