Skip to content

O
order-group
Switch branch/tag
  1. 12 Nov, 2020 10 commits
    • Merge remote-tracking branch 'origin/qa' into qa · e05be944 
      # Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-shoppingcart-sdk/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/mccafe/impl/CouponClientServiceImpl.java
#	order-application-service/src/test/java/cn/freemud/service/impl/MallOrderServiceImplTest.java
#	order-management/pom.xml
#	shopping-cart-application-service/pom.xml
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java
      zhiheng.zhang committed
    • 修改jar包版本 · 4973d156
      zhiheng.zhang committed
    • Merge branch 'feature/20201112_优惠为0的券也要核销_xukang' into qa · 0ed05806 
      # Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/service/mccafe/impl/CouponClientServiceImpl.java
#	ordercenter-sdk/pom.xml
      徐康 committed
    • Merge branch 'feature/20201110_混合支付退款_张志恒' into qa · 67d902c9 
      # Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	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/request/order/CreateOrderProductRequest.java
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderProductAddInfoDto.java
#	assortment-shoppingcart-sdk/pom.xml
#	assortment-shoppingcart-sdk/readme.md
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/mccafe/impl/CouponClientServiceImpl.java
#	order-application-service/src/test/java/cn/freemud/service/impl/MallOrderServiceImplTest.java
#	order-management/pom.xml
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java
#	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/service/impl/ShoppingCartNewServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java
      zhiheng.zhang committed
    • 0元优惠处理 · d61d9f5e
      徐康 committed
    • 结局类型冲突 · 5b6b85fc
      zhiheng.zhang committed
    • 修改返回名字 · 24cb6642
      zhiheng.zhang committed
    • 同意退款添加工具类 · b4b5a739
      zhiheng.zhang committed
    • 下单err更新 · 5adc8e8e
      刘鹏飞 committed
    • 同意退款添加工具类 · d2dc97eb
      zhiheng.zhang committed
  3. 11 Nov, 2020 17 commits
  5. 10 Nov, 2020 13 commits