diff --git a/boot-service/src/main/java/com/xwbing/service/other/AliPayService.java b/boot-service/src/main/java/com/xwbing/service/other/AliPayService.java
index 3ce64fe..1f55f4c 100644
--- a/boot-service/src/main/java/com/xwbing/service/other/AliPayService.java
+++ b/boot-service/src/main/java/com/xwbing/service/other/AliPayService.java
@@ -184,7 +184,7 @@ public class AliPayService {
     }
 
     /**
-     * 退款查询  没有tradeStatus,isSuccess即为成功
+     * 退款查询,没有tradeStatus。isSuccess即为成功
      * 订单号和交易号2选1
      *
      * @param outTradeNo   订单号
@@ -277,10 +277,11 @@ public class AliPayService {
         AliPayQueryResult queryResult = alipayBuilder.queryOrder("", tradeNo);
         if (!queryResult.isSuccess()) {
             System.out.println(queryResult.getMessage());
+        } else {
+            String tradeStatus = queryResult.getTradeStatus();
+            Optional<AliPayTradeStatusEnum> first = Arrays.stream(AliPayTradeStatusEnum.values()).filter(aliPayTradeStatusEnum -> aliPayTradeStatusEnum.getCode().equals(tradeStatus)).findFirst();
+            first.ifPresent(aliPayTradeStatusEnum -> System.out.println(aliPayTradeStatusEnum.getName()));
         }
-        String tradeStatus = queryResult.getTradeStatus();
-        Optional<AliPayTradeStatusEnum> first = Arrays.stream(AliPayTradeStatusEnum.values()).filter(aliPayTradeStatusEnum -> aliPayTradeStatusEnum.getCode().equals(tradeStatus)).findFirst();
-        first.ifPresent(aliPayTradeStatusEnum -> System.out.println(aliPayTradeStatusEnum.getName()));
 
 //        //退款操作
         String outRequestNo = "201805180202";//退款请求号
diff --git a/boot-service/src/main/java/com/xwbing/service/other/WxPayService.java b/boot-service/src/main/java/com/xwbing/service/other/WxPayService.java
index afbfed7..9494fa3 100644
--- a/boot-service/src/main/java/com/xwbing/service/other/WxPayService.java
+++ b/boot-service/src/main/java/com/xwbing/service/other/WxPayService.java
@@ -21,10 +21,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.stereotype.Service;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * 说明: 微信支付接口实现
@@ -417,12 +414,8 @@ public class WxPayService {
             throw new BusinessException(queryResult.getMessage());
         }
         String tradeStatus = queryResult.getTradeStatus();
-        for (WxTradeStatusEnum status : WxTradeStatusEnum.values()) {
-            if (Objects.equals(tradeStatus, status.getCode())) {
-                System.out.println(status.getName());
-                break;
-            }
-        }
+        Optional<WxTradeStatusEnum> wxTrade = Arrays.stream(WxTradeStatusEnum.values()).filter(wxTradeStatusEnum -> wxTradeStatusEnum.getCode().equals(tradeStatus)).findFirst();
+        wxTrade.ifPresent(wxTradeStatusEnum -> System.out.println(wxTradeStatusEnum.getName()));
 
         //退款操作
         String outRefundNo = "2017051201";//商户退款单号
@@ -436,11 +429,7 @@ public class WxPayService {
             throw new BusinessException(refundQueryResult.getMessage());
         }
         String refundStatus = refundQueryResult.getRefundStatus();
-        for (WxRefundStatusEnum status : WxRefundStatusEnum.values()) {
-            if (Objects.equals(refundStatus, status.getCode())) {
-                System.out.println(status.getName());
-                break;
-            }
-        }
+        Optional<WxRefundStatusEnum> wxRefund = Arrays.stream(WxRefundStatusEnum.values()).filter(wxRefundStatusEnum -> wxRefundStatusEnum.getCode().equals(refundStatus)).findFirst();
+        wxRefund.ifPresent(wxRefundStatusEnum -> System.out.println(wxRefundStatusEnum.getName()));
     }
 }