Browse Source

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

Roc 9 months ago
parent
commit
7482f3be0c
79 changed files with 883 additions and 715 deletions
  1. 3 3
      samples/Essensoft.Paylinks.Sample.Web/Pages/WeChatPay/Payments/AppPrepay.cshtml.cs
  2. 3 3
      samples/Essensoft.Paylinks.Sample.Web/Pages/WeChatPay/Payments/CodePay.cshtml.cs
  3. 0 0
      samples/Essensoft.Paylinks.Sample.Web/Pages/WeChatPay/Payments/FundFlowBill.cshtml
  4. 3 3
      samples/Essensoft.Paylinks.Sample.Web/Pages/WeChatPay/Payments/FundFlowBill.cshtml.cs
  5. 3 3
      samples/Essensoft.Paylinks.Sample.Web/Pages/WeChatPay/Payments/H5Prepay.cshtml.cs
  6. 500 156
      samples/Essensoft.Paylinks.Sample.Web/Pages/WeChatPay/Payments/Index.cshtml
  7. 3 3
      samples/Essensoft.Paylinks.Sample.Web/Pages/WeChatPay/Payments/JsapiPrepay.cshtml.cs
  8. 3 3
      samples/Essensoft.Paylinks.Sample.Web/Pages/WeChatPay/Payments/NativePrepay.cshtml.cs
  9. 2 2
      samples/Essensoft.Paylinks.Sample.Web/Pages/WeChatPay/Payments/Notify/RefundResult.cshtml.cs
  10. 2 2
      samples/Essensoft.Paylinks.Sample.Web/Pages/WeChatPay/Payments/Notify/TransactionSuccess.cshtml.cs
  11. 0 0
      samples/Essensoft.Paylinks.Sample.Web/Pages/WeChatPay/Payments/TradeBill.cshtml
  12. 3 3
      samples/Essensoft.Paylinks.Sample.Web/Pages/WeChatPay/Payments/TradeBill.cshtml.cs
  13. 1 1
      samples/Essensoft.Paylinks.Sample.Web/Services/WeChatPayBackgroundService.cs
  14. 2 2
      src/Essensoft.Paylinks.WeChatPay.Certificates/Extensions/WeChatPayCertificatesResponseExtensions.cs
  15. 6 4
      src/Essensoft.Paylinks.WeChatPay.Certificates/Request/WeChatPayCertificatesRequest.cs
  16. 1 1
      src/Essensoft.Paylinks.WeChatPay.Certificates/Response/WeChatPayCertificatesResponse.cs
  17. 4 2
      src/Essensoft.Paylinks.WeChatPay.Core/WeChatPayHeaders.cs
  18. 0 45
      src/Essensoft.Paylinks.WeChatPay.Payments/Domain/ReqContractInfo.cs
  19. 1 1
      src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayCloseByOutTradeNoBodyModel.cs
  20. 6 15
      src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayCombineTransactionsAppBodyModel.cs
  21. 4 1
      src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayCombineTransactionsCloseByCombineOutTradeNoBodyModel.cs
  22. 4 13
      src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayCombineTransactionsH5BodyModel.cs
  23. 6 21
      src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayCombineTransactionsJsapiBodyModel.cs
  24. 4 13
      src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayCombineTransactionsNativeBodyModel.cs
  25. 4 1
      src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayFundFlowBillQueryModel.cs
  26. 1 1
      src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayQueryByOutTradeNoQueryModel.cs
  27. 1 1
      src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayQueryByTransactionIdQueryModel.cs
  28. 1 1
      src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayReverseBodyModel.cs
  29. 4 1
      src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayTradeBillQueryModel.cs
  30. 5 2
      src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayTransactionsAppBodyModel.cs
  31. 5 2
      src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayTransactionsCodePayBodyModel.cs
  32. 6 3
      src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayTransactionsH5BodyModel.cs
  33. 5 2
      src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayTransactionsJsapiBodyModel.cs
  34. 5 2
      src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayTransactionsNativeBodyModel.cs
  35. 3 4
      src/Essensoft.Paylinks.WeChatPay.Payments/Notify/WeChatPayCombineTransactionSuccessNotify.cs
  36. 5 5
      src/Essensoft.Paylinks.WeChatPay.Payments/Notify/WeChatPayRefundResultNotify.cs
  37. 3 4
      src/Essensoft.Paylinks.WeChatPay.Payments/Notify/WeChatPayTransactionSuccessNotify.cs
  38. 12 15
      src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayAppTransferPaymentRequest.cs
  39. 2 3
      src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayApplyAbnormalRefundByRefundIdRequest.cs
  40. 10 19
      src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayCloseByOutTradeNoRequest.cs
  41. 7 5
      src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayCombineTransactionsAppRequest.cs
  42. 8 6
      src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayCombineTransactionsCloseByCombineOutTradeNoRequest.cs
  43. 7 5
      src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayCombineTransactionsH5Request.cs
  44. 9 9
      src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayCombineTransactionsJsapiPrepayRequest.cs
  45. 7 5
      src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayCombineTransactionsNativeRequest.cs
  46. 6 4
      src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayCombineTransactionsQueryByCombineOutTradeNoRequest.cs
  47. 7 26
      src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayDownloadBillRequest.cs
  48. 49 0
      src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayFundFlowBillRequest.cs
  49. 0 65
      src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayGetFundflowBillRequest.cs
  50. 0 65
      src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayGetTradeBillRequest.cs
  51. 4 11
      src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayJsapiTransferPaymentRequest.cs
  52. 5 18
      src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayQueryByOutTradeNoRequest.cs
  53. 5 18
      src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayQueryByTransactionIdRequest.cs
  54. 7 23
      src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayRefundQueryByOutRefundNoRequest.cs
  55. 7 27
      src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayRefundRequest.cs
  56. 2 3
      src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayReverseRequest.cs
  57. 49 0
      src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayTradeBillRequest.cs
  58. 6 4
      src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayTransactionsAppRequest.cs
  59. 6 4
      src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayTransactionsCodePayRequest.cs
  60. 6 4
      src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayTransactionsH5Request.cs
  61. 8 8
      src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayTransactionsJsapiRequest.cs
  62. 6 4
      src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayTransactionsNativeRequest.cs
  63. 15 14
      src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayAppTransferPaymentResponse.cs
  64. 1 1
      src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayCombineTransactionsAppResponse.cs
  65. 1 1
      src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayCombineTransactionsCloseByCombineOutTradeNoResponse.cs
  66. 1 1
      src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayCombineTransactionsH5Response.cs
  67. 1 1
      src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayCombineTransactionsJsapiResponse.cs
  68. 1 1
      src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayCombineTransactionsNativeResponse.cs
  69. 4 4
      src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayCombineTransactionsQueryByCombineOutTradeNoResponse.cs
  70. 1 1
      src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayFundFlowBillResponse.cs
  71. 1 1
      src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayQueryByOutTradeNoResponse.cs
  72. 1 1
      src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayQueryByTransactionIdResponse.cs
  73. 1 1
      src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayReverseResponse.cs
  74. 1 1
      src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayTradeBillResponse.cs
  75. 1 1
      src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayTransactionsAppResponse.cs
  76. 3 3
      src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayTransactionsCodePayResponse.cs
  77. 1 1
      src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayTransactionsH5Response.cs
  78. 1 1
      src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayTransactionsJsapiResponse.cs
  79. 1 1
      src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayTransactionsNativeResponse.cs

+ 3 - 3
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 class AppPrepayModel(IWeChatPayClient client, IOptions<PaylinksOptions> o
 
     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;

+ 3 - 3
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 class CodePayModel(IWeChatPayClient client, IOptions<PaylinksOptions> opt
 
     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;

+ 0 - 0
samples/Essensoft.Paylinks.Sample.Web/Pages/WeChatPay/Payments/GetFundFlowBill.cshtml → samples/Essensoft.Paylinks.Sample.Web/Pages/WeChatPay/Payments/FundFlowBill.cshtml


+ 3 - 3
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;

+ 3 - 3
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 class H5PrepayModel(IWeChatPayClient client, IOptions<PaylinksOptions> op
 
     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;

File diff suppressed because it is too large
+ 500 - 156
samples/Essensoft.Paylinks.Sample.Web/Pages/WeChatPay/Payments/Index.cshtml


+ 3 - 3
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 class JsapiPrepayModel(IWeChatPayClient client, IOptions<PaylinksOptions>
 
     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;

+ 3 - 3
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 class NativePrepayModel(IWeChatPayClient client, IOptions<PaylinksOptions
 
     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;

+ 2 - 2
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()
     {

+ 2 - 2
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()
     {

+ 0 - 0
samples/Essensoft.Paylinks.Sample.Web/Pages/WeChatPay/Payments/GetTradeBill.cshtml → samples/Essensoft.Paylinks.Sample.Web/Pages/WeChatPay/Payments/TradeBill.cshtml


+ 3 - 3
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;

+ 1 - 1
samples/Essensoft.Paylinks.Sample.Web/Services/WeChatPayBackgroundService.cs

@@ -138,7 +138,7 @@ public class WeChatPayBackgroundService(
                 certificateManager.RemoveUnavailableCertificates();
 
                 // 下载平台证书请求
-                var request = new WeChatPayGetCertificatesRequest();
+                var request = new WeChatPayCertificatesRequest();
 
                 // 无有效平台证书时,不需要验签。
                 if (!certificateManager.GetAvailableCertificates().Any())

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

@@ -5,12 +5,12 @@ using Essensoft.Paylinks.WeChatPay.Core;
 
 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);
 

+ 6 - 4
src/Essensoft.Paylinks.WeChatPay.Certificates/Request/WeChatPayGetCertificatesRequest.cs → src/Essensoft.Paylinks.WeChatPay.Certificates/Request/WeChatPayCertificatesRequest.cs

@@ -3,15 +3,17 @@ using Essensoft.Paylinks.WeChatPay.Core;
 
 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
 

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

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

+ 4 - 2
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)

+ 0 - 45
src/Essensoft.Paylinks.WeChatPay.Payments/Domain/ReqContractInfo.cs

@@ -1,45 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace Essensoft.Paylinks.WeChatPay.Payments.Domain;
-
-/// <summary>
-/// 预签约信息
-/// </summary>
-public class ReqContractInfo
-{
-    /// <summary>
-    /// 签约商户号
-    /// </summary>
-    [JsonPropertyName("mchid")]
-    public string MchId { get; set; }
-
-    /// <summary>
-    /// 签约商户AppID
-    /// </summary>
-    [JsonPropertyName("appid")]
-    public string AppId { get; set; }
-
-    /// <summary>
-    /// 签约商户协议号
-    /// </summary>
-    [JsonPropertyName("out_contract_code")]
-    public string OutContractCode { get; set; }
-
-    /// <summary>
-    /// 委托代扣协议模板ID
-    /// </summary>
-    [JsonPropertyName("plan_id")]
-    public string PlanId { get; set; }
-
-    /// <summary>
-    /// 用户账户展示名称
-    /// </summary>
-    [JsonPropertyName("contract_display_account")]
-    public string ContractDisplayAccount { get; set; }
-
-    /// <summary>
-    /// 回调通知地址
-    /// </summary>
-    [JsonPropertyName("notify_url")]
-    public string NotifyUrl { get; set; }
-}

+ 1 - 1
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; }

+ 6 - 15
src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayCombineJsapiPrepayBodyModel.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayCombineTransactionsAppBodyModel.cs

@@ -3,7 +3,10 @@ using Essensoft.Paylinks.WeChatPay.Payments.Domain;
 
 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; }
 }

+ 4 - 1
src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayCombineCloseByCombineOutTradeNoBodyModel.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayCombineTransactionsCloseByCombineOutTradeNoBodyModel.cs

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

+ 4 - 13
src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayCombineH5PrepayBodyModel.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayCombineTransactionsH5BodyModel.cs

@@ -3,7 +3,10 @@ using Essensoft.Paylinks.WeChatPay.Payments.Domain;
 
 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; }
 }

+ 6 - 21
src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayCombineAppPrepayBodyModel.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayCombineTransactionsJsapiBodyModel.cs

@@ -3,10 +3,13 @@ using Essensoft.Paylinks.WeChatPay.Payments.Domain;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Model;
 
-public class WeChatPayCombineAppPrepayBodyModel
+[Obsolete("Use WeChatPayCombineTransactionsJsapiBodyModel")]
+public class WeChatPayCombineJsapiPrepayBodyModel : WeChatPayCombineTransactionsJsapiBodyModel;
+
+public class WeChatPayCombineTransactionsJsapiBodyModel
 {
     /// <summary>
-    /// 合单商户Appid
+    /// 合单商户公众账号ID
     /// </summary>
     [JsonPropertyName("combine_appid")]
     public string CombineAppId { get; set; }
@@ -36,17 +39,11 @@ public class WeChatPayCombineAppPrepayBodyModel
     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,16 +55,4 @@ public class WeChatPayCombineAppPrepayBodyModel
     /// </summary>
     [JsonPropertyName("notify_url")]
     public string NotifyUrl { get; set; }
-
-    /// <summary>
-    /// 指定支付方式
-    /// </summary>
-    [JsonPropertyName("limit_pay")]
-    public List<string>? LimitPay { get; set; }
-
-    /// <summary>
-    /// 预签约信息
-    /// </summary>
-    [JsonPropertyName("contract_info")]
-    public ReqContractInfo? ContractInfo { get; set; }
 }

+ 4 - 13
src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayCombineNativePrepayBodyModel.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayCombineTransactionsNativeBodyModel.cs

@@ -3,7 +3,10 @@ using Essensoft.Paylinks.WeChatPay.Payments.Domain;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Model;
 
-public class WeChatPayCombineNativePrepayBodyModel
+[Obsolete("Use WeChatPayCombineTransactionsNativeBodyModel")]
+public class WeChatPayCombineAppPrepayBodyModel : WeChatPayCombineTransactionsNativeBodyModel;
+
+public class WeChatPayCombineTransactionsNativeBodyModel
 {
     /// <summary>
     /// 合单商户Appid
@@ -35,12 +38,6 @@ public class WeChatPayCombineNativePrepayBodyModel
     [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 WeChatPayCombineNativePrepayBodyModel
     /// </summary>
     [JsonPropertyName("notify_url")]
     public string NotifyUrl { get; set; }
-
-    /// <summary>
-    /// 指定支付方式
-    /// </summary>
-    [JsonPropertyName("limit_pay")]
-    public List<string>? LimitPay { get; set; }
 }

+ 4 - 1
src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayGetFundFlowBillQueryModel.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayFundFlowBillQueryModel.cs

@@ -2,7 +2,10 @@ using System.Text.Json.Serialization;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Model;
 
-public class WeChatPayGetFundFlowBillQueryModel
+[Obsolete("Use WeChatPayFundFlowBillQueryModel")]
+public class WeChatPayGetFundFlowBillQueryModel : WeChatPayFundFlowBillQueryModel;
+
+public class WeChatPayFundFlowBillQueryModel
 {
     /// <summary>
     /// 账单日期

+ 1 - 1
src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayQueryByOutTradeNoQueryModel.cs

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

+ 1 - 1
src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayQueryByTransactionIdQueryModel.cs

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

+ 1 - 1
src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayReverseBodyModel.cs

@@ -11,7 +11,7 @@ public class WeChatPayReverseBodyModel
     public string AppId { get; set; }
 
     /// <summary>
-    /// 直连商户号。
+    /// 商户号。
     /// </summary>
     [JsonPropertyName("mchid")]
     public string MchId { get; set; }

+ 4 - 1
src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayGetTradeBillQueryModel.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayTradeBillQueryModel.cs

@@ -2,7 +2,10 @@ using System.Text.Json.Serialization;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Model;
 
-public class WeChatPayGetTradeBillQueryModel
+[Obsolete("Use WeChatPayTradeBillQueryModel")]
+public class WeChatPayGetTradeBillQueryModel : WeChatPayTradeBillQueryModel;
+
+public class WeChatPayTradeBillQueryModel
 {
     /// <summary>
     /// 账单日期

+ 5 - 2
src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayAppPrepayBodyModel.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayTransactionsAppBodyModel.cs

@@ -3,7 +3,10 @@ using Essensoft.Paylinks.WeChatPay.Payments.Domain;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Model;
 
-public class WeChatPayAppPrepayBodyModel
+[Obsolete("Use WeChatPayTransactionsAppBodyModel")]
+public class WeChatPayAppPrepayBodyModel : WeChatPayTransactionsAppBodyModel;
+
+public class WeChatPayTransactionsAppBodyModel
 {
     /// <summary>
     /// 公众号ID
@@ -12,7 +15,7 @@ public class WeChatPayAppPrepayBodyModel
     public string AppId { get; set; }
 
     /// <summary>
-    /// 直连商户号
+    /// 商户号
     /// </summary>
     [JsonPropertyName("mchid")]
     public string MchId { get; set; }

+ 5 - 2
src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayCodePayBodyModel.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayTransactionsCodePayBodyModel.cs

@@ -3,7 +3,10 @@ using Essensoft.Paylinks.WeChatPay.Payments.Domain;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Model;
 
-public class WeChatPayCodePayBodyModel
+[Obsolete("Use WeChatPayTransactionsCodePayBodyModel")]
+public class WeChatPayCodePayBodyModel : WeChatPayTransactionsCodePayBodyModel;
+
+public class WeChatPayTransactionsCodePayBodyModel
 {
     /// <summary>
     /// 应用AppID
@@ -12,7 +15,7 @@ public class WeChatPayCodePayBodyModel
     public string AppId { get; set; }
 
     /// <summary>
-    /// 直连商户号
+    /// 商户号
     /// </summary>
     [JsonPropertyName("mchid")]
     public string MchId { get; set; }

+ 6 - 3
src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayH5PrepayBodyModel.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayTransactionsH5BodyModel.cs

@@ -3,16 +3,19 @@ using Essensoft.Paylinks.WeChatPay.Payments.Domain;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Model;
 
-public class WeChatPayH5PrepayBodyModel
+[Obsolete("Use WeChatPayTransactionsH5BodyModel")]
+public class WeChatPayH5PrepayBodyModel : WeChatPayTransactionsH5BodyModel;
+
+public class WeChatPayTransactionsH5BodyModel
 {
     /// <summary>
-    /// 应用ID
+    /// 公众账号ID
     /// </summary>
     [JsonPropertyName("appid")]
     public string AppId { get; set; }
 
     /// <summary>
-    /// 直连商户号
+    /// 商户号
     /// </summary>
     [JsonPropertyName("mchid")]
     public string MchId { get; set; }

+ 5 - 2
src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayJsapiPrepayBodyModel.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayTransactionsJsapiBodyModel.cs

@@ -3,7 +3,10 @@ using Essensoft.Paylinks.WeChatPay.Payments.Domain;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Model;
 
-public class WeChatPayJsapiPrepayBodyModel
+[Obsolete("Use WeChatPayTransactionsJsapiBodyModel")]
+public class WeChatPayJsapiPrepayBodyModel : WeChatPayTransactionsJsapiBodyModel;
+
+public class WeChatPayTransactionsJsapiBodyModel
 {
     /// <summary>
     /// 公众号ID
@@ -12,7 +15,7 @@ public class WeChatPayJsapiPrepayBodyModel
     public string AppId { get; set; }
 
     /// <summary>
-    /// 直连商户号
+    /// 商户号
     /// </summary>
     [JsonPropertyName("mchid")]
     public string MchId { get; set; }

+ 5 - 2
src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayNativePrepayBodyModel.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Model/WeChatPayTransactionsNativeBodyModel.cs

@@ -3,7 +3,10 @@ using Essensoft.Paylinks.WeChatPay.Payments.Domain;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Model;
 
-public class WeChatPayNativePrepayBodyModel
+[Obsolete("Use WeChatPayTransactionsNativeBodyModel")]
+public class WeChatPayNativePrepayBodyModel : WeChatPayTransactionsNativeBodyModel;
+
+public class WeChatPayTransactionsNativeBodyModel
 {
     /// <summary>
     /// 公众号ID
@@ -12,7 +15,7 @@ public class WeChatPayNativePrepayBodyModel
     public string AppId { get; set; }
 
     /// <summary>
-    /// 直连商户号
+    /// 商户号
     /// </summary>
     [JsonPropertyName("mchid")]
     public string MchId { get; set; }

+ 3 - 4
src/Essensoft.Paylinks.WeChatPay.Payments/Notify/WeChatPayCombineTransactionSuccessNotify.cs

@@ -5,12 +5,11 @@ using Essensoft.Paylinks.WeChatPay.Payments.Domain;
 namespace Essensoft.Paylinks.WeChatPay.Payments.Notify;
 
 /// <summary>
-/// 支付成功通知
+/// 合单订单支付成功回调通知
 /// </summary>
 /// <para>
-/// https://pay.weixin.qq.com/docs/merchant/apis/combine-payment/orders/payment-notice.html
-/// 支付通知
-/// 更新时间:2023.08.23
+/// 合单订单支付成功回调通知 - 更新时间:2025.01.08
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012158598
 /// </para>
 public class WeChatPayCombineTransactionSuccessNotify : IWeChatPayNotifyResource
 {

+ 5 - 5
src/Essensoft.Paylinks.WeChatPay.Payments/Notify/WeChatPayRefundResultNotify.cs

@@ -5,13 +5,13 @@ using Essensoft.Paylinks.WeChatPay.Payments.Domain;
 namespace Essensoft.Paylinks.WeChatPay.Payments.Notify;
 
 /// <summary>
-/// 退款结果通知
+/// 退款结果回调通知
 /// </summary>
 /// <para>
-/// https://pay.weixin.qq.com/docs/merchant/apis/jsapi-payment/refund-result-notice.html
-/// https://pay.weixin.qq.com/docs/merchant/apis/combine-payment/refunds/refund-result-notice.html
-/// 退款结果通知
-/// 更新时间:2023.08.23
+/// 退款结果回调通知 - 更新时间:2025.01.02
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791865
+/// 退款结果回调通知 - 更新时间:2025.01.08
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012085921
 /// </para>
 public class WeChatPayRefundResultNotify : IWeChatPayNotifyResource
 {

+ 3 - 4
src/Essensoft.Paylinks.WeChatPay.Payments/Notify/WeChatPayTransactionSuccessNotify.cs

@@ -5,12 +5,11 @@ using Essensoft.Paylinks.WeChatPay.Payments.Domain;
 namespace Essensoft.Paylinks.WeChatPay.Payments.Notify;
 
 /// <summary>
-/// 支付成功通知
+/// 支付成功回调通知
 /// </summary>
 /// <para>
-/// https://pay.weixin.qq.com/docs/merchant/apis/jsapi-payment/payment-notice.html
-/// 支付通知
-/// 更新时间:2023.08.16
+/// 支付成功回调通知 - 更新时间:2024.12.27
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791861
 /// </para>
 public class WeChatPayTransactionSuccessNotify : IWeChatPayNotifyResource
 {

+ 12 - 15
src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayAppTransferPaymentRequest.cs

@@ -9,50 +9,47 @@ namespace Essensoft.Paylinks.WeChatPay.Payments.Request;
 /// APP调起支付
 /// </summary>
 /// <para>
-/// https://pay.weixin.qq.com/docs/merchant/apis/in-app-payment/app-transfer-payment.html
-/// APP调起支付
-/// 更新时间:2023.08.16
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/combine-payment/orders/app-transfer-payment.html
-/// APP调起支付
-/// 更新时间:2023.12.08
+/// APP调起支付 - 更新时间:2024.11.25
+/// https://pay.weixin.qq.com/doc/v3/merchant/4013070351
+/// APP调起支付 - 更新时间:2025.01.08
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012266043
 /// </para>
 public class WeChatPayAppTransferPaymentRequest : IWeChatPaySdkRequest<WeChatPayAppTransferPaymentResponse>
 {
     /// <summary>
     /// 微信开放平台审核通过的移动应用AppID。
     /// </summary>
-    [JsonPropertyName("appid")]
+    [JsonPropertyName("appId")]
     public string AppId { get; set; }
 
     /// <summary>
     /// 请填写商户号mchid对应的值。
     /// </summary>
-    [JsonPropertyName("partnerid")]
+    [JsonPropertyName("partnerId")]
     public string PartnerId { get; set; }
 
     /// <summary>
     /// 微信返回的支付交易会话ID,该值有效期为2小时。
     /// </summary>
-    [JsonPropertyName("prepayid")]
+    [JsonPropertyName("prepayId")]
     public string PrepayId { get; set; }
 
     /// <summary>
     /// 暂填写固定值Sign=WXPay
     /// </summary>
-    [JsonPropertyName("package")]
-    public string Package { get; set; } = "Sign=WXPay";
+    [JsonPropertyName("packageValue")]
+    public string PackageValue { get; set; } = "Sign=WXPay";
 
     /// <summary>
     /// 随机字符串,不长于32位。推荐随机数生成算法。
     /// </summary>
-    [JsonPropertyName("noncestr")]
+    [JsonPropertyName("nonceStr")]
     public string NonceStr { get; set; } = Guid.NewGuid().ToString("N");
 
     /// <summary>
     /// 时间戳,标准北京时间,时区为东八区,自1970年1月1日 0点0分0秒以来的秒数。注意:部分系统取到的值为毫秒级,需要转换成秒(10位数字)。
     /// </summary>
-    [JsonPropertyName("timestamp")]
+    [JsonPropertyName("timeStamp")]
     public string TimeStamp { get; set; } = DateTimeOffset.UtcNow.ToUnixTimeSeconds().ToString();
 
     private string BuildSignatureSourceData()
@@ -68,7 +65,7 @@ public class WeChatPayAppTransferPaymentRequest : IWeChatPaySdkRequest<WeChatPay
             AppId = AppId,
             PartnerId = PartnerId,
             PrepayId = PrepayId,
-            Package = Package,
+            PackageValue = PackageValue,
             NonceStr = NonceStr,
             TimeStamp = TimeStamp,
             Sign = SHA256WithRSA.Sign(signatureSourceData, privateKey)

+ 2 - 3
src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayApplyAbnormalRefundByRefundIdRequest.cs

@@ -7,9 +7,8 @@ namespace Essensoft.Paylinks.WeChatPay.Payments.Request;
 /// 发起异常退款
 /// </summary>
 /// <para>
-/// https://pay.weixin.qq.com/docs/merchant/apis/refund/refunds/create-abnormal-refund.html
-/// 发起异常退款
-/// 更新时间:2023.08.16
+/// 发起异常退款 - 更新时间:2024.12.30
+/// https://pay.weixin.qq.com/doc/v3/merchant/4013071193
 /// </para>
 public class WeChatPayApplyAbnormalRefundByRefundIdRequest : IWeChatPayRequest<WeChatPayApplyAbnormalRefundByRefundIdResponse>
 {

+ 10 - 19
src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayCloseByOutTradeNoRequest.cs

@@ -7,25 +7,16 @@ namespace Essensoft.Paylinks.WeChatPay.Payments.Request;
 /// 关闭订单
 /// </summary>
 /// <para>
-/// https://pay.weixin.qq.com/docs/merchant/apis/jsapi-payment/close-order.html
-/// 关闭订单
-/// 更新时间:2023.08.16
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/in-app-payment/close-order.html
-/// 关闭订单
-/// 更新时间:2023.08.16
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/h5-payment/close-order.html
-/// 关闭订单
-/// 更新时间:2023.08.16
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/native-payment/close-order.html
-/// 关闭订单
-/// 更新时间:2023.08.16
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/mini-program-payment/close-order.html
-/// 关闭订单
-/// 更新时间:2023.08.16
+/// 关闭订单 - 更新时间:2024.12.11
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791860
+/// 关闭订单 - 更新时间:2024.11.25
+/// https://pay.weixin.qq.com/doc/v3/merchant/4013070360
+/// 关闭订单 - 更新时间:2024.12.11
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791839
+/// 关闭订单 - 更新时间:2024.12.11
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791881
+/// 关闭订单 - 更新时间:2024.12.11
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791901
 /// </para>
 public class WeChatPayCloseByOutTradeNoRequest : IWeChatPayRequest<WeChatPayCloseByOutTradeNoResponse>
 {

+ 7 - 5
src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayCombineAppPrepayRequest.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayCombineTransactionsAppRequest.cs

@@ -3,15 +3,17 @@ using Essensoft.Paylinks.WeChatPay.Payments.Response;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Request;
 
+[Obsolete("Use WeChatPayCombineTransactionsAppRequest")]
+public class WeChatPayCombineAppPrepayRequest : WeChatPayCombineTransactionsAppRequest;
+
 /// <summary>
-/// 合单下单-APP
+/// App合单下单
 /// </summary>
 /// <para>
-/// https://pay.weixin.qq.com/docs/merchant/apis/combine-payment/orders/app-prepay.html
-/// 合单下单-APP
-/// 更新时间:2023.08.23
+/// App合单下单 - 更新时间:2025.01.10
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012556944
 /// </para>
-public class WeChatPayCombineAppPrepayRequest : IWeChatPayRequest<WeChatPayCombineAppPrepayResponse>
+public class WeChatPayCombineTransactionsAppRequest : IWeChatPayRequest<WeChatPayCombineTransactionsAppResponse>
 {
     #region IWeChatPayRequest Members
 

+ 8 - 6
src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayCombineCloseByCombineOutTradeNoRequest.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayCombineTransactionsCloseByCombineOutTradeNoRequest.cs

@@ -3,15 +3,17 @@ using Essensoft.Paylinks.WeChatPay.Payments.Response;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Request;
 
+[Obsolete("Use WeChatPayCombineTransactionsCloseByCombineOutTradeNoRequest")]
+public class WeChatPayCombineCloseByCombineOutTradeNoRequest : WeChatPayCombineTransactionsCloseByCombineOutTradeNoRequest;
+
 /// <summary>
-/// 合单关单
+/// 关闭合单订
 /// </summary>
 /// <para>
-/// https://pay.weixin.qq.com/docs/merchant/apis/combine-payment/orders/close-order.html
-/// 合单关单
-/// 更新时间:2023.08.23
+/// 关闭合单订单 - 更新时间:2025.01.10
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012577452
 /// </para>
-public class WeChatPayCombineCloseByCombineOutTradeNoRequest : IWeChatPayRequest<WeChatPayCombineCloseByCombineOutTradeNoResponse>
+public class WeChatPayCombineTransactionsCloseByCombineOutTradeNoRequest : IWeChatPayRequest<WeChatPayCombineTransactionsCloseByCombineOutTradeNoResponse>
 {
     #region IWeChatPayRequest Members
 
@@ -40,7 +42,7 @@ public class WeChatPayCombineCloseByCombineOutTradeNoRequest : IWeChatPayRequest
     #endregion
 
     /// <summary>
-    /// 合单商户单号
+    /// 合单商户单号
     /// </summary>
     public string CombineOutTradeNo { get; set; }
 }

+ 7 - 5
src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayCombineH5PrepayRequest.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayCombineTransactionsH5Request.cs

@@ -3,15 +3,17 @@ using Essensoft.Paylinks.WeChatPay.Payments.Response;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Request;
 
+[Obsolete("Use WeChatPayCombineTransactionsH5Request")]
+public class WeChatPayCombineH5PrepayRequest : WeChatPayCombineTransactionsH5Request;
+
 /// <summary>
-/// 合单下单-H5
+/// H5合单下单
 /// </summary>
 /// <para>
-/// https://pay.weixin.qq.com/docs/merchant/apis/combine-payment/orders/h5-prepay.html
-/// 合单下单-H5
-/// 更新时间:2023.08.23
+/// H5合单下单 - 更新时间:2025.01.10
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012556961
 /// </para>
-public class WeChatPayCombineH5PrepayRequest : IWeChatPayRequest<WeChatPayCombineH5PrepayResponse>
+public class WeChatPayCombineTransactionsH5Request : IWeChatPayRequest<WeChatPayCombineTransactionsH5Response>
 {
     #region IWeChatPayRequest Members
 

+ 9 - 9
src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayCombineJsapiPrepayRequest.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayCombineTransactionsJsapiPrepayRequest.cs

@@ -3,19 +3,19 @@ using Essensoft.Paylinks.WeChatPay.Payments.Response;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Request;
 
+[Obsolete("Use WeChatPayCombineTransactionsJsapiRequest")]
+public class WeChatPayCombineJsapiPrepayRequest : WeChatPayCombineTransactionsJsapiRequest;
+
 /// <summary>
-/// 合单下单-JSAPI / 合单下单-小程序
+/// JSAPI合单下单 / 小程序合单下单
 /// </summary>
 /// <para>
-/// https://pay.weixin.qq.com/docs/merchant/apis/combine-payment/orders/jsapi-prepay.html
-/// 合单下单-JSAPI
-/// 更新时间:2023.08.23
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/combine-payment/orders/mini-program-prepay.html
-/// 合单下单-小程序
-/// 更新时间:2023.08.23
+/// JSAPI合单下单 - 更新时间:2025.01.10
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012556926
+/// 小程序合单下单 - 更新时间:2025.01.10
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012556931
 /// </para>
-public class WeChatPayCombineJsapiPrepayRequest : IWeChatPayRequest<WeChatPayCombineJsapiPrepayResponse>
+public class WeChatPayCombineTransactionsJsapiRequest : IWeChatPayRequest<WeChatPayCombineTransactionsJsapiResponse>
 {
     #region IWeChatPayRequest Members
 

+ 7 - 5
src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayCombineNativePrepayRequest.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayCombineTransactionsNativeRequest.cs

@@ -3,15 +3,17 @@ using Essensoft.Paylinks.WeChatPay.Payments.Response;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Request;
 
+[Obsolete("Use WeChatPayCombineTransactionsNativeRequest")]
+public class WeChatPayCombineNativePrepayRequest : WeChatPayCombineTransactionsNativeRequest;
+
 /// <summary>
-/// 合单下单-NATIVE
+/// Native合单下单
 /// </summary>
 /// <para>
-/// https://pay.weixin.qq.com/docs/merchant/apis/combine-payment/orders/native-prepay.html
-/// 合单下单-NATIVE
-/// 更新时间:2023.08.23
+/// Native合单下单 - 更新时间:2025.01.10
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012556982
 /// </para>
-public class WeChatPayCombineNativePrepayRequest : IWeChatPayRequest<WeChatPayCombineNativePrepayResponse>
+public class WeChatPayCombineTransactionsNativeRequest : IWeChatPayRequest<WeChatPayCombineTransactionsNativeResponse>
 {
     #region IWeChatPayRequest Members
 

+ 6 - 4
src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayCombineQueryByCombineOutTradeNoRequest.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayCombineTransactionsQueryByCombineOutTradeNoRequest.cs

@@ -3,15 +3,17 @@ using Essensoft.Paylinks.WeChatPay.Payments.Response;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Request;
 
+[Obsolete("Use WeChatPayCombineTransactionsQueryByCombineOutTradeNoRequest")]
+public class WeChatPayCombineQueryByCombineOutTradeNoRequest : WeChatPayCombineTransactionsQueryByCombineOutTradeNoRequest;
+
 /// <summary>
-/// 合单查询
+/// 合单查询 - 更新时间:2025.01.10
 /// </summary>
 /// <para>
-/// https://pay.weixin.qq.com/docs/merchant/apis/combine-payment/orders/query-order.html
 /// 合单查询
-/// 更新时间:2023.08.23
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012557006
 /// </para>
-public class WeChatPayCombineQueryByCombineOutTradeNoRequest : IWeChatPayRequest<WeChatPayCombineQueryByCombineOutTradeNoResponse>
+public class WeChatPayCombineTransactionsQueryByCombineOutTradeNoRequest : IWeChatPayRequest<WeChatPayCombineTransactionsQueryByCombineOutTradeNoResponse>
 {
     #region IWeChatPayRequest Members
 

+ 7 - 26
src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayDownloadBillRequest.cs

@@ -7,33 +7,14 @@ namespace Essensoft.Paylinks.WeChatPay.Payments.Request;
 /// 下载账单
 /// </summary>
 /// <para>
-/// https://pay.weixin.qq.com/docs/merchant/apis/jsapi-payment/download-bill.html
 /// 下载账单
-/// 更新时间:2024.01.17
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/in-app-payment/download-bill.html
-/// 下载账单
-/// 更新时间:2024.01.17
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/h5-payment/download-bill.html
-/// 下载账单
-/// 更新时间:2024.01.17
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/native-payment/download-bill.html
-/// 下载账单
-/// 更新时间:2024.01.17
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/mini-program-payment/download-bill.html
-/// 下载账单
-/// 更新时间:2024.01.17
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/combine-payment/bill-download/download-bill.html
-/// 下载账单
-/// 更新时间:2024.01.17
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/bill-download/download-bill.html
-/// 下载账单
-/// 更新时间:2024.01.17
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791868
+/// https://pay.weixin.qq.com/doc/v3/merchant/4013070401
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012810615
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791889
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791909
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012085923
+/// https://pay.weixin.qq.com/doc/v3/merchant/4013071238
 /// </para>
 public class WeChatPayDownloadBillRequest : IWeChatPayRequest<WeChatPayDownloadBillResponse>
 {

+ 49 - 0
src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayFundFlowBillRequest.cs

@@ -0,0 +1,49 @@
+using Essensoft.Paylinks.WeChatPay.Core;
+using Essensoft.Paylinks.WeChatPay.Payments.Response;
+
+namespace Essensoft.Paylinks.WeChatPay.Payments.Request;
+
+[Obsolete("Use WeChatPayFundFlowBillRequest")]
+public class WeChatPayGetFundFlowBillRequest : WeChatPayFundFlowBillRequest;
+
+/// <summary>
+/// 申请资金账单
+/// </summary>
+/// <para>
+/// 申请资金账单
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791867
+/// https://pay.weixin.qq.com/doc/v3/merchant/4013070400
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012810609
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791888
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791908
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012556748
+/// https://pay.weixin.qq.com/doc/v3/merchant/4013071235
+/// </para>
+public class WeChatPayFundFlowBillRequest : IWeChatPayRequest<WeChatPayFundFlowBillResponse>
+{
+    #region IWeChatPayRequest Members
+
+    public WeChatPayRequestMethod GetRequestMethod() => WeChatPayRequestMethod.Get;
+
+    public string GetRequestUrl() => "/v3/bill/fundflowbill";
+
+    private bool _needVerify = true;
+
+    public bool GetNeedVerify() => _needVerify;
+
+    public void SetNeedVerify(bool value) => _needVerify = value;
+
+    private object? _queryModel;
+
+    public void SetQueryModel(object queryModel) => _queryModel = queryModel;
+
+    public object? GetQueryModel() => _queryModel;
+
+    private object? _bodyModel;
+
+    public void SetBodyModel(object bodyModel) => _bodyModel = bodyModel;
+
+    public object? GetBodyModel() => _bodyModel;
+
+    #endregion
+}

+ 0 - 65
src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayGetFundflowBillRequest.cs

@@ -1,65 +0,0 @@
-using Essensoft.Paylinks.WeChatPay.Core;
-using Essensoft.Paylinks.WeChatPay.Payments.Response;
-
-namespace Essensoft.Paylinks.WeChatPay.Payments.Request;
-
-/// <summary>
-/// 申请资金账单
-/// </summary>
-/// <para>
-/// https://pay.weixin.qq.com/docs/merchant/apis/jsapi-payment/get-fund-bill.html
-/// 申请资金账单
-/// 更新时间:2023.08.23
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/in-app-payment/get-fund-bill.html
-/// 申请资金账单
-/// 更新时间:2023.08.23
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/h5-payment/get-fund-bill.html
-/// 申请资金账单
-/// 更新时间:2023.08.23
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/native-payment/get-fund-bill.html
-/// 申请资金账单
-/// 更新时间:2023.08.23
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/mini-program-payment/get-fund-bill.html
-/// 申请资金账单
-/// 更新时间:2023.08.23
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/combine-payment/bill-download/get-fund-bill.html
-/// 申请资金账单
-/// 更新时间:2023.08.23
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/bill-download/fund-bill/get-fund-bill.html
-/// 申请资金账单
-/// 更新时间:2023.08.23
-/// </para>
-public class WeChatPayGetFundFlowBillRequest : IWeChatPayRequest<WeChatPayGetFundFlowBillResponse>
-{
-    #region IWeChatPayRequest Members
-
-    public WeChatPayRequestMethod GetRequestMethod() => WeChatPayRequestMethod.Get;
-
-    public string GetRequestUrl() => "/v3/bill/fundflowbill";
-
-    private bool _needVerify = true;
-
-    public bool GetNeedVerify() => _needVerify;
-
-    public void SetNeedVerify(bool value) => _needVerify = value;
-
-    private object? _queryModel;
-
-    public void SetQueryModel(object queryModel) => _queryModel = queryModel;
-
-    public object? GetQueryModel() => _queryModel;
-
-    private object? _bodyModel;
-
-    public void SetBodyModel(object bodyModel) => _bodyModel = bodyModel;
-
-    public object? GetBodyModel() => _bodyModel;
-
-    #endregion
-}

+ 0 - 65
src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayGetTradeBillRequest.cs

@@ -1,65 +0,0 @@
-using Essensoft.Paylinks.WeChatPay.Core;
-using Essensoft.Paylinks.WeChatPay.Payments.Response;
-
-namespace Essensoft.Paylinks.WeChatPay.Payments.Request;
-
-/// <summary>
-/// 申请交易账单
-/// </summary>
-/// <para>
-/// https://pay.weixin.qq.com/docs/merchant/apis/jsapi-payment/get-trade-bill.html
-/// 申请交易账单
-/// 更新时间:2023.08.23
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/in-app-payment/get-trade-bill.html
-/// 申请交易账单
-/// 更新时间:2023.08.23
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/h5-payment/get-trade-bill.html
-/// 申请交易账单
-/// 更新时间:2023.08.23
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/native-payment/get-trade-bill.html
-/// 申请交易账单
-/// 更新时间:2023.08.23
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/mini-program-payment/get-trade-bill.html
-/// 申请交易账单
-/// 更新时间:2023.08.23
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/combine-payment/bill-download/get-trade-bill.html
-/// 申请交易账单
-/// 更新时间:2023.08.23
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/bill-download/trade-bill/get-trade-bill.html
-/// 申请交易账单
-/// 更新时间:2023.08.16
-/// </para>
-public class WeChatPayGetTradeBillRequest : IWeChatPayRequest<WeChatPayGetTradeBillResponse>
-{
-    #region IWeChatPayRequest Members
-
-    public WeChatPayRequestMethod GetRequestMethod() => WeChatPayRequestMethod.Get;
-
-    public string GetRequestUrl() => "/v3/bill/tradebill";
-
-    private bool _needVerify = true;
-
-    public bool GetNeedVerify() => _needVerify;
-
-    public void SetNeedVerify(bool value) => _needVerify = value;
-
-    private object? _queryModel;
-
-    public void SetQueryModel(object queryModel) => _queryModel = queryModel;
-
-    public object? GetQueryModel() => _queryModel;
-
-    private object? _bodyModel;
-
-    public void SetBodyModel(object bodyModel) => _bodyModel = bodyModel;
-
-    public object? GetBodyModel() => _bodyModel;
-
-    #endregion
-}

+ 4 - 11
src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayJsapiTransferPaymentRequest.cs

@@ -8,21 +8,14 @@ namespace Essensoft.Paylinks.WeChatPay.Payments.Request;
 /// JSAPI调起支付 / 小程序调起支付
 /// </summary>
 /// <para>
-/// https://pay.weixin.qq.com/docs/merchant/apis/jsapi-payment/jsapi-transfer-payment.html
 /// JSAPI调起支付
-/// 更新时间:2023.08.16
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/mini-program-payment/mini-transfer-payment.html
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791857
 /// 小程序调起支付
-/// 更新时间:2023.08.16
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/combine-payment/orders/jsapi-transfer-payment.html
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791898
 /// JSAPI调起支付
-/// 更新时间:2023.12.28
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/combine-payment/orders/mini-transfer-payment.html
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012266069
 /// 小程序调起支付
-/// 更新时间:2023.12.12
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012266109
 /// </para>
 public class WeChatPayJsapiTransferPaymentRequest : IWeChatPaySdkRequest<WeChatPayJsapiTransferPaymentResponse>
 {

+ 5 - 18
src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayQueryByOutTradeNoRequest.cs

@@ -7,25 +7,12 @@ namespace Essensoft.Paylinks.WeChatPay.Payments.Request;
 /// 商户订单号查询订单
 /// </summary>
 /// <para>
-/// https://pay.weixin.qq.com/docs/merchant/apis/jsapi-payment/query-by-out-trade-no.html
 /// 商户订单号查询订单
-/// 更新时间:2023.08.16
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/in-app-payment/query-by-out-trade-no.html
-/// 商户订单号查询订单
-/// 更新时间:2023.08.16
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/h5-payment/query-by-out-trade-no.html
-/// 商户订单号查询订单
-/// 更新时间:2023.08.16
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/native-payment/query-by-out-trade-no.html
-/// 商户订单号查询订单
-/// 更新时间:2023.08.16
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/mini-program-payment/query-by-out-trade-no.html
-/// 商户订单号查询订单
-/// 更新时间:2023.08.16
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791859
+/// https://pay.weixin.qq.com/doc/v3/merchant/4013070356
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791838
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791880
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791900
 /// </para>
 public class WeChatPayQueryByOutTradeNoRequest : IWeChatPayRequest<WeChatPayQueryByOutTradeNoResponse>
 {

+ 5 - 18
src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayQueryByTransactionIdRequest.cs

@@ -7,25 +7,12 @@ namespace Essensoft.Paylinks.WeChatPay.Payments.Request;
 /// 微信支付订单号查询订单
 /// </summary>
 /// <para>
-/// https://pay.weixin.qq.com/docs/merchant/apis/jsapi-payment/query-by-wx-trade-no.html
 /// 微信支付订单号查询订单
-/// 更新时间:2023.08.16
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/in-app-payment/query-by-wx-trade-no.html
-/// 微信支付订单号查询订单
-/// 更新时间:2023.08.16
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/h5-payment/query-by-wx-trade-no.html
-/// 微信支付订单号查询订单
-/// 更新时间:2023.08.16
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/native-payment/query-by-wx-trade-no.html
-/// 微信支付订单号查询订单
-/// 更新时间:2023.08.16
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/mini-program-payment/query-by-wx-trade-no.html
-/// 微信支付订单号查询订单
-/// 更新时间:2023.08.16
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791858
+/// https://pay.weixin.qq.com/doc/v3/merchant/4013070354
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791837
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791879
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791899
 /// </para>
 public class WeChatPayQueryByTransactionIdRequest : IWeChatPayRequest<WeChatPayQueryByTransactionIdResponse>
 {

+ 7 - 23
src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayRefundQueryByOutRefundNoRequest.cs

@@ -7,29 +7,13 @@ namespace Essensoft.Paylinks.WeChatPay.Payments.Request;
 /// 查询单笔退款(通过商户退款单号)
 /// </summary>
 /// <para>
-/// https://pay.weixin.qq.com/docs/merchant/apis/jsapi-payment/query-by-out-refund-no.html
-/// 查询单笔退款(通过商户退款单号)
-/// 更新时间:2023.08.23
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/in-app-payment/query-by-out-refund-no.html
-/// 查询单笔退款(通过商户退款单号)
-/// 更新时间:2023.08.23
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/h5-payment/query-by-out-refund-no.html
-/// 查询单笔退款(通过商户退款单号)
-/// 更新时间:2023.08.23
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/native-payment/query-by-out-refund-no.html
-/// 查询单笔退款(通过商户退款单号)
-/// 更新时间:2023.08.23
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/mini-program-payment/query-by-out-refund-no.html
-/// 查询单笔退款(通过商户退款单号)
-/// 更新时间:2023.08.23
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/combine-payment/refunds/query-by-out-refund-no.html
-/// 查询单笔退款(通过商户退款单号)
-/// 更新时间:2023.08.23
+/// 查询单笔退款(通过商户退款单号) - 更新时间:2025.01.09
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791863
+/// https://pay.weixin.qq.com/doc/v3/merchant/4013070374
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012810601
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791884
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791904
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012556587
 /// </para>
 public class WeChatPayRefundQueryByOutRefundNoRequest : IWeChatPayRequest<WeChatPayRefundQueryByOutRefundNoResponse>
 {

+ 7 - 27
src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayRefundRequest.cs

@@ -7,33 +7,13 @@ namespace Essensoft.Paylinks.WeChatPay.Payments.Request;
 /// 退款申请
 /// </summary>
 /// <para>
-/// https://pay.weixin.qq.com/docs/merchant/apis/refund/refunds/create.html
-/// 退款申请
-/// 更新时间:2023.08.23
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/jsapi-payment/create.html
-/// 退款申请
-/// 更新时间:2023.08.23
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/in-app-payment/create.html
-/// 退款申请
-/// 更新时间:2023.08.23
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/h5-payment/create.html
-/// 退款申请
-/// 更新时间:2023.08.23
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/native-payment/create.html
-/// 退款申请
-/// 更新时间:2023.08.23
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/mini-program-payment/create.html
-/// 退款申请
-/// 更新时间:2023.08.23
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/combine-payment/refunds/create.html
-/// 退款申请
-/// 更新时间:2023.08.23
+/// 申请退款 - 更新时间:2025.01.09
+/// https://pay.weixin.qq.com/doc/v3/merchant/4013071036
+/// https://pay.weixin.qq.com/doc/v3/merchant/4013070371
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012810597
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791883
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791903
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012556524
 /// </para>
 public class WeChatPayRefundRequest : IWeChatPayRequest<WeChatPayRefundResponse>
 {

+ 2 - 3
src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayReverseRequest.cs

@@ -7,9 +7,8 @@ namespace Essensoft.Paylinks.WeChatPay.Payments.Request;
 /// 撤销
 /// </summary>
 /// <para>
-/// https://pay.weixin.qq.com/docs/merchant/apis/code-payment-v3/direct/reverse.html
-/// 撤销
-/// 更新时间:2024.04.15
+/// 撤销 - 更新时间:2024.12.03
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012382161
 /// </para>
 public class WeChatPayReverseRequest : IWeChatPayRequest<WeChatPayReverseResponse>
 {

+ 49 - 0
src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayTradeBillRequest.cs

@@ -0,0 +1,49 @@
+using Essensoft.Paylinks.WeChatPay.Core;
+using Essensoft.Paylinks.WeChatPay.Payments.Response;
+
+namespace Essensoft.Paylinks.WeChatPay.Payments.Request;
+
+[Obsolete("Use WeChatPayTradeBillRequest")]
+public class WeChatPayGetTradeBillRequest : WeChatPayTradeBillRequest;
+
+/// <summary>
+/// 申请交易账单
+/// </summary>
+/// <para>
+/// 申请交易账单
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791866
+/// https://pay.weixin.qq.com/doc/v3/merchant/4013070395
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012810606
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791887
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791907
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012556692
+/// https://pay.weixin.qq.com/doc/v3/merchant/4013071227
+/// </para>
+public class WeChatPayTradeBillRequest : IWeChatPayRequest<WeChatPayTradeBillResponse>
+{
+    #region IWeChatPayRequest Members
+
+    public WeChatPayRequestMethod GetRequestMethod() => WeChatPayRequestMethod.Get;
+
+    public string GetRequestUrl() => "/v3/bill/tradebill";
+
+    private bool _needVerify = true;
+
+    public bool GetNeedVerify() => _needVerify;
+
+    public void SetNeedVerify(bool value) => _needVerify = value;
+
+    private object? _queryModel;
+
+    public void SetQueryModel(object queryModel) => _queryModel = queryModel;
+
+    public object? GetQueryModel() => _queryModel;
+
+    private object? _bodyModel;
+
+    public void SetBodyModel(object bodyModel) => _bodyModel = bodyModel;
+
+    public object? GetBodyModel() => _bodyModel;
+
+    #endregion
+}

+ 6 - 4
src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayAppPrepayRequest.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayTransactionsAppRequest.cs

@@ -3,15 +3,17 @@ using Essensoft.Paylinks.WeChatPay.Payments.Response;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Request;
 
+[Obsolete("Use WeChatPayTransactionsAppRequest")]
+public class WeChatPayAppPrepayRequest : WeChatPayTransactionsAppRequest;
+
 /// <summary>
 /// APP下单
 /// </summary>
 /// <para>
-/// https://pay.weixin.qq.com/docs/merchant/apis/in-app-payment/direct-jsons/app-prepay.html
-/// APP下单
-/// 更新时间:2023.08.16
+/// APP下单 - 更新时间:2024.12.30
+/// https://pay.weixin.qq.com/doc/v3/merchant/4013070347
 /// </para>
-public class WeChatPayAppPrepayRequest : IWeChatPayRequest<WeChatPayAppPrepayResponse>
+public class WeChatPayTransactionsAppRequest : IWeChatPayRequest<WeChatPayTransactionsAppResponse>
 {
     #region IWeChatPayRequest Members
 

+ 6 - 4
src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayCodePayRequest.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayTransactionsCodePayRequest.cs

@@ -3,15 +3,17 @@ using Essensoft.Paylinks.WeChatPay.Payments.Response;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Request;
 
+[Obsolete("Use WeChatPayTransactionsCodePayRequest")]
+public class WeChatPayCodePayRequest : WeChatPayTransactionsCodePayRequest;
+
 /// <summary>
 /// 付款码支付
 /// </summary>
 /// <para>
-/// https://pay.weixin.qq.com/docs/merchant/apis/code-payment-v3/direct/code-pay.html
-/// 付款码支付
-/// 更新时间:2024.04.15
+/// 付款码支付 - 更新时间:2024.12.03
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012382150
 /// </para>
-public class WeChatPayCodePayRequest : IWeChatPayRequest<WeChatPayCodePayResponse>
+public class WeChatPayTransactionsCodePayRequest : IWeChatPayRequest<WeChatPayTransactionsCodePayResponse>
 {
     #region IWeChatPayRequest Members
 

+ 6 - 4
src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayH5PrepayRequest.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayTransactionsH5Request.cs

@@ -3,15 +3,17 @@ using Essensoft.Paylinks.WeChatPay.Payments.Response;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Request;
 
+[Obsolete("Use WeChatPayTransactionsH5Request")]
+public class WeChatPayH5PrepayRequest : WeChatPayTransactionsH5Request;
+
 /// <summary>
 /// H5下单
 /// </summary>
 /// <para>
-/// https://pay.weixin.qq.com/docs/merchant/apis/h5-payment/direct-jsons/h5-prepay.html
-/// H5下单
-/// 更新时间:2023.08.16
+/// H5下单 - 更新时间:2025.01.02
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791834
 /// </para>
-public class WeChatPayH5PrepayRequest : IWeChatPayRequest<WeChatPayH5PrepayResponse>
+public class WeChatPayTransactionsH5Request : IWeChatPayRequest<WeChatPayTransactionsH5Response>
 {
     #region IWeChatPayRequest Members
 

+ 8 - 8
src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayJsapiPrepayRequest.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayTransactionsJsapiRequest.cs

@@ -3,19 +3,19 @@ using Essensoft.Paylinks.WeChatPay.Payments.Response;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Request;
 
+[Obsolete("Use WeChatPayTransactionsJsapiRequest")]
+public class WeChatPayJsapiPrepayRequest : WeChatPayTransactionsJsapiRequest;
+
 /// <summary>
 /// JSAPI下单 / 小程序下单
 /// </summary>
 /// <para>
-/// https://pay.weixin.qq.com/docs/merchant/apis/jsapi-payment/direct-jsons/jsapi-prepay.html
-/// JSAPI下单
-/// 更新时间:2023.08.16
-/// <br/>
-/// <a href="https://pay.weixin.qq.com/docs/merchant/apis/mini-program-payment/mini-prepay.html
-/// 小程序下单
-/// 更新时间:2023.08.16
+/// JSAPI下单 - 更新时间:2025.01.10
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791856
+/// 小程序下单 - 更新时间:2025.01.02
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791897
 /// </para>
-public class WeChatPayJsapiPrepayRequest : IWeChatPayRequest<WeChatPayJsapiPrepayResponse>
+public class WeChatPayTransactionsJsapiRequest : IWeChatPayRequest<WeChatPayTransactionsJsapiResponse>
 {
     #region IWeChatPayRequest Members
 

+ 6 - 4
src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayNativePrepayRequest.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Request/WeChatPayTransactionsNativeRequest.cs

@@ -3,15 +3,17 @@ using Essensoft.Paylinks.WeChatPay.Payments.Response;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Request;
 
+[Obsolete("Use WeChatPayTransactionsNativeRequest")]
+public class WeChatPayNativePrepayRequest : WeChatPayTransactionsNativeRequest;
+
 /// <summary>
 /// Native下单
 /// </summary>
 /// <para>
-/// https://pay.weixin.qq.com/docs/merchant/apis/native-payment/direct-jsons/native-prepay.html
-/// Native下单
-/// 更新时间:2023.08.16
+/// Native下单 - 更新时间:2025.01.10
+/// https://pay.weixin.qq.com/doc/v3/merchant/4012791877
 /// </para>
-public class WeChatPayNativePrepayRequest : IWeChatPayRequest<WeChatPayNativePrepayResponse>
+public class WeChatPayTransactionsNativeRequest : IWeChatPayRequest<WeChatPayTransactionsNativeResponse>
 {
     #region IWeChatPayRequest Members
 

+ 15 - 14
src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayAppTransferPaymentResponse.cs

@@ -6,43 +6,44 @@ namespace Essensoft.Paylinks.WeChatPay.Payments.Response;
 public class WeChatPayAppTransferPaymentResponse : WeChatPaySdkResponse
 {
     /// <summary>
-    /// 微信开放平台审核通过的移动应用AppID
+    /// 填写下单时传入的【公众账号ID】appid
     /// </summary>
-    [JsonPropertyName("appid")]
+    [JsonPropertyName("appId")]
     public string AppId { get; set; }
 
     /// <summary>
-    /// 填写商户号mchid对应的值
+    /// 填写下单时传入的【商户号mchid。
     /// </summary>
-    [JsonPropertyName("partnerid")]
+    [JsonPropertyName("partnerId")]
     public string PartnerId { get; set; }
 
     /// <summary>
-    /// 微信返回的支付交易会话ID,该值有效期为2小时
+    /// 预支付交易会话标识。APP下单接口返回的prepay_id,该值有效期为2小时,超过有效期需要重新请求APP下单接口以获取新的prepay_id
     /// </summary>
-    [JsonPropertyName("prepayid")]
+    [JsonPropertyName("prepayId")]
     public string PrepayId { get; set; }
 
     /// <summary>
-    /// 填写固定值Sign=WXPay
+    /// 填写固定值Sign=WXPay
     /// </summary>
-    [JsonPropertyName("package")]
-    public string Package { get; set; }
+    [JsonPropertyName("packageValue")]
+    public string PackageValue { get; set; }
 
     /// <summary>
-    /// 随机字符串,不长于32位。推荐随机数生成算法
+    /// 随机字符串,不长于32位。该值建议使用随机数算法生成
     /// </summary>
-    [JsonPropertyName("noncestr")]
+    [JsonPropertyName("nonceStr")]
     public string NonceStr { get; set; }
 
     /// <summary>
-    /// 时间戳,标准北京时间,时区为东八区,自1970年1月1日 0点0分0秒以来的秒数。注意:部分系统取到的值为毫秒级,需要转换成秒(10位数字)。
+    /// Unix时间戳,是从1970年1月1日(UTC/GMT的午夜)开始所经过的秒数。
+    /// 注意:常见时间戳为秒级或毫秒级,该处必需传秒级时间戳。
     /// </summary>
-    [JsonPropertyName("timestamp")]
+    [JsonPropertyName("timeStamp")]
     public string TimeStamp { get; set; }
 
     /// <summary>
-    /// 签名,使用字段AppId、TimeStamp、NonceStr、PrepayId计算得出的签名值 注意:取值RSA格式
+    /// 签名,使用字段appId、timeStamp、nonceStr、prepayId以及商户API证书私钥生成的RSA签名值,详细参考APP调起支付签名。
     /// </summary>
     [JsonPropertyName("sign")]
     public string Sign { get; set; }

+ 1 - 1
src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayCombineAppPrepayResponse.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayCombineTransactionsAppResponse.cs

@@ -4,7 +4,7 @@ using Essensoft.Paylinks.WeChatPay.Payments.Domain;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Response;
 
-public class WeChatPayCombineAppPrepayResponse : WeChatPayResponse
+public class WeChatPayCombineTransactionsAppResponse : WeChatPayResponse
 {
     /// <summary>
     /// 预支付交易会话标识

+ 1 - 1
src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayCombineCloseByCombineOutTradeNoResponse.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayCombineTransactionsCloseByCombineOutTradeNoResponse.cs

@@ -2,4 +2,4 @@ using Essensoft.Paylinks.WeChatPay.Core;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Response;
 
-public class WeChatPayCombineCloseByCombineOutTradeNoResponse : WeChatPayResponse;
+public class WeChatPayCombineTransactionsCloseByCombineOutTradeNoResponse : WeChatPayResponse;

+ 1 - 1
src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayCombineH5PrepayResponse.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayCombineTransactionsH5Response.cs

@@ -3,7 +3,7 @@ using Essensoft.Paylinks.WeChatPay.Core;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Response;
 
-public class WeChatPayCombineH5PrepayResponse : WeChatPayResponse
+public class WeChatPayCombineTransactionsH5Response : WeChatPayResponse
 {
     /// <summary>
     /// 支付跳转链接

+ 1 - 1
src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayCombineJsapiPrepayResponse.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayCombineTransactionsJsapiResponse.cs

@@ -3,7 +3,7 @@ using Essensoft.Paylinks.WeChatPay.Core;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Response;
 
-public class WeChatPayCombineJsapiPrepayResponse : WeChatPayResponse
+public class WeChatPayCombineTransactionsJsapiResponse : WeChatPayResponse
 {
     /// <summary>
     /// 预支付交易会话标识。

+ 1 - 1
src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayCombineNativePrepayResponse.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayCombineTransactionsNativeResponse.cs

@@ -3,7 +3,7 @@ using Essensoft.Paylinks.WeChatPay.Core;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Response;
 
-public class WeChatPayCombineNativePrepayResponse : WeChatPayResponse
+public class WeChatPayCombineTransactionsNativeResponse : WeChatPayResponse
 {
     /// <summary>
     /// 二维码链接

+ 4 - 4
src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayCombineQueryByCombineOutTradeNoResponse.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayCombineTransactionsQueryByCombineOutTradeNoResponse.cs

@@ -4,10 +4,10 @@ using Essensoft.Paylinks.WeChatPay.Payments.Domain;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Response;
 
-public class WeChatPayCombineQueryByCombineOutTradeNoResponse : WeChatPayResponse
+public class WeChatPayCombineTransactionsQueryByCombineOutTradeNoResponse : WeChatPayResponse
 {
     /// <summary>
-    /// 合单商户Appid
+    /// 合单商户公众账号ID
     /// </summary>
     [JsonPropertyName("combine_appid")]
     public string CombineAppId { get; set; }
@@ -19,13 +19,13 @@ public class WeChatPayCombineQueryByCombineOutTradeNoResponse : WeChatPayRespons
     public string CombineMchId { get; set; }
 
     /// <summary>
-    /// 合单支付者
+    /// 合单支付者信息
     /// </summary>
     [JsonPropertyName("combine_payer_info")]
     public PayerInfo CombinePayerInfo { get; set; }
 
     /// <summary>
-    /// 子单信息
+    /// 子单信息列表
     /// </summary>
     [JsonPropertyName("sub_orders")]
     public List<RespSubOrderCompatible>? SubOrders { get; set; }

+ 1 - 1
src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayGetTradeBillResponse.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayFundFlowBillResponse.cs

@@ -3,7 +3,7 @@ using Essensoft.Paylinks.WeChatPay.Core;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Response;
 
-public class WeChatPayGetTradeBillResponse : WeChatPayResponse
+public class WeChatPayFundFlowBillResponse : WeChatPayResponse
 {
     /// <summary>
     /// 哈希类型

+ 1 - 1
src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayQueryByOutTradeNoResponse.cs

@@ -13,7 +13,7 @@ public class WeChatPayQueryByOutTradeNoResponse : WeChatPayResponse
     public string? AppId { get; set; }
 
     /// <summary>
-    /// 直连商户号
+    /// 商户号
     /// </summary>
     [JsonPropertyName("mchid")]
     public string MchId { get; set; }

+ 1 - 1
src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayQueryByTransactionIdResponse.cs

@@ -13,7 +13,7 @@ public class WeChatPayQueryByTransactionIdResponse : WeChatPayResponse
     public string? AppId { get; set; }
 
     /// <summary>
-    /// 直连商户号
+    /// 商户号
     /// </summary>
     [JsonPropertyName("mchid")]
     public string MchId { get; set; }

+ 1 - 1
src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayReverseResponse.cs

@@ -12,7 +12,7 @@ public class WeChatPayReverseResponse : WeChatPayResponse
     public string? AppId { get; set; }
 
     /// <summary>
-    /// 直连商户号。
+    /// 商户号。
     /// </summary>
     [JsonPropertyName("mchid")]
     public string MchId { get; set; }

+ 1 - 1
src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayGetFundFlowBillResponse.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayTradeBillResponse.cs

@@ -3,7 +3,7 @@ using Essensoft.Paylinks.WeChatPay.Core;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Response;
 
-public class WeChatPayGetFundFlowBillResponse : WeChatPayResponse
+public class WeChatPayTradeBillResponse : WeChatPayResponse
 {
     /// <summary>
     /// 哈希类型

+ 1 - 1
src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayAppPrepayResponse.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayTransactionsAppResponse.cs

@@ -3,7 +3,7 @@ using Essensoft.Paylinks.WeChatPay.Core;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Response;
 
-public class WeChatPayAppPrepayResponse : WeChatPayResponse
+public class WeChatPayTransactionsAppResponse : WeChatPayResponse
 {
     /// <summary>
     /// 预支付交易会话标识。用于后续接口调用中使用,该值有效期为2小时

+ 3 - 3
src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayCodePayResponse.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayTransactionsCodePayResponse.cs

@@ -4,7 +4,7 @@ using Essensoft.Paylinks.WeChatPay.Payments.Domain;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Response;
 
-public class WeChatPayCodePayResponse : WeChatPayResponse
+public class WeChatPayTransactionsCodePayResponse : WeChatPayResponse
 {
     /// <summary>
     /// 应用AppID
@@ -13,7 +13,7 @@ public class WeChatPayCodePayResponse : WeChatPayResponse
     public string? AppId { get; set; }
 
     /// <summary>
-    /// 直连商户号
+    /// 商户号
     /// </summary>
     [JsonPropertyName("mchid")]
     public string MchId { get; set; }
@@ -42,7 +42,7 @@ public class WeChatPayCodePayResponse : WeChatPayResponse
     public string? TradeType { get; set; }
 
     /// <summary>
-    /// 银行类型,采用字符串类型的银行标识。 银行标识请参考<a href="https://pay.weixin.qq.com/docs/partner/development/chart/bank-type.html" target="_blank">《银行类型对照表》</a>。
+    /// 银行类型,采用字符串类型的银行标识。 银行标识请参考<a href="https://pay.weixin.qq.com/doc/v3/partner/4012082814" target="_blank">《银行类型对照表》</a>。
     /// </summary>
     [JsonPropertyName("bank_type")]
     public string? BankType { get; set; }

+ 1 - 1
src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayH5PrepayResponse.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayTransactionsH5Response.cs

@@ -3,7 +3,7 @@ using Essensoft.Paylinks.WeChatPay.Core;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Response;
 
-public class WeChatPayH5PrepayResponse : WeChatPayResponse
+public class WeChatPayTransactionsH5Response : WeChatPayResponse
 {
     /// <summary>
     /// 支付跳转链接

+ 1 - 1
src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayJsapPrepayResponse.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayTransactionsJsapiResponse.cs

@@ -3,7 +3,7 @@ using Essensoft.Paylinks.WeChatPay.Core;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Response;
 
-public class WeChatPayJsapiPrepayResponse : WeChatPayResponse
+public class WeChatPayTransactionsJsapiResponse : WeChatPayResponse
 {
     /// <summary>
     /// 预支付交易会话标识。

+ 1 - 1
src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayNativePrepayResponse.cs → src/Essensoft.Paylinks.WeChatPay.Payments/Response/WeChatPayTransactionsNativeResponse.cs

@@ -3,7 +3,7 @@ using Essensoft.Paylinks.WeChatPay.Core;
 
 namespace Essensoft.Paylinks.WeChatPay.Payments.Response;
 
-public class WeChatPayNativePrepayResponse : WeChatPayResponse
+public class WeChatPayTransactionsNativeResponse : WeChatPayResponse
 {
     /// <summary>
     /// 二维码链接

Some files were not shown because too many files changed in this diff