From 320b9177dbd5dd6ec42c15684b6b8b356e2d803c Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Thu, 10 Jun 2021 15:43:55 +0800 Subject: [PATCH] =?UTF-8?q?fix(tenpayv3):=20=E4=BF=AE=E5=A4=8D=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=88=86=E6=9E=90=E5=B7=A5=E5=85=B7=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E5=87=BA=E7=9A=84=20API=20=E5=AE=9A=E4=B9=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...sinessCircleUserAuthorizationByOpenIdRequest.cs | 4 ++-- .../CreateCombineTransactionH5Request.cs | 1 + .../GetEcommerceBillFundflowBillRequest.cs | 1 + .../CreateEcommerceRefundRequest.cs | 3 ++- .../QueryMarketingPartnershipsRequest.cs | 14 +++++++------- .../Bill/GetMerchantFundWithdrawBillRequest.cs | 1 + ...rePartnerServiceOrderByOutOrderNumberRequest.cs | 4 ++-- ...tPayScorePartnerServiceOrderByQueryIdRequest.cs | 4 ++-- .../ApplyPayScorePermissionsResponse.cs | 2 +- .../SetPayScoreServiceOrderSyncRequest.cs | 1 + .../CreatePayTransactionAppRequest.cs | 1 + .../CreatePayTransactionH5Request.cs | 1 + .../Refund/CreateRefundDomesticRefundRequest.cs | 1 + ...efundDomesticRefundByOutRefundNumberResponse.cs | 1 + .../WechatTenpayClientOptions.cs | 10 +++++----- .../WechatTenpayRequest.cs | 5 ++--- 16 files changed, 31 insertions(+), 23 deletions(-) diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/BusinessCircle/GetBusinessCircleUserAuthorizationByOpenIdRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/BusinessCircle/GetBusinessCircleUserAuthorizationByOpenIdRequest.cs index 84bad243..e03e6e90 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/BusinessCircle/GetBusinessCircleUserAuthorizationByOpenIdRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/BusinessCircle/GetBusinessCircleUserAuthorizationByOpenIdRequest.cs @@ -11,8 +11,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models /// /// 获取或设置子商户号。 /// - [Newtonsoft.Json.JsonProperty("sub_mchid")] - [System.Text.Json.Serialization.JsonPropertyName("sub_mchid")] + [Newtonsoft.Json.JsonIgnore] + [System.Text.Json.Serialization.JsonIgnore] public string? SubMerchantId { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/CombineTransactions/CreateCombineTransactionH5Request.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/CombineTransactions/CreateCombineTransactionH5Request.cs index 8e4a602c..70c090c6 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/CombineTransactions/CreateCombineTransactionH5Request.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/CombineTransactions/CreateCombineTransactionH5Request.cs @@ -22,6 +22,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models { /// /// 获取或设置场景类型。 + /// 默认值：Wap /// [Newtonsoft.Json.JsonProperty("type")] [System.Text.Json.Serialization.JsonPropertyName("type")] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/EcommerceBill/GetEcommerceBillFundflowBillRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/EcommerceBill/GetEcommerceBillFundflowBillRequest.cs index 87ea5af1..c410bc93 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/EcommerceBill/GetEcommerceBillFundflowBillRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/EcommerceBill/GetEcommerceBillFundflowBillRequest.cs @@ -17,6 +17,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models /// /// 获取或设置资金账户类型。 + /// 默认值：ALL /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/EcommerceRefunds/CreateEcommerceRefundRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/EcommerceRefunds/CreateEcommerceRefundRequest.cs index 6a806bc8..f3897b98 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/EcommerceRefunds/CreateEcommerceRefundRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/EcommerceRefunds/CreateEcommerceRefundRequest.cs @@ -28,10 +28,11 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models /// /// 获取或设置退款币种。 + /// 默认值：CNY /// [Newtonsoft.Json.JsonProperty("currency")] [System.Text.Json.Serialization.JsonPropertyName("currency")] - public string Currency { get; set; } = default!; + public string Currency { get; set; } = "CNY"; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MarketingPartnerships/QueryMarketingPartnershipsRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MarketingPartnerships/QueryMarketingPartnershipsRequest.cs index 468b6947..b27f4925 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MarketingPartnerships/QueryMarketingPartnershipsRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MarketingPartnerships/QueryMarketingPartnershipsRequest.cs @@ -15,21 +15,21 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models /// /// 获取或设置合作方类别。 /// - [Newtonsoft.Json.JsonProperty("type")] + [Newtonsoft.Json.JsonProperty("type")] [System.Text.Json.Serialization.JsonPropertyName("type")] public string Type { get; set; } = string.Empty; /// /// 获取或设置合作方 AppId。与字段 二选一。 /// - [Newtonsoft.Json.JsonProperty("appid")] + [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] public string? AppId { get; set; } /// /// 获取或设置合作方商户号。与字段 二选一。 /// - [Newtonsoft.Json.JsonProperty("merchant_id")] + [Newtonsoft.Json.JsonProperty("merchant_id")] [System.Text.Json.Serialization.JsonPropertyName("merchant_id")] public string? MerchantId { get; set; } } @@ -39,7 +39,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models /// /// 获取或设置授权业务类别。 /// - [Newtonsoft.Json.JsonProperty("business_type")] + [Newtonsoft.Json.JsonProperty("business_type")] [System.Text.Json.Serialization.JsonPropertyName("business_type")] public string BusinessType { get; set; } = string.Empty; @@ -53,7 +53,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models /// /// 获取或设置授权批次 ID。 /// - [Newtonsoft.Json.JsonProperty("stock_id")] + [Newtonsoft.Json.JsonProperty("stock_id")] [System.Text.Json.Serialization.JsonPropertyName("stock_id")] public string? StockId { get; set; } } @@ -62,14 +62,14 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models /// /// 获取或设置合作方信息。 /// - [Newtonsoft.Json.JsonIgnore] + [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] public Types.Partner Partner { get; set; } = new Types.Partner(); /// /// 获取或设置被授权数据。 /// - [Newtonsoft.Json.JsonIgnore] + [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] public Types.AuthorizedData AuthorizedData { get; set; } = new Types.AuthorizedData(); diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantFundWithdraw/Bill/GetMerchantFundWithdrawBillRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantFundWithdraw/Bill/GetMerchantFundWithdrawBillRequest.cs index a6ece831..50a3bc9f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantFundWithdraw/Bill/GetMerchantFundWithdrawBillRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantFundWithdraw/Bill/GetMerchantFundWithdrawBillRequest.cs @@ -17,6 +17,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models /// /// 获取或设置资金账户类型。 + /// 默认值：NO_SUCC /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/PayScorePartnerServiceOrder/GetPayScorePartnerServiceOrderByOutOrderNumberRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/PayScorePartnerServiceOrder/GetPayScorePartnerServiceOrderByOutOrderNumberRequest.cs index 6a9d5546..99a03a51 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/PayScorePartnerServiceOrder/GetPayScorePartnerServiceOrderByOutOrderNumberRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/PayScorePartnerServiceOrder/GetPayScorePartnerServiceOrderByOutOrderNumberRequest.cs @@ -11,8 +11,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models /// /// 获取或设置子商户号。 /// - [Newtonsoft.Json.JsonProperty("sub_mchid")] - [System.Text.Json.Serialization.JsonPropertyName("sub_mchid")] + [Newtonsoft.Json.JsonIgnore] + [System.Text.Json.Serialization.JsonIgnore] public string SubMerchantId { get; set; } = string.Empty; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/PayScorePartnerServiceOrder/GetPayScorePartnerServiceOrderByQueryIdRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/PayScorePartnerServiceOrder/GetPayScorePartnerServiceOrderByQueryIdRequest.cs index a68d85a4..495f407f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/PayScorePartnerServiceOrder/GetPayScorePartnerServiceOrderByQueryIdRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/PayScorePartnerServiceOrder/GetPayScorePartnerServiceOrderByQueryIdRequest.cs @@ -11,8 +11,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models /// /// 获取或设置子商户号。 /// - [Newtonsoft.Json.JsonProperty("sub_mchid")] - [System.Text.Json.Serialization.JsonPropertyName("sub_mchid")] + [Newtonsoft.Json.JsonIgnore] + [System.Text.Json.Serialization.JsonIgnore] public string SubMerchantId { get; set; } = string.Empty; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/PayScorePermissions/ApplyPayScorePermissionsResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/PayScorePermissions/ApplyPayScorePermissionsResponse.cs index ce0c2942..d22e2a95 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/PayScorePermissions/ApplyPayScorePermissionsResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/PayScorePermissions/ApplyPayScorePermissionsResponse.cs @@ -13,6 +13,6 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models /// [Newtonsoft.Json.JsonProperty("apply_permissions_token")] [System.Text.Json.Serialization.JsonPropertyName("apply_permissions_token")] - public string ApplyPermissionsToken { get; set; } = string.Empty; + public string ApplyPermissionsToken { get; set; } = default!; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/PayScoreServiceOrder/SetPayScoreServiceOrderSyncRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/PayScoreServiceOrder/SetPayScoreServiceOrderSyncRequest.cs index f4c6511c..54732ca6 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/PayScoreServiceOrder/SetPayScoreServiceOrderSyncRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/PayScoreServiceOrder/SetPayScoreServiceOrderSyncRequest.cs @@ -60,6 +60,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models /// /// 获取或设置场景类型。 + /// 默认值：Order_Paid /// [Newtonsoft.Json.JsonProperty("type")] [System.Text.Json.Serialization.JsonPropertyName("type")] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/PayTransactions/CreatePayTransactionAppRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/PayTransactions/CreatePayTransactionAppRequest.cs index 26e5fc3a..d22c5f8c 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/PayTransactions/CreatePayTransactionAppRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/PayTransactions/CreatePayTransactionAppRequest.cs @@ -21,6 +21,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models /// /// 获取或设置币种。 + /// 默认值：CNY /// [Newtonsoft.Json.JsonProperty("currency")] [System.Text.Json.Serialization.JsonPropertyName("currency")] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/PayTransactions/CreatePayTransactionH5Request.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/PayTransactions/CreatePayTransactionH5Request.cs index 46e8c2ce..f261a67b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/PayTransactions/CreatePayTransactionH5Request.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/PayTransactions/CreatePayTransactionH5Request.cs @@ -26,6 +26,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models { /// /// 获取或设置场景类型。 + /// 默认值：Wap /// [Newtonsoft.Json.JsonProperty("type")] [System.Text.Json.Serialization.JsonPropertyName("type")] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/Refund/CreateRefundDomesticRefundRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/Refund/CreateRefundDomesticRefundRequest.cs index 47b9db1e..c9fa121f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/Refund/CreateRefundDomesticRefundRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/Refund/CreateRefundDomesticRefundRequest.cs @@ -48,6 +48,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models /// /// 获取或设置退款币种。 + /// 默认值：CNY /// [Newtonsoft.Json.JsonProperty("currency")] [System.Text.Json.Serialization.JsonPropertyName("currency")] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/Refund/GetRefundDomesticRefundByOutRefundNumberResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/Refund/GetRefundDomesticRefundByOutRefundNumberResponse.cs index 96fc67e0..c2e00eec 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/Refund/GetRefundDomesticRefundByOutRefundNumberResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/Refund/GetRefundDomesticRefundByOutRefundNumberResponse.cs @@ -48,6 +48,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models /// /// 获取或设置退款币种。 + /// 默认值：CNY /// [Newtonsoft.Json.JsonProperty("currency")] [System.Text.Json.Serialization.JsonPropertyName("currency")] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayClientOptions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayClientOptions.cs index 9ef82513..9b5377b0 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayClientOptions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayClientOptions.cs @@ -9,31 +9,31 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 public class WechatTenpayClientOptions { /// - /// 获取或设置请求超时时间（单位：毫秒）。 + /// 获取或设置请求超时时间（单位：毫秒）。 /// 默认值：30000 /// public int Timeout { get; set; } = 30 * 1000; /// - /// 获取或设置微信支付 API 域名。 + /// 获取或设置微信支付 API 域名。 /// 默认值： /// public string? Endpoints { get; set; } = WechatTenpayEndpoints.DEFAULT; /// - /// 获取或设置声明应答中的错误描述使用的自然语言语种。 + /// 获取或设置声明应答中的错误描述使用的自然语言语种。 /// 默认值：根据操作系统自动生成 /// public string UserAgent { get; set; } = $"OS/{Environment.OSVersion.Platform} SKIT.FlurlHttpClient.Wechat.Tenpay/{Assembly.GetExecutingAssembly().GetName().Version}"; /// - /// 获取或设置声明应答中的错误描述使用的自然语言语种。 + /// 获取或设置声明应答中的错误描述使用的自然语言语种。 /// 默认值：zh_CN /// public string AcceptLanguage { get; set; } = "zh-CN"; /// - /// 获取或设置微信支付 API 签名认证方式。 + /// 获取或设置微信支付 API 签名认证方式。 /// 默认值： /// public string AuthScheme { get; set; } = WechatTenpayAuthSchemes.WECHATPAY2_SHA256_RSA2048; diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayRequest.cs index fe401853..0e909723 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayRequest.cs @@ -8,15 +8,14 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 public abstract class WechatTenpayRequest : IWechatRequest { /// - /// 获取或设置请求超时时间（单位：毫秒）。 - /// 如果不指定将使用构造 时的 参数，这在需要指定特定耗时请求（比如上传或下载文件）的超时时间时很有用。 + /// 获取或设置请求超时时间（单位：毫秒）。如果不指定将使用构造 时的 参数，这在需要指定特定耗时请求（比如上传或下载文件）的超时时间时很有用。 /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] public virtual int? Timeout { get; set; } /// - /// 获取或设置微信请求使用的微信支付平台证书序列号。 + /// 获取或设置微信请求使用的微信支付平台证书序列号。 /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore]