Merge pull request #88 from EasyAbp/handle-empty-return-msg

Handle responses with empty `return_msg`
EasyAbp · Jun 16, 2023 · 6a78923 · 6a78923
2 parents eafccf2 + ad4702d
commit 6a78923
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/Pay/EasyAbp.Abp.WeChat.Pay/Services/WeChatPayServiceBase.cs b/src/Pay/EasyAbp.Abp.WeChat.Pay/Services/WeChatPayServiceBase.cs
@@ -44,8 +44,11 @@ protected WeChatPayServiceBase(AbpWeChatPayOptions options, IAbpLazyServiceProvi
             WeChatPayParameters requestParameters, [CanBeNull] string mchId)
         {
             var result = await ApiRequester.RequestAsync(targetUrl, requestParameters.ToXmlStr(), mchId);
-            if (result.SelectSingleNode("/xml/return_code")?.InnerText != "SUCCESS" ||
-                result.SelectSingleNode("/xml/return_msg")?.InnerText != "OK")
+
+            var returnCode = result.SelectSingleNode("/xml/return_code")?.InnerText;
+            var returnMsg = result.SelectSingleNode("/xml/return_msg")?.InnerText;
+
+            if (returnCode != "SUCCESS" || (returnMsg != "OK" && !returnMsg.IsNullOrWhiteSpace()))
             {
                 var errMsg =
                     $"微信支付接口调用失败，具体失败原因：{result.SelectSingleNode("/xml/err_code_des")?.InnerText ?? result.SelectSingleNode("/xml/return_msg")?.InnerText}";