- 18 Aug, 2020 11 commits
-
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
xiaoer.li@freemud.com committed
-
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountRequestDto.java
xiaoer.li@freemud.com committed -
zhiheng.zhang committed
-
xiaoer.li@freemud.com committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
- 17 Aug, 2020 22 commits
-
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
徐康 committed
-
徐康 committed
-
ping.wu committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/OrderApplication.java # order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java # order-application-service/src/main/java/cn/freemud/service/OrderAdapterService.java # order-application-service/src/main/java/cn/freemud/service/thirdparty/DeliveryFeiginClient.java # order-management/src/main/java/cn/freemud/management/thirdparty/CouponOfflineMCCafeClient.java # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java
徐康 committed -
Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # assortment-shoppingcart-sdk/pom.xml # shopping-cart-application-service/pom.xml # shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java # shopping-cart-application-service/src/main/java/cn/freemud/enums/GoodsTypeEnum.java
ping.wu committed -
ping.wu committed
-
Merge remote-tracking branch 'origin/feature/20200727_麦咖啡p1v2支付券码路由' into feature/20200727_麦咖啡p1v2支付券码路由
huiyang.chen committed -
Merge remote-tracking branch 'origin/feature/20200727_麦咖啡p1v2支付券码路由' into feature/20200727_麦咖啡p1v2支付券码路由
徐康 committed -
huiyang.chen committed
-
徐康 committed
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
huiyang.chen committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # order-application-service/src/main/resources/application.properties # order-management/pom.xml # ordercenter-sdk/pom.xml
huiyang.chen committed -
- 券码透传金额包含小料 - 均摊*主商品金额
xiaoer.li@freemud.com committed -
huiyang.chen committed
-
- 16 Aug, 2020 6 commits
-
-
xiaoer.li@freemud.com committed
-
# Conflicts: # assortment-shoppingcart-sdk/pom.xml # shopping-cart-application-service/pom.xml
xiaoer.li@freemud.com committed -
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
- 15 Aug, 2020 1 commit
-
-
xiaoer.li committed
-
