From b682c1ed2638d04ee5b110bc4c625126b4e8d7c9 Mon Sep 17 00:00:00 2001
From: "491733638@qq.com" <491733638@qq.com>
Date: Thu, 28 Mar 2024 17:25:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E8=BD=AC?=
 =?UTF-8?q?=E8=B4=A6=E6=97=B6=EF=BC=8C=E4=B8=8D=E5=A1=AB=E5=86=99=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=A7=93=E5=90=8D=EF=BC=8C=E8=BF=94=E5=9B=9E=E8=BD=AC?=
 =?UTF-8?q?=E8=B4=A6=E5=A4=B1=E8=B4=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayTransferService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayTransferService.java
index 0e766f0..1159d0e 100644
--- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayTransferService.java
+++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayTransferService.java
@@ -119,6 +119,11 @@ public class WxpayTransferService implements ITransferService {
                 TransferBatchesRequest request = new TransferBatchesRequest();
                 request.setAppid(wxServiceWrapper.getWxPayService().getConfig().getAppId());
                 request.setOutBatchNo(transferOrder.getTransferId());
+                if(StringUtils.isNotBlank(transferOrder.getAccountName())){
+                    request.setBatchName(transferOrder.getAccountName());
+                }else{
+                    request.setBatchName(transferOrder.getTransferDesc());
+                }
                 request.setBatchName(transferOrder.getAccountName());
                 request.setBatchRemark(transferOrder.getTransferDesc());
                 request.setTotalAmount(transferOrder.getAmount().intValue());

From e74a7ffbcb57be9f97e6bc065461c4b090ed11f7 Mon Sep 17 00:00:00 2001
From: "491733638@qq.com" <491733638@qq.com>
Date: Thu, 28 Mar 2024 17:25:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E8=BD=AC?=
 =?UTF-8?q?=E8=B4=A6=E6=97=B6=EF=BC=8C=E4=B8=8D=E5=A1=AB=E5=86=99=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=A7=93=E5=90=8D=EF=BC=8C=E8=BF=94=E5=9B=9E=E8=BD=AC?=
 =?UTF-8?q?=E8=B4=A6=E5=A4=B1=E8=B4=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeequan/jeepay/pay/channel/wxpay/WxpayTransferService.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayTransferService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayTransferService.java
index 1159d0e..ea9911f 100644
--- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayTransferService.java
+++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayTransferService.java
@@ -124,7 +124,6 @@ public class WxpayTransferService implements ITransferService {
                 }else{
                     request.setBatchName(transferOrder.getTransferDesc());
                 }
-                request.setBatchName(transferOrder.getAccountName());
                 request.setBatchRemark(transferOrder.getTransferDesc());
                 request.setTotalAmount(transferOrder.getAmount().intValue());
                 request.setTotalNum(1);