From 7f76ba9d1eb56a391e9a036196b8f49c25e042a3 Mon Sep 17 00:00:00 2001
From: xiaoyu <17601026937@163.com>
Date: Tue, 22 Jun 2021 09:33:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=AC=BE=E8=AE=A2=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E4=BC=A0=E5=85=A5=E4=B8=8A=E6=B8=B8=E4=BF=AE=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?refundOrderId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeepay/pay/channel/wxpay/WxpayRefundService.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayRefundService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayRefundService.java
index ab1221b..60cdede 100644
--- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayRefundService.java
+++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayRefundService.java
@@ -71,7 +71,7 @@ public class WxpayRefundService extends AbstractRefundService {
                 WxpayKit.putApiIsvInfo(mchAppConfigContext, req);
 
                 req.setOutTradeNo(payOrder.getPayOrderId());    // 商户订单号
-                req.setOutRefundNo(refundOrder.getMchRefundNo()); // 退款单号
+                req.setOutRefundNo(refundOrder.getRefundOrderId()); // 退款单号
                 req.setTotalFee(payOrder.getAmount().intValue());   // 订单总金额
                 req.setRefundFee(refundOrder.getRefundAmount().intValue()); // 退款金额
                 WxPayService wxPayService = mchAppConfigContext.getWxServiceWrapper().getWxPayService();
@@ -89,7 +89,7 @@ public class WxpayRefundService extends AbstractRefundService {
                 // 微信统一下单请求对象
                 JSONObject reqJSON = new JSONObject();
                 reqJSON.put("out_trade_no", refundOrder.getPayOrderId());   // 订单号
-                reqJSON.put("out_refund_no", refundOrder.getMchRefundNo()); // 退款订单号
+                reqJSON.put("out_refund_no", refundOrder.getRefundOrderId()); // 退款订单号
 
                 JSONObject amountJson = new JSONObject();
                 amountJson.put("refund", refundOrder.getRefundAmount());// 退款金额
@@ -140,7 +140,7 @@ public class WxpayRefundService extends AbstractRefundService {
                 //放置isv信息
                 WxpayKit.putApiIsvInfo(mchAppConfigContext, req);
 
-                req.setOutRefundNo(refundOrder.getMchRefundNo()); // 退款单号
+                req.setOutRefundNo(refundOrder.getRefundOrderId()); // 退款单号
                 WxPayService wxPayService = mchAppConfigContext.getWxServiceWrapper().getWxPayService();
                 setCretPath(mchAppConfigContext, wxPayService); // 证书路径
 
@@ -159,9 +159,9 @@ public class WxpayRefundService extends AbstractRefundService {
                 if (mchAppConfigContext.isIsvsubMch()) {
                     WxpayIsvsubMchParams isvsubMchParams = mchAppConfigContext.getIsvsubMchParamsByIfCode(getIfCode(), WxpayIsvsubMchParams.class);
                     wxPayService.getConfig().setSubMchId(isvsubMchParams.getSubMchId());
-                    resultJSON = WxpayV3Util.refundQueryV3Isv(refundOrder.getMchRefundNo(), wxPayService.getConfig());
+                    resultJSON = WxpayV3Util.refundQueryV3Isv(refundOrder.getRefundOrderId(), wxPayService.getConfig());
                 }else {
-                    resultJSON = WxpayV3Util.refundQueryV3(refundOrder.getMchRefundNo(), wxPayService.getConfig());
+                    resultJSON = WxpayV3Util.refundQueryV3(refundOrder.getRefundOrderId(), wxPayService.getConfig());
                 }
                 String status = resultJSON.getString("status");
                 if("SUCCESS".equals(status)){ // 退款成功
-- 
GitLab