Merge branch 'feature/20201110_混合支付退款_张志恒' into develop

# 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.2.1-SNAPSHOT</version>
+    <version>2.2.2-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.2.1-SNAPSHOT</version>
+            <version>2.2.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -1755,7 +1755,7 @@ public class OrderServiceImpl implements Orderservice {
         String partnerId = orderBean.getCompanyId();
         int state = PayRefundStatus.SUCCESS.getCode();
         if (orderBean.getAmount() != 0) {
-            if(orderBean.getPayChannelType().equalsIgnoreCase("4")){
+            if("4".equalsIgnoreCase(orderBean.getPayChannelType())){
                 //调用支付退款
                 MultiOrderRefundRequest multiOrderRefundRequest = orderAdapter.getMultiOrderPayRefundRequest(orderBean, refundId);
                 MultiOrderRefundResponse multiOrderRefundResponse = mulitiPaymentClient.paymentApplicationRefund(multiOrderRefundRequest,orderBean.getCompanyId());

order-management/pom.xml

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

order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java

@@ -128,7 +128,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         //支付退款
         PayRefundResponse refundResponse = new PayRefundResponse();
         try {
-            if(orderBean.getPayChannelType().equalsIgnoreCase("4")){
+            if("4".equalsIgnoreCase(orderBean.getPayChannelType())){
                 refundResponse = paymentHandle.multiRefund(orderBean);
             }else{
                 refundResponse = paymentHandle.refund(request, orderBean);
@@ -162,7 +162,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         //支付退款
         PayRefundResponse refundResponse = new PayRefundResponse();
         try {
-            if(orderBean.getPayChannelType().equalsIgnoreCase("4")){
+            if("4".equalsIgnoreCase(orderBean.getPayChannelType())){
                 refundResponse = paymentHandle.multiRefund(orderBean);
             }else{
                 refundResponse = paymentHandle.refund(request, orderBean);