From 2019efffa3f188f15b2acb2f603f6441ee67a3a6 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 19 Sep 2021 12:59:03 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BF=AE=E5=A4=8D=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=91=BD=E5=90=8D=E9=94=99=E8=AF=AF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bean/request/WxPayRefundQueryV3Request.java  | 16 +++++++---------
 .../binarywang/wxpay/service/WxPayService.java   |  4 ++--
 .../wxpay/service/impl/BaseWxPayServiceImpl.java |  6 +++---
 .../service/impl/BaseWxPayServiceImplTest.java   |  4 ++--
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundQueryV3Request.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundQueryV3Request.java
index d29f41a4c..e7d34e31f 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundQueryV3Request.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundQueryV3Request.java
@@ -19,16 +19,14 @@ public class WxPayRefundQueryV3Request implements Serializable {
   private static final long serialVersionUID = 1L;
   /**
    * <pre>
-   * 字段名：商户订单号
-   * 变量名：out_trade_no
+   * 字段名：商户退款单号
+   * 变量名：out_refund_no
    * 是否必填：是
-   * 类型：string[1,32]
-   * 描述：
-   *  商户系统内部订单号，只能是数字、大小写字母_-*且在同一个商户号下唯一。
-   *  特殊规则：最小字符长度为6
-   *  示例值：1217752501201407033233368018
+   * 类型：string[1, 64]
+   * 描述：商户系统内部的退款单号，商户系统内部唯一，只能是数字、大小写字母_-|*@ ，同一退款单号多次请求只退一笔。
+   * 示例值：1217752501201407033233368018
    * </pre>
    */
-  @SerializedName(value = "out_trade_no")
-  private String outTradeNo;
+  @SerializedName(value = "out_refund_no")
+  private String outRefundNo;
 }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
index 9b42bd75b..73dad0c9d 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
@@ -697,11 +697,11 @@ public interface WxPayService {
    * 接口链接：https://api.mch.weixin.qq.com/v3/refund/domestic/refunds/{out_refund_no}
    * </pre>
    *
-   * @param outTradeNo 商户订单号
+   * @param outRefundNo 商户退款单号
    * @return 退款信息 wx pay refund query result
    * @throws WxPayException the wx pay exception
    */
-  WxPayRefundQueryV3Result refundQueryV3(String outTradeNo) throws WxPayException;
+  WxPayRefundQueryV3Result refundQueryV3(String outRefundNo) throws WxPayException;
 
   /**
    * <pre>
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
index a80a7f452..e5ef0be8b 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
@@ -305,15 +305,15 @@ public abstract class BaseWxPayServiceImpl implements WxPayService {
   }
 
   @Override
-  public WxPayRefundQueryV3Result refundQueryV3(String outTradeNo) throws WxPayException {
-    String url = String.format("%s/v3/refund/domestic/refunds/%s", this.getPayBaseUrl(), outTradeNo);
+  public WxPayRefundQueryV3Result refundQueryV3(String outRefundNo) throws WxPayException {
+    String url = String.format("%s/v3/refund/domestic/refunds/%s", this.getPayBaseUrl(), outRefundNo);
     String response = this.getV3(url);
     return GSON.fromJson(response, WxPayRefundQueryV3Result.class);
   }
 
   @Override
   public WxPayRefundQueryV3Result refundQueryV3(WxPayRefundQueryV3Request request) throws WxPayException {
-    String url = String.format("%s/v3/refund/domestic/refunds/%s", this.getPayBaseUrl(), request.getOutTradeNo());
+    String url = String.format("%s/v3/refund/domestic/refunds/%s", this.getPayBaseUrl(), request.getOutRefundNo());
     String response = this.getV3(url);
     return GSON.fromJson(response, WxPayRefundQueryV3Result.class);
   }
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java
index e984b334f..920d917ff 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java
@@ -769,8 +769,8 @@ public class BaseWxPayServiceImplTest {
   @Test
   public void testRefundQueryV3() throws WxPayException {
     WxPayRefundQueryV3Request request = new WxPayRefundQueryV3Request();
-//    request.setOutTradeNo("n1ZvYqjAg3D7LUBa");
-    request.setOutTradeNo("123456789011");
+//    request.setOutRefundNo("n1ZvYqjAg3D7LUBa");
+    request.setOutRefundNo("123456789011");
     WxPayRefundQueryV3Result result = this.payService.refundQueryV3(request);
     System.out.println(GSON.toJson(result));
   }