From feae7cdd9568b3d64d0ce10b4e9f6673106eaeef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=9F=E6=9D=83=E4=BC=9F?= <872046794@qq.com>
Date: Wed, 4 Sep 2024 13:30:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=AE=E4=BF=A1=E9=80=80?=
 =?UTF-8?q?=E6=AC=BE=E4=B8=BA=E7=AC=AC=E4=B8=89=E6=96=B9=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/weixin/AbstractWxPayClient.java      | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/ruoyi-vue-pro-master/yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/AbstractWxPayClient.java b/ruoyi-vue-pro-master/yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/AbstractWxPayClient.java
index dd30174..91cc409 100644
--- a/ruoyi-vue-pro-master/yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/AbstractWxPayClient.java
+++ b/ruoyi-vue-pro-master/yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/AbstractWxPayClient.java
@@ -23,6 +23,7 @@ import com.github.binarywang.wxpay.bean.notify.WxPayNotifyV3Result;
 import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
 import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult;
 import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyV3Result;
+import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
 import com.github.binarywang.wxpay.bean.request.*;
 import com.github.binarywang.wxpay.bean.result.*;
 import com.github.binarywang.wxpay.config.WxPayConfig;
@@ -168,7 +169,19 @@ public abstract class AbstractWxPayClient extends AbstractPayClient<WxPayClientC
 
     private PayOrderRespDTO doParseOrderNotifyV2(String body) throws WxPayException {
         // 1. 解析回调
-        WxPayOrderNotifyResult response = client.parseOrderNotifyResult(body);
+//        WxPayOrderNotifyResult response = client.parseOrderNotifyResult(body);
+
+        JSONObject paramMap = new JSONObject();
+        paramMap.put("appid", config.getAppId());
+        paramMap.put("mchid", config.getMchId());
+        paramMap.put("keyString", config.getKeyContent());
+        paramMap.put("apiv2", config.getMchKey());
+        paramMap.put("body",body);
+        String json = HttpRequest.post("http://alipay.huamar.com/pay/order/parseOrderNotifyResult")
+                .body(paramMap.toJSONString())
+                .execute().body();
+        WxPayOrderNotifyResult response = JSONObject.parseObject(JSONObject.parseObject(json).getString("data"), WxPayOrderNotifyResult.class);
+
         // 2. 构建结果
         // V2 微信支付的回调，只有 SUCCESS 支付成功、CLOSED 支付失败两种情况，无需像支付宝一样解析的比较复杂
         Integer status = Objects.equals(response.getResultCode(), "SUCCESS") ?
@@ -353,7 +366,19 @@ public abstract class AbstractWxPayClient extends AbstractPayClient<WxPayClientC
 
     private PayRefundRespDTO doParseRefundNotifyV2(String body) throws WxPayException {
         // 1. 解析回调
-        WxPayRefundNotifyResult response = client.parseRefundNotifyResult(body);
+//        WxPayRefundNotifyResult response = client.parseRefundNotifyResult(body);
+
+        JSONObject paramMap = new JSONObject();
+        paramMap.put("appid", config.getAppId());
+        paramMap.put("mchid", config.getMchId());
+        paramMap.put("keyString", config.getKeyContent());
+        paramMap.put("apiv2", config.getMchKey());
+        paramMap.put("body",body);
+        String json = HttpRequest.post("http://alipay.huamar.com/pay/order/parseRefundNotifyResult")
+                .body(paramMap.toJSONString())
+                .execute().body();
+        WxPayRefundNotifyResult response = JSONObject.parseObject(JSONObject.parseObject(json).getString("data"), WxPayRefundNotifyResult.class);
+
         WxPayRefundNotifyResult.ReqInfo result = response.getReqInfo();
         // 2. 构建结果
         if (Objects.equals("SUCCESS", result.getRefundStatus())) {