From 38c595cfca73be369a916add81ce0bdce1656a3f Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Fri, 27 May 2022 16:09:33 +0800 Subject: [PATCH] =?UTF-8?q?feat(tenpayv3):=20=E9=9A=8F=E5=AE=98=E6=96=B9?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9F=A5=E8=AF=A2=E6=B6=88=E8=B4=B9=E8=80=85?= =?UTF-8?q?=E6=8A=95=E8=AF=89=E5=8D=95=E5=88=97=E8=A1=A8=E3=80=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=B6=88=E8=B4=B9=E8=80=85=E6=8A=95=E8=AF=89=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ntServiceComplaintByComplaintIdResponse.cs | 47 +++++++++++++++---- .../QueryMerchantServiceComplaintsResponse.cs | 32 ++++++++++--- ...ServiceComplaintByComplaintIdResponse.json | 11 ++++- ...ueryMerchantServiceComplaintsResponse.json | 10 +++- 4 files changed, 82 insertions(+), 18 deletions(-) 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 077aa7cf..2010955a 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/GetMerchantServiceComplaintByComplaintIdResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/GetMerchantServiceComplaintByComplaintIdResponse.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models { @@ -50,6 +50,30 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models [System.Text.Json.Serialization.JsonPropertyName("media_url")] public string[] MediaUrl { get; set; } = default!; } + + public class ServiceOrder + { + /// + /// 获取或设置微信支付服务订单号。 + /// + [Newtonsoft.Json.JsonProperty("order_id")] + [System.Text.Json.Serialization.JsonPropertyName("order_id")] + public string? OrderId { get; set; } + + /// + /// 获取或设置商户服务订单号。 + /// + [Newtonsoft.Json.JsonProperty("out_order_no")] + [System.Text.Json.Serialization.JsonPropertyName("out_order_no")] + public string? OutOrderNumber { get; set; } + + /// + /// 获取或设置支付分服务单状态。 + /// + [Newtonsoft.Json.JsonProperty("state")] + [System.Text.Json.Serialization.JsonPropertyName("state")] + public string? State { get; set; } + } } /// @@ -59,13 +83,6 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models [System.Text.Json.Serialization.JsonPropertyName("complaint_id")] public string ComplaintId { get; set; } = default!; - /// - /// 获取或设置被诉商户号。 - /// - [Newtonsoft.Json.JsonProperty("complainted_mchid")] - [System.Text.Json.Serialization.JsonPropertyName("complainted_mchid")] - public string ComplaintedMerchantId { get; set; } = default!; - /// /// 获取或设置投诉详情。 /// @@ -89,6 +106,13 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.RFC3339DateTimeOffsetConverter))] public DateTimeOffset ComplaintTime { get; set; } + /// + /// 获取或设置被诉商户号。 + /// + [Newtonsoft.Json.JsonProperty("complainted_mchid")] + [System.Text.Json.Serialization.JsonPropertyName("complainted_mchid")] + public string? ComplaintedMerchantId { get; set; } + /// /// 获取或设置投诉人联系方式（需使用商户私钥解密）。 /// @@ -166,5 +190,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models [Newtonsoft.Json.JsonProperty("user_tag_list")] [System.Text.Json.Serialization.JsonPropertyName("user_tag_list")] public string[]? UserTagList { get; set; } + + /// + /// 获取或设置关联服务单列表。 + /// + [Newtonsoft.Json.JsonProperty("service_order_info")] + [System.Text.Json.Serialization.JsonPropertyName("service_order_info")] + public Types.ServiceOrder[]? ServiceOrderList { 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 ae2da1fd..31262d79 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/QueryMerchantServiceComplaintsResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/QueryMerchantServiceComplaintsResponse.cs @@ -53,6 +53,13 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models [System.Text.Json.Serialization.JsonPropertyName("complaint_state")] public string ComplaintState { get; set; } = default!; + /// + /// 获取或设置被诉商户号。 + /// + [Newtonsoft.Json.JsonProperty("complainted_mchid")] + [System.Text.Json.Serialization.JsonPropertyName("complainted_mchid")] + public string? ComplaintedMerchantId { get; set; } + /// /// 获取或设置投诉人联系方式（需使用商户私钥解密）。 /// @@ -68,13 +75,6 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models [System.Text.Json.Serialization.JsonPropertyName("payer_openid")] public string? PayerOpenId { get; set; } - /// - /// 获取或设置投诉单关联订单列表。 - /// - [Newtonsoft.Json.JsonProperty("complaint_order_info")] - [System.Text.Json.Serialization.JsonPropertyName("complaint_order_info")] - public Types.ComplaintOrder[] ComplaintOrderList { get; set; } = default!; - /// /// 获取或设置投诉资料列表。 /// @@ -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("complaint_order_info")] + [System.Text.Json.Serialization.JsonPropertyName("complaint_order_info")] + public Types.ComplaintOrder[] ComplaintOrderList { get; set; } = default!; + /// /// 获取或设置问题类型。 /// @@ -131,6 +138,10 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models [System.Text.Json.Serialization.JsonPropertyName("user_tag_list")] public string[]? UserTagList { get; set; } } + + public class ServiceOrder : GetMerchantServiceComplaintByComplaintIdResponse.Types.ServiceOrder + { + } } /// @@ -140,6 +151,13 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models [System.Text.Json.Serialization.JsonPropertyName("data")] public Types.Complaint[] ComplaintList { get; set; } = default!; + /// + /// 获取或设置关联服务单列表。 + /// + [Newtonsoft.Json.JsonProperty("service_order_info")] + [System.Text.Json.Serialization.JsonPropertyName("service_order_info")] + public Types.ServiceOrder[]? ServiceOrderList { get; set; } + /// /// 获取或设置分页大小。 /// diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/MerchantService/ComplaintsV2/GetMerchantServiceComplaintByComplaintIdResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/MerchantService/ComplaintsV2/GetMerchantServiceComplaintByComplaintIdResponse.json index 8bf16fa9..6a61b15c 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/MerchantService/ComplaintsV2/GetMerchantServiceComplaintByComplaintIdResponse.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/MerchantService/ComplaintsV2/GetMerchantServiceComplaintByComplaintIdResponse.json @@ -2,8 +2,8 @@ "complaint_id": "200201820200101080076610000", "complaint_time": "2015-05-20T13:29:35.120+08:00", "complaint_detail": "反馈一个重复扣费的问题", - "complainted_mchid": "1900012181", "complaint_state": "PENDING", + "complainted_mchid": "1900012181", "payer_phone": "sGdNeTHMQGlxCWiUyHu6XNO9GCYln2Luv4HhwJzZBfcL12sB", "payer_openid": "oUpF8uMuAJO_M2pxb1Q9zNjWeS6o", "complaint_media_list": [ @@ -24,5 +24,12 @@ "complaint_full_refunded": true, "incoming_user_response": true, "problem_description": "不满意商家服务", - "user_complaint_times": 1 + "user_complaint_times": 1, + "service_order_info": [ + { + "order_id": "15646546545165651651", + "out_order_no": "1234323JKHDFE1243252", + "state": "CREATED" + } + ] } 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 b32ec245..c422e848 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 @@ -5,6 +5,7 @@ "complaint_time": "2015-05-20T13:29:35.120+08:00", "complaint_detail": "反馈一个重复扣费的问题", "complaint_state": "PENDING", + "complainted_mchid": "1900012181", "payer_phone": "Qe41VhP/sGdNeTHMQGlxCWiUyHu6XNO9GCYln2Luv4HhwJzZBfcL12sB+PgZcS5NhePBog30NgJ1xRaK+gbGDKwpg==", "complaint_media_list": [ { @@ -34,5 +35,12 @@ ], "limit": 5, "offset": 10, - "total_count": 1000 + "total_count": 1000, + "service_order_info": [ + { + "order_id": "15646546545165651651", + "out_order_no": "1234323JKHDFE1243252", + "state": "CREATED" + } + ] }