尽量使用常量

binarywang · binarywang · commit b4833d10194d · 2018-11-01T15:57:25.000+08:00
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayOrderNotifyResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayOrderNotifyResult.java
@@ -7,7 +7,10 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.github.binarywang.wxpay.bean.result.BaseWxPayResult;
+import com.github.binarywang.wxpay.constant.WxPayConstants;
 import com.github.binarywang.wxpay.converter.WxPayOrderNotifyResultConverter;
+import com.github.binarywang.wxpay.exception.WxPayException;
+import com.github.binarywang.wxpay.service.WxPayService;
 import com.github.binarywang.wxpay.util.SignUtils;
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
@@ -285,18 +288,10 @@ public class WxPayOrderNotifyResult extends BaseWxPayResult {
   @XStreamAlias("version")
   private String version;
   
-  /**
-   * 校验返回结果签名.
-   *
-   * @param wxPayService the wx pay service
-   * @param signType     签名类型
-   * @param checkSuccess 是否同时检查结果是否成功
-   * @throws WxPayException the wx pay exception
-   */
   @Override
   public void checkResult(WxPayService wxPayService, String signType, boolean checkSuccess) throws WxPayException {
     //防止伪造成功通知
-    if ("SUCCESS".equals(getReturnCode()) && getSign() == null) {
+    if (WxPayConstants.ResultCode.SUCCESS.equals(getReturnCode()) && getSign() == null) {
       throw new WxPayException("伪造的通知！");
     }
     
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayRefundNotifyResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayRefundNotifyResult.java
@@ -11,6 +11,7 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.github.binarywang.wxpay.bean.result.BaseWxPayResult;
+import com.github.binarywang.wxpay.constant.WxPayConstants;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
@@ -46,7 +47,7 @@ public class WxPayRefundNotifyResult extends BaseWxPayResult implements Serializ
    */
   public static WxPayRefundNotifyResult fromXML(String xmlString, String mchKey) throws WxPayException {
     WxPayRefundNotifyResult result = BaseWxPayResult.fromXML(xmlString, WxPayRefundNotifyResult.class);
-    if ("FAIL".equals(result.getReturnCode())) {
+    if (WxPayConstants.ResultCode.FAIL.equals(result.getReturnCode())) {
       return result;
     }
     
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java
@@ -22,6 +22,7 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
+import com.github.binarywang.wxpay.constant.WxPayConstants;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.github.binarywang.wxpay.util.SignUtils;
@@ -254,7 +255,7 @@ public void checkResult(WxPayService wxPayService, String signType, boolean chec
 
     //校验结果是否成功
     if (checkSuccess) {
-      List<String> successStrings = Lists.newArrayList("SUCCESS", "");
+      List<String> successStrings = Lists.newArrayList(WxPayConstants.ResultCode.SUCCESS, "");
       if (!successStrings.contains(StringUtils.trimToEmpty(getReturnCode()).toUpperCase())
         || !successStrings.contains(StringUtils.trimToEmpty(getResultCode()).toUpperCase())) {
         StringBuilder errorMsg = new StringBuilder();
