[WeChatPay] 同步文档，重命名部分请求

samples/Essensoft.Paylinks.Sample.Web/Pages/WeChatPay/Payments/AppPrepay.cshtml.cs

@@ -14,11 +14,11 @@ public class AppPrepayModel(IWeChatPayClient client, IOptions<PaylinksOptions> o
     private readonly WeChatPayClientOptions _options = options.Value.WeChatPay;
 
     [BindProperty]
-    public WeChatPayAppPrepayBodyModel Input { get; set; }
+    public WeChatPayTransactionsAppBodyModel Input { get; set; }
 
     public void OnGet()
     {
-        Input = new WeChatPayAppPrepayBodyModel
+        Input = new WeChatPayTransactionsAppBodyModel
         {
             AppId = _options.AppId,
             MchId = _options.MchId,
@@ -31,7 +31,7 @@ public void OnGet()
 
     public async Task OnPostAsync()
     {
-        var request = new WeChatPayAppPrepayRequest();
+        var request = new WeChatPayTransactionsAppRequest();
         request.SetBodyModel(Input);
         var response = await client.ExecuteAsync(request, _options);
         ViewData["response"] = response.Body;

samples/Essensoft.Paylinks.Sample.Web/Pages/WeChatPay/Payments/CodePay.cshtml.cs

@@ -13,11 +13,11 @@ public class CodePayModel(IWeChatPayClient client, IOptions<PaylinksOptions> opt
     private readonly WeChatPayClientOptions _options = options.Value.WeChatPay;
 
     [BindProperty]
-    public WeChatPayCodePayBodyModel Input { get; set; }
+    public WeChatPayTransactionsCodePayBodyModel Input { get; set; }
 
     public void OnGet()
     {
-        Input = new WeChatPayCodePayBodyModel
+        Input = new WeChatPayTransactionsCodePayBodyModel
         {
             AppId = _options.AppId,
             MchId = _options.MchId,
@@ -31,7 +31,7 @@ public void OnGet()
 
     public async Task OnPostAsync()
     {
-        var request = new WeChatPayCodePayRequest();
+        var request = new WeChatPayTransactionsCodePayRequest();
         request.SetBodyModel(Input);
         var response = await client.ExecuteAsync(request, _options);
         ViewData["response"] = response.Body;

samples/Essensoft.Paylinks.Sample.Web/Pages/WeChatPay/Payments/GetFundFlowBill.cshtml.cs → samples/Essensoft.Paylinks.Sample.Web/Pages/WeChatPay/Payments/FundFlowBill.cshtml.cs

@@ -12,16 +12,16 @@ public class GetFundFlowBillModel(IWeChatPayClient client, IOptions<PaylinksOpti
     private readonly WeChatPayClientOptions _options = options.Value.WeChatPay;
 
     [BindProperty]
-    public WeChatPayGetFundFlowBillQueryModel Input { get; set; }
+    public WeChatPayFundFlowBillQueryModel Input { get; set; }
 
     public void OnGet()
     {
-        Input = new WeChatPayGetFundFlowBillQueryModel { BillDate = DateTimeOffset.Now.AddDays(-1).ToString("yyyy-MM-dd") };
+        Input = new WeChatPayFundFlowBillQueryModel { BillDate = DateTimeOffset.Now.AddDays(-1).ToString("yyyy-MM-dd") };
     }
 
     public async Task OnPostAsync()
     {
-        var request = new WeChatPayGetFundFlowBillRequest();
+        var request = new WeChatPayFundFlowBillRequest();
         request.SetQueryModel(Input);
         var response = await client.ExecuteAsync(request, _options);
         ViewData["response"] = response.Body;

samples/Essensoft.Paylinks.Sample.Web/Pages/WeChatPay/Payments/H5Prepay.cshtml.cs

@@ -13,11 +13,11 @@ public class H5PrepayModel(IWeChatPayClient client, IOptions<PaylinksOptions> op
     private readonly WeChatPayClientOptions _options = options.Value.WeChatPay;
 
     [BindProperty]
-    public WeChatPayH5PrepayBodyModel Input { get; set; }
+    public WeChatPayTransactionsH5BodyModel Input { get; set; }
 
     public void OnGet()
     {
-        Input = new WeChatPayH5PrepayBodyModel
+        Input = new WeChatPayTransactionsH5BodyModel
         {
             AppId = _options.AppId,
             MchId = _options.MchId,
@@ -31,7 +31,7 @@ public void OnGet()
 
     public async Task OnPostAsync()
     {
-        var request = new WeChatPayH5PrepayRequest();
+        var request = new WeChatPayTransactionsH5Request();
         request.SetBodyModel(Input);
         var response = await client.ExecuteAsync(request, _options);
         ViewData["response"] = response.Body;

samples/Essensoft.Paylinks.Sample.Web/Pages/WeChatPay/Payments/JsapiPrepay.cshtml.cs

@@ -14,11 +14,11 @@ public class JsapiPrepayModel(IWeChatPayClient client, IOptions<PaylinksOptions>
     private readonly WeChatPayClientOptions _options = options.Value.WeChatPay;
 
     [BindProperty]
-    public WeChatPayJsapiPrepayBodyModel Input { get; set; }
+    public WeChatPayTransactionsJsapiBodyModel Input { get; set; }
 
     public void OnGet()
     {
-        Input = new WeChatPayJsapiPrepayBodyModel
+        Input = new WeChatPayTransactionsJsapiBodyModel
         {
             AppId = _options.AppId,
             MchId = _options.MchId,
@@ -32,7 +32,7 @@ public void OnGet()
 
     public async Task OnPostAsync()
     {
-        var request = new WeChatPayJsapiPrepayRequest();
+        var request = new WeChatPayTransactionsJsapiRequest();
         request.SetBodyModel(Input);
         var response = await client.ExecuteAsync(request, _options);
         ViewData["response"] = response.Body;

samples/Essensoft.Paylinks.Sample.Web/Pages/WeChatPay/Payments/NativePrepay.cshtml.cs

@@ -13,11 +13,11 @@ public class NativePrepayModel(IWeChatPayClient client, IOptions<PaylinksOptions
     private readonly WeChatPayClientOptions _options = options.Value.WeChatPay;
 
     [BindProperty]
-    public WeChatPayNativePrepayBodyModel Input { get; set; }
+    public WeChatPayTransactionsNativeBodyModel Input { get; set; }
 
     public void OnGet()
     {
-        Input = new WeChatPayNativePrepayBodyModel
+        Input = new WeChatPayTransactionsNativeBodyModel
         {
             AppId = _options.AppId,
             MchId = _options.MchId,
@@ -30,7 +30,7 @@ public void OnGet()
 
     public async Task OnPostAsync()
     {
-        var request = new WeChatPayNativePrepayRequest();
+        var request = new WeChatPayTransactionsNativeRequest();
         request.SetBodyModel(Input);
         var response = await client.ExecuteAsync(request, _options);
         ViewData["code_url"] = response.CodeUrl;

samples/Essensoft.Paylinks.Sample.Web/Pages/WeChatPay/Payments/Notify/RefundResult.cshtml.cs

@@ -16,8 +16,8 @@ public class RefundResultModel(ILogger<RefundResultModel> logger, IWeChatPayNoti
     private readonly WeChatPayClientOptions _options = options.Value.WeChatPay;
 
     /// <summary>
-    /// 退款结果通知
-    /// https://pay.weixin.qq.com/docs/merchant/apis/jsapi-payment/refund-result-notice.html
+    /// 退款结果回调通知
+    /// https://pay.weixin.qq.com/doc/v3/merchant/4012791865
     /// </summary>
     public async Task<IActionResult> OnPostAsync()
     {

samples/Essensoft.Paylinks.Sample.Web/Pages/WeChatPay/Payments/Notify/TransactionSuccess.cshtml.cs

@@ -15,8 +15,8 @@ public class TransactionSuccessModel(ILogger<TransactionSuccessModel> logger, IW
     private readonly WeChatPayClientOptions _options = options.Value.WeChatPay;
 
     /// <summary>
-    /// 支付成功通知
-    /// https://pay.weixin.qq.com/docs/merchant/apis/jsapi-payment/payment-notice.html
+    /// 支付成功回调通知
+    /// https://pay.weixin.qq.com/doc/v3/merchant/4012791861
     /// </summary>
     public async Task<IActionResult> OnPostAsync()
     {

samples/Essensoft.Paylinks.Sample.Web/Pages/WeChatPay/Payments/GetTradeBill.cshtml.cs → samples/Essensoft.Paylinks.Sample.Web/Pages/WeChatPay/Payments/TradeBill.cshtml.cs

@@ -12,16 +12,16 @@ public class GetTradeBillModel(IWeChatPayClient client, IOptions<PaylinksOptions
     private readonly WeChatPayClientOptions _options = options.Value.WeChatPay;
 
     [BindProperty]
-    public WeChatPayGetTradeBillQueryModel Input { get; set; }
+    public WeChatPayTradeBillQueryModel Input { get; set; }
 
     public void OnGet()
     {
-        Input = new WeChatPayGetTradeBillQueryModel { BillDate = DateTimeOffset.Now.AddDays(-1).ToString("yyyy-MM-dd") };
+        Input = new WeChatPayTradeBillQueryModel { BillDate = DateTimeOffset.Now.AddDays(-1).ToString("yyyy-MM-dd") };
     }
 
     public async Task OnPostAsync()
     {
-        var request = new WeChatPayGetTradeBillRequest();
+        var request = new WeChatPayTradeBillRequest();
         request.SetQueryModel(Input);
         var response = await client.ExecuteAsync(request, _options);
         ViewData["response"] = response.Body;

samples/Essensoft.Paylinks.Sample.Web/Services/WeChatPayBackgroundService.cs

@@ -138,7 +138,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                 certificateManager.RemoveUnavailableCertificates();
 
                 // 下载平台证书请求
-                var request = new WeChatPayGetCertificatesRequest();
+                var request = new WeChatPayCertificatesRequest();
 
                 // 无有效平台证书时，不需要验签。
                 if (!certificateManager.GetAvailableCertificates().Any())

src/Essensoft.Paylinks.WeChatPay.Certificates/Extensions/WeChatPayGetCertificatesResponseExtensions.cs → src/Essensoft.Paylinks.WeChatPay.Certificates/Extensions/WeChatPayCertificatesResponseExtensions.cs

@@ -5,12 +5,12 @@
 
 namespace Essensoft.Paylinks.WeChatPay.Certificates.Extensions;
 
-public static class WeChatPayGetCertificatesResponseExtensions
+public static class WeChatPayCertificatesResponseExtensions
 {
     /// <summary>
     /// 获取解密后的平台证书
     /// </summary>
-    public static List<WeChatPayPlatformCertificate> GetWeChatPayDecryptedPlatformCertificates(this WeChatPayGetCertificatesResponse response, string APIv3Key)
+    public static List<WeChatPayPlatformCertificate> GetWeChatPayDecryptedPlatformCertificates(this WeChatPayCertificatesResponse response, string APIv3Key)
     {
         ArgumentNullException.ThrowIfNull(response);
 

src/Essensoft.Paylinks.WeChatPay.Certificates/Request/WeChatPayGetCertificatesRequest.cs → src/Essensoft.Paylinks.WeChatPay.Certificates/Request/WeChatPayCertificatesRequest.cs

@@ -3,15 +3,17 @@
 
 namespace Essensoft.Paylinks.WeChatPay.Certificates.Request;
 
+[Obsolete("Use WeChatPayCertificatesRequest")]
+public class WeChatPayGetCertificatesRequest : WeChatPayCertificatesRequest;
+
 /// <summary>
 /// 下载平台证书
 /// </summary>
 /// <para>
-/// https://pay.weixin.qq.com/docs/merchant/apis/platform-certificate/api-v3-get-certificates/get.html
-/// 下载平台证书
-/// 更新时间：2023.09.06
+/// 下载平台证书 - 更新时间：2024.09.13
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012551764
 /// </para>
-public class WeChatPayGetCertificatesRequest : IWeChatPayRequest<WeChatPayGetCertificatesResponse>
+public class WeChatPayCertificatesRequest : IWeChatPayRequest<WeChatPayCertificatesResponse>
 {
     #region IWeChatPayRequest Members
 

src/Essensoft.Paylinks.WeChatPay.Certificates/Response/WeChatPayGetCertificatesResponse.cs → src/Essensoft.Paylinks.WeChatPay.Certificates/Response/WeChatPayCertificatesResponse.cs

@@ -4,7 +4,7 @@
 
 namespace Essensoft.Paylinks.WeChatPay.Certificates.Response;
 
-public class WeChatPayGetCertificatesResponse : WeChatPayResponse
+public class WeChatPayCertificatesResponse : WeChatPayResponse
 {
     /// <summary>
     /// 平台证书的详情

src/Essensoft.Paylinks.WeChatPay.Core/WeChatPayHeaders.cs

@@ -4,8 +4,10 @@ namespace Essensoft.Paylinks.WeChatPay.Core;
 /// WeChatPay 应答、通知的头部信息
 /// </summary>
 /// <para>
-/// 如何验证签名
-/// https://pay.weixin.qq.com/docs/merchant/development/interface-rules/signature-verification.html
+/// 如何使用微信支付公钥验签 - 更新时间：2024.11.20
+/// https://pay.weixin.qq.com/doc/v3/merchant/4013053249
+/// 如何使用平台证书验签名 - 更新时间：2024.11.29
+/// https://pay.weixin.qq.com/doc/v3/merchant/4013053420
 /// </para>
 [Serializable]
 public class WeChatPayHeaders(string requestId, string serial, string timestamp, string nonce, string signature, string signatureType)

src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayCloseByOutTradeNoBodyModel.cs

@@ -5,7 +5,7 @@ namespace Essensoft.Paylinks.WeChatPay.Payments.Model;
 public class WeChatPayCloseByOutTradeNoBodyModel
 {
     /// <summary>
-    /// 直连商户号
+    /// 商户号
     /// </summary>
     [JsonPropertyName("mchid")]
     public string MchId { get; set; }

src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayCombineJsapiPrepayBodyModel.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayCombineTransactionsAppBodyModel.cs

@@ -3,7 +3,10 @@
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Model;
 
-public class WeChatPayCombineJsapiPrepayBodyModel
+[Obsolete("Use WeChatPayCombineTransactionsAppBodyModel")]
+public class WeChatPayCombineNativePrepayBodyModel : WeChatPayCombineTransactionsAppBodyModel;
+
+public class WeChatPayCombineTransactionsAppBodyModel
 {
     /// <summary>
     /// 合单商户Appid
@@ -30,23 +33,17 @@ public class WeChatPayCombineJsapiPrepayBodyModel
     public ReqSceneInfo? SceneInfo { get; set; }
 
     /// <summary>
-    /// 子单信息
+    /// 子单信息列表
     /// </summary>
     [JsonPropertyName("sub_orders")]
     public List<ReqSubOrderCompatible> SubOrders { get; set; }
 
     /// <summary>
-    /// 支付者
+    /// 合单支付者信息
     /// </summary>
     [JsonPropertyName("combine_payer_info")]
     public ReqPayerInfo CombinePayerInfo { get; set; }
 
-    /// <summary>
-    /// 交易起始时间
-    /// </summary>
-    [JsonPropertyName("time_start")]
-    public DateTimeOffset? TimeStart { get; set; }
-
     /// <summary>
     /// 交易结束时间
     /// </summary>
@@ -58,10 +55,4 @@ public class WeChatPayCombineJsapiPrepayBodyModel
     /// </summary>
     [JsonPropertyName("notify_url")]
     public string NotifyUrl { get; set; }
-
-    /// <summary>
-    /// 指定支付方式
-    /// </summary>
-    [JsonPropertyName("limit_pay")]
-    public List<string>? LimitPay { get; set; }
 }

src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayCombineCloseByCombineOutTradeNoBodyModel.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayCombineTransactionsCloseByCombineOutTradeNoBodyModel.cs

@@ -3,7 +3,10 @@
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Model;
 
-public class WeChatPayCombineCloseByCombineOutTradeNoBodyModel
+[Obsolete("Use WeChatPayCombineTransactionsCloseByCombineOutTradeNoBodyModel")]
+public class WeChatPayCombineCloseByCombineOutTradeNoBodyModel : WeChatPayCombineTransactionsCloseByCombineOutTradeNoBodyModel;
+
+public class WeChatPayCombineTransactionsCloseByCombineOutTradeNoBodyModel
 {
     /// <summary>
     /// 合单Appid

src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayCombineH5PrepayBodyModel.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayCombineTransactionsH5BodyModel.cs

@@ -3,7 +3,10 @@
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Model;
 
-public class WeChatPayCombineH5PrepayBodyModel
+[Obsolete("Use WeChatPayCombineTransactionsH5BodyModel")]
+public class WeChatPayCombineH5PrepayBodyModel : WeChatPayCombineTransactionsH5BodyModel;
+
+public class WeChatPayCombineTransactionsH5BodyModel
 {
     /// <summary>
     /// 合单商户Appid
@@ -35,12 +38,6 @@ public class WeChatPayCombineH5PrepayBodyModel
     [JsonPropertyName("sub_orders")]
     public List<ReqSubOrderCompatible> SubOrders { get; set; }
 
-    /// <summary>
-    /// 交易起始时间
-    /// </summary>
-    [JsonPropertyName("time_start")]
-    public DateTimeOffset? TimeStart { get; set; }
-
     /// <summary>
     /// 交易结束时间
     /// </summary>
@@ -52,10 +49,4 @@ public class WeChatPayCombineH5PrepayBodyModel
     /// </summary>
     [JsonPropertyName("notify_url")]
     public string NotifyUrl { get; set; }
-
-    /// <summary>
-    /// 指定支付方式
-    /// </summary>
-    [JsonPropertyName("limit_pay")]
-    public List<string>? LimitPay { get; set; }
 }