feat(tenpayv3): 调整包含需加解密字段的接口模型

This commit is contained in:
Fu Diwei 2021-07-08 17:10:21 +08:00
parent de8b3f9158
commit 2ed43acaa9
16 changed files with 66 additions and 66 deletions

View File

@ -34,13 +34,13 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
var accountValidationModel = response.AccountValidation;
if (!string.IsNullOrEmpty(accountValidationModel.AccountNameEncryptedData))
if (!string.IsNullOrEmpty(accountValidationModel.AccountName))
{
try
{
accountValidationModel.AccountNameEncryptedData = Utilities.RSAUtility.DecryptWithECB(
accountValidationModel.AccountName = Utilities.RSAUtility.DecryptWithECB(
client.WechatMerchantCertPrivateKey,
accountValidationModel.AccountNameEncryptedData
accountValidationModel.AccountName
);
}
catch (Exception ex)
@ -49,13 +49,13 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
}
}
if (!string.IsNullOrEmpty(accountValidationModel.AccountNumberEncryptedData))
if (!string.IsNullOrEmpty(accountValidationModel.AccountNumber))
{
try
{
accountValidationModel.AccountNumberEncryptedData = Utilities.RSAUtility.DecryptWithECB(
accountValidationModel.AccountNumber = Utilities.RSAUtility.DecryptWithECB(
client.WechatMerchantCertPrivateKey,
accountValidationModel.AccountNumberEncryptedData!
accountValidationModel.AccountNumber!
);
}
catch (Exception ex)
@ -96,13 +96,13 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
foreach (var downloadBillModel in response.DownloadBillList)
{
if (!string.IsNullOrEmpty(downloadBillModel.EncryptKeyEncryptedData))
if (!string.IsNullOrEmpty(downloadBillModel.EncryptKey))
{
try
{
downloadBillModel.EncryptKeyEncryptedData = Utilities.RSAUtility.DecryptWithECB(
downloadBillModel.EncryptKey = Utilities.RSAUtility.DecryptWithECB(
client.WechatMerchantCertPrivateKey,
downloadBillModel.EncryptKeyEncryptedData
downloadBillModel.EncryptKey
);
}
catch (Exception ex)
@ -140,13 +140,13 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
if (response.ComplaintDetail != null)
{
if (!string.IsNullOrEmpty(response.PayerPhoneEncryptedData))
if (!string.IsNullOrEmpty(response.PayerPhone))
{
try
{
response.PayerPhoneEncryptedData = Utilities.RSAUtility.DecryptWithECB(
response.PayerPhone = Utilities.RSAUtility.DecryptWithECB(
client.WechatMerchantCertPrivateKey,
response.PayerPhoneEncryptedData!
response.PayerPhone!
);
}
catch (Exception ex)
@ -238,13 +238,13 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
foreach (var complaintModel in response.ComplaintList)
{
if (!string.IsNullOrEmpty(complaintModel.PayerPhoneEncryptedData))
if (!string.IsNullOrEmpty(complaintModel.PayerPhone))
{
try
{
complaintModel.PayerPhoneEncryptedData = Utilities.RSAUtility.DecryptWithECB(
complaintModel.PayerPhone = Utilities.RSAUtility.DecryptWithECB(
client.WechatMerchantCertPrivateKey,
complaintModel.PayerPhoneEncryptedData!
complaintModel.PayerPhone!
);
}
catch (Exception ex)
@ -286,13 +286,13 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
foreach (var guideModel in response.GuideList)
{
if (!string.IsNullOrEmpty(guideModel.UserNameEncryptedData))
if (!string.IsNullOrEmpty(guideModel.UserName))
{
try
{
guideModel.UserNameEncryptedData = Utilities.RSAUtility.DecryptWithECB(
guideModel.UserName = Utilities.RSAUtility.DecryptWithECB(
client.WechatMerchantCertPrivateKey,
guideModel.UserNameEncryptedData
guideModel.UserName
);
}
catch (Exception ex)
@ -301,13 +301,13 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
}
}
if (!string.IsNullOrEmpty(guideModel.UserMobileEncryptedData))
if (!string.IsNullOrEmpty(guideModel.UserMobile))
{
try
{
guideModel.UserMobileEncryptedData = Utilities.RSAUtility.DecryptWithECB(
guideModel.UserMobile = Utilities.RSAUtility.DecryptWithECB(
client.WechatMerchantCertPrivateKey,
guideModel.UserMobileEncryptedData
guideModel.UserMobile
);
}
catch (Exception ex)

View File

@ -17,35 +17,35 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
/// </summary>
[Newtonsoft.Json.JsonProperty("contact_name")]
[System.Text.Json.Serialization.JsonPropertyName("contact_name")]
public string NameEncryptedData { get; set; } = string.Empty;
public string Name { get; set; } = string.Empty;
/// <summary>
/// 获取或设置联系人手机号(需使用微信支付平台公钥加密)。
/// </summary>
[Newtonsoft.Json.JsonProperty("mobile_phone")]
[System.Text.Json.Serialization.JsonPropertyName("mobile_phone")]
public string MobileEncryptedData { get; set; } = string.Empty;
public string Mobile { get; set; } = string.Empty;
/// <summary>
/// 获取或设置超级管理员身份证号码(需使用微信支付平台公钥加密)。与字段 <see cref="OpenId"/> 二选一。
/// </summary>
[Newtonsoft.Json.JsonProperty("contact_id_number")]
[System.Text.Json.Serialization.JsonPropertyName("contact_id_number")]
public string? IdCardNumberEncryptedData { get; set; }
public string? IdCardNumber { get; set; }
/// <summary>
/// 获取或设置超级管理员微信 OpenId。与字段 <see cref="IdCardNumberEncryptedData"/> 二选一。
/// 获取或设置超级管理员微信 OpenId。与字段 <see cref="IdCardNumber"/> 二选一。
/// </summary>
[Newtonsoft.Json.JsonProperty("openid")]
[System.Text.Json.Serialization.JsonPropertyName("openid")]
public string? OpenId { get; set; }
/// <summary>
/// 获取或设置联系邮箱(需使用微信支付平台公钥加密)。与字段 <see cref="OpenId"/> 二选一。
/// 获取或设置联系邮箱(需使用微信支付平台公钥加密)。
/// </summary>
[Newtonsoft.Json.JsonProperty("contact_email")]
[System.Text.Json.Serialization.JsonPropertyName("contact_email")]
public string EmailEncryptedData { get; set; } = string.Empty;
public string Email { get; set; } = string.Empty;
}
public class Subject
@ -198,14 +198,14 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
/// </summary>
[Newtonsoft.Json.JsonProperty("id_card_name")]
[System.Text.Json.Serialization.JsonPropertyName("id_card_name")]
public string IdCardNameEncryptedData { get; set; } = string.Empty;
public string IdCardName { get; set; } = string.Empty;
/// <summary>
/// 获取或设置身份证号码(需使用微信支付平台公钥加密)。
/// </summary>
[Newtonsoft.Json.JsonProperty("id_card_number")]
[System.Text.Json.Serialization.JsonPropertyName("id_card_number")]
public string IdCardNumberEncryptedData { get; set; } = string.Empty;
public string IdCardNumber { get; set; } = string.Empty;
/// <summary>
/// 获取或设置身份证有效期开始时间格式yyyy-MM-dd
@ -236,14 +236,14 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
/// </summary>
[Newtonsoft.Json.JsonProperty("id_doc_name")]
[System.Text.Json.Serialization.JsonPropertyName("id_doc_name")]
public string IdDocumentNameEncryptedData { get; set; } = string.Empty;
public string IdDocumentName { get; set; } = string.Empty;
/// <summary>
/// 获取或设置证件号码(需使用微信支付平台公钥加密)。
/// </summary>
[Newtonsoft.Json.JsonProperty("id_doc_number")]
[System.Text.Json.Serialization.JsonPropertyName("id_doc_number")]
public string IdDocumentNumberEncryptedData { get; set; } = string.Empty;
public string IdDocumentNumber { get; set; } = string.Empty;
/// <summary>
/// 获取或设置证件有效期开始时间格式yyyy-MM-dd
@ -326,14 +326,14 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
/// </summary>
[Newtonsoft.Json.JsonProperty("name")]
[System.Text.Json.Serialization.JsonPropertyName("name")]
public string NameEncryptedData { get; set; } = string.Empty;
public string Name { get; set; } = string.Empty;
/// <summary>
/// 获取或设置证件号码(需使用微信支付平台公钥加密)。
/// </summary>
[Newtonsoft.Json.JsonProperty("id_number")]
[System.Text.Json.Serialization.JsonPropertyName("id_number")]
public string IdNumberEncryptedData { get; set; } = string.Empty;
public string IdNumber { get; set; } = string.Empty;
/// <summary>
/// 获取或设置证件有效期开始时间格式yyyy-MM-dd
@ -707,14 +707,14 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
/// </summary>
[Newtonsoft.Json.JsonProperty("account_name")]
[System.Text.Json.Serialization.JsonPropertyName("account_name")]
public string AccountNameEncryptedData { get; set; } = string.Empty;
public string AccountName { get; set; } = string.Empty;
/// <summary>
/// 获取或设置银行账号(需使用微信支付平台公钥加密)。
/// </summary>
[Newtonsoft.Json.JsonProperty("account_number")]
[System.Text.Json.Serialization.JsonPropertyName("account_number")]
public string AccountNumberEncryptedData { get; set; } = string.Empty;
public string AccountNumber { get; set; } = string.Empty;
/// <summary>
/// 获取或设置开户银行。

View File

@ -27,7 +27,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
/// </summary>
[Newtonsoft.Json.JsonProperty("account_number")]
[System.Text.Json.Serialization.JsonPropertyName("account_number")]
public string AccountNumberEncryptedData { get; set; } = string.Empty;
public string AccountNumber { get; set; } = string.Empty;
/// <summary>
/// 获取或设置开户银行。

View File

@ -17,21 +17,21 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
/// </summary>
[Newtonsoft.Json.JsonProperty("name")]
[System.Text.Json.Serialization.JsonPropertyName("name")]
public string NameEncryptedData { get; set; } = string.Empty;
public string Name { get; set; } = string.Empty;
/// <summary>
/// 获取或设置联系人手机号(需使用微信支付平台公钥加密)。
/// </summary>
[Newtonsoft.Json.JsonProperty("mobile")]
[System.Text.Json.Serialization.JsonPropertyName("mobile")]
public string MobileEncryptedData { get; set; } = string.Empty;
public string Mobile { get; set; } = string.Empty;
/// <summary>
/// 获取或设置联系人身份证号码(需使用微信支付平台公钥加密)。
/// </summary>
[Newtonsoft.Json.JsonProperty("id_card_number")]
[System.Text.Json.Serialization.JsonPropertyName("id_card_number")]
public string IdCardNumberEncryptedData { get; set; } = string.Empty;
public string IdCardNumber { get; set; } = string.Empty;
}
public class Subject
@ -255,14 +255,14 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
/// </summary>
[Newtonsoft.Json.JsonProperty("identification_name")]
[System.Text.Json.Serialization.JsonPropertyName("identification_name")]
public string IdentificationNameEncryptedData { get; set; } = string.Empty;
public string IdentificationName { get; set; } = string.Empty;
/// <summary>
/// 获取或设置证件号码(需使用微信支付平台公钥加密)。
/// </summary>
[Newtonsoft.Json.JsonProperty("identification_number")]
[System.Text.Json.Serialization.JsonPropertyName("identification_number")]
public string IdentificationNumberEncryptedData { get; set; } = string.Empty;
public string IdentificationNumber { get; set; } = string.Empty;
/// <summary>
/// 获取或设置证件有效日期(格式:["yyyy-MM-dd", "yyyy-MM-dd"])。

View File

@ -31,7 +31,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
/// </summary>
[Newtonsoft.Json.JsonProperty("name")]
[System.Text.Json.Serialization.JsonPropertyName("name")]
public string? NameEncryptedData { get; set; }
public string? Name { get; set; }
/// <summary>
/// 获取或设置分账金额(单位:分)。

View File

@ -100,14 +100,14 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
/// </summary>
[Newtonsoft.Json.JsonProperty("id_card_name")]
[System.Text.Json.Serialization.JsonPropertyName("id_card_name")]
public string IdCardNameEncryptedData { get; set; } = string.Empty;
public string IdCardName { get; set; } = string.Empty;
/// <summary>
/// 获取或设置身份证号码(需使用微信支付平台公钥加密)。
/// </summary>
[Newtonsoft.Json.JsonProperty("id_card_number")]
[System.Text.Json.Serialization.JsonPropertyName("id_card_number")]
public string IdCardNumberEncryptedData { get; set; } = string.Empty;
public string IdCardNumber { get; set; } = string.Empty;
/// <summary>
/// 获取或设置身份证有效期结束时间格式yyyy-MM-dd / "长期")。
@ -131,14 +131,14 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
/// </summary>
[Newtonsoft.Json.JsonProperty("id_doc_name")]
[System.Text.Json.Serialization.JsonPropertyName("id_doc_name")]
public string IdDocumentNameEncryptedData { get; set; } = string.Empty;
public string IdDocumentName { get; set; } = string.Empty;
/// <summary>
/// 获取或设置证件号码(需使用微信支付平台公钥加密)。
/// </summary>
[Newtonsoft.Json.JsonProperty("id_doc_number")]
[System.Text.Json.Serialization.JsonPropertyName("id_doc_number")]
public string IdDocumentNumberEncryptedData { get; set; } = string.Empty;
public string IdDocumentNumber { get; set; } = string.Empty;
/// <summary>
/// 获取或设置证件有效期结束时间格式yyyy-MM-dd / "长期")。
@ -162,28 +162,28 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
/// </summary>
[Newtonsoft.Json.JsonProperty("contact_name")]
[System.Text.Json.Serialization.JsonPropertyName("contact_name")]
public string ContactNameEncryptedData { get; set; } = string.Empty;
public string ContactName { get; set; } = string.Empty;
/// <summary>
/// 获取或设置联系人手机号(需使用微信支付平台公钥加密)。
/// </summary>
[Newtonsoft.Json.JsonProperty("mobile_phone")]
[System.Text.Json.Serialization.JsonPropertyName("mobile_phone")]
public string ContactMobileEncryptedData { get; set; } = string.Empty;
public string ContactMobile { get; set; } = string.Empty;
/// <summary>
/// 获取或设置超级管理员身份证号码(需使用微信支付平台公钥加密)。
/// </summary>
[Newtonsoft.Json.JsonProperty("contact_id_card_number")]
[System.Text.Json.Serialization.JsonPropertyName("contact_id_card_number")]
public string ContactIdCardNumberEncryptedData { get; set; } = string.Empty;
public string ContactIdCardNumber { get; set; } = string.Empty;
/// <summary>
/// 获取或设置联系邮箱(需使用微信支付平台公钥加密)。与字段 <see cref="OpenId"/> 二选一。
/// </summary>
[Newtonsoft.Json.JsonProperty("contact_email")]
[System.Text.Json.Serialization.JsonPropertyName("contact_email")]
public string ContactEmailEncryptedData { get; set; } = string.Empty;
public string ContactEmail { get; set; } = string.Empty;
}
public class BankAccount
@ -200,14 +200,14 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
/// </summary>
[Newtonsoft.Json.JsonProperty("account_name")]
[System.Text.Json.Serialization.JsonPropertyName("account_name")]
public string AccountNameEncryptedData { get; set; } = string.Empty;
public string AccountName { get; set; } = string.Empty;
/// <summary>
/// 获取或设置银行账号(需使用微信支付平台公钥加密)。
/// </summary>
[Newtonsoft.Json.JsonProperty("account_number")]
[System.Text.Json.Serialization.JsonPropertyName("account_number")]
public string AccountNumberEncryptedData { get; set; } = string.Empty;
public string AccountNumber { get; set; } = string.Empty;
/// <summary>
/// 获取或设置开户银行。

View File

@ -17,14 +17,14 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
/// </summary>
[Newtonsoft.Json.JsonProperty("account_name")]
[System.Text.Json.Serialization.JsonPropertyName("account_name")]
public string AccountNameEncryptedData { get; set; } = default!;
public string AccountName { get; set; } = default!;
/// <summary>
/// 获取或设置付款卡号(需使用商户私钥解密)。
/// </summary>
[Newtonsoft.Json.JsonProperty("account_no")]
[System.Text.Json.Serialization.JsonPropertyName("account_no")]
public string? AccountNumberEncryptedData { get; set; }
public string? AccountNumber { get; set; }
/// <summary>
/// 获取或设置汇款金额(单位:分)。

View File

@ -45,7 +45,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
/// </summary>
[Newtonsoft.Json.JsonProperty("encrypt_key")]
[System.Text.Json.Serialization.JsonPropertyName("encrypt_key")]
public string EncryptKeyEncryptedData { get; set; } = default!;
public string EncryptKey { get; set; } = default!;
/// <summary>
/// 获取或设置账单加密使用的随机字符串。

View File

@ -31,7 +31,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
/// </summary>
[Newtonsoft.Json.JsonProperty("receiver_name")]
[System.Text.Json.Serialization.JsonPropertyName("receiver_name")]
public string? NameEncryptedData { get; set; }
public string? Name { get; set; }
/// <summary>
/// 获取或设置分账金额(单位:分)。

View File

@ -41,7 +41,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
/// </summary>
[Newtonsoft.Json.JsonProperty("encrypted_name")]
[System.Text.Json.Serialization.JsonPropertyName("encrypted_name")]
public string? NameEncryptedData { get; set; }
public string? EncryptedName { get; set; }
/// <summary>
/// 获取或设置与分账方的关系类型。

View File

@ -77,7 +77,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
/// </summary>
[Newtonsoft.Json.JsonProperty("payer_phone")]
[System.Text.Json.Serialization.JsonPropertyName("payer_phone")]
public string? PayerPhoneEncryptedData { get; set; }
public string? PayerPhone { get; set; }
/// <summary>
/// 获取或设置投诉人 OpenId。

View File

@ -74,7 +74,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
/// </summary>
[Newtonsoft.Json.JsonProperty("payer_phone")]
[System.Text.Json.Serialization.JsonPropertyName("payer_phone")]
public string? PayerPhoneEncryptedData { get; set; }
public string? PayerPhone { get; set; }
/// <summary>
/// 获取或设置投诉人 OpenId。

View File

@ -31,7 +31,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
/// </summary>
[Newtonsoft.Json.JsonProperty("name")]
[System.Text.Json.Serialization.JsonPropertyName("name")]
public string? NameEncryptedData { get; set; }
public string? Name { get; set; }
/// <summary>
/// 获取或设置分账金额(单位:分)。

View File

@ -41,14 +41,14 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
/// </summary>
[Newtonsoft.Json.JsonProperty("name")]
[System.Text.Json.Serialization.JsonPropertyName("name")]
public string UserNameEncryptedData { get; set; } = string.Empty;
public string UserName { get; set; } = string.Empty;
/// <summary>
/// 获取或设置企业微信的员工手机号码(需使用微信支付平台公钥加密)。
/// </summary>
[Newtonsoft.Json.JsonProperty("mobile")]
[System.Text.Json.Serialization.JsonPropertyName("mobile")]
public string UserMobileEncryptedData { get; set; } = string.Empty;
public string UserMobile { get; set; } = string.Empty;
/// <summary>
/// 获取或设置企业微信的员工个人二维码地址。

View File

@ -38,14 +38,14 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
/// </summary>
[Newtonsoft.Json.JsonProperty("name")]
[System.Text.Json.Serialization.JsonPropertyName("name")]
public string UserNameEncryptedData { get; set; } = default!;
public string UserName { get; set; } = default!;
/// <summary>
/// 获取或设置企业微信的员工手机号码(需使用商户私钥解密)。
/// </summary>
[Newtonsoft.Json.JsonProperty("mobile")]
[System.Text.Json.Serialization.JsonPropertyName("mobile")]
public string UserMobileEncryptedData { get; set; } = default!;
public string UserMobile { get; set; } = default!;
/// <summary>
/// 获取或设置企业微信的员工工号。

View File

@ -27,14 +27,14 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models
/// </summary>
[Newtonsoft.Json.JsonProperty("name")]
[System.Text.Json.Serialization.JsonPropertyName("name")]
public string? UserNameEncryptedData { get; set; }
public string? UserName { get; set; }
/// <summary>
/// 获取或设置企业微信的员工手机号码(需使用微信支付平台公钥加密)。
/// </summary>
[Newtonsoft.Json.JsonProperty("mobile")]
[System.Text.Json.Serialization.JsonPropertyName("mobile")]
public string? UserMobileEncryptedData { get; set; }
public string? UserMobile { get; set; }
/// <summary>
/// 获取或设置企业微信的员工个人二维码地址。