From 6f344560d2db87ade7d42a755cf5f65eb99517c1 Mon Sep 17 00:00:00 2001 From: Ge Date: Thu, 2 Mar 2023 22:06:57 +0800 Subject: [PATCH] =?UTF-8?q?fix(tenpayv2):=20=E4=BF=AE=E5=A4=8D=E9=85=92?= =?UTF-8?q?=E5=BA=97=E6=8A=BC=E9=87=91=E6=9F=A5=E8=AF=A2=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=93=8D=E5=BA=94=E5=8F=8D=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E5=8C=96=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Deposit/CreateDepositRefundResponse.cs | 7 + .../Deposit/GetDepositRefundResponse.cs | 163 +++++++----------- 2 files changed, 67 insertions(+), 103 deletions(-) diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/CreateDepositRefundResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/CreateDepositRefundResponse.cs index dc761193..f424fb58 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/CreateDepositRefundResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/CreateDepositRefundResponse.cs @@ -47,6 +47,13 @@ [System.Text.Json.Serialization.JsonPropertyName("transaction_id")] public string TransactionId { get; set; } = default!; + /// + /// 获取或设置商户退款单号。 + /// + [Newtonsoft.Json.JsonProperty("out_refund_no")] + [System.Text.Json.Serialization.JsonPropertyName("out_refund_no")] + public string OutRefundNumber { get; set; } = default!; + /// /// 获取或设置微信退款单号。 /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/GetDepositRefundResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/GetDepositRefundResponse.cs index 17583e14..b47fe756 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/GetDepositRefundResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Deposit/GetDepositRefundResponse.cs @@ -5,103 +5,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models /// /// 表示 [POST] /deposit/refundquery 接口的响应。 /// - [Newtonsoft.Json.JsonConverter(typeof(Converters.ResponseClassNewtonsoftJsonConverter))] - [System.Text.Json.Serialization.JsonConverter(typeof(Converters.ResponseClassSystemTextJsonConverter))] public class GetDepositRefundResponse : WechatTenpaySignableResponse { - public static class Types - { - public class Refund - { - /// - /// 获取或设置微信退款单号。 - /// - [Newtonsoft.Json.JsonProperty("refund_id_$n")] - [System.Text.Json.Serialization.JsonPropertyName("refund_id_$n")] - public string RefundId { get; set; } = default!; - - /// - /// 获取或设置退款渠道。 - /// - [Newtonsoft.Json.JsonProperty("refund_channel_$n")] - [System.Text.Json.Serialization.JsonPropertyName("refund_channel_$n")] - public string? RefundChannel { get; set; } - - /// - /// 获取或设置退款状态。 - /// - [Newtonsoft.Json.JsonProperty("refund_status_$n")] - [System.Text.Json.Serialization.JsonPropertyName("refund_status_$n")] - public string RefundStatus { get; set; } = default!; - - /// - /// 获取或设置退款资金来源。 - /// - [Newtonsoft.Json.JsonProperty("refund_account_$n")] - [System.Text.Json.Serialization.JsonPropertyName("refund_account_$n")] - public string? RefundAccount { get; set; } - - /// - /// 获取或设置退款入账账户。 - /// - [Newtonsoft.Json.JsonProperty("refund_recv_accout_$n")] - [System.Text.Json.Serialization.JsonPropertyName("refund_recv_accout_$n")] - public string? RefundReceiveAccount { get; set; } - - /// - /// 获取或设置退款金额（单位：分）。 - /// - [Newtonsoft.Json.JsonProperty("refund_fee_$n")] - [System.Text.Json.Serialization.JsonPropertyName("refund_fee_$n")] - [System.Text.Json.Serialization.JsonNumberHandling(System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString)] - public int RefundFee { get; set; } - - /// - /// 获取或设置应结退款金额（单位：分）。 - /// - [Newtonsoft.Json.JsonProperty("settlement_refund_fee_$n")] - [System.Text.Json.Serialization.JsonPropertyName("settlement_refund_fee_$n")] - [System.Text.Json.Serialization.JsonNumberHandling(System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString)] - public int? SettlementRefundFee { get; set; } - - /// - /// 获取或设置代金券退款金额。 - /// - [Newtonsoft.Json.JsonProperty("coupon_refund_fee_$n")] - [System.Text.Json.Serialization.JsonPropertyName("coupon_refund_fee_$n")] - [System.Text.Json.Serialization.JsonNumberHandling(System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString)] - public int? CouponRefundFee { get; set; } - - /// - /// 获取或设置现金退款金额（单位：分）。 - /// - [Newtonsoft.Json.JsonProperty("cash_refund_fee_$n")] - [System.Text.Json.Serialization.JsonPropertyName("cash_refund_fee_$n")] - [System.Text.Json.Serialization.JsonNumberHandling(System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString)] - public int? CashRefundFee { get; set; } - - /// - /// 获取或设置退款成功时间。 - /// - [Newtonsoft.Json.JsonProperty("refund_success_time_$n")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.PureDigitalTextNullableDateTimeOffsetConverter))] - [System.Text.Json.Serialization.JsonPropertyName("refund_success_time_$n")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.PureDigitalTextNullableDateTimeOffsetConverter))] - public DateTimeOffset? SuccessTime { get; set; } - } - } - - internal static class Converters - { - internal class ResponseClassNewtonsoftJsonConverter : Newtonsoft.Json.Converters.FlattenNArrayObjectConverterBase - { - } - - internal class ResponseClassSystemTextJsonConverter : System.Text.Json.Converters.FlattenNArrayObjectConverterBase - { - } - } - /// /// /// @@ -176,18 +81,70 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models public int? CashFee { get; set; } /// - /// 获取或设置记录列表。 + /// 获取或设置商户退款单号。 /// - [Newtonsoft.Json.JsonProperty(Newtonsoft.Json.Converters.FlattenNArrayObjectConverterBase.PROPERTY_NAME_NARRAY)] - [System.Text.Json.Serialization.JsonPropertyName(System.Text.Json.Converters.FlattenNArrayObjectConverterBase.PROPERTY_NAME_NARRAY)] - public Types.Refund[] RefundList { get; set; } = default!; + [Newtonsoft.Json.JsonProperty("out_refund_no")] + [System.Text.Json.Serialization.JsonPropertyName("out_refund_no")] + public string OutRefundNumber { get; set; } = default!; /// - /// 获取或设置记录总数。 + /// 获取或设置微信退款单号。 /// - [Newtonsoft.Json.JsonProperty("refund_count")] - [System.Text.Json.Serialization.JsonPropertyName("refund_count")] + [Newtonsoft.Json.JsonProperty("refund_id")] + [System.Text.Json.Serialization.JsonPropertyName("refund_id")] + public string RefundId { get; set; } = default!; + + /// + /// 获取或设置退款渠道。 + /// + [Newtonsoft.Json.JsonProperty("refund_channel")] + [System.Text.Json.Serialization.JsonPropertyName("refund_channel")] + public string? RefundChannel { get; set; } + + /// + /// 获取或设置退款状态。 + /// + [Newtonsoft.Json.JsonProperty("refund_status")] + [System.Text.Json.Serialization.JsonPropertyName("refund_status")] + public string RefundStatus { get; set; } = default!; + + /// + /// 获取或设置退款资金来源。 + /// + [Newtonsoft.Json.JsonProperty("refund_account")] + [System.Text.Json.Serialization.JsonPropertyName("refund_account")] + public string? RefundAccount { get; set; } + + /// + /// 获取或设置退款入账账户。 + /// + [Newtonsoft.Json.JsonProperty("refund_recv_accout")] + [System.Text.Json.Serialization.JsonPropertyName("refund_recv_accout")] + public string? RefundReceiveAccount { get; set; } + + /// + /// 获取或设置退款金额（单位：分）。 + /// + [Newtonsoft.Json.JsonProperty("refund_fee")] + [System.Text.Json.Serialization.JsonPropertyName("refund_fee")] [System.Text.Json.Serialization.JsonNumberHandling(System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString)] - public int TotalRefundCount { get; set; } + public int RefundFee { get; set; } + + /// + /// 获取或设置应结退款金额（单位：分）。 + /// + [Newtonsoft.Json.JsonProperty("settlement_refund_fee")] + [System.Text.Json.Serialization.JsonPropertyName("settlement_refund_fee")] + [System.Text.Json.Serialization.JsonNumberHandling(System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString)] + public int? SettlementRefundFee { get; set; } + + /// + /// 获取或设置退款成功时间。 + /// + [Newtonsoft.Json.JsonProperty("refund_success_time")] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.PureDigitalTextNullableDateTimeOffsetConverter))] + [System.Text.Json.Serialization.JsonPropertyName("refund_success_time")] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.PureDigitalTextNullableDateTimeOffsetConverter))] + public DateTimeOffset? SuccessTime { get; set; } } }