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 e4be7b54..8202e78d 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 @@ -6,6 +6,14 @@ "complaint_state": "PENDING", "payer_phone": "sGdNeTHMQGlxCWiUyHu6XNO9GCYln2Luv4HhwJzZBfcL12sB", "payer_openid": "oUpF8uMuAJO_M2pxb1Q9zNjWeS6o", + "complaint_media_list": [ + { + "media_type": "USER_COMPLAINT_IMAGE", + "media_url": [ + "https://api.mch.weixin.qq.com/v3/merchant-service/images/xxxxx" + ] + } + ], "complaint_order_info": [ { "transaction_id": "4200000404201909069117582536", @@ -15,5 +23,6 @@ ], "complaint_full_refunded": true, "incoming_user_response": true, + "problem_description": "不满意商家服务", "user_complaint_times": 1 } \ No newline at end of file diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/MerchantService/ComplaintsV2/QueryMerchantServiceComplaintNegotiationHistoriesResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/MerchantService/ComplaintsV2/QueryMerchantServiceComplaintNegotiationHistoriesResponse.json index 630cc6a5..d0861a3e 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/MerchantService/ComplaintsV2/QueryMerchantServiceComplaintNegotiationHistoriesResponse.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/MerchantService/ComplaintsV2/QueryMerchantServiceComplaintNegotiationHistoriesResponse.json @@ -1,6 +1,14 @@ { "data": [ { + "complaint_media_list": [ + { + "media_type": "USER_COMPLAINT_IMAGE", + "media_url": [ + "https://api.mch.weixin.qq.com/v3/merchant-service/images/xxxxx" + ] + } + ], "log_id": "300285320210322170000071077", "operator": "投诉人", "operate_time": "2015-05-20T13:29:35.120+08:00", 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 6bc2e55b..93fed3c5 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 @@ -6,7 +6,14 @@ "complaint_detail": "反馈一个重复扣费的问题", "complaint_state": "PENDING", "payer_phone": "Qe41VhP/sGdNeTHMQGlxCWiUyHu6XNO9GCYln2Luv4HhwJzZBfcL12sB+PgZcS5NhePBog30NgJ1xRaK+gbGDKwpg==", - "payer_openid": "oUpF8uMuAJO_M2pxb1Q9zNjWeS6o", + "complaint_media_list": [ + { + "media_type": "USER_COMPLAINT_IMAGE", + "media_url": [ + "https://api.mch.weixin.qq.com/v3/merchant-service/images/xxxxx" + ] + } + ], "complaint_order_info": [ { "transaction_id": "4200000404201909069117582536", @@ -21,6 +28,7 @@ ], "complaint_full_refunded": true, "incoming_user_response": true, + "problem_description": "不满意商家服务", "user_complaint_times": 1 } ], diff --git a/test/SKIT.FlurlHttpClient.Wechat.TestTools/CodeStyleUtil.cs b/test/SKIT.FlurlHttpClient.Wechat.TestTools/CodeStyleUtil.cs index 27aab4fe..81d8bb13 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TestTools/CodeStyleUtil.cs +++ b/test/SKIT.FlurlHttpClient.Wechat.TestTools/CodeStyleUtil.cs @@ -373,7 +373,7 @@ namespace SKIT.FlurlHttpClient.Wechat string actualMethod = sourceCode.Contains(".CreateRequest(request, new HttpMethod(\"") ? sourceCode.Split(".CreateRequest(request, new HttpMethod(\"")[1].Split("\"")[0] : sourceCode.Contains(".CreateRequest(request, HttpMethod.") ? - sourceCode.Split(".CreateRequest(request, HttpMethod.")[1].Split(",")[0] : + sourceCode.Split(".CreateRequest(request, HttpMethod.")[1].Split(",")[0].Split(")")[0] : string.Empty; if (!string.Equals(expectedMethod, actualMethod, StringComparison.OrdinalIgnoreCase)) { @@ -490,7 +490,7 @@ namespace SKIT.FlurlHttpClient.Wechat // 如果是 GET 请求,检查是否包含 JSON 序列化字段 if ("GET".Equals(expectedRequestMethod, StringComparison.OrdinalIgnoreCase)) { - if (!reqCodeSourceCode.Contains("/* @codestyle-disable") || !reqCodeSourceCode.Contains("no-jsonable-property-in-get")) + if (!(reqCodeSourceCode.Contains("/* @codestyle-disable") && reqCodeSourceCode.Contains("no-jsonable-property-in-get"))) { if (new Regex("\\[Newtonsoft.Json.JsonProperty\\(\"[a-zA-Z0-9_]*\"\\)\\]").IsMatch(reqCodeSourceCode)) {