diff --git a/docs/WechatTenpayV2/Basic_ModelDefinition.md b/docs/WechatTenpayV2/Basic_ModelDefinition.md index 7867bd54..1c0480ca 100644 --- a/docs/WechatTenpayV2/Basic_ModelDefinition.md +++ b/docs/WechatTenpayV2/Basic_ModelDefinition.md @@ -67,7 +67,7 @@ [展开查看] -- 支付工具 +- 支付产品 - 付款码支付： @@ -89,6 +89,8 @@ - 付款码查询 OpenID：`ToolsAuthCodeToOpenId` + - 拉取订单评价数据：`BatchQueryBillComment` + - JSAPI 支付： - 统一下单：`CreatePayUnifiedOrder` @@ -107,6 +109,8 @@ - 交易保障：`SubmitPayITILReport` + - 拉取订单评价数据：`BatchQueryBillComment` + - Native 支付： - 统一下单：`CreatePayUnifiedOrder` @@ -127,6 +131,8 @@ - 转换短链接：`ToolsShortUrl` + - 拉取订单评价数据：`BatchQueryBillComment` + - APP 支付： - 统一下单：`CreatePayUnifiedOrder` @@ -145,6 +151,8 @@ - 交易保障：`SubmitPayITILReport` + - 拉取订单评价数据：`BatchQueryBillComment` + - H5 支付： - 统一下单：`CreatePayUnifiedOrder` @@ -163,6 +171,8 @@ - 交易保障：`SubmitPayITILReport` + - 拉取订单评价数据：`BatchQueryBillComment` + - 小程序支付： - 统一下单：`CreatePayUnifiedOrder` @@ -181,6 +191,8 @@ - 交易保障：`SubmitPayITILReport` + - 拉取订单评价数据：`BatchQueryBillComment` + - 支付工具： - 现金红包： @@ -247,7 +259,7 @@ [展开查看] -- 支付工具 +- 支付产品 - 付款码支付： @@ -423,6 +435,22 @@ - 查询红包记录：`GetPayMarketingTransfersRedPackInfo` +- 小微商户： + + - 查询提现状态：`GetFundAutoWithdrawByDate` + + - 修改结算银行卡：`ModifyMicroMerchantArchives` + + - 修改联系信息：`ModifyMicroMerchantContactInfo` + + - 关注配置：`AddMarketingRecommendConfig` + + - 支付目录配置：`AddSubMerchantDevelopConfig` + + - 绑定 AppID 配置：`AddSubMerchantDevelopConfig` + + - 配置查询：`GetSubMerchantDevelopConfig` + --- diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteFundExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteFundExtensions.cs new file mode 100644 index 00000000..69d832a1 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteFundExtensions.cs @@ -0,0 +1,30 @@ +using System; +using System.Net.Http; +using System.Threading; +using System.Threading.Tasks; +using Flurl.Http; + +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 +{ + public static class WechatTenpayClientExecuteFundExtensions + { + /// + /// 异步调用 [POST] /fund/queryautowithdrawbydate 接口。 + /// REF: https://pay.weixin.qq.com/wiki/doc/api/xiaowei.php?chapter=21_1 + /// + /// + /// + /// + /// + public static async Task ExecuteGetFundAutoWithdrawByDateAsync(this WechatTenpayClient client, Models.GetFundAutoWithdrawByDateRequest request, CancellationToken cancellationToken = default) + { + if (client is null) throw new ArgumentNullException(nameof(client)); + if (request is null) throw new ArgumentNullException(nameof(request)); + + IFlurlRequest flurlReq = client + .CreateRequest(request, HttpMethod.Post, "fund", "queryautowithdrawbydate"); + + return await client.SendRequestWithXmlAsync(flurlReq, data: request, cancellationToken: cancellationToken); + } + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteMerchantMicroExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteMerchantMicroExtensions.cs new file mode 100644 index 00000000..b910fcb4 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteMerchantMicroExtensions.cs @@ -0,0 +1,49 @@ +using System; +using System.Net.Http; +using System.Threading; +using System.Threading.Tasks; +using Flurl.Http; + +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 +{ + public static class WechatTenpayClientExecuteMerchantMicroExtensions + { + /// + /// 异步调用 [POST] /applyment/micro/modifyarchives 接口。 + /// REF: https://pay.weixin.qq.com/wiki/doc/api/xiaowei.php?chapter=21_2 + /// + /// + /// + /// + /// + public static async Task ExecuteModifyMicroMerchantArchivesAsync(this WechatTenpayClient client, Models.ModifyMicroMerchantArchivesRequest request, CancellationToken cancellationToken = default) + { + if (client is null) throw new ArgumentNullException(nameof(client)); + if (request is null) throw new ArgumentNullException(nameof(request)); + + IFlurlRequest flurlReq = client + .CreateRequest(request, HttpMethod.Post, "applyment", "micro", "modifyarchives"); + + return await client.SendRequestWithXmlAsync(flurlReq, data: request, cancellationToken: cancellationToken); + } + + /// + /// 异步调用 [POST] /applyment/micro/modifycontactinfo 接口。 + /// REF: https://pay.weixin.qq.com/wiki/doc/api/xiaowei.php?chapter=21_4 + /// + /// + /// + /// + /// + public static async Task ExecuteModifyMicroMerchantContactInfoAsync(this WechatTenpayClient client, Models.ModifyMicroMerchantContactInfoRequest request, CancellationToken cancellationToken = default) + { + if (client is null) throw new ArgumentNullException(nameof(client)); + if (request is null) throw new ArgumentNullException(nameof(request)); + + IFlurlRequest flurlReq = client + .CreateRequest(request, HttpMethod.Post, "applyment", "micro", "modifycontactinfo"); + + return await client.SendRequestWithXmlAsync(flurlReq, data: request, cancellationToken: cancellationToken); + } + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteSubMerchantExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteSubMerchantExtensions.cs index c8dc2034..ca49c926 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteSubMerchantExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteSubMerchantExtensions.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Net.Http; using System.Threading; using System.Threading.Tasks; @@ -12,6 +12,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /secapi/mch/addsubdevconfig 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/api/mch_bank.php?chapter=9_24_2&index=1&p=901 /// REF: https://pay.weixin.qq.com/wiki/doc/api/mch_bank.php?chapter=9_24_3&index=2&p=901 + /// REF: https://pay.weixin.qq.com/wiki/doc/api/xiaowei.php?chapter=20_2 + /// REF: https://pay.weixin.qq.com/wiki/doc/api/xiaowei.php?chapter=20_3 /// /// /// @@ -31,6 +33,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// /// 异步调用 [POST] /secapi/mch/querysubdevconfig 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/api/mch_bank.php?chapter=9_25&index=3&p=901 + /// REF: https://pay.weixin.qq.com/wiki/doc/api/xiaowei.php?chapter=20_4 /// /// /// @@ -46,5 +49,24 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 return await client.SendRequestWithXmlAsync(flurlReq, data: request, cancellationToken: cancellationToken); } + + /// + /// 异步调用 [POST] /secapi/mkt/addrecommendconf 接口。 + /// REF: https://pay.weixin.qq.com/wiki/doc/api/xiaowei.php?chapter=20_0 + /// + /// + /// + /// + /// + public static async Task ExecuteAddSubMerchantMarketingRecommendConfigAsync(this WechatTenpayClient client, Models.AddSubMerchantMarketingRecommendConfigRequest request, CancellationToken cancellationToken = default) + { + if (client is null) throw new ArgumentNullException(nameof(client)); + if (request is null) throw new ArgumentNullException(nameof(request)); + + IFlurlRequest flurlReq = client + .CreateRequest(request, HttpMethod.Post, "secapi", "mkt", "addrecommendconf"); + + return await client.SendRequestWithXmlAsync(flurlReq, data: request, cancellationToken: cancellationToken); + } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/BillComment/BatchQueryBillCommentResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/BillComment/BatchQueryBillCommentResponse.cs index 58f8ab97..c8cad378 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/BillComment/BatchQueryBillCommentResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/BillComment/BatchQueryBillCommentResponse.cs @@ -6,14 +6,14 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models public class BatchQueryBillCommentResponse : WechatTenpayResponse { /// - /// + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] public override string? MerchantId { get; set; } /// - /// + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/ConsumeDepositResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/ConsumeDepositResponse.cs index a0de5a90..1a56b6e0 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/ConsumeDepositResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/ConsumeDepositResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /deposit/consume 接口的响应。 @@ -10,14 +10,22 @@ /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置子商户号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/CreateDepositMicroPayResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/CreateDepositMicroPayResponse.cs index f333fc61..d860c76f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/CreateDepositMicroPayResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/CreateDepositMicroPayResponse.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { @@ -12,14 +12,22 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置子商户号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/CreateDepositRefundResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/CreateDepositRefundResponse.cs index f424fb58..d52794d6 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/CreateDepositRefundResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/CreateDepositRefundResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /deposit/refund 接口的响应。 @@ -10,14 +10,22 @@ /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置子商户号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/CreateDepositUnifiedOrderResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/CreateDepositUnifiedOrderResponse.cs index 06bf3820..cf3055db 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/CreateDepositUnifiedOrderResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/CreateDepositUnifiedOrderResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /deposit/unifiedorder 接口的响应。 @@ -10,14 +10,22 @@ /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置子商户号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/GetDepositOrderResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/GetDepositOrderResponse.cs index ee9fa37b..59a9df05 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/GetDepositOrderResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/GetDepositOrderResponse.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { @@ -12,14 +12,22 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置子商户号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/GetDepositRefundResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/GetDepositRefundResponse.cs index b47fe756..5b40dcc9 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/GetDepositRefundResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/GetDepositRefundResponse.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { @@ -12,14 +12,22 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置子商户号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/ReverseDepositOrderResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/ReverseDepositOrderResponse.cs index cc8233e6..b5c9cdee 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/ReverseDepositOrderResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/ReverseDepositOrderResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /deposit/reverse 接口的响应。 @@ -10,14 +10,22 @@ /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置子商户号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Fraud/GetRiskPublicKeyRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Fraud/GetRiskPublicKeyRequest.cs index 0269aca5..d3a0d77f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Fraud/GetRiskPublicKeyRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Fraud/GetRiskPublicKeyRequest.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /risk/getpublickey 接口的请求。 @@ -13,7 +13,7 @@ public override string? MerchantId { get; set; } /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Fraud/GetRiskPublicKeyResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Fraud/GetRiskPublicKeyResponse.cs index d377e315..da313378 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Fraud/GetRiskPublicKeyResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Fraud/GetRiskPublicKeyResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /risk/getpublickey 接口的响应。 @@ -10,10 +10,14 @@ /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Fund/GetFundAutoWithdrawByDateRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Fund/GetFundAutoWithdrawByDateRequest.cs new file mode 100644 index 00000000..c7174078 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Fund/GetFundAutoWithdrawByDateRequest.cs @@ -0,0 +1,46 @@ +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +{ + /// + /// 表示 [POST] /fund/queryautowithdrawbydate 接口的请求。 + /// + public class GetFundAutoWithdrawByDateRequest : WechatTenpaySignableRequest + { + /// + /// + /// + [Newtonsoft.Json.JsonProperty("mch_id")] + [System.Text.Json.Serialization.JsonPropertyName("mch_id")] + public override string? MerchantId { get; set; } + + /// + /// （冗余字段，请忽略） + /// + [Newtonsoft.Json.JsonIgnore] + [System.Text.Json.Serialization.JsonIgnore] + public override string? AppId { get; set; } + + /// + /// 获取或设置子商户号。 + /// + [Newtonsoft.Json.JsonProperty("sub_mch_id")] + [System.Text.Json.Serialization.JsonPropertyName("sub_mch_id")] + public string SubMerchantId { get; set; } = string.Empty; + + /// + /// + /// 默认值： + /// + [Newtonsoft.Json.JsonProperty("sign_type")] + [System.Text.Json.Serialization.JsonPropertyName("sign_type")] +#pragma warning disable CS8765 + public override string SignType { get; set; } = Constants.SignTypes.HMAC_SHA256; +#pragma warning restore CS8765 + + /// + /// 获取或设置日期字符串（格式：yyyyMMdd）。 + /// + [Newtonsoft.Json.JsonProperty("date")] + [System.Text.Json.Serialization.JsonPropertyName("date")] + public string DateString { get; set; } = string.Empty; + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Fund/GetFundAutoWithdrawByDateResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Fund/GetFundAutoWithdrawByDateResponse.cs new file mode 100644 index 00000000..ebe19d3e --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Fund/GetFundAutoWithdrawByDateResponse.cs @@ -0,0 +1,97 @@ +using System; + +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +{ + /// + /// 表示 [POST] /fund/queryautowithdrawbydate 接口的响应。 + /// + public class GetFundAutoWithdrawByDateResponse : WechatTenpaySignableResponse + { + /// + /// + /// + [Newtonsoft.Json.JsonProperty("mch_id")] + [System.Text.Json.Serialization.JsonPropertyName("mch_id")] +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 + + /// + /// （冗余字段，请忽略） + /// + [Newtonsoft.Json.JsonIgnore] + [System.Text.Json.Serialization.JsonIgnore] + public override string? AppId { get; set; } + + /// + /// 获取或设置子商户号。 + /// + [Newtonsoft.Json.JsonProperty("sub_mch_id")] + [System.Text.Json.Serialization.JsonPropertyName("sub_mch_id")] + public string? SubMerchantId { get; set; } + + /// + /// 获取或设置日期字符串（格式：yyyyMMdd）。 + /// + [Newtonsoft.Json.JsonProperty("date")] + [System.Text.Json.Serialization.JsonPropertyName("date")] + public string DateString { get; set; } = default!; + + /// + /// 获取或设置单据 ID。 + /// + [Newtonsoft.Json.JsonProperty("withdraw_id")] + [System.Text.Json.Serialization.JsonPropertyName("withdraw_id")] + public string? WithdrawId { get; set; } + + /// + /// 获取或设置单据状态。 + /// + [Newtonsoft.Json.JsonProperty("withdraw_status")] + [System.Text.Json.Serialization.JsonPropertyName("withdraw_status")] + public string WithdrawStatus { get; set; } = default!; + + /// + /// 获取或设置金额（单位：分）。 + /// + [Newtonsoft.Json.JsonProperty("amount")] + [System.Text.Json.Serialization.JsonPropertyName("amount")] + public int? Amount { get; set; } + + /// + /// 获取或设置失败原因。 + /// + [Newtonsoft.Json.JsonProperty("fail_reason")] + [System.Text.Json.Serialization.JsonPropertyName("fail_reason")] + public string? FailReason { get; set; } + + /// + /// 获取或设置创建时间。 + /// + [Newtonsoft.Json.JsonProperty("create_time")] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.RegularNullableDateTimeOffsetConverter))] + [System.Text.Json.Serialization.JsonPropertyName("create_time")] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.RegularNullableDateTimeOffsetConverter))] + public DateTimeOffset? CreateTime { get; set; } + + /// + /// 获取或设置成功时间。 + /// + [Newtonsoft.Json.JsonProperty("success_time")] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.RegularNullableDateTimeOffsetConverter))] + [System.Text.Json.Serialization.JsonPropertyName("success_time")] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.RegularNullableDateTimeOffsetConverter))] + public DateTimeOffset? SuccessTime { get; set; } + + /// + /// 获取或设置退票时间。 + /// + [Newtonsoft.Json.JsonProperty("refund_time")] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.RegularNullableDateTimeOffsetConverter))] + [System.Text.Json.Serialization.JsonPropertyName("refund_time")] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.RegularNullableDateTimeOffsetConverter))] + public DateTimeOffset? RefundTime { get; set; } + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantCustoms/CreateMerchantCustomsCustomDeclarationResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantCustoms/CreateMerchantCustomsCustomDeclarationResponse.cs index 3d2ecc21..42668ef3 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantCustoms/CreateMerchantCustomsCustomDeclarationResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantCustoms/CreateMerchantCustomsCustomDeclarationResponse.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { @@ -12,14 +12,22 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置状态码。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantCustoms/QueryMerchantCustomsCustomDeclarationResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantCustoms/QueryMerchantCustomsCustomDeclarationResponse.cs index ff3aa8ac..e450b4c2 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantCustoms/QueryMerchantCustomsCustomDeclarationResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantCustoms/QueryMerchantCustomsCustomDeclarationResponse.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { @@ -127,14 +127,22 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置微信支付订单号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantCustoms/RedeclareMerchantCustomsCustomDeclarationResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantCustoms/RedeclareMerchantCustomsCustomDeclarationResponse.cs index 5a4ac077..0f2a6b53 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantCustoms/RedeclareMerchantCustomsCustomDeclarationResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantCustoms/RedeclareMerchantCustomsCustomDeclarationResponse.cs @@ -12,14 +12,22 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置状态码。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantInstitutionSub/AddSubMerchantInstitutionResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantInstitutionSub/AddSubMerchantInstitutionResponse.cs index c52db48d..6ddc9cfc 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantInstitutionSub/AddSubMerchantInstitutionResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantInstitutionSub/AddSubMerchantInstitutionResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /secapi/mch/addInstitutionsub 接口的响应。 @@ -6,14 +6,14 @@ public class AddSubMerchantInstitutionResponse : WechatTenpaySignableResponse { /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] public override string? MerchantId { get; set; } /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantInstitutionSub/GetSubMerchantInstitutionResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantInstitutionSub/GetSubMerchantInstitutionResponse.cs index a7a50c64..311332fd 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantInstitutionSub/GetSubMerchantInstitutionResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantInstitutionSub/GetSubMerchantInstitutionResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /secapi/mch/queryInstitutionsub 接口的响应。 @@ -6,14 +6,14 @@ public class GetSubMerchantInstitutionResponse : WechatTenpaySignableResponse { /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] public override string? MerchantId { get; set; } /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantInstitutionSub/ModifySubMerchantInstitutionResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantInstitutionSub/ModifySubMerchantInstitutionResponse.cs index 45910ccc..dd656771 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantInstitutionSub/ModifySubMerchantInstitutionResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantInstitutionSub/ModifySubMerchantInstitutionResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /secapi/mch/modifyInstitutionsub 接口的响应。 @@ -6,14 +6,14 @@ public class ModifySubMerchantInstitutionResponse : WechatTenpaySignableResponse { /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] public override string? MerchantId { get; set; } /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantMedia/UploadMerchantMediaRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantMedia/UploadMerchantMediaRequest.cs index 3ea4636e..df391787 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantMedia/UploadMerchantMediaRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantMedia/UploadMerchantMediaRequest.cs @@ -8,14 +8,14 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models public class UploadMerchantMediaRequest : WechatTenpayRequest { /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] public override string? MerchantId { get; set; } /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantMedia/UploadMerchantMediaResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantMedia/UploadMerchantMediaResponse.cs index 3ace22d9..c2ac6c23 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantMedia/UploadMerchantMediaResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantMedia/UploadMerchantMediaResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /secapi/mch/uploadmedia 接口的响应。 @@ -6,14 +6,14 @@ public class UploadMerchantMediaResponse : WechatTenpaySignableResponse { /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] public override string? MerchantId { get; set; } /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantMicro/ModifyMicroMerchantArchivesRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantMicro/ModifyMicroMerchantArchivesRequest.cs new file mode 100644 index 00000000..36c6d61c --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantMicro/ModifyMicroMerchantArchivesRequest.cs @@ -0,0 +1,81 @@ +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +{ + /// + /// 表示 [POST] /applyment/micro/modifyarchives 接口的请求。 + /// + public class ModifyMicroMerchantArchivesRequest : WechatTenpaySignableRequest + { + /// + /// 获取或设置接口版本号。 + /// + [Newtonsoft.Json.JsonProperty("version")] + [System.Text.Json.Serialization.JsonPropertyName("version")] + public string? Version { get; set; } + + /// + /// + /// + [Newtonsoft.Json.JsonProperty("mch_id")] + [System.Text.Json.Serialization.JsonPropertyName("mch_id")] + public override string? MerchantId { get; set; } + + /// + /// （冗余字段，请忽略） + /// + [Newtonsoft.Json.JsonIgnore] + [System.Text.Json.Serialization.JsonIgnore] + public override string? AppId { get; set; } + + /// + /// 获取或设置子商户号。 + /// + [Newtonsoft.Json.JsonProperty("sub_mch_id")] + [System.Text.Json.Serialization.JsonPropertyName("sub_mch_id")] + public string SubMerchantId { get; set; } = string.Empty; + + /// + /// + /// 默认值： + /// + [Newtonsoft.Json.JsonProperty("sign_type")] + [System.Text.Json.Serialization.JsonPropertyName("sign_type")] +#pragma warning disable CS8765 + public override string SignType { get; set; } = Constants.SignTypes.HMAC_SHA256; +#pragma warning restore CS8765 + + /// + /// 获取或设置开户银行。 + /// + [Newtonsoft.Json.JsonProperty("account_bank")] + [System.Text.Json.Serialization.JsonPropertyName("account_bank")] + public string? BankName { get; set; } + + /// + /// 获取或设置开户银行全称。 + /// + [Newtonsoft.Json.JsonProperty("bank_name")] + [System.Text.Json.Serialization.JsonPropertyName("bank_name")] + public string? BankFullName { get; set; } + + /// + /// 获取或设置开户银行省市编码。 + /// + [Newtonsoft.Json.JsonProperty("bank_address_code")] + [System.Text.Json.Serialization.JsonPropertyName("bank_address_code")] + public string? BankAddressCode { get; set; } + + /// + /// 获取或设置银行卡号（需使用平台提供的 RSA 公钥加密）。 + /// + [Newtonsoft.Json.JsonProperty("account_number")] + [System.Text.Json.Serialization.JsonPropertyName("account_number")] + public string? BankAccountNumber { get; set; } + + /// + /// 获取或设置平台证书序列号。 + /// + [Newtonsoft.Json.JsonProperty("cert_sn")] + [System.Text.Json.Serialization.JsonPropertyName("cert_sn")] + public string CertificateSerialNumber { get; set; } = string.Empty; + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantMicro/ModifyMicroMerchantArchivesResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantMicro/ModifyMicroMerchantArchivesResponse.cs new file mode 100644 index 00000000..38825fa4 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantMicro/ModifyMicroMerchantArchivesResponse.cs @@ -0,0 +1,33 @@ +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +{ + /// + /// 表示 [POST] /applyment/micro/modifyarchives 接口的响应。 + /// + public class ModifyMicroMerchantArchivesResponse : WechatTenpaySignableResponse + { + /// + /// + /// + [Newtonsoft.Json.JsonProperty("mch_id")] + [System.Text.Json.Serialization.JsonPropertyName("mch_id")] +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 + + /// + /// （冗余字段，请忽略） + /// + [Newtonsoft.Json.JsonIgnore] + [System.Text.Json.Serialization.JsonIgnore] + public override string? AppId { get; set; } + + /// + /// 获取或设置子商户号。 + /// + [Newtonsoft.Json.JsonProperty("sub_mch_id")] + [System.Text.Json.Serialization.JsonPropertyName("sub_mch_id")] + public string SubMerchantId { get; set; } = default!; + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantMicro/ModifyMicroMerchantContactInfoRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantMicro/ModifyMicroMerchantContactInfoRequest.cs new file mode 100644 index 00000000..36828e0a --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantMicro/ModifyMicroMerchantContactInfoRequest.cs @@ -0,0 +1,74 @@ +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +{ + /// + /// 表示 [POST] /applyment/micro/modifycontactinfo 接口的请求。 + /// + public class ModifyMicroMerchantContactInfoRequest : WechatTenpaySignableRequest + { + /// + /// 获取或设置接口版本号。 + /// + [Newtonsoft.Json.JsonProperty("version")] + [System.Text.Json.Serialization.JsonPropertyName("version")] + public string? Version { get; set; } + + /// + /// + /// + [Newtonsoft.Json.JsonProperty("mch_id")] + [System.Text.Json.Serialization.JsonPropertyName("mch_id")] + public override string? MerchantId { get; set; } + + /// + /// （冗余字段，请忽略） + /// + [Newtonsoft.Json.JsonIgnore] + [System.Text.Json.Serialization.JsonIgnore] + public override string? AppId { get; set; } + + /// + /// 获取或设置子商户号。 + /// + [Newtonsoft.Json.JsonProperty("sub_mch_id")] + [System.Text.Json.Serialization.JsonPropertyName("sub_mch_id")] + public string SubMerchantId { get; set; } = string.Empty; + + /// + /// + /// 默认值： + /// + [Newtonsoft.Json.JsonProperty("sign_type")] + [System.Text.Json.Serialization.JsonPropertyName("sign_type")] +#pragma warning disable CS8765 + public override string SignType { get; set; } = Constants.SignTypes.HMAC_SHA256; +#pragma warning restore CS8765 + + /// + /// 获取或设置商户简称。 + /// + [Newtonsoft.Json.JsonProperty("merchant_name")] + [System.Text.Json.Serialization.JsonPropertyName("merchant_name")] + public string? MerchantName { get; set; } + + /// + /// 获取或设置手机号码（需使用平台提供的 RSA 公钥加密）。 + /// + [Newtonsoft.Json.JsonProperty("mobile_phone")] + [System.Text.Json.Serialization.JsonPropertyName("mobile_phone")] + public string? MobileNumber { get; set; } + + /// + /// 获取或设置邮箱地址（需使用平台提供的 RSA 公钥加密）。 + /// + [Newtonsoft.Json.JsonProperty("email")] + [System.Text.Json.Serialization.JsonPropertyName("email")] + public string? Email { get; set; } + + /// + /// 获取或设置平台证书序列号。 + /// + [Newtonsoft.Json.JsonProperty("cert_sn")] + [System.Text.Json.Serialization.JsonPropertyName("cert_sn")] + public string CertificateSerialNumber { get; set; } = string.Empty; + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantMicro/ModifyMicroMerchantContactInfoResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantMicro/ModifyMicroMerchantContactInfoResponse.cs new file mode 100644 index 00000000..37c89b8b --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/MerchantMicro/ModifyMicroMerchantContactInfoResponse.cs @@ -0,0 +1,33 @@ +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +{ + /// + /// 表示 [POST] /applyment/micro/modifycontactinfo 接口的响应。 + /// + public class ModifyMicroMerchantContactInfoResponse : WechatTenpaySignableResponse + { + /// + /// + /// + [Newtonsoft.Json.JsonProperty("mch_id")] + [System.Text.Json.Serialization.JsonPropertyName("mch_id")] +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 + + /// + /// （冗余字段，请忽略） + /// + [Newtonsoft.Json.JsonIgnore] + [System.Text.Json.Serialization.JsonIgnore] + public override string? AppId { get; set; } + + /// + /// 获取或设置子商户号。 + /// + [Newtonsoft.Json.JsonProperty("sub_mch_id")] + [System.Text.Json.Serialization.JsonPropertyName("sub_mch_id")] + public string SubMerchantId { get; set; } = default!; + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/Contract/ApplyPAPPayResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/Contract/ApplyPAPPayResponse.cs index 9934d6fb..df9326a5 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/Contract/ApplyPAPPayResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/Contract/ApplyPAPPayResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /pay/pappayapply 接口的响应。 @@ -10,13 +10,21 @@ /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/Contract/CreateContractOrderResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/Contract/CreateContractOrderResponse.cs index 177f46db..8976dd9e 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/Contract/CreateContractOrderResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/Contract/CreateContractOrderResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /pay/contractorder 接口的响应。 @@ -31,14 +31,22 @@ /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置商户订单号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/Contract/DeletePAPPayContractResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/Contract/DeletePAPPayContractResponse.cs index e738e0e2..87a083f9 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/Contract/DeletePAPPayContractResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/Contract/DeletePAPPayContractResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /papay/deletecontract 接口的响应。 @@ -10,14 +10,22 @@ /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置子商户号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/Contract/GetPAPPayContractResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/Contract/GetPAPPayContractResponse.cs index 1564c2a8..275a081a 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/Contract/GetPAPPayContractResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/Contract/GetPAPPayContractResponse.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { @@ -12,14 +12,22 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置用户的 OpenId。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/CreatePAPPayH5EntrustWebResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/CreatePAPPayH5EntrustWebResponse.cs index a88ab692..85b7d9d0 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/CreatePAPPayH5EntrustWebResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/CreatePAPPayH5EntrustWebResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [GET] /papay/h5entrustweb 接口的响应。 @@ -6,14 +6,14 @@ public class CreatePAPPayH5EntrustWebResponse : WechatTenpaySignableResponse { /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] public override string? MerchantId { get; set; } /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/CreatePAPPayPreEntrustWebResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/CreatePAPPayPreEntrustWebResponse.cs index 3c6f6e26..dea53e73 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/CreatePAPPayPreEntrustWebResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/CreatePAPPayPreEntrustWebResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /papay/preentrustweb 接口的响应。 @@ -10,14 +10,22 @@ /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置预签约 ID。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/Bill/DownloadPayBillResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/Bill/DownloadPayBillResponse.cs index cc462089..c3930fcc 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/Bill/DownloadPayBillResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/Bill/DownloadPayBillResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /pay/downloadbill 接口的响应。 @@ -6,14 +6,14 @@ public class DownloadPayBillResponse : WechatTenpaySignableResponse { /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] public override string? MerchantId { get; set; } /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/Bill/DownloadPayFundFlowResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/Bill/DownloadPayFundFlowResponse.cs index 2c507857..cc9f7ce0 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/Bill/DownloadPayFundFlowResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/Bill/DownloadPayFundFlowResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /pay/downloadfundflow 接口的响应。 @@ -6,14 +6,14 @@ public class DownloadPayFundFlowResponse : WechatTenpaySignableResponse { /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] public override string? MerchantId { get; set; } /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/ClosePayOrderResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/ClosePayOrderResponse.cs index b4949a06..3d3365a9 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/ClosePayOrderResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/ClosePayOrderResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /pay/closeorder 接口的响应。 @@ -10,14 +10,22 @@ /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置子商户号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/CreatePayMicroPayResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/CreatePayMicroPayResponse.cs index 2a1e5054..19ba30b1 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/CreatePayMicroPayResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/CreatePayMicroPayResponse.cs @@ -56,14 +56,22 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置子商户号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/CreatePayRefundResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/CreatePayRefundResponse.cs index b871cf09..d097a6ee 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/CreatePayRefundResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/CreatePayRefundResponse.cs @@ -50,14 +50,22 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置子商户号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/CreatePayRefundV2Response.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/CreatePayRefundV2Response.cs index b1c5e7fb..f7bf8ec4 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/CreatePayRefundV2Response.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/CreatePayRefundV2Response.cs @@ -54,14 +54,22 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置子商户号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/CreatePayUnifiedOrderResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/CreatePayUnifiedOrderResponse.cs index 4b5aeaf2..b59cd4ee 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/CreatePayUnifiedOrderResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/CreatePayUnifiedOrderResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /pay/unifiedorder 接口的响应。 @@ -10,14 +10,22 @@ /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置子商户号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/ExchangeRate/GetPayExchangeRateResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/ExchangeRate/GetPayExchangeRateResponse.cs index 9a2d3989..4c9efe09 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/ExchangeRate/GetPayExchangeRateResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/ExchangeRate/GetPayExchangeRateResponse.cs @@ -10,14 +10,22 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置子商户号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/GetPayOrderResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/GetPayOrderResponse.cs index e93177d7..0b33e76b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/GetPayOrderResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/GetPayOrderResponse.cs @@ -256,14 +256,22 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置子商户号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/GetPayRefundResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/GetPayRefundResponse.cs index 91a979c0..75312407 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/GetPayRefundResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/GetPayRefundResponse.cs @@ -106,14 +106,22 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置子商户号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/GetPayRefundV2Response.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/GetPayRefundV2Response.cs index 8d3352a3..df3ad5e8 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/GetPayRefundV2Response.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/GetPayRefundV2Response.cs @@ -119,14 +119,22 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置子商户号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/ReversePayOrderResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/ReversePayOrderResponse.cs index 742a02fc..9005a6af 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/ReversePayOrderResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/ReversePayOrderResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /secapi/pay/reverse 接口的响应。 @@ -10,14 +10,22 @@ /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置子商户号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/Settlement/GetPaySettlementResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/Settlement/GetPaySettlementResponse.cs index 31091f44..c23178ef 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/Settlement/GetPaySettlementResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/Settlement/GetPaySettlementResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /pay/settlementquery 接口的响应。 @@ -10,14 +10,22 @@ /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置子商户号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayITIL/SubmitPayITILReportResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayITIL/SubmitPayITILReportResponse.cs index 655d1138..b2b0c611 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayITIL/SubmitPayITILReportResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayITIL/SubmitPayITILReportResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /payitil/report 接口的响应。 @@ -6,14 +6,14 @@ public class SubmitPayITILReportResponse : WechatTenpaySignableResponse { /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] public override string? MerchantId { get; set; } /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersRedPack/GetPayMarketingTransfersRedPackInfoResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersRedPack/GetPayMarketingTransfersRedPackInfoResponse.cs index 59ee9aa0..63516589 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersRedPack/GetPayMarketingTransfersRedPackInfoResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersRedPack/GetPayMarketingTransfersRedPackInfoResponse.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { @@ -52,14 +52,22 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置商户定单号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersRedPack/SendPayMarketingTransfersGroupRedPackResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersRedPack/SendPayMarketingTransfersGroupRedPackResponse.cs index 8a7ee656..ce75e328 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersRedPack/SendPayMarketingTransfersGroupRedPackResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersRedPack/SendPayMarketingTransfersGroupRedPackResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /mmpaymkttransfers/sendgroupredpack 接口的响应。 @@ -10,14 +10,22 @@ /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("wxappid")] [System.Text.Json.Serialization.JsonPropertyName("wxappid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置商户订单号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersRedPack/SendPayMarketingTransfersMiniProgramRedPackResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersRedPack/SendPayMarketingTransfersMiniProgramRedPackResponse.cs index 0d35a038..adbd51d1 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersRedPack/SendPayMarketingTransfersMiniProgramRedPackResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersRedPack/SendPayMarketingTransfersMiniProgramRedPackResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /mmpaymkttransfers/sendminiprogramhb 接口的响应。 @@ -10,14 +10,22 @@ /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("wxappid")] [System.Text.Json.Serialization.JsonPropertyName("wxappid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置商户订单号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersRedPack/SendPayMarketingTransfersRedPackResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersRedPack/SendPayMarketingTransfersRedPackResponse.cs index 89d5bdd4..a7eb3d19 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersRedPack/SendPayMarketingTransfersRedPackResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersRedPack/SendPayMarketingTransfersRedPackResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /mmpaymkttransfers/sendredpack 接口的响应。 @@ -10,14 +10,22 @@ /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("wxappid")] [System.Text.Json.Serialization.JsonPropertyName("wxappid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置商户订单号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersRedPack/WeWork/SendPayMarketingTransfersWeWorkRedPackResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersRedPack/WeWork/SendPayMarketingTransfersWeWorkRedPackResponse.cs index 0784140c..4e483dbd 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersRedPack/WeWork/SendPayMarketingTransfersWeWorkRedPackResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersRedPack/WeWork/SendPayMarketingTransfersWeWorkRedPackResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /mmpaymkttransfers/sendworkwxredpack 接口的响应。 @@ -10,14 +10,22 @@ /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("wxappid")] [System.Text.Json.Serialization.JsonPropertyName("wxappid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置商户订单号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersTransfer/CreatePayMarketingTransfersPromotionTransferResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersTransfer/CreatePayMarketingTransfersPromotionTransferResponse.cs index e88b909e..f8fad479 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersTransfer/CreatePayMarketingTransfersPromotionTransferResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersTransfer/CreatePayMarketingTransfersPromotionTransferResponse.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { @@ -12,14 +12,22 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models /// [Newtonsoft.Json.JsonProperty("mchid")] [System.Text.Json.Serialization.JsonPropertyName("mchid")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("mch_appid")] [System.Text.Json.Serialization.JsonPropertyName("mch_appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置商户付款单号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersTransfer/GetPayMarketingTransfersTransferInfoResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersTransfer/GetPayMarketingTransfersTransferInfoResponse.cs index a88ed0a5..7439aeaa 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersTransfer/GetPayMarketingTransfersTransferInfoResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersTransfer/GetPayMarketingTransfersTransferInfoResponse.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { @@ -12,14 +12,22 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置商户付款单号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersTransfer/WeWork/CreatePayMarketingTransfersPromotionWeWorkTransferResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersTransfer/WeWork/CreatePayMarketingTransfersPromotionWeWorkTransferResponse.cs index ececabab..e5d87450 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersTransfer/WeWork/CreatePayMarketingTransfersPromotionWeWorkTransferResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersTransfer/WeWork/CreatePayMarketingTransfersPromotionWeWorkTransferResponse.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { @@ -12,14 +12,22 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置商户付款单号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayServicePartnerTransfers/CreatePayServicePartnerTransfersPayToBankRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayServicePartnerTransfers/CreatePayServicePartnerTransfersPayToBankRequest.cs index 9ea09c4e..2b12dd2e 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayServicePartnerTransfers/CreatePayServicePartnerTransfersPayToBankRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayServicePartnerTransfers/CreatePayServicePartnerTransfersPayToBankRequest.cs @@ -13,7 +13,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models public override string? MerchantId { get; set; } /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] @@ -40,25 +40,25 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models [System.Text.Json.Serialization.JsonPropertyName("desc")] public string? Description { get; set; } + /// + /// 获取或设置收款方开户行。 + /// + [Newtonsoft.Json.JsonProperty("bank_code")] + [System.Text.Json.Serialization.JsonPropertyName("bank_code")] + public string BankCode { get; set; } = string.Empty; + /// /// 获取或设置收款方银行卡号（需使用平台提供的 RSA 公钥加密）。 /// [Newtonsoft.Json.JsonProperty("enc_bank_no")] [System.Text.Json.Serialization.JsonPropertyName("enc_bank_no")] - public string EncryptedBankNumber { get; set; } = string.Empty; + public string BankAccountNumber { get; set; } = string.Empty; /// /// 获取或设置收款方用户名（需使用平台提供的 RSA 公钥加密）。 /// [Newtonsoft.Json.JsonProperty("enc_true_name")] [System.Text.Json.Serialization.JsonPropertyName("enc_true_name")] - public string EncryptedUserName { get; set; } = string.Empty; - - /// - /// 获取或设置收款方开户行。 - /// - [Newtonsoft.Json.JsonProperty("bank_code")] - [System.Text.Json.Serialization.JsonPropertyName("bank_code")] - public string BankCode { get; set; } = string.Empty; + public string RealName { get; set; } = string.Empty; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayServicePartnerTransfers/CreatePayServicePartnerTransfersPayToBankResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayServicePartnerTransfers/CreatePayServicePartnerTransfersPayToBankResponse.cs index bcfad0e4..f9a29df3 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayServicePartnerTransfers/CreatePayServicePartnerTransfersPayToBankResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayServicePartnerTransfers/CreatePayServicePartnerTransfersPayToBankResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /mmpaysptrans/pay_bank 接口的响应。 @@ -10,10 +10,14 @@ /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayServicePartnerTransfers/GetPayServicePartnerTransfersPayToBankInfoRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayServicePartnerTransfers/GetPayServicePartnerTransfersPayToBankInfoRequest.cs index acd0566a..3a212b53 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayServicePartnerTransfers/GetPayServicePartnerTransfersPayToBankInfoRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayServicePartnerTransfers/GetPayServicePartnerTransfersPayToBankInfoRequest.cs @@ -13,7 +13,7 @@ public override string? MerchantId { get; set; } /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayServicePartnerTransfers/GetPayServicePartnerTransfersPayToBankInfoResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayServicePartnerTransfers/GetPayServicePartnerTransfersPayToBankInfoResponse.cs index a37e9991..d89ec9c9 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayServicePartnerTransfers/GetPayServicePartnerTransfersPayToBankInfoResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayServicePartnerTransfers/GetPayServicePartnerTransfersPayToBankInfoResponse.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { @@ -12,10 +12,14 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Risk/QueryRiskViolationRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Risk/QueryRiskViolationRequest.cs index 9a286a5c..aa29c1ac 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Risk/QueryRiskViolationRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Risk/QueryRiskViolationRequest.cs @@ -15,7 +15,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models public override string? MerchantId { get; set; } /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Risk/QueryRiskViolationResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Risk/QueryRiskViolationResponse.cs index 150ceac0..4b88fd2e 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Risk/QueryRiskViolationResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Risk/QueryRiskViolationResponse.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { @@ -86,14 +86,14 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models } /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] public override string? MerchantId { get; set; } /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/SubMerchant/AddSubMerchantDevelopConfigResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/SubMerchant/AddSubMerchantDevelopConfigResponse.cs index 0b68ce60..08f05812 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/SubMerchant/AddSubMerchantDevelopConfigResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/SubMerchant/AddSubMerchantDevelopConfigResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /secapi/mch/addsubdevconfig 接口的响应。 @@ -6,14 +6,14 @@ public class AddSubMerchantDevelopConfigResponse : WechatTenpaySignableResponse { /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] public override string? MerchantId { get; set; } /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/SubMerchant/AddSubMerchantMarketingRecommendConfigRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/SubMerchant/AddSubMerchantMarketingRecommendConfigRequest.cs new file mode 100644 index 00000000..2ce449f1 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/SubMerchant/AddSubMerchantMarketingRecommendConfigRequest.cs @@ -0,0 +1,60 @@ +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +{ + /// + /// 表示 [POST] /secapi/mkt/addrecommendconf 接口的请求。 + /// + public class AddSubMerchantMarketingRecommendConfigRequest : WechatTenpaySignableRequest + { + /// + /// + /// + [Newtonsoft.Json.JsonProperty("mch_id")] + [System.Text.Json.Serialization.JsonPropertyName("mch_id")] + public override string? MerchantId { get; set; } + + /// + /// （冗余字段，请忽略） + /// + [Newtonsoft.Json.JsonIgnore] + [System.Text.Json.Serialization.JsonIgnore] + public override string? AppId { get; set; } + + /// + /// 获取或设置子商户号。 + /// + [Newtonsoft.Json.JsonProperty("sub_mch_id")] + [System.Text.Json.Serialization.JsonPropertyName("sub_mch_id")] + public string SubMerchantId { get; set; } = string.Empty; + + /// + /// 获取或设置子商户 AppId。 + /// + [Newtonsoft.Json.JsonProperty("sub_appid")] + [System.Text.Json.Serialization.JsonPropertyName("sub_appid")] + public string SubAppId { get; set; } = string.Empty; + + /// + /// + /// 默认值： + /// + [Newtonsoft.Json.JsonProperty("sign_type")] + [System.Text.Json.Serialization.JsonPropertyName("sign_type")] +#pragma warning disable CS8765 + public override string SignType { get; set; } = Constants.SignTypes.HMAC_SHA256; +#pragma warning restore CS8765 + + /// + /// 获取或设置推荐关注的微信 AppId。 + /// + [Newtonsoft.Json.JsonProperty("subscribe_appid")] + [System.Text.Json.Serialization.JsonPropertyName("subscribe_appid")] + public string? SubscribeAppId { get; set; } + + /// + /// 获取或设置支付凭证的微信 AppId。 + /// + [Newtonsoft.Json.JsonProperty("receipt_appid")] + [System.Text.Json.Serialization.JsonPropertyName("receipt_appid")] + public string? ReceiptAppId { get; set; } + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/SubMerchant/AddSubMerchantMarketingRecommendConfigResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/SubMerchant/AddSubMerchantMarketingRecommendConfigResponse.cs new file mode 100644 index 00000000..0731b6fb --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/SubMerchant/AddSubMerchantMarketingRecommendConfigResponse.cs @@ -0,0 +1,22 @@ +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +{ + /// + /// 表示 [POST] /secapi/mkt/addrecommendconf 接口的响应。 + /// + public class AddSubMerchantMarketingRecommendConfigResponse : WechatTenpaySignableResponse + { + /// + /// （冗余字段，请忽略） + /// + [Newtonsoft.Json.JsonIgnore] + [System.Text.Json.Serialization.JsonIgnore] + public override string? MerchantId { get; set; } + + /// + /// （冗余字段，请忽略） + /// + [Newtonsoft.Json.JsonIgnore] + [System.Text.Json.Serialization.JsonIgnore] + public override string? AppId { get; set; } + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/SubMerchant/GetSubMerchantDevelopConfigResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/SubMerchant/GetSubMerchantDevelopConfigResponse.cs index 7b68ade5..41b170f3 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/SubMerchant/GetSubMerchantDevelopConfigResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/SubMerchant/GetSubMerchantDevelopConfigResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /secapi/mch/querysubdevconfig 接口的响应。 @@ -65,14 +65,14 @@ } /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] public override string? MerchantId { get; set; } /// - /// （请忽略此字段） + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Tools/ToolsAuthCodeToOpenIdResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Tools/ToolsAuthCodeToOpenIdResponse.cs index edf058b1..02ac55cb 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Tools/ToolsAuthCodeToOpenIdResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Tools/ToolsAuthCodeToOpenIdResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /tools/authcodetoopenid 接口的响应。 @@ -10,14 +10,22 @@ /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置子商户号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Tools/ToolsShortUrlResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Tools/ToolsShortUrlResponse.cs index 55df7e15..58f1d9c3 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Tools/ToolsShortUrlResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Tools/ToolsShortUrlResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /tools/shorturl 接口的响应。 @@ -10,14 +10,22 @@ /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置子商户号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/VehiclePartner/ApplyVehiclePartnerPayResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/VehiclePartner/ApplyVehiclePartnerPayResponse.cs index 3ab2b742..4038725b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/VehiclePartner/ApplyVehiclePartnerPayResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/VehiclePartner/ApplyVehiclePartnerPayResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /vehicle/partnerpay/payapply 接口的响应。 @@ -10,14 +10,22 @@ /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置子商户号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/VehiclePartner/GetVehiclePartnerPayStateResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/VehiclePartner/GetVehiclePartnerPayStateResponse.cs index db1b64b3..687be830 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/VehiclePartner/GetVehiclePartnerPayStateResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/VehiclePartner/GetVehiclePartnerPayStateResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /vehicle/partnerpay/querystate 接口的响应。 @@ -61,14 +61,22 @@ /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置子商户号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/VehiclePartner/NotifyVehiclePartnerPayResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/VehiclePartner/NotifyVehiclePartnerPayResponse.cs index 9bddf27d..728468c2 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/VehiclePartner/NotifyVehiclePartnerPayResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/VehiclePartner/NotifyVehiclePartnerPayResponse.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /vehicle/partnerpay/notification 接口的响应。 @@ -10,14 +10,22 @@ /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public override string? AppId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// /// 获取或设置子商户号。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/XDC/GetSandboxSignKeyRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/XDC/GetSandboxSignKeyRequest.cs index f97f7a08..7b9919f3 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/XDC/GetSandboxSignKeyRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/XDC/GetSandboxSignKeyRequest.cs @@ -13,7 +13,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models public override string? MerchantId { get; set; } /// - /// + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/XDC/GetSandboxSignKeyResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/XDC/GetSandboxSignKeyResponse.cs index 07ddc366..56f6cf60 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/XDC/GetSandboxSignKeyResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/XDC/GetSandboxSignKeyResponse.cs @@ -10,10 +10,14 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models /// [Newtonsoft.Json.JsonProperty("mch_id")] [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 /// - /// + /// （冗余字段，请忽略） /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/WechatTenpayEvent.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/WechatTenpayEvent.cs index 320f1bb5..42034aba 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/WechatTenpayEvent.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/WechatTenpayEvent.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 { diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/WechatTenpayResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/WechatTenpayResponse.cs index 39c177f1..aab22b41 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/WechatTenpayResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/WechatTenpayResponse.cs @@ -77,12 +77,19 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 public virtual string? ErrorCode { get; set; } /// - /// 获取微信支付 API 返回的状态描述。 + /// 获取微信支付 API 返回的错误描述。 /// [Newtonsoft.Json.JsonProperty("err_code_des")] [System.Text.Json.Serialization.JsonPropertyName("err_code_des")] public virtual string? ErrorCodeDescription { get; set; } + /// + /// 获取微信支付 API 返回的错误信息。 + /// + [Newtonsoft.Json.JsonProperty("err_msg")] + [System.Text.Json.Serialization.JsonPropertyName("err_msg")] + public virtual string? ErrorMessage { get; set; } + /// /// 获取或设置业务结果。 /// diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/Fund/GetFundAutoWithdrawByDateRequest.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/Fund/GetFundAutoWithdrawByDateRequest.json new file mode 100644 index 00000000..1d410121 --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/Fund/GetFundAutoWithdrawByDateRequest.json @@ -0,0 +1,8 @@ +{ + "nonce_str": "ibuaiVcKdpRxkhJA", + "date": "20180503", + "mch_id": "2480029942", + "sub_mch_id": "2480029752", + "sign_type": "HMAC-SHA256", + "sign": "1091442CB5E1D3B04DAC6CA9F42B50F74428727968FE2E570DE271030F16CCA8" +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/Fund/GetFundAutoWithdrawByDateResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/Fund/GetFundAutoWithdrawByDateResponse.json new file mode 100644 index 00000000..f5048743 --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/Fund/GetFundAutoWithdrawByDateResponse.json @@ -0,0 +1,17 @@ +{ + "return_code": "SUCCESS", + "return_msg": "OK", + "result_code": "SUCCESS", + "err_code": "SUCCESS", + "err_msg": "success", + "date": "20180602", + "mch_id": "2480029942", + "sub_mch_id": "2480029752", + "withdraw_id": "10900999991802018060200326172006", + "amount": "445", + "create_time": "2018-06-04 11:44:59", + "nonce_str": "ibuaiVcKdpRxkhJA", + "sign_type": "HMAC-SHA256", + "sign": "8ADACE9EE2A39C20F56D115794AD8D1D91B636A12346766713D741E847B77BF5", + "withdraw_status": "PROCESSING" +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/MerchantMicro/ModifyMicroMerchantArchivesRequest.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/MerchantMicro/ModifyMicroMerchantArchivesRequest.json new file mode 100644 index 00000000..cff1bdb7 --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/MerchantMicro/ModifyMicroMerchantArchivesRequest.json @@ -0,0 +1,10 @@ +{ + "version": "1.0", + "mch_id": "1900006501", + "nonce_str": "578891d2f06e2bb730a3c5a93f916515", + "sign_type": "HMAC-SHA256", + "sign": "9874FC913356B685DACF641B20E93ECA06B6D5AB9013CD40274BE73F71A267C6", + "sub_mch_id": "1501859791", + "account_bank": "招商银行", + "account_number": "1111857554101111" +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/MerchantMicro/ModifyMicroMerchantArchivesResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/MerchantMicro/ModifyMicroMerchantArchivesResponse.json new file mode 100644 index 00000000..549011ae --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/MerchantMicro/ModifyMicroMerchantArchivesResponse.json @@ -0,0 +1,9 @@ +{ + "return_code": "SUCCESS", + "return_msg": "OK", + "nonce_str": "3Ilu41xvNWLNmgjw", + "sign": "5E024CB99587352F6141DDC0BE13FD1A3F349AD1E5874244EE9717C3B295557E", + "result_code": "FAIL", + "err_code": "INVALID_REQUEST", + "err_code_des": "银行卡存在，但与姓名证件号其中一项或全部不匹配" +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/MerchantMicro/ModifyMicroMerchantContactInfoRequest.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/MerchantMicro/ModifyMicroMerchantContactInfoRequest.json new file mode 100644 index 00000000..4d3e96ac --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/MerchantMicro/ModifyMicroMerchantContactInfoRequest.json @@ -0,0 +1,12 @@ +{ + "version": "1.0", + "mch_id": "1900006501", + "nonce_str": "578891d2f06e2bb730a3c5a93f916515", + "sign_type": "HMAC-SHA256", + "sign": "592EF3CC5620AECB1871A27A6813DA79B19E4552C58061C09742B0D335EAAE8E", + "sub_mch_id": "1501859791", + "merchant_name": "小微修改联系人测试", + "mobile_phone": "bkEvTYonL8G4r1/9ygZWSXppSFjBjTpKSFQje04Bcp9RoDoOPLO1DgyChBCiaCOHwDPCkuV5etQvbT+B3iLVMS7QAgRH1Ovuu5hS8K8FbRTJgfUalCOyuiAIGSOtFpbtUAFyWCxVoShlDQSqXT11CwUFEKD4x7l1U46AzRUCz/4Pfc1mle7Px86MeZNdx42O8pvsb43AsISqnrcq7idz2zQGotc/Y378H/nptrAEphd5KsWdZMv2/sXtNwjFvqR0mfAJygu389sM/7TdH0Ji81/GPn0FnBxk2G7U+usfvRa68gE72S2C075eQ3pmK7ONahT5APSWbmeeg0w624Icgg==", + "cert_sn": "50062CE505775F070CAB06E697F1BBD1AD4F4D87", + "email": "SYO4atvj/i18zakEhzf2g3V4Cl+dmmnqOxcC22yw/wOQFAL7NZC3RV9dTJxReYfLQsE9tla3PSaseg3zF+n31YkuHSUWYctZi8532p0c+VkaiTpFDmtSD2At3qJdwQJYtD5FGWY7JLaAaYf567SQrqqdzxiJCXuEW2sD6QE4cib1AKhb6mq1YYX87c1t9SUGOjDmNI9txCxFmYOzjkUVZ3f26QqDEZ+uz7UPB24d7UTql5nsoMS2AOMsk8ZegDYuY0Re5eATmlFhVn6y6a9WKe0pZnEWHPYRwIOGTUaUPnSPPq8Xy8V9+0DXxiCeDV+WSjQlWBpGxG5WKu6M4GosDw==" +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/MerchantMicro/ModifyMicroMerchantContactInfoResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/MerchantMicro/ModifyMicroMerchantContactInfoResponse.json new file mode 100644 index 00000000..36d04c32 --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/MerchantMicro/ModifyMicroMerchantContactInfoResponse.json @@ -0,0 +1,9 @@ +{ + "return_code": "SUCCESS", + "return_msg": "OK", + "nonce_str": "z5SLBxca4rw1Quiv", + "sign": "7C474FF5CD991BE660EF02C6404F5708C12E0580A4F1A46BC6FC99E563D46B09", + "result_code": "SUCCESS", + "mch_id": "1900006501", + "sub_mch_id": "1501859791" +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/SubMerchant/AddSubMerchantMarketingRecommendConfigRequest.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/SubMerchant/AddSubMerchantMarketingRecommendConfigRequest.json new file mode 100644 index 00000000..a3440fbd --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/SubMerchant/AddSubMerchantMarketingRecommendConfigRequest.json @@ -0,0 +1,10 @@ +{ + "mch_id": "1451234567", + "sub_mch_id": "10000101", + "sub_appid": "wx931386123456789e", + "subscribe_appid": "wx931386123456789e", + "receipt_appid": "wx931386123456789e", + "nonce_str": "5K8264ILTKCH16CQ2502SI8ZNMTM67VS", + "sign": "C380BEC2BFD727A4B6845133519F3AD6C380BEC2BFD727A4B6845133519F3AD6", + "sign_type": "HMAC-SHA256" +}