From bbd9df562237c87f3ebfadd4f922491b6b6a8f14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=9F=E6=9D=83=E4=BC=9F?= <872046794@qq.com>
Date: Mon, 2 Sep 2024 22:42:07 +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      | 25 ++++++++++++++++++-
 .../client/impl/weixin/WxPubPayClient.java    |  1 +
 2 files changed, 25 insertions(+), 1 deletion(-)

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 163f97c..dd30174 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
@@ -6,6 +6,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.date.TemporalAccessorUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpRequest;
 import cn.iocoder.yudao.framework.common.util.io.FileUtils;
 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
 import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
@@ -17,6 +18,7 @@ import cn.iocoder.yudao.framework.pay.core.client.dto.transfer.PayTransferUnifie
 import cn.iocoder.yudao.framework.pay.core.client.impl.AbstractPayClient;
 import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum;
 import cn.iocoder.yudao.framework.pay.core.enums.transfer.PayTransferTypeEnum;
+import com.alibaba.fastjson.JSONObject;
 import com.github.binarywang.wxpay.bean.notify.WxPayNotifyV3Result;
 import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
 import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult;
@@ -284,7 +286,28 @@ public abstract class AbstractWxPayClient extends AbstractPayClient<WxPayClientC
                 .setTotalFee(reqDTO.getPayPrice())
                 .setNotifyUrl(reqDTO.getNotifyUrl());
         // 2.1 执行请求
-        WxPayRefundResult response = client.refundV2(request);
+//        WxPayRefundResult response = client.refundV2(request);
+
+        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("domainUrl", request.getNotifyUrl());
+        paramMap.put("outTradeNo",request.getOutTradeNo());
+        paramMap.put("outRefundNo",request.getOutRefundNo());
+        paramMap.put("totalAmount", request.getTotalFee().toString());
+        paramMap.put("refundAmount", request.getRefundFee().toString());
+        paramMap.put("refundReason", request.getRefundDesc());
+
+        String json = HttpRequest.post("http://alipay.huamar.com/pay/order/doRefund")
+                .body(paramMap.toJSONString())
+                .execute().body();
+        WxPayRefundResult response = JSONObject.parseObject(JSONObject.parseObject(json).getString("data"), WxPayRefundResult.class);
+        if (response == null){
+            return PayRefundRespDTO.failureOf(reqDTO.getOutRefundNo(), "退款失败，请联系技术人员排查！");
+        }
+
         // 2.2 创建返回结果
         if (Objects.equals("SUCCESS", response.getResultCode())) { // V2 情况下，不直接返回退款成功，而是等待异步通知
             return PayRefundRespDTO.waitingOf(response.getRefundId(),
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/WxPubPayClient.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/WxPubPayClient.java
index 5ecd98d..12a372d 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/WxPubPayClient.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/WxPubPayClient.java
@@ -62,6 +62,7 @@ public class WxPubPayClient extends AbstractWxPayClient {
         paramMap.put("domainUrl", request.getNotifyUrl());
         paramMap.put("orderSn",request.getOutTradeNo());
         paramMap.put("openId",request.getOpenid());
+        paramMap.put("body",request.getBody());
         String json = HttpRequest.post("http://alipay.huamar.com/pay/order/createOrder")
                 .body(paramMap.toJSONString())
                 .execute().body();