Merge remote-tracking branch 'origin/qa' into qa

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

@@ -1699,7 +1699,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/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);