diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantMediaExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantMediaExtensions.cs index c3d97bcc..a8827cfd 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantMediaExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantMediaExtensions.cs @@ -1,10 +1,7 @@ using System; using System.Net.Http; -using System.Net.Http.Headers; -using System.Text; using System.Threading; using System.Threading.Tasks; -using System.Web; using Flurl.Http; namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/GetMerchantServiceComplaintByComplaintIdResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/GetMerchantServiceComplaintByComplaintIdResponse.cs index 03064e47..077aa7cf 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/GetMerchantServiceComplaintByComplaintIdResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/GetMerchantServiceComplaintByComplaintIdResponse.cs @@ -118,6 +118,13 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models [System.Text.Json.Serialization.JsonPropertyName("complaint_media_list")] public Types.ComplaintMedia[] ComplaintMediaList { get; set; } = default!; + /// + /// 获取或设置问题类型。 + /// + [Newtonsoft.Json.JsonProperty("problem_type")] + [System.Text.Json.Serialization.JsonPropertyName("problem_type")] + public string? ProblemType { get; set; } + /// /// 获取或设置问题描述。 /// @@ -125,6 +132,13 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models [System.Text.Json.Serialization.JsonPropertyName("problem_description")] public string ProblemDescription { get; set; } = default!; + /// + /// 获取或设置申请退款金额(单位:分)。 + /// + [Newtonsoft.Json.JsonProperty("apply_refund_amount")] + [System.Text.Json.Serialization.JsonPropertyName("apply_refund_amount")] + public int? ApplyRefundAmount { get; set; } + /// /// 获取或设置投诉单是否已全额退款。 /// @@ -145,5 +159,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models [Newtonsoft.Json.JsonProperty("user_complaint_times")] [System.Text.Json.Serialization.JsonPropertyName("user_complaint_times")] public int UserComplaintTimes { get; set; } + + /// + /// 获取或设置用户标签列表。 + /// + [Newtonsoft.Json.JsonProperty("user_tag_list")] + [System.Text.Json.Serialization.JsonPropertyName("user_tag_list")] + public string[]? UserTagList { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/QueryMerchantServiceComplaintsResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/QueryMerchantServiceComplaintsResponse.cs index f910a3c5..ae2da1fd 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/QueryMerchantServiceComplaintsResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/QueryMerchantServiceComplaintsResponse.cs @@ -82,6 +82,13 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models [System.Text.Json.Serialization.JsonPropertyName("complaint_media_list")] public Types.ComplaintMedia[] ComplaintMediaList { get; set; } = default!; + /// + /// 获取或设置问题类型。 + /// + [Newtonsoft.Json.JsonProperty("problem_type")] + [System.Text.Json.Serialization.JsonPropertyName("problem_type")] + public string? ProblemType { get; set; } + /// /// 获取或设置问题描述。 /// @@ -89,6 +96,13 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models [System.Text.Json.Serialization.JsonPropertyName("problem_description")] public string ProblemDescription { get; set; } = default!; + /// + /// 获取或设置申请退款金额(单位:分)。 + /// + [Newtonsoft.Json.JsonProperty("apply_refund_amount")] + [System.Text.Json.Serialization.JsonPropertyName("apply_refund_amount")] + public int? ApplyRefundAmount { get; set; } + /// /// 获取或设置投诉单是否已全额退款。 /// @@ -109,6 +123,13 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models [Newtonsoft.Json.JsonProperty("user_complaint_times")] [System.Text.Json.Serialization.JsonPropertyName("user_complaint_times")] public int UserComplaintTimes { get; set; } + + /// + /// 获取或设置用户标签列表。 + /// + [Newtonsoft.Json.JsonProperty("user_tag_list")] + [System.Text.Json.Serialization.JsonPropertyName("user_tag_list")] + public string[]? UserTagList { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/UpdateMerchantServiceComplaintRefundProgressRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/UpdateMerchantServiceComplaintRefundProgressRequest.cs new file mode 100644 index 00000000..66afc338 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/UpdateMerchantServiceComplaintRefundProgressRequest.cs @@ -0,0 +1,52 @@ +using System.Collections.Generic; + +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models +{ + /// + /// 表示 [POST] /merchant-service/complaints-v2/{complaint_id}/update-refund-progress 接口的请求。 + /// + public class UpdateMerchantServiceComplaintRefundProgressRequest : WechatTenpayRequest + { + /// + /// 获取或设置投诉单号。 + /// + [Newtonsoft.Json.JsonIgnore] + [System.Text.Json.Serialization.JsonIgnore] + public string ComplaintId { get; set; } = string.Empty; + + /// + /// 获取或设置审批动作。 + /// + [Newtonsoft.Json.JsonProperty("action")] + [System.Text.Json.Serialization.JsonPropertyName("action")] + public string Action { get; set; } = string.Empty; + + /// + /// 获取或设置预计发起退款天数。 + /// + [Newtonsoft.Json.JsonProperty("launch_refund_day")] + [System.Text.Json.Serialization.JsonPropertyName("launch_refund_day")] + public int? LaunchRefundDays { get; set; } + + /// + /// 获取或设置拒绝退款原因。 + /// + [Newtonsoft.Json.JsonProperty("reject_reason")] + [System.Text.Json.Serialization.JsonPropertyName("reject_reason")] + public string? RejectReason { get; set; } + + /// + /// 获取或设置拒绝退款的举证图片 MediaId 列表。 + /// + [Newtonsoft.Json.JsonProperty("reject_media_list")] + [System.Text.Json.Serialization.JsonPropertyName("reject_media_list")] + public IList? RejectMediaIdList { get; set; } + + /// + /// 获取或设置备注。 + /// + [Newtonsoft.Json.JsonProperty("remark")] + [System.Text.Json.Serialization.JsonPropertyName("remark")] + public string? Remark { get; set; } + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/UpdateMerchantServiceComplaintRefundProgressResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/UpdateMerchantServiceComplaintRefundProgressResponse.cs new file mode 100644 index 00000000..b581bae1 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/UpdateMerchantServiceComplaintRefundProgressResponse.cs @@ -0,0 +1,9 @@ +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models +{ + /// + /// 表示 [POST] /merchant-service/complaints-v2/{complaint_id}/update-refund-progress 接口的响应。 + /// + public class UpdateMerchantServiceComplaintRefundProgressResponse : WechatTenpayResponse + { + } +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/MerchantService/ComplaintsV2/QueryMerchantServiceComplaintsResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/MerchantService/ComplaintsV2/QueryMerchantServiceComplaintsResponse.json index 93fed3c5..4da11e0b 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/MerchantService/ComplaintsV2/QueryMerchantServiceComplaintsResponse.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/MerchantService/ComplaintsV2/QueryMerchantServiceComplaintsResponse.json @@ -21,9 +21,9 @@ "amount": 3 }, { - "transaction_id": "4200000404201909069117982536", - "out_trade_no": "20190906154617947772231", - "amount": 9 + "transaction_id": "4200000404201909069117582836", + "out_trade_no": "20190906154617947762291", + "amount": 4 } ], "complaint_full_refunded": true, diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/MerchantService/ComplaintsV2/UpdateMerchantServiceComplaintRefundProgressRequest.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/MerchantService/ComplaintsV2/UpdateMerchantServiceComplaintRefundProgressRequest.json new file mode 100644 index 00000000..9fcdae6f --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/MerchantService/ComplaintsV2/UpdateMerchantServiceComplaintRefundProgressRequest.json @@ -0,0 +1,7 @@ +{ + "action": "REJECT", + "launch_refund_day": 3, + "reject_media_list": [ "file23578_21798531.jpg" ], + "reject_reason": "拒绝退款", + "remark": "不同意退款" +} \ No newline at end of file