OrderServiceTest.java
21.8 KB
-
Merge remote-tracking branch 'remotes/origin/feature-2020/5/12-1.9.22-退单增加配送费选项-海波' into qa · e5094600
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # 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/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # order-management/pom.xml # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java
姜海波 committed