From 6ef991898dffccc2ec2a7d5636a4321a4584d57d Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Mon, 14 Mar 2022 14:01:37 +0800 Subject: [PATCH] =?UTF-8?q?feat(work):=20=E9=9A=8F=E5=AE=98=E6=96=B9?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BC=9A=E8=AE=AE=E5=AE=A4=E3=80=81=E6=97=A5?= =?UTF-8?q?=E7=A8=8B=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ngRoomGetBookingInfoByMeetingIdResponse.cs | 4 ++-- ...ibinOAMeetingRoomGetBookingInfoResponse.cs | 7 +++++++ .../Schedule/CgibinOAScheduleUpdateRequest.cs | 7 +++++++ ...RoomGetBookingInfoByMeetingIdResponse.json | 19 +++++++++---------- ...inOAMeetingRoomGetBookingInfoResponse.json | 3 ++- .../CgibinOAScheduleUpdateRequest.json | 3 ++- 6 files changed, 29 insertions(+), 14 deletions(-) diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomGetBookingInfoByMeetingIdResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomGetBookingInfoByMeetingIdResponse.cs index 5c56f718..2fe484c9 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomGetBookingInfoByMeetingIdResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomGetBookingInfoByMeetingIdResponse.cs @@ -20,10 +20,10 @@ public int MeetingRoomId { get; set; } /// - /// 获取或设置排期列表。 + /// 获取或设置排期信息。 /// [Newtonsoft.Json.JsonProperty("schedule")] [System.Text.Json.Serialization.JsonPropertyName("schedule")] - public Types.Schedule[] ScheduleList { get; set; } = default!; + public Types.Schedule Schedule { get; set; } = default!; } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomGetBookingInfoResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomGetBookingInfoResponse.cs index 8d375a10..e9033d4d 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomGetBookingInfoResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomGetBookingInfoResponse.cs @@ -47,6 +47,13 @@ [Newtonsoft.Json.JsonProperty("booker")] [System.Text.Json.Serialization.JsonPropertyName("booker")] public string? BookerUserId { get; set; } + + /// + /// 获取或设置预定状态。 + /// + [Newtonsoft.Json.JsonProperty("status")] + [System.Text.Json.Serialization.JsonPropertyName("status")] + public int Status { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Schedule/CgibinOAScheduleUpdateRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Schedule/CgibinOAScheduleUpdateRequest.cs index 402c1c7c..d66fcfd4 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Schedule/CgibinOAScheduleUpdateRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Models/CgibinOA/Schedule/CgibinOAScheduleUpdateRequest.cs @@ -84,6 +84,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Work.Models [Newtonsoft.Json.JsonProperty("attendees")] [System.Text.Json.Serialization.JsonPropertyName("attendees")] public IList? AttendeeList { get; set; } + + /// + /// 获取或设置是否忽略参与者字段。 + /// + [Newtonsoft.Json.JsonProperty("skip_attendees")] + [System.Text.Json.Serialization.JsonPropertyName("skip_attendees")] + public bool? RequireSkipAttendees { get; set; } } } diff --git a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomGetBookingInfoByMeetingIdResponse.json b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomGetBookingInfoByMeetingIdResponse.json index 07f1ecad..c3cd25e4 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomGetBookingInfoByMeetingIdResponse.json +++ b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomGetBookingInfoByMeetingIdResponse.json @@ -2,13 +2,12 @@ "errcode": 0, "errmsg": "ok", "meetingroom_id": 1, - "schedule": [ - { - "meeting_id": "mtebsada6e027c123cbafAAA", - "schedule_id": "17c7d2bd9f20d652840f72f59e796AAA", - "start_time": 1593532800, - "end_time": 1593662400, - "booker": "zhangsan" - } - ] -} \ No newline at end of file + "schedule": { + "meeting_id": "mtebsada6e027c123cbafAAA", + "schedule_id": "17c7d2bd9f20d652840f72f59e796AAA", + "start_time": 1593532800, + "end_time": 1593662400, + "booker": "zhangsan", + "status": 0 + } +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomGetBookingInfoResponse.json b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomGetBookingInfoResponse.json index b19507fe..046a6830 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomGetBookingInfoResponse.json +++ b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/MettingRoom/Book/CgibinOAMeetingRoomGetBookingInfoResponse.json @@ -10,7 +10,8 @@ "schedule_id": "17c7d2bd9f20d652840f72f59e796AAA", "start_time": 1593532800, "end_time": 1593662400, - "booker": "zhangsan" + "booker": "zhangsan", + "status": 0 } ] }, diff --git a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/Schedule/CgibinOAScheduleUpdateRequest.json b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/Schedule/CgibinOAScheduleUpdateRequest.json index fe69076f..9e76ed50 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/Schedule/CgibinOAScheduleUpdateRequest.json +++ b/test/SKIT.FlurlHttpClient.Wechat.Work.UnitTests/ModelSamples/CgibinOA/Schedule/CgibinOAScheduleUpdateRequest.json @@ -23,6 +23,7 @@ "repeat_day_of_month": [ 10, 21 ], "timezone": 8 }, - "location": "test_place" + "location": "test_place", + "skip_attendees": true } }