Merge branch 'feature/2020-1104-混合支付' into qa

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-management/pom.xml

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>2.1.8-SNAPSHOT</version>
+    <version>2.2.1-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.5.0-SNAPSHOT</version>
+            <version>1.6.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.2.0-SNAPSHOT</version>
+            <version>2.2.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
@@ -119,7 +119,7 @@
         <dependency>
             <artifactId>assortment-data-manager</artifactId>
             <groupId>com.freemud.sdk.api.assortment</groupId>
-            <version>5.1.1-SNAPSHOT</version>
+            <version>5.2.7.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud.commons</groupId>

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -3243,7 +3243,7 @@ public class OrderServiceImpl implements Orderservice {
      * @param trackingNo
      * @return
      */
-    public com.freemud.application.sdk.api.paymentcenter.client.response.OrderPayResponse comPayOrder(String cardNo
+    public OrderPayResponse comPayOrder(String cardNo
             , QueryOrdersResponse.DataBean.OrderBean orderBean
             , PaymentRequest paymentRequest
             , String partnerPayOvertime
@@ -3255,7 +3255,7 @@ public class OrderServiceImpl implements Orderservice {
             , String trackingNo) {
 
         String ebCode = this.getPayCodeByChanel(paymentRequest.getWxAppId(), channel, storeId);
-        com.freemud.application.sdk.api.paymentcenter.client.response.OrderPayResponse orderPayResponse = new com.freemud.application.sdk.api.paymentcenter.client.response.OrderPayResponse();;
+        OrderPayResponse orderPayResponse = new OrderPayResponse();;
         if (StringUtils.isBlank(ebCode)) {
             orderPayResponse.setMsg("渠道码没有配置");
             return orderPayResponse;

order-management/pom.xml

@@ -65,7 +65,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.2.0-SNAPSHOT</version>
+            <version>2.2.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>