From 6852617bd770111f438ebbad3e2f97045f0a7083 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Wed, 19 Jul 2023 18:51:52 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=EF=BC=8C=E5=85=BC=E5=AE=B9=E6=B7=B7=E4=B9=B1=E4=B8=94?=
 =?UTF-8?q?=E5=8F=98=E6=80=81=E7=9A=84=E5=BE=AE=E4=BF=A1=E5=AE=98=E6=96=B9?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=91=BD=E5=90=8D=E4=B9=A0=E6=83=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wxpay/bean/result/BaseWxPayResult.java           | 12 ++++++++++--
 .../binarywang/wxpay/exception/WxPayException.java   | 12 +++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

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
index a48617c4c..0a27bd6ca 100644
--- 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
@@ -59,11 +59,18 @@ public abstract class BaseWxPayResult {
    */
   @XStreamAlias("result_code")
   private String resultCode;
+
   /**
    * 错误代码.
    */
   @XStreamAlias("err_code")
   private String errCode;
+  /**
+   * 错误代码描述.
+   */
+  @XStreamAlias("err_code_des")
+  private String errCodeDes;
+
   /**
    * 错误代码.
    */
@@ -72,8 +79,9 @@ public abstract class BaseWxPayResult {
   /**
    * 错误代码描述.
    */
-  @XStreamAlias("err_code_des")
-  private String errCodeDes;
+  @XStreamAlias("error_message")
+  private String errorMessage;
+
   /**
    * 公众账号ID.
    */
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/exception/WxPayException.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/exception/WxPayException.java
index a5a2552b3..4f3e4b822 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/exception/WxPayException.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/exception/WxPayException.java
@@ -89,7 +89,7 @@ public class WxPayException extends Exception {
    * @return the wx pay exception
    */
   public static WxPayException from(BaseWxPayResult payBaseResult) {
-    return WxPayException.newBuilder()
+    WxPayException exception = WxPayException.newBuilder()
       .xmlString(payBaseResult.getXmlString())
       .returnMsg(payBaseResult.getReturnMsg())
       .returnCode(payBaseResult.getReturnCode())
@@ -97,6 +97,16 @@ public class WxPayException extends Exception {
       .errCode(payBaseResult.getErrCode())
       .errCodeDes(payBaseResult.getErrCodeDes())
       .build();
+
+    if (payBaseResult.getErrorCode() != null) {
+      exception.setErrCode(payBaseResult.getErrorCode());
+    }
+
+    if (payBaseResult.getErrorMessage() != null) {
+      exception.setErrCodeDes(payBaseResult.getErrorMessage());
+    }
+
+    return exception;
   }
 
   /**