Merge branch 'Ka-OMS订单同意退款改造' into qa

order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java

@@ -145,7 +145,7 @@ public class PaymentHandle {
             message = orderRefundResponse.getMessage();
         }
         PayRefundResponse payRefundResponse = handlePayRefundResponse(refundStatus, orderRefundRequest.getRefundId());
-        if(message != null){
+        if (message != null) {
             payRefundResponse.setMessage(message);
         }
         return payRefundResponse;
@@ -184,15 +184,15 @@ public class PaymentHandle {
                 if (refunded > 0L) {
                     refundStatus = PayRefundStatus.RUNNING;
                 }
-                for (MultiOrderRefundResponse.RefundPlatformResponse refundPlatformResponse : refundPlatformResponseList){
-                    if(refundPlatformResponse.getResultCode().compareTo(MultiOrderRefundResponse.RefundPlatformResponse.REFUND_SUCCESS) != 0){
-                        message = refundPlatformResponse.getResultMsg()+ ";" + message;
+                for (MultiOrderRefundResponse.RefundPlatformResponse refundPlatformResponse : refundPlatformResponseList) {
+                    if (refundPlatformResponse.getResultCode().compareTo(MultiOrderRefundResponse.RefundPlatformResponse.REFUND_SUCCESS) != 0) {
+                        message = refundPlatformResponse.getResultMsg() + ";" + message;
                     }
                 }
             }
         }
         PayRefundResponse payRefundResponse = handlePayRefundResponse(refundStatus, multiOrderRefundRequest.getRefundTradeNo());
-        if(StringUtils.isNotEmpty(message)){
+        if (StringUtils.isNotEmpty(message)) {
             payRefundResponse.setMessage(message);
         }
         return payRefundResponse;
@@ -216,8 +216,8 @@ public class PaymentHandle {
             AgentPayRefundResp.DataDTO data = resp.getData();
             if (Objects.nonNull(data)) {
                 refundStatus = this.getFinalRefundStatus(data.getResultCode());
+                fmRefundNo = data.getFmRefundNo();
             }
-            fmRefundNo = resp.getData().getFmRefundNo();
         } catch (Throwable e) {
             refundStatus = PayRefundStatus.FAIL;
         }