Skip to content

Commit 23bea47

Browse files
fudiweifudiwei
committed
feat(tenpayv3): 新增商家转账用户免确认收款相关接口
1 parent f3f3800 commit 23bea47

18 files changed

Lines changed: 891 additions & 2 deletions

‎docs/WechatTenpayV3/Basic_ModelDefinition.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,12 @@
200200

201201
- 微信单号查询转账单：`GetFundAppMerchantTransferBillByTransferBillNumber`
202202

203+
- 发起转账并完成免确认收款授权：`CreateFundAppMerchantTransferBillPreTransferWithAuthorization`
204+
205+
- 转账（用户免确认收款）：`CreateFundAppMerchantTransferBillTransfer`
206+
207+
- 商户单号查询免确认收款授权：`GetFundAppMerchantTransferUserConfirmAuthorizationByOutAuthorizationNumber`
208+
203209
- 获取电子回单
204210

205211
- 商户单号申请电子回单：`CreateFundAppMerchantTransferElecsignByOutBillNumber`

‎src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/MerchantTransfer/MerchantTransferAuthorizationConfirmedResource.cs‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
using System;
2+
3+
namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Events
4+
{
5+
/// <summary>
6+
/// <para>表示 MCHTRANSFER.AUTHORIZATION.CONFIRMED 通知的数据。</para>
7+
/// <para>
8+
/// REF: <br/>
9+
/// <![CDATA[ https://pay.weixin.qq.com/doc/v3/merchant/4014512908 ]]> <br/>
10+
/// </para>
11+
/// </summary>
12+
public class MerchantTransferAuthorizationConfirmedResource : WechatTenpayEvent.Types.IDecryptedResource
13+
{
14+
/// <summary>
15+
/// 获取或设置微信商户号。
16+
/// </summary>
17+
[Newtonsoft.Json.JsonProperty("mchid")]
18+
[System.Text.Json.Serialization.JsonPropertyName("mchid")]
19+
public string MerchantId { get; set; } = default!;
20+
21+
/// <summary>
22+
/// 获取或设置微信 AppId。
23+
/// </summary>
24+
[Newtonsoft.Json.JsonProperty("appid")]
25+
[System.Text.Json.Serialization.JsonPropertyName("appid")]
26+
public string AppId { get; set; } = default!;
27+
28+
/// <summary>
29+
/// 获取或设置商户侧授权单号。
30+
/// </summary>
31+
[Newtonsoft.Json.JsonProperty("out_authorization_no")]
32+
[System.Text.Json.Serialization.JsonPropertyName("out_authorization_no")]
33+
public string OutAuthorizationNumber { get; set; } = default!;
34+
35+
/// <summary>
36+
/// 获取或设置微信免确认收款授权单号。
37+
/// </summary>
38+
[Newtonsoft.Json.JsonProperty("authorization_id")]
39+
[System.Text.Json.Serialization.JsonPropertyName("authorization_id")]
40+
public string AuthorizationId { get; set; } = default!;
41+
42+
/// <summary>
43+
/// 获取或设置授权状态。
44+
/// </summary>
45+
[Newtonsoft.Json.JsonProperty("state")]
46+
[System.Text.Json.Serialization.JsonPropertyName("state")]
47+
public string State { get; set; } = default!;
48+
49+
/// <summary>
50+
/// 获取或设置收款用户 OpenId。
51+
/// </summary>
52+
[Newtonsoft.Json.JsonProperty("openid")]
53+
[System.Text.Json.Serialization.JsonPropertyName("openid")]
54+
public string OpenId { get; set; } = default!;
55+
56+
/// <summary>
57+
/// 获取或设置用户展示昵称。
58+
/// </summary>
59+
[Newtonsoft.Json.JsonProperty("user_display_name")]
60+
[System.Text.Json.Serialization.JsonPropertyName("user_display_name")]
61+
public string UserDisplayName { get; set; } = default!;
62+
63+
/// <summary>
64+
/// 获取或设置用户确认授权的时间。
65+
/// </summary>
66+
[Newtonsoft.Json.JsonProperty("authorize_time")]
67+
[Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.Rfc3339DateTimeOffsetConverter))]
68+
[System.Text.Json.Serialization.JsonPropertyName("authorize_time")]
69+
[System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.Rfc3339DateTimeOffsetConverter))]
70+
public DateTimeOffset AuthorizeTime { get; set; }
71+
}
72+
}

‎src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/MerchantTransfer/MerchantTransferBillFinishedResource.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class MerchantTransferBillFinishedResource : WechatTenpayEvent.Types.IDec
1919
public string MerchantId { get; set; } = default!;
2020

2121
/// <summary>
22-
/// 获取或设置商户转账单号
22+
/// 获取或设置商户转账单号。
2323
/// </summary>
2424
[Newtonsoft.Json.JsonProperty("out_bill_no")]
2525
[System.Text.Json.Serialization.JsonPropertyName("out_bill_no")]

‎src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteFundAppExtensions.cs‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,72 @@ public static class WechatTenpayClientExecuteFundAppExtensions
188188

189189
return await client.SendFlurlRequestAsJsonAsync<Models.GetFundAppMerchantTransferBillByTransferBillNumberResponse>(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
190190
}
191+
192+
/// <summary>
193+
/// <para>异步调用 [POST] /fund-app/mch-transfer/transfer-bills/pre-transfer-with-authorization 接口。</para>
194+
/// <para>
195+
/// REF: <br/>
196+
/// <![CDATA[ https://pay.weixin.qq.com/doc/v3/merchant/4014399293 ]]>
197+
/// </para>
198+
/// </summary>
199+
/// <param name="client"></param>
200+
/// <param name="request"></param>
201+
/// <param name="cancellationToken"></param>
202+
/// <returns></returns>
203+
public static async Task<Models.CreateFundAppMerchantTransferBillPreTransferWithAuthorizationResponse> ExecuteCreateFundAppMerchantTransferBillPreTransferWithAuthorizationAsync(this WechatTenpayClient client, Models.CreateFundAppMerchantTransferBillPreTransferWithAuthorizationRequest request, CancellationToken cancellationToken = default)
204+
{
205+
if (client is null) throw new ArgumentNullException(nameof(client));
206+
if (request is null) throw new ArgumentNullException(nameof(request));
207+
208+
IFlurlRequest flurlReq = client
209+
.CreateFlurlRequest(request, HttpMethod.Post, "fund-app", "mch-transfer", "transfer-bills", "pre-transfer-with-authorization");
210+
211+
return await client.SendFlurlRequestAsJsonAsync<Models.CreateFundAppMerchantTransferBillPreTransferWithAuthorizationResponse>(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
212+
}
213+
214+
/// <summary>
215+
/// <para>异步调用 [POST] /fund-app/mch-transfer/transfer-bills/transfer 接口。</para>
216+
/// <para>
217+
/// REF: <br/>
218+
/// <![CDATA[ https://pay.weixin.qq.com/doc/v3/merchant/4014399371 ]]>
219+
/// </para>
220+
/// </summary>
221+
/// <param name="client"></param>
222+
/// <param name="request"></param>
223+
/// <param name="cancellationToken"></param>
224+
/// <returns></returns>
225+
public static async Task<Models.CreateFundAppMerchantTransferBillTransferResponse> ExecuteCreateFundAppMerchantTransferBillTransferAsync(this WechatTenpayClient client, Models.CreateFundAppMerchantTransferBillTransferRequest request, CancellationToken cancellationToken = default)
226+
{
227+
if (client is null) throw new ArgumentNullException(nameof(client));
228+
if (request is null) throw new ArgumentNullException(nameof(request));
229+
230+
IFlurlRequest flurlReq = client
231+
.CreateFlurlRequest(request, HttpMethod.Post, "fund-app", "mch-transfer", "transfer-bills", "transfer");
232+
233+
return await client.SendFlurlRequestAsJsonAsync<Models.CreateFundAppMerchantTransferBillTransferResponse>(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
234+
}
235+
236+
/// <summary>
237+
/// <para>异步调用 [GET] /fund-app/mch-transfer/user-confirm-authorization/out-authorization-no/{out_authorization_no} 接口。</para>
238+
/// <para>
239+
/// REF: <br/>
240+
/// <![CDATA[ https://pay.weixin.qq.com/doc/v3/merchant/4014399423 ]]>
241+
/// </para>
242+
/// </summary>
243+
/// <param name="client"></param>
244+
/// <param name="request"></param>
245+
/// <param name="cancellationToken"></param>
246+
/// <returns></returns>
247+
public static async Task<Models.GetFundAppMerchantTransferUserConfirmAuthorizationByOutAuthorizationNumberResponse> ExecuteGetFundAppMerchantTransferUserConfirmAuthorizationByOutAuthorizationNumberAsync(this WechatTenpayClient client, Models.GetFundAppMerchantTransferUserConfirmAuthorizationByOutAuthorizationNumberRequest request, CancellationToken cancellationToken = default)
248+
{
249+
if (client is null) throw new ArgumentNullException(nameof(client));
250+
if (request is null) throw new ArgumentNullException(nameof(request));
251+
252+
IFlurlRequest flurlReq = client
253+
.CreateFlurlRequest(request, HttpMethod.Get, "fund-app", "mch-transfer", "user-confirm-authorization", "out-authorization-no", request.OutAuthorizationNumber);
254+
255+
return await client.SendFlurlRequestAsJsonAsync<Models.GetFundAppMerchantTransferUserConfirmAuthorizationByOutAuthorizationNumberResponse>(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
256+
}
191257
#endregion
192258

193259
#region MerchantTransfer/TransferToQQWalletBills

‎src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferBills/CreateFundAppMerchantTransferBillPreTransferWithAuthorizationRequest.cs‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
using System.Collections.Generic;
2+
3+
namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
4+
{
5+
/// <summary>
6+
/// <para>表示 [POST] /fund-app/mch-transfer/transfer-bills/pre-transfer-with-authorization 接口的请求。</para>
7+
/// </summary>
8+
[WechatTenpaySensitive]
9+
public class CreateFundAppMerchantTransferBillPreTransferWithAuthorizationRequest : WechatTenpayRequest
10+
{
11+
public static class Types
12+
{
13+
public class TransferSceneReportInfo : CreateFundAppMerchantTransferBillRequest.Types.TransferSceneReportInfo
14+
{
15+
}
16+
17+
public class AuthorizationInfo
18+
{
19+
/// <summary>
20+
/// 获取或设置用户展示名称。
21+
/// </summary>
22+
[Newtonsoft.Json.JsonProperty("user_display_name")]
23+
[System.Text.Json.Serialization.JsonPropertyName("user_display_name")]
24+
public string UserDisplayName { get; set; } = string.Empty;
25+
26+
/// <summary>
27+
/// 获取或设置商户侧授权单号。
28+
/// </summary>
29+
[Newtonsoft.Json.JsonProperty("out_authorization_no")]
30+
[System.Text.Json.Serialization.JsonPropertyName("out_authorization_no")]
31+
public string OutAuthorizationNumber { get; set; } = string.Empty;
32+
33+
/// <summary>
34+
/// 获取或设置免确认收款授权结果通知地址。
35+
/// </summary>
36+
[Newtonsoft.Json.JsonProperty("authorization_notify_url")]
37+
[System.Text.Json.Serialization.JsonPropertyName("authorization_notify_url")]
38+
public string NotifyUrl { get; set; } = string.Empty;
39+
}
40+
}
41+
42+
/// <summary>
43+
/// 获取或设置微信 AppId。
44+
/// </summary>
45+
[Newtonsoft.Json.JsonProperty("appid")]
46+
[System.Text.Json.Serialization.JsonPropertyName("appid")]
47+
public string AppId { get; set; } = string.Empty;
48+
49+
/// <summary>
50+
/// 获取或设置商户单号。
51+
/// </summary>
52+
[Newtonsoft.Json.JsonProperty("out_bill_no")]
53+
[System.Text.Json.Serialization.JsonPropertyName("out_bill_no")]
54+
public string OutBillNumber { get; set; } = string.Empty;
55+
56+
/// <summary>
57+
/// 获取或设置转账金额（单位：分）。
58+
/// </summary>
59+
[Newtonsoft.Json.JsonProperty("transfer_amount")]
60+
[System.Text.Json.Serialization.JsonPropertyName("transfer_amount")]
61+
public int TransferAmount { get; set; }
62+
63+
/// <summary>
64+
/// 获取或设置转账备注。
65+
/// </summary>
66+
[Newtonsoft.Json.JsonProperty("transfer_remark")]
67+
[System.Text.Json.Serialization.JsonPropertyName("transfer_remark")]
68+
public string TransferRemark { get; set; } = string.Empty;
69+
70+
/// <summary>
71+
/// 获取或设置收款用户 OpenId。
72+
/// </summary>
73+
[Newtonsoft.Json.JsonProperty("openid")]
74+
[System.Text.Json.Serialization.JsonPropertyName("openid")]
75+
public string? OpenId { get; set; }
76+
77+
/// <summary>
78+
/// 获取或设置收款用户姓名（需使用平台公钥/证书加密）。
79+
/// </summary>
80+
[Newtonsoft.Json.JsonProperty("user_name")]
81+
[System.Text.Json.Serialization.JsonPropertyName("user_name")]
82+
[WechatTenpaySensitiveProperty(scheme: Constants.SignSchemes.WECHATPAY2_RSA_2048_WITH_SHA256, algorithm: Constants.EncryptionAlgorithms.RSA_2048_ECB_PKCS8_OAEP_WITH_SHA1_AND_MGF1)]
83+
[WechatTenpaySensitiveProperty(scheme: Constants.SignSchemes.WECHATPAY2_SM2_WITH_SM3, algorithm: Constants.EncryptionAlgorithms.SM2_C1C3C2_ASN1)]
84+
public string? UserName { get; set; }
85+
86+
/// <summary>
87+
/// 获取或设置转账场景 ID。
88+
/// </summary>
89+
[Newtonsoft.Json.JsonProperty("transfer_scene_id")]
90+
[System.Text.Json.Serialization.JsonPropertyName("transfer_scene_id")]
91+
public string? TransferSceneId { get; set; }
92+
93+
/// <summary>
94+
/// 获取或设置通知地址。
95+
/// </summary>
96+
[Newtonsoft.Json.JsonProperty("notify_url")]
97+
[System.Text.Json.Serialization.JsonPropertyName("notify_url")]
98+
public string? NotifyUrl { get; set; }
99+
100+
/// <summary>
101+
/// 获取或设置用户收款感知。
102+
/// </summary>
103+
[Newtonsoft.Json.JsonProperty("user_recv_perception")]
104+
[System.Text.Json.Serialization.JsonPropertyName("user_recv_perception")]
105+
public string? UserReceivePerception { get; set; }
106+
107+
/// <summary>
108+
/// 获取或设置转账场景报备信息列表。
109+
/// </summary>
110+
[Newtonsoft.Json.JsonProperty("transfer_scene_report_infos")]
111+
[System.Text.Json.Serialization.JsonPropertyName("transfer_scene_report_infos")]
112+
public IList<Types.TransferSceneReportInfo>? TransferSceneReportInfoList { get; set; }
113+
114+
/// <summary>
115+
/// 获取或设置免确认收款授权信息。
116+
/// </summary>
117+
[Newtonsoft.Json.JsonProperty("authorization_info")]
118+
[System.Text.Json.Serialization.JsonPropertyName("authorization_info")]
119+
public Types.AuthorizationInfo? AuthorizationInfo { get; set; }
120+
121+
/// <summary>
122+
/// 获取或设置出资商户号。
123+
/// </summary>
124+
[Newtonsoft.Json.JsonProperty("sponsor_mchid")]
125+
[System.Text.Json.Serialization.JsonPropertyName("sponsor_mchid")]
126+
public string? SponsorMerchantId { get; set; }
127+
}
128+
}

‎src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferBills/CreateFundAppMerchantTransferBillPreTransferWithAuthorizationResponse.cs‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
using System;
2+
3+
namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
4+
{
5+
/// <summary>
6+
/// <para>表示 [POST] /fund-app/mch-transfer/transfer-bills/pre-transfer-with-authorization 接口的响应。</para>
7+
/// </summary>
8+
public class CreateFundAppMerchantTransferBillPreTransferWithAuthorizationResponse : WechatTenpayResponse
9+
{
10+
/// <summary>
11+
/// 获取或设置商户单号。
12+
/// </summary>
13+
[Newtonsoft.Json.JsonProperty("out_bill_no")]
14+
[System.Text.Json.Serialization.JsonPropertyName("out_bill_no")]
15+
public string OutBillNumber { get; set; } = default!;
16+
17+
/// <summary>
18+
/// 获取或设置微信转账单号。
19+
/// </summary>
20+
[Newtonsoft.Json.JsonProperty("transfer_bill_no")]
21+
[System.Text.Json.Serialization.JsonPropertyName("transfer_bill_no")]
22+
public string TransferBillNumber { get; set; } = default!;
23+
24+
/// <summary>
25+
/// 获取或设置单据状态。
26+
/// </summary>
27+
[Newtonsoft.Json.JsonProperty("state")]
28+
[System.Text.Json.Serialization.JsonPropertyName("state")]
29+
public string State { get; set; } = default!;
30+
31+
/// <summary>
32+
/// 获取或设置单据创建时间。
33+
/// </summary>
34+
[Newtonsoft.Json.JsonProperty("create_time")]
35+
[Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.Rfc3339DateTimeOffsetConverter))]
36+
[System.Text.Json.Serialization.JsonPropertyName("create_time")]
37+
[System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.Rfc3339DateTimeOffsetConverter))]
38+
public DateTimeOffset CreateTime { get; set; }
39+
40+
/// <summary>
41+
/// 获取或设置跳转领取页面的携带信息。
42+
/// </summary>
43+
[Newtonsoft.Json.JsonProperty("package_info")]
44+
[System.Text.Json.Serialization.JsonPropertyName("package_info")]
45+
public string? PackageInfo { get; set; }
46+
47+
/// <summary>
48+
/// 获取或设置用户展示昵称。
49+
/// </summary>
50+
[Newtonsoft.Json.JsonProperty("user_display_name")]
51+
[System.Text.Json.Serialization.JsonPropertyName("user_display_name")]
52+
public string? UserDisplayName { get; set; }
53+
54+
/// <summary>
55+
/// 获取或设置商户侧授权单号。
56+
/// </summary>
57+
[Newtonsoft.Json.JsonProperty("out_authorization_no")]
58+
[System.Text.Json.Serialization.JsonPropertyName("out_authorization_no")]
59+
public string? OutAuthorizationNumber { get; set; }
60+
}
61+
}

0 commit comments

Comments
 (0)