From 43d270ac78fbe75c13ce1895969bbc86cfdecf41 Mon Sep 17 00:00:00 2001
From: wzkris <1439804473@qq.com>
Date: Fri, 30 Aug 2024 11:23:11 +0000
Subject: [PATCH] =?UTF-8?q?:new:=E3=80=90=E5=BE=AE=E4=BF=A1=E6=94=AF?=
=?UTF-8?q?=E4=BB=98=E3=80=91=E5=A2=9E=E5=8A=A0=E5=95=86=E5=AE=B6=E8=BD=AC?=
=?UTF-8?q?=E8=B4=A6=E5=88=B0=E9=9B=B6=E9=92=B1=E7=BB=93=E6=9E=9C=E5=9B=9E?=
=?UTF-8?q?=E8=B0=83=E7=9A=84=E8=A7=A3=E6=9E=90=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../bean/transfer/TransferBatchesRequest.java | 6 ++
.../bean/transfer/TransferNotifyResult.java | 92 +++++++++++++++++++
.../wxpay/service/TransferService.java | 12 +++
.../service/impl/TransferServiceImpl.java | 6 ++
4 files changed, 116 insertions(+)
create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/transfer/TransferNotifyResult.java
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/transfer/TransferBatchesRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/transfer/TransferBatchesRequest.java
index 6e6b3846d..e9f0026e3 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/transfer/TransferBatchesRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/transfer/TransferBatchesRequest.java
@@ -72,6 +72,12 @@ public class TransferBatchesRequest implements Serializable {
@SerializedName("transfer_scene_id")
private String transferSceneId;
+ /**
+ * 异步接收微信支付结果通知的回调地址，通知url必须为公网可访问的url，必须为https，不能携带参数
+ */
+ @SerializedName("notify_url")
+ private String notifyUrl;
+
@Data
@Builder(builderMethodName = "newBuilder")
@AllArgsConstructor
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/transfer/TransferNotifyResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/transfer/TransferNotifyResult.java
new file mode 100644
index 000000000..532bfa3c6
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/transfer/TransferNotifyResult.java
@@ -0,0 +1,92 @@
+package com.github.binarywang.wxpay.bean.transfer;
+
+import com.github.binarywang.wxpay.bean.notify.OriginNotifyResponse;
+import com.github.binarywang.wxpay.bean.notify.WxPayBaseNotifyV3Result;
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 商家转账到零钱接口将转账结果通知用户
+ * 文档地址：https://pay.weixin.qq.com/docs/merchant/apis/batch-transfer-to-balance/transfer-batch-callback-notice.html
+ *
+ */
+@Data
+public class TransferNotifyResult implements Serializable, WxPayBaseNotifyV3Result {
+ /**
+ * 源数据
+ */
+ private OriginNotifyResponse rawData;
+ /**
+ * 解密后的数据
+ */
+ private TransferNotifyResult.DecryptNotifyResult result;
+
+ @Data
+ @NoArgsConstructor
+ public static class DecryptNotifyResult implements Serializable {
+ /**
+ * 商户号
+ */
+ @SerializedName(value = "mchid")
+ private String mchid;
+ /**
+ * 商家批次单号
+ */
+ @SerializedName(value = "out_batch_no")
+ private String outBatchNo;
+ /**
+ * 微信批次单号
+ */
+ @SerializedName(value = "batch_id")
+ private String batchId;
+ /**
+ * 批次状态
+ */
+ @SerializedName(value = "batch_status")
+ private String batchStatus;
+ /**
+ * 批次总笔数
+ */
+ @SerializedName(value = "total_num")
+ private Integer totalNum;
+ /**
+ * 批次总金额
+ */
+ @SerializedName(value = "total_amount")
+ private Integer totalAmount;
+ /**
+ * 转账成功金额
+ */
+ @SerializedName(value = "success_amount")
+ private Integer successAmount;
+ /**
+ * 转账成功笔数
+ */
+ @SerializedName(value = "success_num")
+ private Integer successNum;
+ /**
+ * 转账失败金额
+ */
+ @SerializedName(value = "fail_amount")
+ private Integer failAmount;
+ /**
+ * 转账失败笔数
+ */
+ @SerializedName(value = "fail_num")
+ private Integer failNum;
+ /**
+ * 批次更新时间
+ */
+ @SerializedName(value = "update_time")
+ private String updateTime;
+ /**
+ * 批次关闭原因
+ */
+ @SerializedName(value = "close_reason")
+ private String closeReason;
+ }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/TransferService.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/TransferService.java
index 8f29f7dce..ebf746214 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/TransferService.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/TransferService.java
@@ -1,5 +1,6 @@
package com.github.binarywang.wxpay.service;
+import com.github.binarywang.wxpay.bean.notify.SignatureHeader;
import com.github.binarywang.wxpay.bean.transfer.*;
import com.github.binarywang.wxpay.exception.WxPayException;
@@ -28,6 +29,17 @@ public interface TransferService {
*/
TransferBatchesResult transferBatches(TransferBatchesRequest request) throws WxPayException;
+ /**
+ * 解析商家转账结果
+ * 详见
+ *
+ * @param notifyData 通知数据
+ * @param header 通知头部数据，不传则表示不校验头
+ * @return the wx transfer notify result
+ * @throws WxPayException the wx pay exception
+ */
+ TransferNotifyResult parseTransferNotifyResult(String notifyData, SignatureHeader header) throws WxPayException;
+
/**
*
*
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/TransferServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/TransferServiceImpl.java
index 749551b12..e62dc9c05 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/TransferServiceImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/TransferServiceImpl.java
@@ -1,5 +1,6 @@
package com.github.binarywang.wxpay.service.impl;
+import com.github.binarywang.wxpay.bean.notify.SignatureHeader;
import com.github.binarywang.wxpay.bean.transfer.*;
import com.github.binarywang.wxpay.exception.WxPayException;
import com.github.binarywang.wxpay.service.TransferService;
@@ -36,6 +37,11 @@ public class TransferServiceImpl implements TransferService {
return GSON.fromJson(result, TransferBatchesResult.class);
}
+ @Override
+ public TransferNotifyResult parseTransferNotifyResult(String notifyData, SignatureHeader header) throws WxPayException {
+ return this.payService.baseParseOrderNotifyV3Result(notifyData, header, TransferNotifyResult.class, TransferNotifyResult.DecryptNotifyResult.class);
+ }
+
@Override
public QueryTransferBatchesResult transferBatchesBatchId(QueryTransferBatchesRequest request) throws WxPayException {
String url;