diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/CreateMerchantServiceComplaintResponseRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/CreateMerchantServiceComplaintResponseRequest.cs index 98e3b1bd..424c1809 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/CreateMerchantServiceComplaintResponseRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/CreateMerchantServiceComplaintResponseRequest.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models { @@ -7,6 +7,33 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models /// public class CreateMerchantServiceComplaintResponseRequest : WechatTenpayRequest { + public static class Types + { + public class MiniProgramJumpInfo + { + /// + /// 获取或设置小程序 AppId。 + /// + [Newtonsoft.Json.JsonProperty("appid")] + [System.Text.Json.Serialization.JsonPropertyName("appid")] + public string AppId { get; set; } = string.Empty; + + /// + /// 获取或设置小程序页面路径。 + /// + [Newtonsoft.Json.JsonProperty("path")] + [System.Text.Json.Serialization.JsonPropertyName("path")] + public string PagePath { get; set; } = string.Empty; + + /// + /// 获取或设置小程序页面名称。 + /// + [Newtonsoft.Json.JsonProperty("text")] + [System.Text.Json.Serialization.JsonPropertyName("text")] + public string Text { get; set; } = string.Empty; + } + } + /// /// 获取或设置投诉单号。 /// @@ -48,5 +75,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models [Newtonsoft.Json.JsonProperty("jump_url_text")] [System.Text.Json.Serialization.JsonPropertyName("jump_url_text")] public string? JumpUrlText { get; set; } + + /// + /// 获取或设置小程序跳转信息。 + /// + [Newtonsoft.Json.JsonProperty("mini_program_jump_info")] + [System.Text.Json.Serialization.JsonPropertyName("mini_program_jump_info")] + public Types.MiniProgramJumpInfo? MiniProgramJumpInfo { get; set; } } } 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 14f833bc..54d6c82d 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/GetMerchantServiceComplaintByComplaintIdResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/GetMerchantServiceComplaintByComplaintIdResponse.cs @@ -127,6 +127,13 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models [Newtonsoft.Json.JsonProperty("return_address_info")] [System.Text.Json.Serialization.JsonPropertyName("return_address_info")] public Types.ReturnAddress? ReturnAddress { get; set; } + + /// + /// 获取或设置是否归还同一柜机。 + /// + [Newtonsoft.Json.JsonProperty("is_returned_to_same_machine")] + [System.Text.Json.Serialization.JsonPropertyName("is_returned_to_same_machine")] + public bool? IsReturnedToSameMachine { get; set; } } } @@ -276,5 +283,19 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models [Newtonsoft.Json.JsonProperty("additional_info")] [System.Text.Json.Serialization.JsonPropertyName("additional_info")] public Types.AdditionalInfomation? AdditionalInfomation { get; set; } + + /// + /// 获取或设置是否在平台协助中。 + /// + [Newtonsoft.Json.JsonProperty("in_platform_service")] + [System.Text.Json.Serialization.JsonPropertyName("in_platform_service")] + public bool? IsInPlatformService { get; set; } + + /// + /// 获取或设置是否需即时服务用户。 + /// + [Newtonsoft.Json.JsonProperty("need_immediate_service")] + [System.Text.Json.Serialization.JsonPropertyName("need_immediate_service")] + public bool? IsImmediateServiceRequired { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/QueryMerchantServiceComplaintNegotiationHistoriesResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/QueryMerchantServiceComplaintNegotiationHistoriesResponse.cs index db8015a6..684970d9 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/QueryMerchantServiceComplaintNegotiationHistoriesResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/QueryMerchantServiceComplaintNegotiationHistoriesResponse.cs @@ -71,6 +71,20 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models [System.Text.Json.Serialization.JsonPropertyName("complaint_media_list")] [System.Text.Json.Serialization.JsonConverter(typeof(Converters.ResponsePropertyNegotiationHistoryItemComplaintMediaListSystemTextJsonConverter))] public Types.ComplaintMedia[]? ComplaintMediaList { get; set; } + + /// + /// 获取或设置用户申请平台协助原因。 + /// + [Newtonsoft.Json.JsonProperty("user_appy_platform_service_reason")] + [System.Text.Json.Serialization.JsonPropertyName("user_appy_platform_service_reason")] + public string? UserAppyPlatformServiceReason { get; set; } + + /// + /// 获取或设置用户申请平台协助原因描述。 + /// + [Newtonsoft.Json.JsonProperty("user_appy_platform_service_reason_description")] + [System.Text.Json.Serialization.JsonPropertyName("user_appy_platform_service_reason_description")] + public string? UserAppyPlatformServiceReasonDescription { 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 588f7922..035bb6c6 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/QueryMerchantServiceComplaintsResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/MerchantService/ComplaintsV2/QueryMerchantServiceComplaintsResponse.cs @@ -161,6 +161,20 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models [Newtonsoft.Json.JsonProperty("additional_info")] [System.Text.Json.Serialization.JsonPropertyName("additional_info")] public Types.AdditionalInfomation? AdditionalInfomation { get; set; } + + /// + /// 获取或设置是否在平台协助中。 + /// + [Newtonsoft.Json.JsonProperty("in_platform_service")] + [System.Text.Json.Serialization.JsonPropertyName("in_platform_service")] + public bool? IsInPlatformService { get; set; } + + /// + /// 获取或设置是否需即时服务用户。 + /// + [Newtonsoft.Json.JsonProperty("need_immediate_service")] + [System.Text.Json.Serialization.JsonPropertyName("need_immediate_service")] + public bool? IsImmediateServiceRequired { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/MarketingShoppingReceipt/SetMarketingShoppingReceiptJumpInfoRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/MarketingShoppingReceipt/SetMarketingShoppingReceiptJumpInfoRequest.cs index 4f121a7a..ef29b771 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/MarketingShoppingReceipt/SetMarketingShoppingReceiptJumpInfoRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/MarketingShoppingReceipt/SetMarketingShoppingReceiptJumpInfoRequest.cs @@ -9,7 +9,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models { public static class Types { - public class JumpLink + public class JumpInfo { /// /// 获取或设置小程序 AppId。 @@ -69,6 +69,6 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models /// [Newtonsoft.Json.JsonProperty("jump_info")] [System.Text.Json.Serialization.JsonPropertyName("jump_info")] - public Types.JumpLink JumpLink { get; set; } = new Types.JumpLink(); + public Types.JumpInfo JumpInfo { get; set; } = new Types.JumpInfo(); } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/MarketingShoppingReceipt/SetMarketingShoppingReceiptJumpInfoResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/MarketingShoppingReceipt/SetMarketingShoppingReceiptJumpInfoResponse.cs index 1053fa4d..6f645eb8 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/MarketingShoppingReceipt/SetMarketingShoppingReceiptJumpInfoResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/MarketingShoppingReceipt/SetMarketingShoppingReceiptJumpInfoResponse.cs @@ -13,7 +13,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models { public static class Types { - public class JumpLink : SetMarketingShoppingReceiptJumpInfoRequest.Types.JumpLink + public class JumpLink : SetMarketingShoppingReceiptJumpInfoRequest.Types.JumpInfo { } } diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/MerchantService/ComplaintsV2/CreateMerchantServiceComplaintResponseRequest.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/MerchantService/ComplaintsV2/CreateMerchantServiceComplaintResponseRequest.json index 3caec025..6e35498b 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/MerchantService/ComplaintsV2/CreateMerchantServiceComplaintResponseRequest.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/MerchantService/ComplaintsV2/CreateMerchantServiceComplaintResponseRequest.json @@ -1,7 +1,14 @@ -{ +{ "complainted_mchid": "1900012181", "response_content": "已与用户沟通解决", + "response_images": [ + "aabbccdd" + ], "jump_url": "https://www.xxx.com/notify", "jump_url_text": "查看订单详情", - "response_images": ["file23578_21798531.jpg"] + "mini_program_jump_info": { + "appid": "example_appid", + "path": "example_path", + "text": "example_text" + } } 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 0450e886..b6f02790 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,10 +2,19 @@ "complaint_id": "200201820200101080076610000", "complaint_time": "2015-05-20T13:29:35.120+08:00", "complaint_detail": "反馈一个重复扣费的问题", - "complainted_mchid": "1900012181", "complaint_state": "PENDING", - "payer_phone": "sGdNeTHMQGlxCWiUyHu6XNO9GCYln2Luv4HhwJzZBfcL12sB", + "payer_phone": "18500000000", "payer_openid": "oUpF8uMuAJO_M2pxb1Q9zNjWeS6o", + "complaint_order_info": [ + { + "transaction_id": "4200000404201909069117582536", + "out_trade_no": "20190906154617947762231", + "amount": 3 + } + ], + "complaint_full_refunded": true, + "incoming_user_response": true, + "user_complaint_times": 1, "complaint_media_list": [ { "media_type": "USER_COMPLAINT_IMAGE", @@ -14,12 +23,11 @@ ] } ], - "complaint_order_info": [ - { - "transaction_id": "4200000404201909069117582536", - "out_trade_no": "20190906154617947762231", - "amount": 3 - } + "problem_description": "不满意商家服务", + "problem_type": "REFUND", + "apply_refund_amount": 10, + "user_tag_list": [ + "TRUSTED" ], "service_order_info": [ { @@ -28,14 +36,18 @@ "state": "DOING" } ], - "complaint_full_refunded": true, - "incoming_user_response": true, - "problem_description": "不满意商家服务", - "user_complaint_times": 1, "additional_info": { + "type": "SHARE_POWER_TYPE", "share_power_info": { - "return_time": "2023-02-10T14:44:00+08:00" - }, - "type": "SHARE_POWER_TYPE" - } + "return_time": "2015-05-20T13:29:35+08:00", + "return_address_info": { + "return_address": "广东省深圳市南山区海天二路南山区后海腾讯滨海大厦(海天二路西)", + "longitude": "113.93535488533665", + "latitude": "22.52305518747831" + }, + "is_returned_to_same_machine": false + } + }, + "in_platform_service": true, + "need_immediate_service": true } 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 b7e21fbb..ea05b1fa 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 @@ -32,7 +32,9 @@ "operate_details": "已与用户电话沟通解决", "image_list": [ "https://qpic.cn/xxx" - ] + ], + "user_appy_platform_service_reason": "商家响应不及时", + "user_appy_platform_service_reason_description": "一周前就提交咨询了，到现在商家还没理我" } ], "limit": 50, 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 2890b699..07e7b858 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 @@ -1,17 +1,11 @@ { "data": [ { - "additional_info": { - "share_power_info": { - "return_time": "2023-02-10T14:44:00+08:00" - }, - "type": "SHARE_POWER_TYPE" - }, "complaint_id": "200201820200101080076610000", "complaint_time": "2015-05-20T13:29:35.120+08:00", "complaint_detail": "反馈一个重复扣费的问题", "complaint_state": "PENDING", - "payer_phone": "Qe41VhP/sGdNeTHMQGlxCWiUyHu6XNO9GCYln2Luv4HhwJzZBfcL12sB+PgZcS5NhePBog30NgJ1xRaK+gbGDKwpg==", + "payer_phone": "18500000000", "complaint_order_info": [ { "transaction_id": "4200000404201909069117582536", @@ -19,13 +13,6 @@ "amount": 3 } ], - "service_order_info": [ - { - "order_id": "15646546545165651651", - "out_order_no": "1234323JKHDFE1243252", - "state": "DOING" - } - ], "complaint_full_refunded": true, "incoming_user_response": true, "user_complaint_times": 1, @@ -37,7 +24,33 @@ ] } ], - "problem_description": "不满意商家服务" + "problem_description": "不满意商家服务", + "problem_type": "REFUND", + "apply_refund_amount": 10, + "user_tag_list": [ + "TRUSTED" + ], + "service_order_info": [ + { + "order_id": "15646546545165651651", + "out_order_no": "1234323JKHDFE1243252", + "state": "DOING" + } + ], + "additional_info": { + "type": "SHARE_POWER_TYPE", + "share_power_info": { + "return_time": "2015-05-20T13:29:35+08:00", + "return_address_info": { + "return_address": "广东省深圳市南山区海天二路南山区后海腾讯滨海大厦(海天二路西)", + "longitude": "113.93535488533665", + "latitude": "22.52305518747831" + }, + "is_returned_to_same_machine": false + } + }, + "in_platform_service": true, + "need_immediate_service": true } ], "limit": 5,